Merge branch 'master' into dev

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

@@ -12,6 +12,7 @@ import com.fjhx.account.service.account.AccountPaymentService;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.common.utils.ExchangeRateUtil;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
@@ -94,9 +95,8 @@ public class PayFlow extends FlowDelegate {
         if (opType == 1) {
             Assert.notEmpty(pay.getId(), "采购付款id不能为空");
         }
-
-        pay.setStatus(PayStatusEnum.UNDER_REVIEW.getKey());
         pay.setCurrency("CNY");//默认币种人民币
+        pay.setStatus(PayStatusEnum.UNDER_REVIEW.getKey());
         payService.saveOrUpdate(pay);
 
         List<PayDetail> payDetailList = pay.getPayDetailList();

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

@@ -41,7 +41,7 @@
 
     <select id="getPayDetailList" resultType="com.fjhx.purchase.entity.pay.po.Pay">
         SELECT
-            IFNULL( t1.money, 0 ) AS money,
+            IFNULL( t1.money, 0 ) AS amount,
             IFNULL( t2.rate, 1 ) AS rate,
             IFNULL( t2.currency, "CNY" ) AS currency
         FROM

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

@@ -11,6 +11,7 @@ import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.common.utils.ExchangeRateUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.core.FlowThreadLocalUtil;
 import com.fjhx.flow.enums.FlowStatusEnum;
@@ -183,6 +184,7 @@ public class PurchaseFlow extends FlowDelegate {
         if (opType == 1) {
             Assert.notEmpty(purchase.getId(), "采购id不能为空");
         }
+        purchase.setRate(ExchangeRateUtil.getCnyToCodeRate(purchase.getCurrency()));
         purchase.setPurchaseStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
         purchaseService.saveOrUpdate(purchase);
         List<PurchaseDetail> purchaseDetailList = purchase.getPurchaseDetailList();

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

@@ -343,7 +343,7 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                             // 返回兑人民币后金额
                             return rate.multiply(money);
                         }).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        p.setAccountPaid(payAmount);
+                        p.setPayForGoods(payAmount);
                     }
                 }
                 /**
@@ -404,7 +404,7 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                 if (CollectionUtils.isNotEmpty(pList)) {
                     BigDecimal purchaseAmount = pList.stream().map(purchase -> {
                         //获取汇率
-                        BigDecimal rate = purchase.getRate() == null ? BigDecimal.ZERO : purchase.getRate();
+                        BigDecimal rate = purchase.getRate() == null ? BigDecimal.ONE : purchase.getRate();
                         // 获取认领金额
                         BigDecimal money = purchase.getAmount() == null ? BigDecimal.ZERO : purchase.getAmount();
                         // 返回兑人民币后金额
@@ -426,7 +426,7 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                             // 返回兑人民币后金额
                             return rate.multiply(money);
                         }).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        p.setAccountPaid(payAmount);
+                        p.setPayForGoods(payAmount);
                     }
                 }
                 /**
@@ -518,7 +518,7 @@ public class SaleStatementServiceImpl implements SaleStatementService {
         for (ProfitSettlementVo profitSettlementVo : list) {
 
             // 收入
-            BigDecimal totalIncome = profitSettlementVo.getOtherIncome().add(profitSettlementVo.getContractArrival());
+            BigDecimal totalIncome = profitSettlementVo.getOtherIncome().add(profitSettlementVo.getContractArrival().add(profitSettlementVo.getTaxReturnMoney()));
             profitSettlementVo.setTotalIncome(totalIncome);
 
             // 支出