Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -230,6 +230,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(modelSid);
                 vos.setCarDetailPage(appVehicleVersionVo);
                 vos.setVehicleAlias(baseVehicleModel.getModelName());
+                vos.setGuidedPrice(vos.getGuidedPrice()+"调到"+vos.getTzhGuidedPrice());
+                vos.setManufactorSettlementPrice(vos.getManufactorSettlementPrice()+"调到"+vos.getTzhManufactorSettlementPrice());
             });
         }
         baseModelModpriceDetailVo.setBaseModelModpriceModels(baseModelModpriceModelVos);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -538,6 +538,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
             List<String> vinSidList  = busHandoverPrepareVehicleList.stream().map(v->v.getVinSid()).collect(Collectors.toList());
             //查询车辆的随车资料是否都已移交
             List<String> countList = busVehicleInformationHandoverService.selectByVinSid(vinSidList);
+            List<String> countList1 = busVehicleInformationHandoverService.selectByVinSid1(vinSidList);
+            countList1.removeAll(Collections.singleton(null));
+            if(countList1.size() != vinSidList.size()){
+                return rb.setMsg("车辆中包含随车资料记录为空的车辆，请检查");
+            }
             if(!countList.isEmpty()){
                 return rb.setMsg("车辆："+String.join(",",countList)+"随车资料未完成交接");
             }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java

@@ -100,7 +100,7 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
 //                qw.notIn("vinSid", vinSidList);
 //            }
 //        }
-        qw.eq("createBySid", query.getUserSid());
+//        qw.eq("createBySid", query.getUserSid());
         qw.eq("useOrgSid", query.getUseOrgSid());
         qw.eq("isDelete", 0);
         qw.orderByDesc("createTime");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java

@@ -26,6 +26,7 @@ public interface BusVehicleInformationHandoverMapper extends BaseMapper<BusVehic
     BusVehicleInformationHandover detailsByVinSid(@Param("sid")String sid);
 
     List<String> selectByVinSid(@Param("list") List<String> vinSidList);
+    List<String> selectByVinSid1(@Param("list") List<String> vinSidList);
 
     IPage<AppInformationListVo> selectAppPageVo(IPage<BusVehicleInformationHandover> page, @Param(Constants.WRAPPER)QueryWrapper<AppInformationListVo> qw);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml

@@ -57,6 +57,14 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="selectByVinSid1" resultType="java.lang.String">
+        select bh.vinNo
+        from bus_vehicle_information_handover bh where bh.vehicleSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
     <select id="selectAppPageVo"
             resultType="com.yxt.anrui.buscenter.api.busvehicleinformationhandover.AppInformationListVo">
         SELECT

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java

@@ -574,6 +574,10 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         return baseMapper.selectByVinSid(vinSidList);
     }
 
+    public List<String> selectByVinSid1(List<String> vinSidList) {
+        return baseMapper.selectByVinSid1(vinSidList);
+    }
+
     /*********************************移动端接口************************************************/
     /**
      * 分页列表

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue

@@ -340,6 +340,9 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '因政策类别为优惠,则优惠包类别只能选择赠送优惠' })
         return
       }
+      if (this.temp.salesPolicyKey === '0001') {
+        this.temp.projectCost = '0'
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.disabled = true
@@ -367,6 +370,9 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '因政策类别为优惠,则优惠包类别只能选择赠送优惠' })
         return
       }
+      if (this.temp.salesPolicyKey === '0001') {
+        this.temp.projectCost = '0'
+      }
       if (this.temp.salesPolicy === '促销' && this.temp.baseDiscountpackageVehs.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '因政策类别为促销,则享受促销政策的车辆列表不能为空' })
         return

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java

@@ -36,7 +36,7 @@ public class FinSelectReceivablesDetailedVo implements Vo {
     @ApiModelProperty("应收未收sid")
     private String receivablesSid;
 
-    @ApiModelProperty("应收金额")
+    @ApiModelProperty("剩余金额")
     private String reveivableMoney;
     @ApiModelProperty("业务车辆sid")
     private String busVinSid;
@@ -48,4 +48,9 @@ public class FinSelectReceivablesDetailedVo implements Vo {
 
     @ApiModelProperty("是否是已认款的选择：0不是（应收未收），1是（已认款）")
     private int subscribedOf;
+
+    private String subscriptionMoney;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java

@@ -53,4 +53,7 @@ public class AppFinUncollectedReceivablesDetailedVo implements Vo {
     @ApiModelProperty("是否是从已认款列表选择的：0不是（应收未收），1已认款")
     private int subscribedOf;
 
+    @ApiModelProperty("应收未收sid")
+    private String receivablesSid;
+
 }

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

@@ -1082,6 +1082,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (collList.isEmpty()) {
             collList = finSelectedReceivablesDetailedService.getPaymentList(qw, "");
             for (AppFinUncollectedReceivablesDetailedVo record : collList) {
+                record.setReceivablesSid(record.getSid());
                 record.setSubscribedOf(0);
                 record.setConfirmDate(dateFormat.format(new Date()));
                 String busVinSid = record.getBusVinSid();
@@ -1107,6 +1108,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             }
         } else {
             for (AppFinUncollectedReceivablesDetailedVo record : collList) {
+                record.setReceivablesSid(record.getSid());
                 record.setSubscribedOf(0);
                 record.setConfirmDate(dateFormat.format(new Date()));
                 String busVinSid = record.getBusVinSid();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -296,13 +296,14 @@
         fd.customerPhone,
         fd.receivablesName,
         fd.currentReceivableMoney,
-        0 as reveivableMoney,
         furd.busVinSid,
         furd.payType,
-        furd.payTypeKey
+        furd.payTypeKey,
+        fd.subscriptionMoney,
+        fd.useOrgSid
         from fin_selected_receivables_detailed fd
         left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
-        where fd.receivablesName != '订金'
+        where fd.receivablesName != '订金' and fd.auditState = 3
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -46,6 +46,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -359,6 +360,18 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         if (collList.isEmpty()) {
             collList = baseMapper.selectPageList(qw, "");
             for (FinSelectReceivablesDetailedVo record : collList) {
+                BigDecimal currentMoney = new BigDecimal(record.getCurrentReceivableMoney());
+                BigDecimal subscriptionMoney = new BigDecimal(record.getSubscriptionMoney());
+                if(currentMoney.compareTo(BigDecimal.ZERO)<=0){
+                    record.setReveivableMoney("0");
+                }else{
+                    BigDecimal bigDecimal1 = currentMoney.subtract(subscriptionMoney);
+                    if(bigDecimal1.compareTo(BigDecimal.ZERO)<=0){
+                        record.setReveivableMoney("0");
+                    }else{
+                        record.setReveivableMoney(bigDecimal1.toString());
+                    }
+                }
                 record.setSubscribedOf(1);
                 String busVinSid = record.getBusVinSid();
                 ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@@ -95,4 +95,7 @@ public interface AppFinCollectionConfirmationFeign {
     @PostMapping("/getCustomerBillDetail/{paymentSid}")
     public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(@PathVariable("paymentSid") String paymentSid);
 
+    @ApiOperation("查询已认款列表")
+    @PostMapping("/selectPageList")
+    ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(@RequestBody PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@@ -96,4 +96,9 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 	public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(String paymentSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+		return null;
+	}
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java

@@ -0,0 +1,60 @@
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 已认款的选择列表
+ * @author: dimengzhe
+ * @date: 2023/6/30
+ **/
+@Data
+public class CollectedReceivablesDetailedVo implements Vo {
+    private static final long serialVersionUID = -3610496597863356874L;
+
+    @ApiModelProperty("当前行sid")
+    private String sid;
+    @ApiModelProperty("应收未收sid")
+    private String receivablesSid;
+    @ApiModelProperty("合同编号")
+    @JsonProperty("contractId")
+    private String contractNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    @JsonProperty("name")
+    private String customerName;
+    @ApiModelProperty("车架号")
+    @JsonProperty("vin")
+    private String VIN;
+    @ApiModelProperty("联系电话")
+    @JsonProperty("mobile")
+    private String customerPhone;
+    @ApiModelProperty("应收项目名称")
+    @JsonProperty("projectName")
+    private String receivablesName;
+    @ApiModelProperty("当前应收金额")
+    @JsonProperty("receivable")
+    private String currentReceivableMoney;
+
+
+    @ApiModelProperty("剩余金额")
+    @JsonProperty("receivable")
+    private String reveivableMoney;
+    @ApiModelProperty("业务车辆sid")
+    private String busVinSid;
+
+    @ApiModelProperty("全款贷款key:1是全款，2贷款")
+    private String payTypeKey;
+    @ApiModelProperty("全款贷款")
+    private String payType;
+
+    @ApiModelProperty("是否是已认款的选择：0不是（应收未收），1是（已认款）")
+    private int subscribedOf;
+
+    private String subscriptionMoney;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java

@@ -8,6 +8,10 @@ import lombok.Data;
 public class UncollectedReceivablesDetailedVo implements Vo {
     private static final long serialVersionUID = 6090426752725222574L;
 
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("应收未收sid")
+    private String receivablesSid;
     @ApiModelProperty("合同编号")
     private String contractId;
 
@@ -19,28 +23,18 @@ public class UncollectedReceivablesDetailedVo implements Vo {
 
     @ApiModelProperty("客户名称")
     private String name;
-
     @ApiModelProperty("应收金额")
     private String receivable;
-
     @ApiModelProperty("合同sid")
     private String contractSid;
-
     @ApiModelProperty("认款金额")
     private String confirmMoney;
-
     @ApiModelProperty("车架号")
     private String vin;
-
     @ApiModelProperty("认款时间")
     private String confirmDate;
-
     @ApiModelProperty("认款状态")
     private String state;
-
-    @ApiModelProperty("sid")
-    private String sid;
-
     @ApiModelProperty("付款方式value")
     private String payType;
     @ApiModelProperty("付款方式key:1全款、2贷款")
@@ -50,4 +44,7 @@ public class UncollectedReceivablesDetailedVo implements Vo {
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 
+    @ApiModelProperty("是否是已认款的选择：0不是（应收未收），1是（已认款）")
+    private int subscribedOf;
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@@ -25,10 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
 
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillDetailVo;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillSummaryQuery;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillSummaryVo;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedQuery;
 import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -150,4 +146,9 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
     public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(String paymentSid) {
         return appfinCollectionConfirmationService.getCustomerBillDetail(paymentSid);
     }
+
+    @Override
+    public ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+        return appfinCollectionConfirmationService.selectPageList(pagerQuery);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@@ -29,6 +29,9 @@ package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesPaymentDetailsQuery;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
@@ -62,6 +65,8 @@ public class AppFinCollectionConfirmationService {
     FinCollectionConfirmationFeign finCollectionConfirmationFeign;
     @Autowired
     FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
+    @Autowired
+    private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
 
 
     /**
@@ -223,4 +228,12 @@ public class AppFinCollectionConfirmationService {
         v.setRecords(voList);
         return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
     }
+
+    public ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+        ResultBean<PagerVo<CollectedReceivablesDetailedVo>> rb = ResultBean.fireFail();
+        PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<FinSelectReceivablesDetailedVo>> paymentDetailsList = finSelectedReceivablesDetailedFeign.selectPageList(pq);
+        PagerVo<CollectedReceivablesDetailedVo> vo = CoverUtils.selectPagerVo(paymentDetailsList.getData());
+        return rb.success().setData(vo);
+    }
 }