修改

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

@@ -101,5 +101,7 @@ public class AppDeliveredDetailsVo implements Vo {
 
     private String taskDefKey;
 
+    private boolean showLoanUser;
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -150,8 +150,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             }
             //待出库：1，出库申请：0
             qw.eq("bd.state", 1);
-            if(StringUtils.isNotBlank(query.getUserSid())){
+            if (StringUtils.isNotBlank(query.getUserSid())) {
-                qw.eq("bd.createBySid",query.getUserSid());
+                qw.eq("bd.createBySid", query.getUserSid());
             }
         }
         IPage<BusDelivered> page = PagerUtil.queryToPage(pq);
@@ -214,8 +214,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         }
         qw.eq("bd.useOrgSid", orgSid);
         qw.eq("bd.state", 1);
-        if(StringUtils.isNotBlank(pq.getParams().getUserSid())){
+        if (StringUtils.isNotBlank(pq.getParams().getUserSid())) {
-            qw.eq("bd.createBySid",pq.getParams().getUserSid());
+            qw.eq("bd.createBySid", pq.getParams().getUserSid());
         }
         IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotList(page, qw, name);
         for (AppBusDeliveredPageVo record : iPage.getRecords()) {
@@ -298,6 +298,9 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             //销售类型
             appDeliveredDetailsVo.setPaymentMethod(appOrderDetailsVo.getPayType());
             appDeliveredDetailsVo.setPaymentMethodKey(appOrderDetailsVo.getPayTypeKey());
+            if ("2".equals(appDeliveredDetailsVo.getPaymentMethodKey())) {
+                appDeliveredDetailsVo.setShowLoanUser(true);
+            }
             //客户名称
             appDeliveredDetailsVo.setName(appOrderDetailsVo.getName());
             appDeliveredDetailsVo.setMobile(appOrderDetailsVo.getPhone());
@@ -334,7 +337,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 appCarListVo.setVinSid(list.get(i));
 //                appCarListVo.setDiscount(appOrderPriceInfoVo.getSingleCarDiscountPrice());
                 //查询该车辆是否有挂车
-                ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid,contractNo);
+                ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, contractNo);
                 if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
                     appCarListVo.setShowHandCarBtn(false);
                 } else {
@@ -366,7 +369,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             ResultBean<List<DictCommonVo>> listResultBean = dictCommonFeign.getTypeValues("buyerType", "0");
             List<DictCommonVo> dictCommonVoList = listResultBean.getData();
             List<DeliveredDictVo> voList = Optional.ofNullable(dictCommonVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveredDictVo.class)).collect(Collectors.toList());
-            if("1".equals(appOrderDetailsVo.getPayTypeKey())){//贷款
+            if ("1".equals(appOrderDetailsVo.getPayTypeKey())) {//贷款
                 voList.remove(1);
             }
             appDeliveredDetailsVo.setBuyerType(voList);
@@ -413,11 +416,14 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 log.error("获取销售订单详情出错啦！！！");
                 return rb;
             }
+            if ("2".equals(appDeliveredDetailsVo.getPaymentMethodKey())) {
+                appDeliveredDetailsVo.setShowLoanUser(true);
+            }
             appDeliveredDetailsVo.setTaskDefKey(busDeliveredApply.getTaskDefKey());
             appDeliveredDetailsVo.setBusSalesOrderSid(resultBean.getData().getBusSalesOrderSid());
             List<BusDeliveredApplyDetails> busDeliveredApplyDetailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid());
             busDeliveredApplyDetailsList.removeAll(Collections.singleton(null));
-             //pc发起人
+            //pc发起人
             appDeliveredDetailsVo.setPcApplyName(busDeliveredApply.getApplyName());
             appDeliveredDetailsVo.setPcApplySid(busDeliveredApply.getApplySid());
             appDeliveredDetailsVo.setPcApplyDept(busDeliveredApply.getApplyDept());
@@ -445,14 +451,14 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             List<AppCarListVo> carList = new ArrayList<>();
             List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid());
             detailsList.removeAll(Collections.singleton(null));
-            if(!detailsList.isEmpty()){
+            if (!detailsList.isEmpty()) {
                 for (int i = 0; i < detailsList.size(); i++) {
                     BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
                     AppCarListVo appCarListVo = new AppCarListVo();
                     appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
                     appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
                     //查询该车辆是否有挂车
-                    ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(),busDeliveredApply.getContractNo());
+                    ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo());
                     if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
                         appCarListVo.setShowHandCarBtn(false);
                     } else {
@@ -475,7 +481,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                         int count = busDeliveredDetailsDiscount.getNum();
                         //剩余数量
                         int discountLeaveNum = count - intCount;
-                        if(discountLeaveNum<busDeliveredDetailsDiscount.getGiveNum()){
+                        if (discountLeaveNum < busDeliveredDetailsDiscount.getGiveNum()) {
                             codeMsg = true;
                             nameList.add(busDeliveredDetailsDiscount.getName());
                             busDeliveredDetailsDiscountsVo.setDiscountNum(0);
@@ -486,12 +492,12 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                     //使用人信息
                     BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
                     BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage();
-                    if(!query.isPcView()){
+                    if (!query.isPcView()) {
-                        if("2".equals(busDeliveredApply.getTypeKey())){
+                        if ("2".equals(busDeliveredApply.getTypeKey())) {
                             busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
                             BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
                         }
-                    }else{
+                    } else {
                         busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
                         BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
                     }
@@ -516,12 +522,12 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 int giveNum = busDeliveredDetailsDiscountService.selectGiveNum(discountSid, busDeliveredApply.getSid());
                 //剩余数量
                 int discountLeaveNum = 0;
-                if(count - intCount <=0){
+                if (count - intCount <= 0) {
                     discountLeaveNum = 0;
-                }else{
+                } else {
-                    if(count - intCount - giveNum<0){
+                    if (count - intCount - giveNum < 0) {
                         discountLeaveNum = count - intCount;
-                    }else{
+                    } else {
                         discountLeaveNum = count - intCount - giveNum;
                     }
                 }
@@ -534,7 +540,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             ResultBean<List<DictCommonVo>> listResultBean = dictCommonFeign.getTypeValues("buyerType", "0");
             List<DictCommonVo> dictCommonVoList = listResultBean.getData();
             List<DeliveredDictVo> voList = Optional.ofNullable(dictCommonVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveredDictVo.class)).collect(Collectors.toList());
-            if("1".equals(busDeliveredApply.getPaymentMethodKey())){//全款
+            if ("1".equals(busDeliveredApply.getPaymentMethodKey())) {//全款
                 voList.remove(1);
             }
             appDeliveredDetailsVo.setBuyerType(voList);
@@ -568,9 +574,9 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         vo.setCarList(appCarListVos);
         vo.setTerminalKey("0");
         vo.setTerminalValue("否");*/
-        if(codeMsg){
+        if (codeMsg) {
-            String msgs = String.join(",",nameList);
+            String msgs = String.join(",", nameList);
-            return rb.success().setData(appDeliveredDetailsVo).setCode("20005").setMsg(msgs+"优惠套餐数量已超出，赠送数量已重置为0");
+            return rb.success().setData(appDeliveredDetailsVo).setCode("20005").setMsg(msgs + "优惠套餐数量已超出，赠送数量已重置为0");
         }
         return rb.success().setData(appDeliveredDetailsVo);
     }
@@ -602,21 +608,21 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             AppCarListVo appCarListVo = new AppCarListVo();
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
             String vinSid = busSalesOrderVehicle.getLinkSid();
-            if(!vinSelectSid.isEmpty()){
+            if (!vinSelectSid.isEmpty()) {
-                if(vinSelectSid.contains(vinSid)){
+                if (vinSelectSid.contains(vinSid)) {
                     continue;
                 }
             }
-            if(!vinSids.isEmpty()){
+            if (!vinSids.isEmpty()) {
-                if(vinSids.contains(vinSid)){
+                if (vinSids.contains(vinSid)) {
                     appCarListVo.setVinSid(vinSid);
-                }else{
+                } else {
                     continue;
                 }
-            }else{
+            } else {
                 appCarListVo.setVinSid(vinSid);
             }
-            ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid,query.getContractNo());
+            ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, query.getContractNo());
             if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
                 appCarListVo.setShowHandCarBtn(false);
             } else {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -1235,9 +1235,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if (StringUtils.isBlank(dto.getPaymentMethodKey())) {
                 dto.setPaymentMethodKey(busDeliveredApply.getPaymentMethodKey());
             }
-
             BeanUtil.copyProperties(dto, busDeliveredApply, "sid");
-
             //根据合同编号查询销售订单的信息
             ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(contractNo);
             if (!resultBean.getSuccess()) {
@@ -1341,8 +1339,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                         busDeliveredUseMessageService.insert(busDeliveredUseMessage);
                         busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid());
                     }
-
-
                 }
                 if ("1".equals(busDeliveredApply.getTypeKey())) {
                     //贷款人的信息
@@ -1363,64 +1359,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                         busDeliveredUseMessageService.insert(busDeliveredUseMessage);
                         busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid());
                     }
-
                 }
                 busDeliveredApplyDetailsService.insert(busDeliveredApplyDetails);
-
             }
             baseMapper.updateById(busDeliveredApply);
         }
-        /*String dtoSid = appDeliveredApplyDto.getSid();
-        SysUserVo sysUserVo = sysUserFeign.fetchBySid(appDeliveredApplyDto.getUserSid()).getData();
-        BaseVehicle baseVehicle = null;
-        if (StringUtils.isBlank(dtoSid)) {
-            BusDeliveredApply busDeliveredApply = new BusDeliveredApply();
-            BeanUtil.copyProperties(appDeliveredApplyDto, busDeliveredApply, "sid");
-            List<AppCarListDto> carList = appDeliveredApplyDto.getCarList();
-            //根据申请人sid查询分公司sid
-            ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(appDeliveredApplyDto.getUserSid());
-            if (stringResultBean.getSuccess()) {
-                busDeliveredApply.setUseOrgSid(stringResultBean.getData());
-            }
-            if (carList.size() > 0) {
-                String vin = carList.get(0).getVin();
-                baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vin, stringResultBean.getData()).getData();
-                busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid());
-                //更改车辆状态
-                for (int i = 0; i < carList.size(); i++) {
-                    String vinNo = carList.get(i).getVin();
-                    busDeliveredService.updateState(vinNo, 0);
-                }
-            }
-            baseMapper.updateStateBySid(2, dtoSid);
-            busDeliveredApply.setApplySid(sysUserVo.getSid());
-            busDeliveredApply.setApplyName(sysUserVo.getName());
-            busDeliveredApply.setModelSid(baseVehicle.getModelSid());
-            busDeliveredApply.setConfigSid(baseVehicle.getModelConfigSid());
-            save(busDeliveredApply);
-            return rb.success().setData(busDeliveredApply.getSid());
-        } else {
-            BusDeliveredApply busDeliveredApply = fetchBySid(dtoSid);
-            if (busDeliveredApply == null) {
-                return rb.setMsg("该申请不存在");
-            }
-            BeanUtil.copyProperties(appDeliveredApplyDto, busDeliveredApply, "sid");
-            //删除
-            busDeliveredApplyDetailsService.deleteByApplySid(dtoSid);
-            busDeliveredUseMessageService.deleteByApplySid(dtoSid);
-            List<AppCarListDto> carList = appDeliveredApplyDto.getCarList();
-            //根据申请人sid查询分公司sid
-            ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(appDeliveredApplyDto.getUserSid());
-            if (carList.size() > 0) {
-                String vin = carList.get(0).getVin();
-                baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vin, stringResultBean.getData()).getData();
-                busDeliveredApply.setModelSid(baseVehicle.getModelSid());
-                busDeliveredApply.setConfigSid(baseVehicle.getModelConfigSid());
-                busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid());
-            }
-            updateById(busDeliveredApply);
-            return rb.success().setData(busDeliveredApply.getSid());
-        }*/
         return rb.success().setData(sid);
     }
 

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -57,7 +57,7 @@ public interface CrmCustomerTempFeign {
 
     @ApiOperation("推送财务客户-否")
     @PostMapping("/sendFinCustomer/{orgCode}")
-    public ResultBean sendFinCustomer(@RequestBody String[] customerSids,@PathVariable("orgCode") String orgCode);
+    public ResultBean sendFinCustomer(@RequestBody String[] customerSids, @PathVariable("orgCode") String orgCode);
 
     @ApiOperation("推送财务客户-是")
     @PostMapping("/sendFinCustomerTrue")
@@ -180,4 +180,15 @@ public interface CrmCustomerTempFeign {
     @ApiOperation("合同审核通过后更新客户档案证件")
     ResultBean saveFileCustomer(@RequestBody CrmCustomerFileDDto dto);
 
+    /**
+     * 检查并创建金蝶中的客户
+     *
+     * @param customerQuery 相关参数
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/checkCustomerOrUpdate")
+    @ApiOperation("检查并创建金蝶中的客户")
+    ResultBean<String> checkCustomerOrUpdate(@Valid @RequestBody CustomerQuery customerQuery);
+
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -145,5 +145,10 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> checkCustomerOrUpdate(CustomerQuery customerQuery) {
+		return null;
+	}
+
 
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CustomerQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @description: 客户相关
+ * @author: dimengzhe
+ * @date: 2023/5/11
+ **/
+@Data
+public class CustomerQuery {
+
+    @ApiModelProperty("客户编码")
+    @NotBlank(message = "客户编码不能为空")
+    private String customerNo;
+    @ApiModelProperty("客户名称")
+    @NotBlank(message = "客户名称不能为空")
+    private String customerName;
+    @ApiModelProperty("当前分公司code")
+    @NotBlank(message = "当前分公司code不能为空")
+    private String orgCode;
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -294,5 +294,10 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerTempService.saveFileCustomer(dto);
     }
 
+    @Override
+    public ResultBean<String> checkCustomerOrUpdate(CustomerQuery customerQuery) {
+        return crmCustomerTempService.checkCustomerOrUpdate(customerQuery);
+    }
+
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -51,6 +51,8 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -73,6 +75,7 @@ import java.util.*;
  */
 @Service
 public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMapper, CrmCustomerTemp> {
+    public static final Logger logger = LoggerFactory.getLogger(CrmCustomerTempService.class);
 
 
     @Autowired
@@ -229,7 +232,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData();
                 String psid = sysOrganizationVo.getPsid();
-                if (psid.equals(createOrgSid)){
+                if (psid.equals(createOrgSid)) {
                     String orgName = sysStaffOrgVo.getOrgName();
                     record.setDeptName(orgName);
                 }
@@ -1071,4 +1074,24 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         return rb.success();
     }
 
+    /**
+     * 检查并创建金蝶中的客户
+     *
+     * @param customerQuery 客户相关参数
+     * @return
+     */
+    public ResultBean checkCustomerOrUpdate(CustomerQuery customerQuery) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //根据客户编码查询金蝶中是否存在该客户
+        Boolean aBoolean = finKingDeeFeign.customerExistState(customerQuery.getCustomerNo()).getData();
+        if (!aBoolean) {//不存在则创建
+            BdCustomer bdCustomer = new BdCustomer();
+            bdCustomer.setFNumber(customerQuery.getCustomerNo());
+            bdCustomer.setFName(customerQuery.getCustomerName());
+            bdCustomer.setTOrgIds(customerQuery.getOrgCode());
+            ResultBean resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
+            logger.info("推送客户{}", resultBean);
+        }
+        return rb.success().setData(customerQuery.getCustomerNo());
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java

@@ -92,12 +92,6 @@ public class DeliveredDetailsVo implements Vo {
     private String sid;
     @ApiModelProperty("orgPath")
     private String orgPath;
-
-   /* private String applyName;
-    private String applySid;
-    private String applyDeptSid;
-    private String staffUserSid;
-    private String applyDept;*/
     @ApiModelProperty("车辆集合")
     private List<CarListVo> carList = new ArrayList<>();
     @ApiModelProperty("剩余")
@@ -112,4 +106,6 @@ public class DeliveredDetailsVo implements Vo {
 
     @ApiModelProperty("销售订单sid")
     private String busSalesOrderSid;
+
+    private boolean showLoanUser;
 }