Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -2,6 +2,8 @@ package com.yxt.anrui.base.api.basedistributor;
 
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListQuery;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -84,5 +86,8 @@ public interface BaseDistributorFeign {
     @PostMapping("/getDistributorList")
     ResultBean<PagerVo<BaseDistributorsListVo>> getDistributorList(@RequestBody PagerQuery<BaseDistributorsListQuery> pagerQuery);
 
+    @ApiOperation("移动端-经销商分页列表")
+    @PostMapping("/getDistributorListOne")
+    ResultBean<PagerVo<BaseDistributorsVo>> getDistributorListOne(@RequestBody PagerQuery<BaseDistributorsQuery> pagerQuery);
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -2,6 +2,8 @@ package com.yxt.anrui.base.api.basedistributor;
 
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListQuery;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -83,5 +85,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseDistributorsVo>> getDistributorListOne(PagerQuery<BaseDistributorsQuery> pagerQuery) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.base.api.basedistributor.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/13 15:39
+ * @Description
+ */
+@Data
+public class BaseDistributorsQuery implements Query {
+    private static final long serialVersionUID = 5154070887643571544L;
+    @ApiModelProperty(value = "优先名称")
+    private String name;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistributorsVo.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.base.api.basedistributor.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/8 17:52
+ * @Description
+ */
+@Data
+public class BaseDistributorsVo implements Vo {
+    private static final long serialVersionUID = 5914392219484987169L;
+
+    @ApiModelProperty(value = "经销商名称")
+    private String disName;
+    @ApiModelProperty(value = "经销商sid")
+    private String sid;
+    @ApiModelProperty(value = "状态")
+    private String state;
+    @ApiModelProperty(value = "所属经销商")
+    private String pDistributorName;
+    @ApiModelProperty(value = "统一信用代码")
+    private String registNum;
+    @ApiModelProperty(value = "注册地址")
+    private String registDetailAddress;
+    @ApiModelProperty(value = "经销商开票信息联系电话")
+    private String invoPhone;
+    @ApiModelProperty(value = "成立日期")
+    private String setUpTime;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java

@@ -1,5 +1,7 @@
 package com.yxt.anrui.base.api.busvehicleapply;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,6 +36,9 @@ public class BusVehicleApplyDetailsVo implements Vo {
     private String remarks;
     @ApiModelProperty("申请人sid")
     private String createBySid;
+    @ApiModelProperty(value = "当前订金金额")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String currentAmount;
     @ApiModelProperty("车辆排产申请详情")
     private List<BusVehicleApplyDetailVo> busVehicleApplyDetailVoList = new ArrayList<>();
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basedistributor.*;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -103,4 +104,6 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
      * @return
      */
     IPage<BaseDistributorsListVo> getDistributorList(IPage<BaseDistributorsListVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseMiddleman> qw);
+
+    IPage<BaseDistributorsVo> getDistributorListOne(IPage<BaseDistributor> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDistributor> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -115,4 +115,21 @@
         select sid, disName orgName, pDistributorName, registNum, contract, mobile
         from base_distributor ${ew.customSqlSegment}
     </select>
+
+    <select id="getDistributorListOne" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo">
+        SELECT bd.sid,
+               bd.disName,
+               case bd.state
+                   when 1 then '未备案'
+                   when 2 then '已备案' end             as state,
+               bd.pDistributorName,
+               bd.registNum,
+               bd.registDetailAddress,
+               bd.invoPhone,
+               DATE_FORMAT(bd.setUpTime, '%Y-%m-%d') as setUpTime
+        FROM base_distributor bd
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basedistributor.*;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListQuery;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
 import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
 import com.yxt.anrui.base.biz.basedistributorlegal.BaseDistributorLegalService;
 import com.yxt.anrui.base.biz.basedistributorperson.BaseDistributorPersonService;
@@ -188,4 +190,11 @@ public class BaseDistributorRest implements BaseDistributorFeign {
         PagerVo<BaseDistributorsListVo> pv = baseDistributorService.getDistributorList(pagerQuery);
         return rb.success().setMsg("当前共查询到" + pv.getTotal() + "条记录").setData(pv);
     }
+
+    @Override
+    public ResultBean<PagerVo<BaseDistributorsVo>> getDistributorListOne(PagerQuery<BaseDistributorsQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseDistributorsVo> pv = baseDistributorService.getDistributorListOne(pagerQuery);
+        return rb.success().setData(pv);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basedistributor.*;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListQuery;
 import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendix;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixDto;
 import com.yxt.anrui.base.api.basedistributorappendix.BaseDistributorAppendixVo;
@@ -525,4 +527,22 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         PagerVo<BaseDistributorsListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public PagerVo<BaseDistributorsVo> getDistributorListOne(PagerQuery<BaseDistributorsQuery> pagerQuery) {
+        IPage<BaseDistributor> page = PagerUtil.queryToPage(pagerQuery);
+        BaseDistributorsQuery params = pagerQuery.getParams();
+        QueryWrapper<BaseDistributor> qw = new QueryWrapper<>();
+        if (params != null) {
+            if (StringUtils.isNotBlank(params.getUserSid())) {
+                ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
+                qw.eq("bd.useOrg", resultBean.getData());
+            }
+            if (StringUtils.isNotBlank(params.getName())) {
+                qw.like("bd.disName", params.getName());
+            }
+        }
+        IPage<BaseDistributorsVo> pagging = baseMapper.getDistributorListOne(page, qw);
+        PagerVo<BaseDistributorsVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -168,6 +168,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
      * @param dto
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> saveOrUpdateDto(BusVehicleApplyDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
@@ -179,13 +180,21 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             String billNo = getApplyCode(dto);
             entity.setApplicationCode(billNo);
             entity.setApplicationDate(DateUtil.today());
+            BigDecimal bigDecimalAll = new BigDecimal("0");
             List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailDtoList();
             for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) {
                 BusVehicleApplyDetail busVehicleApplyDetail = new BusVehicleApplyDetail();
                 BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid");
                 busVehicleApplyDetail.setApplySid(entity.getSid());
+                if (StringUtils.isNotBlank(busVehicleApplyDetailDto.getApplyForDeposit())) {
+                    bigDecimalAll = bigDecimalAll.add(new BigDecimal(busVehicleApplyDetailDto.getApplyForDeposit()));
+                }
                 busVehicleApplyDetailService.insert(busVehicleApplyDetail);
             }
+            if (bigDecimalAll.compareTo(new BigDecimal(dto.getCurrentAmount())) != 0) {
+                return rb.setMsg("申请订金合计计算错误");
+            }
+            entity.setCurrentAmount(bigDecimalAll);
             baseMapper.insert(entity);
             sid = entity.getSid();
         } else {//修改
@@ -195,13 +204,21 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             }
             BeanUtil.copyProperties(dto, busVehicleApply);
             busVehicleApplyDetailService.delByApplySid(dto.getSid());
+            BigDecimal bigDecimalAll = new BigDecimal("0");
             List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailDtoList();
             for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) {
                 BusVehicleApplyDetail busVehicleApplyDetail = new BusVehicleApplyDetail();
                 BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid");
                 busVehicleApplyDetail.setApplySid(dto.getSid());
+                if (StringUtils.isNotBlank(busVehicleApplyDetailDto.getApplyForDeposit())) {
+                    bigDecimalAll = bigDecimalAll.add(new BigDecimal(busVehicleApplyDetailDto.getApplyForDeposit()));
+                }
                 busVehicleApplyDetailService.insert(busVehicleApplyDetail);
             }
+            if (bigDecimalAll.compareTo(new BigDecimal(dto.getCurrentAmount())) != 0) {
+                return rb.setMsg("申请订金合计计算错误");
+            }
+            busVehicleApply.setCurrentAmount(bigDecimalAll);
             baseMapper.updateById(busVehicleApply);
 
         }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java

@@ -66,5 +66,7 @@ public class BusDelivered extends BaseEntity {
     private String idNo;
     @ApiModelProperty(value = "联系地址")
     private String address;
+    @ApiModelProperty(value = "成交价")
+    private String price;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredDto.java

@@ -69,4 +69,7 @@ public class BusDeliveredDto implements Dto {
     @ApiModelProperty(value = "联系地址")
     private String address;
 
+    @ApiModelProperty(value = "成交价")
+    private String price;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/13 14:38
+ * @Description
+ */
+@Api(tags = "经销商")
+@FeignClient(
+        contextId = "anrui-terminal-Distributor",
+        name = "anrui-terminal",
+        path = "/autoservice/v1/distributor",
+        fallback = DistributorFeignFallback.class)
+public interface DistributorFeign {
+
+    @ApiOperation("移动端-经销商分页列表")
+    @PostMapping("/getDistributorList")
+    @ResponseBody
+    ResultBean<PagerVo<DistributorVo>> getDistributorList(@RequestBody PagerQuery<DistributorQuery> pagerQuery);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/13 14:39
+ * @Description
+ */
+@Component
+public class DistributorFeignFallback {
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/13 16:20
+ * @Description
+ */
+@Data
+public class DistributorQuery implements Query {
+    private static final long serialVersionUID = -3564429656889398105L;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "名称")
+    private String name;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorVo.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/13 14:40
+ * @Description
+ */
+@Data
+public class DistributorVo implements Vo {
+    private static final long serialVersionUID = -5685583365459129962L;
+
+    @ApiModelProperty(value = "经销商sid")
+    private String sid;
+    @ApiModelProperty(value = "经销商名称")
+    @JsonProperty("distributorName")
+    private String disName;
+    @ApiModelProperty(value = "状态")
+    private String state;
+    @ApiModelProperty(value = "所属经销商")
+    private String pDistributorName;
+    @ApiModelProperty(value = "统一信用代码")
+    private String registNum;
+    @ApiModelProperty(value = "注册地址")
+    private String registDetailAddress;
+    @ApiModelProperty(value = "经销商开票信息联系电话")
+    private String invoPhone;
+    @ApiModelProperty(value = "成立日期")
+    private String setUpTime;
+
+
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanFeign.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "中介人员")
 @FeignClient(
-        contextId = "anrui-terminal-BusSalesOrder",
+        contextId = "anrui-terminal-Middleman",
         name = "anrui-terminal",
         path = "/autoservice/v1/intermediary",
         fallback = MiddlemanFeignFallback.class)

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.terminal.biz.autoservice.distributor;
+
+import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorFeign;
+import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorQuery;
+import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/13 16:22
+ * @Description
+ */
+@Api(tags = "经销商")
+@Controller
+@RequestMapping("/autoservice/v1/distributor")
+public class DistributorRest implements DistributorFeign {
+
+    @Autowired
+    private DistributorService distributorService;
+
+    @Override
+    public ResultBean<PagerVo<DistributorVo>> getDistributorList(PagerQuery<DistributorQuery> pagerQuery) {
+        return distributorService.pageList(pagerQuery);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.terminal.biz.autoservice.distributor;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
+import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
+import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorQuery;
+import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorVo;
+import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/13 16:22
+ * @Description
+ */
+@Service
+public class DistributorService {
+
+    @Autowired
+    private BaseDistributorFeign baseDistributorFeign;
+
+    public ResultBean<PagerVo<DistributorVo>> pageList(PagerQuery<DistributorQuery> pagerQuery) {
+        ResultBean<PagerVo<DistributorVo>> rb = ResultBean.fireFail();
+        PagerQuery<BaseDistributorsQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<BaseDistributorsVo>> resultBean = baseDistributorFeign.getDistributorListOne(pq);
+        List<DistributorVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DistributorVo.class)).collect(Collectors.toList());
+        PagerVo<DistributorVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(resultBean.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
+    }
+}