Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -71,6 +71,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
+import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.*;
@@ -1764,22 +1765,34 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getCreateOrgSid()).getData();
         otherReceivableOne.setCollectionOrg(sysOrganizationVo1.getOrgCode());
         otherReceivableOne.setBussDate(DateUtil.formatDate(new Date()));
-        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoListOne = new ArrayList<>();
+        List<OtherReceivable.CollectionDetailDto> collectionDetailDtoList = new ArrayList<>();
         OtherReceivable.CollectionDetailDto collectionDetailDtoOne = new OtherReceivable.CollectionDetailDto();
+        OtherReceivable.CollectionDetailDto collectionDetailDtoTwo = new OtherReceivable.CollectionDetailDto();
         SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getOrgSid()).getData();
         collectionDetailDtoOne.setDearDept(sysOrganizationVo2.getOrgCode());
+        collectionDetailDtoTwo.setDearDept(sysOrganizationVo2.getOrgCode());
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData();
         if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) {
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData();
             String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
-            if (StringUtils.isNotBlank(otherReceivableMoney)) {
+            SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
+            String serviceAmount = solutionsDetailsVo.getServiceAmount();
+            if (StringUtils.isNotBlank(otherReceivableMoney) && StringUtils.isNotBlank(serviceAmount)) {
+                collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney);
+                collectionDetailDtoTwo.setExTaxMoney(serviceAmount);
+                collectionDetailDtoList.add(collectionDetailDtoOne);
+                collectionDetailDtoList.add(collectionDetailDtoTwo);
+            } else if (StringUtils.isNotBlank(otherReceivableMoney) && StringUtils.isBlank(serviceAmount)) {
                 collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney);
+                collectionDetailDtoList.add(collectionDetailDtoOne);
+            } else if (StringUtils.isBlank(otherReceivableMoney) && StringUtils.isNotBlank(serviceAmount)) {
+                collectionDetailDtoTwo.setExTaxMoney(serviceAmount);
+                collectionDetailDtoList.add(collectionDetailDtoTwo);
             } else {
                 return null;
             }
         }
-        collectionDetailDtoListOne.add(collectionDetailDtoOne);
-        otherReceivableOne.setCollectionDetails(collectionDetailDtoListOne);
+        otherReceivableOne.setCollectionDetails(collectionDetailDtoList);
         return otherReceivableOne;
     }
 
@@ -2240,6 +2253,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumZc);
                 finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
             }
+            //推送其他应收单
+            for (BaseVehicleZSOutDto zcDto : zcDtos) {
+                OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto);
+                if (otherReceivable != null) {
+                    finKingDeeFeign.draftOtherReceivableBill(otherReceivable);
+                }
+            }
         } else {//贷款
             //挂车单独出库重推
             if (zcDtosDK.size() == 0) {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java

@@ -74,6 +74,7 @@ public class LoanFileexamineQuery implements Query {
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
     private String menuUrl;
+    private String menuSid;
     private String type;
     private String names;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java

@@ -73,4 +73,9 @@ public class LoanFileexamineVo implements Vo {
     private String policyName;
     @ApiModelProperty("资方合同号")
     private String bankContractNo;
+
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml

@@ -6,6 +6,7 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo">
         SELECT
         lf.`sid`,
+        bo.sid AS saleOrderSid,
         bo.`useOrgName`,
         bo.`orgName`,
         bo.`staffName`,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -103,11 +103,12 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         LoanFileexamineQuery query = pq.getParams();
         QueryWrapper<LoanFileexamine> qw = new QueryWrapper<>();
         qw.eq("bl.busNo", 305);
-        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+        if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
             //=======================
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
             privilegeQuery.setOrgPath(query.getOrgSidPath());
             privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setMenuSid(query.getMenuSid());
             privilegeQuery.setUserSid(query.getUserSid());
             ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
             if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
@@ -174,6 +175,14 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         }
         IPage<LoanFileexamine> page = PagerUtil.queryToPage(pq);
         IPage<LoanFileexamineVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (LoanFileexamineVo record : pagging.getRecords()) {
+            List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(record.getSaleOrderSid()).getData();
+            String vinNos = "";
+            for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+                vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ",";
+            }
+            record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
+        }
         PagerVo<LoanFileexamineVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDetailsVo.java

@@ -53,21 +53,21 @@ public class FileexamineDetailsVo implements Vo {
     private String sid; // sid
 
     @ApiModelProperty("消贷合同编号")
-    private String loanContractNo;
+    private String contractId;
     @ApiModelProperty("台数")
-    private Integer num;
+    private Integer number;
     @ApiModelProperty("贷款人名称")
-    private String borrowerName;
+    private String lenderName;
     @ApiModelProperty("销售专员名称")
-    private String staffName;
+    private String salesName;
     @ApiModelProperty("车架号拼接")
-    private String vinNo;
+    private String vin;
     @ApiModelProperty("银行卡")
-    private List<String> yhkImages;
+    private List<String> bankCard;
     @ApiModelProperty("购置税发票")
-    private List<String> gzsfpImages;
+    private List<String> purchaseTaxInvoice;
     @ApiModelProperty("保险发票")
-    private List<String> bxfpImages;
+    private List<String> insuranceInvoice;
     @ApiModelProperty("保单")
-    private List<String> bdImages;
+    private List<String> insuranceBills;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDto.java

@@ -54,11 +54,11 @@ public class FileexamineDto implements Dto {
     private String sid; // sid
 
     @ApiModelProperty("银行卡")
-    private List<String> yhkImages = new ArrayList<>();
+    private List<String> bankCard = new ArrayList<>();
     @ApiModelProperty("购置税发票")
-    private List<String> gzsfpImages = new ArrayList<>();
+    private List<String> purchaseTaxInvoice = new ArrayList<>();
     @ApiModelProperty("保险发票")
-    private List<String> bxfpImages = new ArrayList<>();
+    private List<String> insuranceInvoice = new ArrayList<>();
     @ApiModelProperty("保单")
-    private List<String> bdImages = new ArrayList<>();
+    private List<String> insuranceBills = new ArrayList<>();
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java

@@ -50,12 +50,12 @@ import org.springframework.web.bind.annotation.*;
 @FeignClient(
         contextId = "terminal-Fileexamine",
         name = "anrui-terminal",
-        path = "v1/loanfileexamine",
+        path = "riskcenter/v1/loanData",
         fallback = FileexamineFeignFallback.class)
 public interface FileexamineFeign {
 
     @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
+    @PostMapping("/getLoanDataList")
     @ResponseBody
     public ResultBean<PagerVo<FileexamineVo>> listPage(@RequestBody PagerQuery<FileexamineQuery> pq);
 
@@ -63,11 +63,6 @@ public interface FileexamineFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody FileexamineDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
       
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeignFallback.java

@@ -57,11 +57,6 @@ public class FileexamineFeignFallback implements FileexamineFeign {
 		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanfileexamine/save无法访问");
 	}
 
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanfileexamine/delBySids无法访问");
-	}
-
 	@Override
 	public ResultBean<FileexamineDetailsVo> fetchDetailsBySid(String sid){
 		ResultBean rb = ResultBean.fireFail();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineVo.java

@@ -51,15 +51,17 @@ public class FileexamineVo implements Vo {
     private String sid; // sid
 
     @ApiModelProperty("消贷合同编号")
-    private String loanContractNo;
+    private String contractId;
+    @ApiModelProperty("资料状态")
+    private String nodeState;
     @ApiModelProperty("贷款人名称")
-    private String borrowerName;
+    private String lenderName;
+    @ApiModelProperty("车架号")
+    private String vin;
     @ApiModelProperty("台数")
-    private String num;
+    private String carNum;
     @ApiModelProperty("销售专员名称")
-    private String staffName;
-    @ApiModelProperty("资料状态")
-    private String zlState;
+    private String salesName;
     @ApiModelProperty("是否上传")
-    private Boolean isUpload = false;
+    private Boolean showHandleBtn = false;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java

@@ -50,7 +50,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "放款资料审核")
 @RestController
-@RequestMapping("v1/loanfileexamine")
+@RequestMapping("riskcenter/v1/loanData")
 public class FileexamineRest implements FileexamineFeign {
 
 	@Autowired
@@ -66,11 +66,6 @@ public class FileexamineRest implements FileexamineFeign {
 		return fileexamineService.save(dto);
 	}
 
-	@Override
-	public ResultBean delBySids(String[] sids) {
-		return null;
-	}
-
 	@Override
 	public ResultBean<FileexamineDetailsVo> fetchDetailsBySid(String sid) {
 		return fileexamineService.fetchDetailsBySid(sid);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java

@@ -64,13 +64,14 @@ public class FileexamineService {
         for (LoanFileexamineVo record : records) {
             FileexamineVo fileexamineVo = new FileexamineVo();
             fileexamineVo.setSid(record.getSid());
-            fileexamineVo.setLoanContractNo(record.getLoanContractNo());
-            fileexamineVo.setZlState(record.getZlState());
-            fileexamineVo.setBorrowerName(record.getBorrowerName());
-            fileexamineVo.setNum(record.getNum());
-            fileexamineVo.setStaffName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName());
+            fileexamineVo.setContractId(record.getLoanContractNo());
+            fileexamineVo.setNodeState(record.getZlState());
+            fileexamineVo.setLenderName(record.getBorrowerName());
+            fileexamineVo.setCarNum(record.getNum());
+            fileexamineVo.setVin(record.getVinNo());
+            fileexamineVo.setSalesName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName());
             if ("未齐全".equals(record.getZlState())) {
-                fileexamineVo.setIsUpload(true);
+                fileexamineVo.setShowHandleBtn(true);
             }
             fileexamineVos.add(fileexamineVo);
         }
@@ -82,14 +83,14 @@ public class FileexamineService {
         ResultBean rb = ResultBean.fireFail();
         FileexamineDetailsVo fileexamineDetailsVo = new FileexamineDetailsVo();
         LoanFileexamineDetailsVo data = loanFileexamineFeign.fetchDetailsBySid(sid).getData();
-        fileexamineDetailsVo.setLoanContractNo(data.getLoanContractNo());
-        fileexamineDetailsVo.setNum(data.getNum());
-        fileexamineDetailsVo.setStaffName(data.getStaffName());
-        fileexamineDetailsVo.setVinNo(data.getVinNo());
-        fileexamineDetailsVo.setYhkImages(data.getYhkImages());
-        fileexamineDetailsVo.setGzsfpImages(data.getGzsfpImages());
-        fileexamineDetailsVo.setBxfpImages(data.getBxfpImages());
-        fileexamineDetailsVo.setBdImages(data.getBdImages());
+        fileexamineDetailsVo.setContractId(data.getLoanContractNo());
+        fileexamineDetailsVo.setNumber(data.getNum());
+        fileexamineDetailsVo.setSalesName(data.getStaffName());
+        fileexamineDetailsVo.setVin(data.getVinNo());
+        fileexamineDetailsVo.setBankCard(data.getYhkImages());
+        fileexamineDetailsVo.setPurchaseTaxInvoice(data.getGzsfpImages());
+        fileexamineDetailsVo.setInsuranceInvoice(data.getBxfpImages());
+        fileexamineDetailsVo.setInsuranceBills(data.getBdImages());
         return rb.success().setData(fileexamineDetailsVo);
     }
 
@@ -97,10 +98,10 @@ public class FileexamineService {
         ResultBean rb = ResultBean.fireFail();
         LoanFileDto loanFileDto = new LoanFileDto();
         loanFileDto.setSid(dto.getSid());
-        loanFileDto.setYhkImages(dto.getYhkImages());
-        loanFileDto.setGzsfpImages(dto.getGzsfpImages());
-        loanFileDto.setBxfpImages(dto.getBxfpImages());
-        loanFileDto.setBdImages(dto.getBdImages());
+        loanFileDto.setYhkImages(dto.getBankCard());
+        loanFileDto.setGzsfpImages(dto.getPurchaseTaxInvoice());
+        loanFileDto.setBxfpImages(dto.getInsuranceInvoice());
+        loanFileDto.setBdImages(dto.getInsuranceBills());
         loanFileexamineFeign.uploadFile(loanFileDto);
         return rb.success();
     }