添加了产品看板

hx-account/src/main/java/com/fjhx/account/entity/account/enums/PaymentStatusEnum.java

@@ -7,8 +7,8 @@ import java.util.Map;
 
 //打款状态
 public enum PaymentStatusEnum {
-    UNDER_REVIEW("10", "未打款"),
-    REJECT("20", "已打款"),
+    UNDER_REVIEW("20", "未打款"),
+    REJECT("10", "已打款"),
     ;
     private String key;
 

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountRunningWater.java

@@ -33,6 +33,12 @@ public class AccountRunningWater extends BasePo {
      */
     private Long businessId;
 
+
+    /**
+     * 流水类型。10：打款
+     */
+    private String type;
+
     /**
      * 收支类型：10 收入，20支出
      */

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

@@ -105,14 +105,14 @@ public class AccountRequestFundsFlow extends FlowDelegate {
 
         accountPayment.setDepartmentId(accountRequestFundsDto.getDepartmentId());
         accountPayment.setCorporationId(accountRequestFundsDto.getCorporationId());
-
+        accountPayment.setBusinessId(accountPayment.getId());
         accountPayment.setPaymentMethod(accountRequestFundsDto.getPaymentMethod());
         accountPayment.setIncomeAmount(accountRequestFundsDto.getTotal());
         accountPayment.setAmount(accountRequestFundsDto.getTotal());
         accountPayment.setName(accountRequestFundsDto.getName());
         accountPayment.setBusinessManagementId(accountRequestFundsDto.getAccountManagementId());
         accountPayment.setOpeningBank(accountRequestFundsDto.getOpeningBank());
-        accountPayment.setBusinessCurrency(accountPayment.getCurrency());
+        accountPayment.setCurrency(accountPayment.getCurrency());
         accountPayment.setAccountOpening(accountRequestFundsDto.getAccountOpening());
         accountPayment.setInterbankNumber(accountPayment.getInterbankNumber());
         accountPaymentService.save(accountPayment);

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountPaymentServiceImpl.java

@@ -200,6 +200,8 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         accountRunningWater.setTransactionTime(accountPaymentDto.getExpensesTime());
         accountRunningWater.setRemarks(accountPaymentDto.getRemark());
         accountRunningWater.setBusinessId(accountPaymentDto.getId());
+        //添加流水类型
+        accountRunningWater.setType("10");
         accountRunningWaterService.save(accountRunningWater);
 
     }

hx-account/src/main/resources/mapper/account/AccountPaymentMapper.xml

@@ -3,32 +3,7 @@
 <mapper namespace="com.fjhx.account.mapper.account.AccountPaymentMapper">
     <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountPaymentVo">
         select
-            ap.id,
-            ap.tenant_id,
-            ap.account_management_id,
-            ap.department_id,
-            ap.corporation_id,
-            ap.business_id,
-            ap.expenses_time,
-            ap.currency,
-            ap.payment_time,
-            ap.amount,
-            ap.status,
-            ap.type,
-            ap.remark,
-            ap.create_user,
-            ap.create_time,
-            ap.update_user,
-            ap.payment_remark,
-            ap.update_time,
-            ap.payment_method,
-            ap.income_amount,
-            ap.name,
-            ap.business_management_id,
-            ap.opening_bank,
-            ap.business_currency,
-            ap.account_opening,
-            ap.interbank_number
+            *
         from account_payment ap
             ${ew.customSqlSegment}
     </select>

hx-purchase/src/main/java/com/fjhx/purchase/service/refund/impl/RefundServiceImpl.java

@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
  * 退款管理 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-13
  */
 @Service
@@ -159,6 +159,7 @@ public class RefundServiceImpl extends ServiceImpl<RefundMapper, Refund> impleme
         accountRunningWater.setName(refundDto.getReceiptName());
         accountRunningWater.setOpeningBank(refundDto.getReceiptOpeningBank());
         accountRunningWater.setAccountOpening(refundDto.getReceiptAccountOpening());
+        accountRunningWater.setType("20"); //添加流水类型 10 打款  20 到款登记
         accountRunningWaterService.save(accountRunningWater);
     }