销售订单选择订金排除未确认的订金、款项确认添加业务sid及业务单据编号

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -65,7 +65,6 @@ import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
-import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
@@ -2027,7 +2026,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     finConfirmDto.setBanlance(busDeposit.getDeposit().toString());
                     //创建人sid
                     finConfirmDto.setCreateBySid(busMainDeposit.getCreateBySid());
-                    List<FinSelectDto> list = new ArrayList<>();
+                    finConfirmDto.setPushMessgae(1);
+                    finConfirmDto.setBusSid(busMainDeposit.getSid());
+                    finConfirmDto.setBusNo(busMainDeposit.getBillNo());
+                  /*  List<FinSelectDto> list = new ArrayList<>();
                     if (StringUtils.isNotBlank(busDeposit.getVehicleNum())) {
                         List<BusDepositCustomerVo> customerList = busDepositCustomerService.selectListByBillSid(bv.getBusinessSid());
                         for (int i = 0; i < Integer.valueOf(busDeposit.getVehicleNum()); i++) {
@@ -2044,7 +2046,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                             }
                         }
                     }
-                    finConfirmDto.setFinSelectList(list);
+                    finConfirmDto.setFinSelectList(list);*/
                     finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
                 }
                 if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
@@ -91,6 +92,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     private BusDepositService busDepositService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
 
     public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
@@ -336,6 +339,13 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                     qw.eq("bd.staffSid", resultBean.getData().getStaffSid());
                 }
             }
+            //查询已审核通过的款项确认
+            ResultBean<List<String>> stringList = finCollectionConfirmationFeign.billeNoList();
+            if(stringList.getSuccess()){
+                if(!stringList.getData().isEmpty()){
+                    qw.in("bmd.billNo",stringList.getData());
+                }
+            }
         }
         qw.eq("bmd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         qw.eq("bmd.depositBillTypeKey", "01");

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -84,4 +84,11 @@ public class FinCollectionConfirmation extends BaseEntity {
     private Integer auditState; // 审核状态
     @ApiModelProperty("款项状态（1未认款/2部分认款/3已认款）")
     private Integer paymentState; // 审核状态
+
+    @ApiModelProperty("是否是推送的：0否，1是")
+    private int pushMessgae;
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("业务单据编号")
+    private String busNo;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -35,6 +35,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinCollectionConfirmationFeign.java <br/>
@@ -114,5 +116,9 @@ public interface FinCollectionConfirmationFeign {
     @PostMapping("/saveFinConfirm")
     ResultBean saveFinConfirm(@RequestBody FinConfirmDto dto);
 
+    @ApiOperation("查询已审核通过的款项确认的业务编号")
+    @GetMapping("/billeNoList")
+    ResultBean<List<String>> billeNoList();
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -32,6 +32,8 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinCollectionConfirmationFeignFallback.java <br/>
@@ -119,4 +121,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean saveFinConfirm(FinConfirmDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<String>> billeNoList() {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java

@@ -52,4 +52,11 @@ public class FinConfirmDto implements Dto {
 
     private String banlance;
 
+    @ApiModelProperty("是否是推送的：0否，1是")
+    private int pushMessgae;
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("业务单据编号")
+    private String busNo;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -31,7 +31,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
-import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -96,4 +95,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
      * @return
      */
     AppFinCollectionConfirmationDetailedVo getCollectionConfirmDetail(String collectionBillSid);
+
+    List<String> billNoList();
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -70,4 +70,8 @@
         FROM fin_collection_confirmation
         WHERE sid = #{collectionBillSid}
     </select>
+
+    <select id="billNoList" resultType="java.lang.String">
+        select busNo from fin_collection_confirmation where pushMessgae = 1 and auditState = 3
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -39,6 +39,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinCollectionConfirmationFeignFallback.java <br/>
@@ -193,4 +195,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     public ResultBean saveFinConfirm(FinConfirmDto dto) {
         return finCollectionConfirmationService.saveFinConfirm(dto);
     }
+
+    @Override
+    public ResultBean<List<String>> billeNoList() {
+        return finCollectionConfirmationService.billNoList();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -389,6 +389,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 qw.like("payerName", pagerQuery.getName());
             }
         }
+        qw.eq("pushMessage",0);
         return qw;
     }
 
@@ -753,4 +754,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         return rb.success();
     }
+
+    public ResultBean<List<String>> billNoList() {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<String> stringList = baseMapper.billNoList();
+        return rb.success().setData(stringList);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -54,7 +54,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
@@ -562,8 +561,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     ResultBean<BaseVehicle> baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(scmVehicleEnterlibrary.getVinNo(), internalPurchaseDetailsVo.getSellerOrgSid());
                     //厂家回款通路sid 厂家回款通路名称
                     if (baseVehicleResultBean.getData() != null) {
+                        if(StringUtils.isNotBlank(baseVehicleResultBean.getData().getManufSaleAccessSid())){
                             baseVehicleDto.setManufSaleAccessSid(baseVehicleResultBean.getData().getManufSaleAccessSid());
-                        baseVehicleDto.setManufSaleAccessName(baseVehicleResultBean.getData().getManufSaleAccessName());
                             //厂家回款通路类别key
                             BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.details(baseVehicleResultBean.getData().getManufSaleAccessSid()).getData();
                             if (baseManufacturerBankVo != null) {
@@ -572,6 +571,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                                 baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey());
                             }
                         }
+                        if(StringUtils.isNotBlank(baseVehicleResultBean.getData().getManufSaleAccessName())){
+                            baseVehicleDto.setManufSaleAccessName(baseVehicleResultBean.getData().getManufSaleAccessName());
+                        }
+                    }
                     List<BaseVehicleDto> list = new ArrayList<>();
                     list.add(baseVehicleDto);
                     baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.TC_SAVEVEH.getCode());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -508,6 +508,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                 for (String s : factoryImage) {
                     if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                         s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }else{
+                        s1 = s;
                     }
                     ScmFile scmFile1 = new ScmFile();
                     scmFile1.setAttachType(type1);
@@ -521,6 +523,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                 for (String s : carInspectedImage) {
                     if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                         s2 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }else{
+                        s2 = s;
                     }
                     ScmFile scmFile2 = new ScmFile();
                     scmFile2.setAttachType(type2);