Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java

@@ -60,6 +60,16 @@ public interface BusDiscountpackageHandoverFeign {
     @PostMapping("/uploadPicture")
     public ResultBean uploadPicture(@RequestBody BusDiscountpackageHandoverDto dto);
 
+    @ApiOperation("交接准备")
+    @PostMapping("/handoverReady")
+    @ResponseBody
+    public ResultBean handoverReady(@RequestBody BusDiscountpackageHandoverDto dto);
+
+    @ApiOperation("交接操作")
+    @PostMapping("/handoverConfirm")
+    @ResponseBody
+    public ResultBean handoverConfirm(@RequestBody BusDiscountpackageHandoverDto dto);
+
 
     /**********************移动端***************************/
     @ApiOperation("获取优惠包交接列表")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java

@@ -59,6 +59,16 @@ public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpacka
         return null;
     }
 
+    @Override
+    public ResultBean handoverReady(BusDiscountpackageHandoverDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean handoverConfirm(BusDiscountpackageHandoverDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<AppBusDiscountpackageHandoverVo>> getDiscountHandoverList(PagerQuery<AppBusDiscountpackageHandoverQuery> pq) {
         return null;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java

@@ -80,6 +80,16 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove
         return rb.success();
     }
 
+    @Override
+    public ResultBean handoverReady(BusDiscountpackageHandoverDto dto) {
+        return busDiscountpackageHandoverService.handoverReady(dto);
+    }
+
+    @Override
+    public ResultBean handoverConfirm(BusDiscountpackageHandoverDto dto) {
+        return busDiscountpackageHandoverService.handoverConfirm(dto);
+    }
+
     /********************移动端接口**********************/
     @Override
     public ResultBean<PagerVo<AppBusDiscountpackageHandoverVo>> getDiscountHandoverList(PagerQuery<AppBusDiscountpackageHandoverQuery> pq) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@@ -396,8 +396,12 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
             }
         }
         int i = 0;
+        //按角色控制权限 1优惠包管理员 2销售专员 3优惠包管理员&&销售专员
+        int role = 0;
+        String transferStateValue = busDiscountpackageHandover.getTransferStateValue();
         //根据当前用户sid查询用户角色
         List<SysRoleVo> roleVoList = sysRoleFeign.fetchByUserSid(userSid).getData();
+
         //判断当前登录用户角色是否为销售专员
         if (null != roleVoList) {
             for (SysRoleVo sysRoleVo : roleVoList) {
@@ -414,11 +418,11 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
                         this.uploadPicture(dto);
                     }
                     BusDiscountpackageHandoverDetailsVo detailsVo = this.handoverDetails(sid);
-                  //  String s = commonCreatePdf(detailsVo);
+                    //  String s = commonCreatePdf(detailsVo);
                     String targetPath = docPdfComponent.getUploadTemplateUrl();
-                  //  String filePath = s.substring(targetPath.length());
+                    //  String filePath = s.substring(targetPath.length());
                     BusDiscountpackageHandover entity = fetchBySid(sid);
-                   // entity.setFilePath(filePath);
+                    // entity.setFilePath(filePath);
                     entity.setFilePath("");
                     baseMapper.updateById(entity);
                 } else if ((sysRoleVo.getName()).contains("优惠包管理员")) {
@@ -436,6 +440,79 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         return i;
     }
 
+    /**
+     * 优惠包管理员交接准备
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean handoverReady(BusDiscountpackageHandoverDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        String userSid = dto.getCreateBySid();
+        String mobile = "";
+        String userName = "";
+        BusDiscountpackageHandover busDiscountpackageHandover = fetchBySid(sid);
+        dto.setCreateBySid(busDiscountpackageHandover.getCreateBySid());
+        if (sysUserFeign.selectBySid(userSid).getSuccess()) {
+            SysUser user = sysUserFeign.selectBySid(userSid).getData();
+            if (null != user) {
+                if (StringUtils.isNotBlank(user.getMobile())) {
+                    mobile = user.getMobile();
+                }
+                if (StringUtils.isNotBlank(user.getStaffSid())) {
+                    SysStaffinfoDetailsVo staffinfoDetailsVo = sysStaffinfoFeign.fetchBySid(user.getStaffSid()).getData();
+                    if (null != staffinfoDetailsVo) {
+                        if (StringUtils.isNotBlank(staffinfoDetailsVo.getName())) {
+                            userName = staffinfoDetailsVo.getName();
+                        }
+                    }
+                }
+            }
+        }
+        dto.setTransferStateKey("003");
+        dto.setTransferStateValue("移交中");
+        dto.setTransferUserSid(userSid);
+        dto.setTransferName(userName);
+        dto.setTransferPhone(mobile);
+        if (StringUtils.isNotBlank(dto.getTransferStateKey())) {
+            this.updateBySid(dto.toMap(), sid);
+        }
+        return rb.success();
+    }
+
+    /**
+     * 销售专员交接确认
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean handoverConfirm(BusDiscountpackageHandoverDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        BusDiscountpackageHandover busDiscountpackageHandover = fetchBySid(sid);
+        dto.setCreateBySid(busDiscountpackageHandover.getCreateBySid());
+        int i = 0;
+        dto.setTransferStateKey("004");
+        dto.setTransferStateValue("已移交");
+        dto.setRecTime(new Date());
+        if (StringUtils.isNotBlank(dto.getTransferStateKey())) {
+            i = this.updateBySid(dto.toMap(), sid);
+        }
+        List<BuscenterFile> busFiles = dto.getBusFiles();
+        if (null != busFiles && i > 0 && !busFiles.isEmpty()) {
+            this.uploadPicture(dto);
+        }
+//            BusDiscountpackageHandoverDetailsVo detailsVo = this.handoverDetails(sid);
+//            String s = commonCreatePdf(detailsVo);
+//            String targetPath = docPdfComponent.getUploadTemplateUrl();
+//            String filePath = s.substring(targetPath.length());
+//            BusDiscountpackageHandover entity = fetchBySid(sid);
+//            entity.setFilePath(filePath);
+//            baseMapper.updateById(entity);
+        return rb.success();
+    }
+
     public BusDiscountpackageHandoverDetailsVo handoverDetails(String sid) {
 
         BusDiscountpackageHandoverDetailsVo detailsVo = new BusDiscountpackageHandoverDetailsVo();
@@ -916,11 +993,11 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         entity.setRecTime(new Date());
         entity.setTransferStateValue("已移交");
         entity.setTransferStateKey("004");
-        BusDiscountpackageHandoverDetailsVo detailsVo = this.handoverDetails(dto.getSid());
-        String s = commonCreatePdf(detailsVo);
-        String targetPath = docPdfComponent.getUploadTemplateUrl();
-        String filePath = s.substring(targetPath.length());
-        entity.setFilePath(filePath);
+//        BusDiscountpackageHandoverDetailsVo detailsVo = this.handoverDetails(dto.getSid());
+//        String s = commonCreatePdf(detailsVo);
+//        String targetPath = docPdfComponent.getUploadTemplateUrl();
+//        String filePath = s.substring(targetPath.length());
+//        entity.setFilePath(filePath);
         baseMapper.updateById(entity);
         return rb.success();
     }
@@ -941,4 +1018,6 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         }
         return rb.success().setData(handoverImages);
     }
+
+
 }

anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue

@@ -789,16 +789,14 @@ export default {
     },
     // 应收明细 -- 车辆总价
     vehTotalPrice() {
-      if (this.finance.serviceAmount !== '') {
-        this.finance.receivableTotal = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod))) + parseInt(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod)))
-        if (!this.finance.premiumCb) {
-          this.finance.receivableTotal = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod))) + parseInt(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod))) + parseInt(this.arguments(this.finance.premium))
-        }
-        if (!this.finance.purchaseTaxCb) {
-          this.finance.receivableTotal = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod))) + parseInt(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod))) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
-        }
+      this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod))))
+      if (!this.finance.premiumCb && this.finance.premium !== '' && this.finance.premium !== null) {
+        this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod)))) + parseInt(this.arguments(this.finance.premium))
       }
-      return this.finance.receivableTotal
+      if (!this.finance.purchaseTaxCb && this.finance.purchaseTax !== '' && this.finance.purchaseTax !== null) {
+        this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod)))) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
+      }
+      return this.finance.vehTotalPrice
     },
     arguments(val) {
       if (val === '' || val === undefined) {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBank.java

@@ -27,6 +27,8 @@ public class LoanFinBank extends BaseEntity {
 
     @ApiModelProperty("资方名称（陕汽必须字段）")
     private String bankName;
+    @ApiModelProperty("资方编码")
+    private String bankNo;
     @ApiModelProperty("联系人（陕汽必须字段）")
     private String contactor;
     @ApiModelProperty("联系电话（陕汽必须字段）")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankDto.java

@@ -32,6 +32,8 @@ public class LoanFinBankDto implements Dto {
     @NotBlank(message = "资方名称不允许为空")
     @JsonProperty("manageName")
     private String bankName;
+    @ApiModelProperty("资方编码")
+    private String bankNo;
     @ApiModelProperty(value = "联系人（陕汽必须字段）", required = true)
     @NotBlank(message = "联系人不允许为空")
     @JsonProperty("name")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankVo.java

@@ -26,6 +26,8 @@ public class LoanFinBankVo implements Vo {
     @ApiModelProperty("资方名称（陕汽必须字段）")
     @JsonProperty("manageName")
     private String bankName;
+    @ApiModelProperty("资方编码")
+    private String bankNo;
     @ApiModelProperty("联系人（陕汽必须字段）")
     @JsonProperty("name")
     private String contactor;