优化

2 years ago · 4b3a44751e
4 changed files with 153 additions and 144 deletions
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java
@ -49,4 +49,6 @@ public class AppFinSelectedReceivablesPaymentDetailsVo implements Vo {
    @ApiModelProperty("分公司sid")
    private String useOrgSid;

+    private int subscribedOf;
+
 }
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java
@ -116,4 +116,6 @@ public class FinSelectedReceivablesDetailedVo implements Vo {
    private String payTypeKey;
    @ApiModelProperty("全款贷款")
    private String payType;
+    
+    private int subscribedOf;
 }
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@ -57,7 +57,6 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeig
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CustomerQuery;
-import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
@ -101,7 +100,6 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;

 /**
 * Project: anrui-fin(销售相关) <br/>
@ -493,11 +491,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                    //认款日期默认为当天的日期
                    finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
                    finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
+                    if(v.getSubscribedOf() == 0){
                        //应收未收减去相应的认款
                        FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
                        BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
                        finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
                        finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                    }
+                    
                });
            }
            finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney());
@ -534,31 +535,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                    finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid());
                    finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
                    finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
-                    //添加已选车架号为临时状态
-                   /* BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
-                    baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
-                    baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
-                    if ("车款".equals(v.getReceivablesName())) {
-                        baseVehicleTempstateDto.setTempKey("001");
-                        baseVehicleTempstateDto.setTempValue("车款");
-                    }
-                    if ("订金".equals(v.getReceivablesName())) {
-                        baseVehicleTempstateDto.setTempKey("002");
-                        baseVehicleTempstateDto.setTempValue("订金");
-                    }
-
-                    baseVehicleTempstateDto.setBusSid(finalSid);
-                    //根据合同编号和车架号查询该合同的车辆sid
-                    ResultBean<String> resultBean = busSalesOrderFeign.getVinSidByConSid(v.getContractNo(), v.getVIN());
-                    if (resultBean.getSuccess()) {
-                        baseVehicleTempstateDto.setVehSid(resultBean.getData());
-                    }
-                    ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);*/
+                    if(v.getSubscribedOf() == 0){
                        //应收未收减去相应的认款
                        FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
                        BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
                        finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
                        finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                    }
+
                });
            }
            finCollectionConfirmation.setAuditState(1);
@ -1019,12 +1003,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
            finSelectedReceivablesDetailed.setCreateByName(finCollectionConfirmation.getCreateByName());
            finSelectedReceivablesDetailed.setUseOrgSid(paymentDetail.getUseOrgSid());
            finSelectedReceivablesDetailed.setCustomerSid(paymentDetail.getCustomerSid());
+            finSelectedReceivablesDetailed.setSubscribedOf(paymentDetail.getSubscribedOf());
            finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
+            if(paymentDetail.getSubscribedOf() == 0){
                FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
                BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
                finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
                finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
            }
+        }
        return rb.success();
    }

@ -1140,13 +1127,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                -> new TreeSet<>(Comparator.comparing(AppFinUncollectedReceivablesDetailedVo::getSid))), ArrayList::new));
        //根据合同编号倒序排序
        collList = collList.stream().sorted(Comparator.comparing(AppFinUncollectedReceivablesDetailedVo::getContractId).reversed()).collect(Collectors.toList());
-        //分页
+        /*//分页
        IPage<AppFinUncollectedReceivablesDetailedVo> page1 = new Page<>();
        page1.setRecords(collList);
        page1.setTotal(collList.size());
        page1.setPages((collList.size() / pagerQuery.getSize()) + 1);
        page1.setCurrent(pagerQuery.getCurrent());
        page1.setSize(pagerQuery.getSize());
+        return page1;*/
+        //分页
+        IPage<AppFinUncollectedReceivablesDetailedVo> page1 = new Page<>();
+        page1.setTotal(collList.size());
+        page1.setPages(collList.size()/pagerQuery.getSize()+(collList.size()%pagerQuery.getSize()==0?0:1));
+        collList = collList.stream().skip((pagerQuery.getCurrent() - 1) *pagerQuery.getSize()).limit(pagerQuery.getSize()).collect(Collectors.toList()); //开始分页
+        page1.setRecords(collList);
+        page1.setCurrent(pagerQuery.getCurrent());
+        page1.setSize(pagerQuery.getSize());
        return page1;
    }

@ -1185,11 +1181,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
            finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
            finSelectedReceivablesDetailed.setAuditState(2);
            finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
+            if(v.getSubscribedOf() == 0){
                //应收未收将款项加回来
                FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
                BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(finSelectedReceivablesDetailed.getSubscriptionMoney());
                finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
                finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+            }
+
        });
        confirmation.setAuditState(2);
        //更新驳回原因
@ -1429,6 +1428,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
                //ToDo:查询是否符合待出库的条件
                //该合同编号下的该车架号的所有认款金额
+                if(v.getSubscribedOf() == 0){
                    List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
                    BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
                    //查询该合同编号下的销售订单的单车成交价
@ -1539,6 +1539,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                            }
                        }
                    }
+                }
+
            });
            //查询该申请已认款金额总数
            subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
@ -2258,10 +2260,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
            finSelectedReceivablesDetailed.setAuditState(4);
            finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
            //应收未收将款项加回来
+            if(v.getSubscribedOf() == 0){
                FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
                BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(finSelectedReceivablesDetailed.getSubscriptionMoney());
                finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
                finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+            }
        });
        confirmation.setAuditState(4);
        confirmation.setReason("申请人已撤回");
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
@ -122,7 +122,8 @@
               payType,
               payTypeKey,
               customerSid,
-               useOrgSid
+               useOrgSid,
+                subscribedOf
        FROM fin_selected_receivables_detailed
        WHERE collSid = #{collectionBillSid}
    </select>
@ -180,7 +181,7 @@
        where collSid = #{sid}
          and auditState = #{state}
          and receivablesName = #{type}
-          and payTypeKey = #{payTypeKey}
+          and payTypeKey = #{payTypeKey} and subscribedOf = 0
        group by contractNo
    </select>

@ -191,7 +192,7 @@
        where collSid = #{sid}
          and auditState = #{state}
          and receivablesName = #{type}
-          and payTypeKey = #{payTypeKey}
+          and payTypeKey = #{payTypeKey} and subscribedOf = 0
    </select>

    <select id="selectCustomerList" resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo">
@ -199,7 +200,7 @@
        from fin_selected_receivables_detailed
        where collSid = #{sid}
          and auditState = #{state}
-          and receivablesName = #{type}
+          and receivablesName = #{type} and subscribedOf = 0
        group by concat(customerName, customerPhone)
    </select>

@ -208,7 +209,7 @@
        select *
        from fin_selected_receivables_detailed
        where collSid = #{sid}
-          and auditState = #{state}
+          and auditState = #{state} and subscribedOf = 0
          and receivablesName = #{type}
    </select>

@ -220,7 +221,7 @@
          and auditState = #{state}
          and receivablesName = #{type}
          and customerName = #{customerName}
-          and customerPhone = #{customerPhone}
+          and customerPhone = #{customerPhone} and subscribedOf = 0
          and length(VIN) > 0
    </select>

@ -231,7 +232,7 @@
        where collSid = #{sid}
          and auditState = #{state}
          and receivablesName = #{type}
-          and contractNo = #{contractNo}
+          and contractNo = #{contractNo} and subscribedOf = 0
          and length(VIN) > 0
    </select>

@ -242,7 +243,7 @@
        where collSid = #{sid}
          and auditState = #{state}
          and receivablesName = #{type}
-          and contractNo = #{contractNo}
+          and contractNo = #{contractNo} and subscribedOf = 0
          and length(VIN) = 0
    </select>

@ -254,7 +255,7 @@
          and auditState = #{state}
          and receivablesName = #{type}
          and customerName = #{customerName}
-          and customerPhone = #{customerPhone}
+          and customerPhone = #{customerPhone} and subscribedOf = 0
          and length(VIN) = 0
    </select>

@ -263,7 +264,7 @@
        from fin_selected_receivables_detailed fd
                     left join fin_uncollected_receivables_detailed ff on ff.sid = fd.receivablesSid
        where ff.busVinSid = #{busVinSid}
-          and fd.auditState = 3
+          and fd.auditState = 3 and subscribedOf = 0
    </select>

    <update id="updateAuditStateBySid">