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

@@ -249,6 +249,22 @@ public class ContractFlow extends FlowDelegate {
         reStart1(contract);
     }
 
+    public void reStartUpdate(ContractDto contract) {
+        if (StringUtils.isEmpty(contract.getCurrency())) {
+            throw new ServiceException("币种不能为空");
+        }
+        // 保存合同产品
+        List<ContractProduct> contractProductList = contract.getContractProductList();
+
+        // 赋值待处理数量
+        if (CollectionUtils.isNotEmpty(contractProductList)) {
+            contractProductList.forEach(item -> item.setExpendQuantity(item.getQuantity()));
+        }
+
+        //调用公共代码
+        commStart(contract, 1);
+    }
+
     public void reStart1(ContractDto contract) {
         Long contractId = contract.getId();
         Assert.notEmpty(contractId, "合同id不能为空");

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

@@ -440,12 +440,12 @@ public class ContractUpdateFlow extends FlowDelegate {
     private void reStart(JSONObject submitData) {
         ContractDto contract = submitData.toJavaObject(ContractDto.class);
 
-        Assert.notEmpty(contract.getId(), "合同id不能为空");
+        Assert.notEmpty(contract.getOldContractId(), "合同id不能为空");
 
         //变更合同需要提前操作数据
         contract = opDate(contract);
 
-        contractFlow.reStart1(contract);
+        contractFlow.reStartUpdate(contract);
     }
 
     /**

hx-sale/src/main/java/com/fjhx/sale/service/statement/impl/SaleStatementServiceImpl.java

@@ -589,7 +589,7 @@ public class SaleStatementServiceImpl implements SaleStatementService {
         BigDecimal totalExpensesSumAmount = BigDecimal.ZERO;
         BigDecimal grossProfitMargin = BigDecimal.ZERO;
         for (ProfitSettlementVo p : list) {
-            contractSumAmount = contractSumAmount.add(ObjectUtil.isEmpty(p.getContractAmount())?BigDecimal.ZERO:p.getContractAmount());//合同金额
+            contractSumAmount = contractSumAmount.add(ObjectUtil.isEmpty(p.getContractAmount())?BigDecimal.ZERO:p.getContractAmount().multiply(p.getRate()));//合同金额
             contractArrivalSumAmount = contractArrivalSumAmount.add(ObjectUtil.isEmpty(p.getContractArrival())?BigDecimal.ZERO:p.getContractArrival());//合同到账
             taxReturnMoneySumAmount = taxReturnMoneySumAmount.add(ObjectUtil.isEmpty(p.getTaxReturnMoney())?BigDecimal.ZERO:p.getTaxReturnMoney());//退税
             otherIncomeSumAmount = otherIncomeSumAmount.add(ObjectUtil.isEmpty(p.getOtherIncome())?BigDecimal.ZERO:p.getOtherIncome());//其他收入