增加打款数据插入逻辑更改

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

@@ -141,6 +141,9 @@ 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){//不生成打款数据
+                return;
+            }
         } else {
             accountPayment.setAmount(accountRequestFunds.getTotal());
         }

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

@@ -104,14 +104,14 @@ public class PayFlow extends FlowDelegate {
         AccountPayment payment = new AccountPayment();
         payment.setAccountManagementId(pay.getAccountManagementId());
         payment.setBusinessId(pay.getId());
-        // todo 暂时写死人民币
-        payment.setCurrency("CNY");
+        payment.setCurrency(pay.getCurrency());
         payment.setPaymentRemark(pay.getRemark());
         payment.setType(PaymentTypeEnum.REJECT.getKey());
         payment.setStatus(PaymentStatusEnum.UNDER_REVIEW.getKey());
         payment.setAmount(pay.getAmount());
         payment.setIncomeAmount(pay.getAmount());
         payment.setName(pay.getName());
+        payment.setCreateUser(pay.getCreateUser());
         payment.setBusinessManagementId(pay.getAccountManagementId());
         payment.setOpeningBank(pay.getOpeningBank());
         payment.setBusinessCurrency(pay.getCurrency());