Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java

@@ -31,9 +31,11 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -62,5 +64,7 @@ public interface FinUncollectedReceivablesDetailedJRFeign {
     @PostMapping("/listAll")
     public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsJRVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedJRQuery query);
 
-
+    @ApiOperation("更新")
+    @PostMapping("/updateAll")
+    ResultBean updateAll(@RequestParam("sid") String sid, @RequestParam("type") String type, @RequestParam("fundDay") BigDecimal fundDay);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java

@@ -31,6 +31,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -54,4 +55,9 @@ public class FinUncollectedReceivablesDetailedJRFeignFallback implements FinUnco
     public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsJRVo>> listAll(FinUncollectedReceivablesDetailedJRQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean updateAll(String sid, String type, BigDecimal fundDay) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java

@@ -84,4 +84,6 @@ public interface FinUncollectedReceivablesDetailedJRMapper extends BaseMapper<Fi
     List<AppFinUncollectedReceivablesDetailedRskVo> getRskPaymentDetailsListForRule( @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedRskVo> qw,
                                                                                      @Param("userOrgSid") String userOrgSid,
                                                                                      @Param("purchaseSystemSid") String purchaseSystemSid);
+
+    FinUncollectedReceivablesDetailedJR selectByType(@Param("sid") String sid, @Param("type") String type);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml

@@ -344,4 +344,9 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectByType"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
+        select * from anrui_fin.fin_uncollected_receivables_detailed_jr where busSid = #{sid} and payCostTitleValue = #{type}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRRest.java

@@ -37,6 +37,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -64,4 +65,9 @@ public class FinUncollectedReceivablesDetailedJRRest implements FinUncollectedRe
     public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsJRVo>> listAll(FinUncollectedReceivablesDetailedJRQuery query) {
         return finUncollectedReceivablesDetailedJRService.listAll(query);
     }
+
+    @Override
+    public ResultBean updateAll(String sid, String type, BigDecimal fundDay) {
+        return finUncollectedReceivablesDetailedJRService.updateAll(sid,type,fundDay);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java

@@ -42,6 +42,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.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -94,7 +95,7 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
                 String[] sids = query.getSids();
                 for (String sid : sids) {
                     IntStream.range(0, list.size()).filter(i ->
-                            list.get(i).getSid().equals(sid)).
+                                    list.get(i).getSid().equals(sid)).
                             boxed().findFirst().map(i -> list.remove((int) i));
                 }
             }
@@ -122,12 +123,21 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
     public List<AppFinUncollectedReceivablesDetailedRskVo> getRskPaymentDetailsListForRule(String loanContractNo, String vinNo, String useOrgSid, String purchaseSystemSid) {
         QueryWrapper<AppFinUncollectedReceivablesDetailedRskVo> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(loanContractNo)) {
-            qw.eq("t.loanContractNo",loanContractNo);
+            qw.eq("t.loanContractNo", loanContractNo);
         }
         if (StringUtils.isNotBlank(vinNo)) {
-            qw.eq("t.vin",vinNo);
+            qw.eq("t.vin", vinNo);
         }
         List<AppFinUncollectedReceivablesDetailedRskVo> list = baseMapper.getRskPaymentDetailsListForRule(qw, useOrgSid, purchaseSystemSid);
         return list;
     }
+
+    public ResultBean updateAll(String sid, String type, BigDecimal fundDay) {
+        ResultBean rb = ResultBean.fireFail();
+        FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = baseMapper.selectByType(sid, type);
+        BigDecimal bigDecimal = new BigDecimal(finUncollectedReceivablesDetailedJR.getReveivableMoney()).add(fundDay);
+        finUncollectedReceivablesDetailedJR.setReveivableMoney(bigDecimal.toString());
+        baseMapper.updateById(finUncollectedReceivablesDetailedJR);
+        return rb.success();
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -557,7 +557,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         SysOrganization sysOrganization = fetchBySid(sid);
         String orgSid = "";
         if ("0".equals(sysOrganization.getPsid())) {//总公司
-            orgSid = sysOrganization.getSid();
+//            orgSid = sysOrganization.getSid();
+            orgSid = null;
             return orgSid;
         }
         if (sysOrganization.getIsDept() == 0) {//是独立法人的

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDay.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.riskcenter.api.loanfundday;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/12/19
+ **/
+@Data
+public class LoanFundDay extends BaseEntity {
+    private static final long serialVersionUID = 8336958436247857388L;
+
+    @ApiModelProperty("还款计划明细表sid")
+    private String busSid;
+    @ApiModelProperty("日期")
+    private String createDate;
+
+    @ApiModelProperty("公司垫款金额")
+    private BigDecimal paymentMoney;
+
+    @ApiModelProperty("当日资金占用费")
+    private BigDecimal fund;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayFeign.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.api.loanfundday;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/12/19
+ **/
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanFundDay",
+        name = "anrui-riskcenter",
+        path = "v1/LoanFundDay",
+        fallback = LoanFundDayFeignFallback.class)
+public interface LoanFundDayFeign {
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.riskcenter.api.loanfundday;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/12/19
+ **/
+@Component
+public class LoanFundDayFeignFallback {
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java

@@ -70,4 +70,11 @@ public class LoanRepaymentPlanDetails extends BaseEntity {
     private String orgSidPath;
 
 
+    private String returnWayKey;
+    private String returnWay;
+    private String actualPerson;
+    private BigDecimal paymentMoney;
+    private BigDecimal fund;
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loanfundday;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDay;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/12/19
+ **/
+@Mapper
+public interface LoanFundDayMapper extends BaseMapper<LoanFundDay> {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.riskcenter.biz.loanfundday.LoanFundDayMapper">
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayRest.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.riskcenter.biz.loanfundday;
+
+import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDayFeign;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/12/19
+ **/
+@RestController
+@RequestMapping("v1/LoanFundDay")
+public class LoanFundDayRest implements LoanFundDayFeign {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayService.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.biz.loanfundday;
+
+import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDay;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/12/19
+ **/
+@Service
+public class LoanFundDayService extends MybatisBaseService<LoanFundDayMapper, LoanFundDay> {
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java

@@ -0,0 +1,67 @@
+package com.yxt.anrui.riskcenter.biz.loanfundday;
+
+import cn.hutool.core.date.DateUtil;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
+import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDay;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/12/19
+ **/
+@Component
+public class ScheduledLoanFundDayService {
+
+    @Autowired
+    private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+    @Autowired
+    private LoanFundDayService loanFundDayService;
+    @Autowired
+    private FinUncollectedReceivablesDetailedJRFeign finUncollectedReceivablesDetailedJRFeign;
+
+
+    //    @Scheduled(cron = "0 0 0 * * ?")
+    public void loanFundDayScheduled() {
+        /**
+         * 每天晚上12点遍历还款计划表中的公司垫款余额，按照以下规则计算：
+         * 每笔垫款的累计资金占用费用A（金融应收未收表中）：
+         * 截止到当天垫款余额（在还款计划表中）：T    当天新增的资金占用费B
+         * A=A+B，B =T*7/10000。
+         * 需要建立每日资金占用费记录表（还款计划明细表sid，日期、当日垫款余额，当日资金占用费）
+         */
+        //查询
+        List<LoanRepaymentPlanDetails> list = loanRepaymentPlanDetailsService.planList();
+        list.removeAll(Collections.singleton(null));
+        if (list.size() > 0) {
+            //截止到当天垫款余额T
+            BigDecimal paymentMoneyAll = list.stream().map(LoanRepaymentPlanDetails::getPaymentMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+            //当天资金占用费B
+            BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal(7)).divide(new BigDecimal(10000), BigDecimal.ROUND_CEILING);
+            for (int i = 0; i < list.size(); i++) {
+                LoanRepaymentPlanDetails loanRepaymentPlanDetails = list.get(i);
+                LoanFundDay loanFundDay = new LoanFundDay();
+                loanFundDay.setBusSid(loanRepaymentPlanDetails.getSid());
+                loanFundDay.setCreateDate(DateUtil.today());
+                loanFundDay.setPaymentMoney(paymentMoneyAll);
+                loanFundDay.setFund(fundDay);
+                loanFundDayService.insert(loanFundDay);
+                //更新资金占用A
+                finUncollectedReceivablesDetailedJRFeign.updateAll(loanRepaymentPlanDetails.getSid(), "资金占用费", fundDay);
+            }
+        }
+
+    }
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanOrderPreloanVo;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
@@ -63,6 +64,7 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
     IPage<LoanPreloanVo> getOrderLoanPagerList(IPage<LoanPreloanCreditApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanPreloanCreditApply> qw, @Param("name") String name);
 
     LoanPreloanCreditApply judgeIsLoan(String sid);
+    LoanPreloanCreditApply judgeIsLoan3(String sid);
 
     LoanOrderPreloanVo judgeIsLoan2(String sid);
 
@@ -70,4 +72,6 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
 
     @Update("update loan_preloan_credit_apply set ssjg=#{ssjg} where sid=#{creditApplySid}")
     void updateSsjgBySid(@Param("ssjg") String ssjg, @Param("creditApplySid") String creditApplySid);
+
+    BusSalesOrder selectAppSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml

@@ -54,6 +54,13 @@
         where bo.sid = #{sid}
         order by la.createTime desc limit 1
     </select>
+    <select id="judgeIsLoan3" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply">
+        select la.* from
+        loan_preloan_credit_apply la
+        left join anrui_buscenter.bus_sales_order bo on bo.customerSid = la.qySid
+        where bo.sid = #{sid}
+        order by la.createTime desc limit 1
+    </select>
 
     <select id="judgeIsLoan2" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanOrderPreloanVo">
         select bo.customerName,bp.quantity from
@@ -67,4 +74,8 @@
         left join anrui_buscenter.bus_sales_order_borrower bb on bb.sid = bv.borrowerSid
         where bv.salesOrderSid = #{orderSid}
     </select>
+
+    <select id="selectAppSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
+        select * from anrui_buscenter.bus_sales_order where sid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -33,6 +33,7 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixSelectQuery;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
@@ -632,7 +633,14 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             }
         }
         //查询销售订单的实际购车人也就是客户是否已信用审核通过
-        LoanPreloanCreditApply loanPreloanCreditApply = baseMapper.judgeIsLoan(sid);
+        BusSalesOrder busSalesOrder = baseMapper.selectAppSid(sid);
+        LoanPreloanCreditApply loanPreloanCreditApply = new LoanPreloanCreditApply();
+        if("1".equals(busSalesOrder.getCustomerClassKey())){
+            loanPreloanCreditApply = baseMapper.judgeIsLoan(sid);
+        }else{
+            loanPreloanCreditApply = baseMapper.judgeIsLoan3(sid);
+        }
+
         LoanOrderPreloanVo loanOrderPreloanVo = baseMapper.judgeIsLoan2(sid);
         if (loanPreloanCreditApply == null) {
             loanOrderPreloanVo.setConfirmBtn("信用审核");

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java

@@ -35,4 +35,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
     MonRepayDetails details(String saleVehSid);
 
     List<MonRepayPeriodDetails> periodDetails(String saleVehSid);
+
+    List<LoanRepaymentPlanDetails> planList();
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -99,4 +99,8 @@
         HAVING (notRepaidMoney > 0)
         ORDER BY lrpd.period
     </select>
+
+    <select id="planList" resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
+        select * from anrui_riskcenter.loan_repayment_plan_details where paymentMoney>0
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java

@@ -107,4 +107,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
         LoanRepaymentPlanDetails planDetails = fetchBySid(sid);
         return rb.success().setData(planDetails);
     }
+
+    public List<LoanRepaymentPlanDetails> planList() {
+        return baseMapper.planList();
+    }
 }

doc/databases/risk_center.sql

@@ -1231,6 +1231,30 @@ CREATE TABLE `loan_template_install`
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='金融方案模板上装';
 
+-- 每日资金占用费记录表
+DROP TABLE IF EXISTS `loan_fund_day`;
+CREATE TABLE `loan_fund_day`
+(
+    `id`           int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`          varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`  int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`   timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`   timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`     int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`        int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`     int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`      varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`  varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`  varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `busSid`       varchar(64)          DEFAULT NULL COMMENT '还款计划表明细sid',
+    `createDate`   varchar(64)          DEFAULT NULL COMMENT '日期',
+    `paymentMoney` decimal(10, 2)       DEFAULT NULL COMMENT '当日垫款金额',
+    `fund`         decimal(10, 2)       DEFAULT NULL COMMENT '当日资金占用',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='每日资金占用费记录表';
+
 
 
 

doc/databases/报表中心.sql

@@ -527,20 +527,44 @@ where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 -- 存销比
 update daily_report r inner join (
-    select ifnull(sum(dr.sale_subtotal_month), 0) as subtotal,dr.useOrgSid,dr.vehModelSid,dr.vehMConfigSid
+    select ifnull(sum(dr.sale_subtotal_month), 0) as subtotal, dr.useOrgSid, dr.vehModelSid, dr.vehMConfigSid
     from daily_report dr
-    where
-        (DATE_FORMAT(createTime, '%Y-%m') LIKE DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')
-            OR DATE_FORMAT(createTime, '%Y-%m') LIKE DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 2 MONTH), '%Y-%m')
-            OR DATE_FORMAT(createTime, '%Y-%m') LIKE DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 3 MONTH), '%Y-%m')
-            )  group by dr.useOrgSid, dr.vehModelSid, dr.vehMConfigSid) s
+    where (DATE_FORMAT(createTime, '%Y-%m') LIKE DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')
+        OR DATE_FORMAT(createTime, '%Y-%m') LIKE DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 2 MONTH), '%Y-%m')
+        OR DATE_FORMAT(createTime, '%Y-%m') LIKE DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 3 MONTH), '%Y-%m')
+              )
+    group by dr.useOrgSid, dr.vehModelSid, dr.vehMConfigSid) s
     on r.useOrgSid = s.useOrgSid
         and r.vehModelSid = s.vehModelSid
         and r.vehMConfigSid = s.vehMConfigSid
-set saleOfStockRatio =if(s.subtotal= 0,stock_subtotal+pcOrder_subtotal,ROUND((stock_subtotal+pcOrder_subtotal)/ROUND(s.subtotal/3,2),2)) ,
-    stock_total = (stock_subtotal+pcOrder_subtotal)
+set saleOfStockRatio =if(s.subtotal = 0, stock_subtotal + pcOrder_subtotal,
+                         ROUND((stock_subtotal + pcOrder_subtotal) / ROUND(s.subtotal / 3, 2), 2)),
+    stock_total      = (stock_subtotal + pcOrder_subtotal)
 where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
+--  ==============================================
+-- 欠款出库数量、欠款出库金额万元、金融未放款数量、金融未放款金额（万元）
+
+update daily_report r inner join (
+    select count(bdad.id) as scount, ba.useOrgSid, bm.modelConfigSid as vehMConfigSid, bm.modelSid as vehModelSid
+    from anrui_buscenter.bus_delivered_apply_details bdad
+             left join anrui_buscenter.bus_delivered_apply ba on ba.sid = bdad.applySid
+             left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = bdad.sid
+             left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
+             left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid
+    where ba.nodeState = '已办结'
+      and typeState = 1
+    group by ba.useOrgSid, bm.modelSid, bm.modelConfigSid) s
+    on r.useOrgSid = s.useOrgSid
+        and r.vehModelSid = s.vehModelSid
+        and r.vehMConfigSid = s.vehMConfigSid
+set arrears_carry_veh_count = s.scount
+where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
+
+
+
+
+