Merge branch 'test' into dev

hx-account/src/main/java/com/fjhx/account/flow/AccountRequestFundsFlow.java

@@ -141,7 +141,7 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         if ("3".equals(accountRequestFunds.getType())) {
             BigDecimal subtract = accountRequestFunds.getTotal().subtract(accountRequestFunds.getAdvanceAmounts());
             accountPayment.setAmount(subtract);
-            if(subtract.compareTo(BigDecimal.ZERO)==0){//不生成打款数据
+            if (subtract.compareTo(BigDecimal.ZERO) <= 0) {//不生成打款数据
                 return;
             }
         } else {

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimContractServiceImpl.java

@@ -1,16 +1,16 @@
 package com.fjhx.sale.service.claim.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.sale.entity.claim.dto.ClaimContractDto;
+import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
 import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
 import com.fjhx.sale.mapper.claim.ClaimContractMapper;
 import com.fjhx.sale.service.claim.ClaimContractService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
-import com.fjhx.sale.entity.claim.dto.ClaimContractSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.sale.entity.claim.dto.ClaimContractDto;
-import cn.hutool.core.bean.BeanUtil;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -65,6 +65,7 @@ public class ClaimContractServiceImpl extends ServiceImpl<ClaimContractMapper, C
     public List<ClaimContract> getListByContractIds(List<Long> contractIds) {
         IWrapper<ClaimContract> wrapper = getWrapper();
         wrapper.in("t1.contract_id", contractIds);
+        wrapper.orderByDesc("t1.create_time");
         return baseMapper.getListByContractIds(wrapper);
     }
 

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="getPage" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
         SELECT t1.id,
-               t2.create_time AS contractTime,
+               t2.create_time     AS contractTime,
                t1.contract_id,
                t1.product_id,
                t2.`code`          AS contractCode,
@@ -18,7 +18,16 @@
                 ORDER BY create_time DESC
                                      LIMIT 1)               AS claimTime,
                t2.contract_template_id AS contractTemplateId,
-               t1.quantity
+               t1.quantity,
+                (SELECT
+                    if(sum( pd.count ) is null,0,sum( pd.count ))
+                FROM
+                    bytesailing_purchase.purchase_detail pd
+                    LEFT JOIN bytesailing_purchase.purchase p ON pd.purchase_id = p.id
+                WHERE
+                    p.purchase_status = 10
+                    and pd.data_resource_id = t1.id
+                ) as startPurchaseCount
         FROM contract_product t1
             LEFT JOIN contract t2
             LEFT JOIN claim_contract co