Merge branch 'master' into dev

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/po/Pay.java

@@ -115,11 +115,16 @@ public class Pay extends BasePo {
     private String payStatus;
 
     /**
-     * 税率
+     * 汇率
      */
     private BigDecimal rate;
 
     /**
+     * 税率
+     */
+    private BigDecimal taxRate;
+
+    /**
      * 付款类型  0:未核销  1发票核销
      */
     private String type;

hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java

@@ -96,6 +96,7 @@ public class PayFlow extends FlowDelegate {
             Assert.notEmpty(pay.getId(), "采购付款id不能为空");
         }
         pay.setCurrency("CNY");//默认币种人民币
+        pay.setRate(new BigDecimal("1"));//默认币种人民币
         pay.setStatus(PayStatusEnum.UNDER_REVIEW.getKey());
         payService.saveOrUpdate(pay);
 
@@ -137,7 +138,7 @@ public class PayFlow extends FlowDelegate {
         pay.setStatus(PayStatusEnum.PASS.getKey());
         pay.setApprovedDate(new Date());
         payService.updateById(pay);
-        if(!StringUtils.equals(pay.getPayType(),"3")){
+        if(!StringUtils.equals(pay.getType(),"3")){
 
             // 添加一条付款流水
             AccountPayment payment = new AccountPayment();

hx-purchase/src/main/resources/mapper/pay/PayDetailMapper.xml

@@ -48,7 +48,7 @@
         pay_detail t1
         LEFT JOIN pay t2 ON t1.pay_id = t2.id
         <where>
-            pay_type != 3
+            `type` != 3
             <if test="purchaseIds neq null and purchaseIds.size() > 0">
                 <foreach collection="purchaseIds" item="purchaseId" open="AND purchase_id IN (" separator="," close=")">
                     #{purchaseId}

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -9,6 +9,7 @@ import com.fjhx.common.utils.Assert;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.sale.entity.claim.po.Claim;
 import com.fjhx.sale.entity.claim.po.ClaimContract;
 import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.po.Contract;
@@ -16,6 +17,7 @@ import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProject;
 import com.fjhx.sale.entity.contract.po.ContractShipment;
 import com.fjhx.sale.service.claim.ClaimContractService;
+import com.fjhx.sale.service.claim.ClaimService;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractProjectService;
 import com.fjhx.sale.service.contract.ContractService;
@@ -51,9 +53,12 @@ public class ContractUpdateFlow extends FlowDelegate {
 
     @Autowired
     private ContractProductService contractProductService;
+
     @Autowired
     private ClaimContractService claimContractService;
 
+    @Autowired
+    private ClaimService claimService;
 
     @Autowired
     private ContractProjectService contractProjectService;
@@ -275,8 +280,16 @@ public class ContractUpdateFlow extends FlowDelegate {
         oldContract.setIsChange("1");
         contractService.updateById(oldContract);
 
+
+        List<ClaimContract> claimContractList = claimContractService.list(Wrappers.<ClaimContract>query().lambda().eq(ClaimContract::getContractId,oldContractId));
+        List<Long> claimIds = claimContractList.stream().map(ClaimContract::getClaimId).collect(Collectors.toList());
+        List<Long> claimContractIds = claimContractList.stream().map(ClaimContract::getId).collect(Collectors.toList());
         //删除到账认领数据
-        claimContractService.remove(q -> q.eq(ClaimContract::getContractId, oldContractId));
+        claimContractService.remove(q -> q.in(ClaimContract::getId, claimContractIds));
+        //删除到账认领数据
+        claimService.remove(q -> q.in(Claim::getId, claimIds));
+
+
         oldContract.setUpId(temOldId);
         oldContract.setIsShow(1);//隐藏旧合同
         contractService.updateContract(oldContract);