feat:page settle

api/src/main/java/com/jiejing/fitness/finance/api/cashier/vo/StudioSettleVO.java

@@ -47,6 +47,9 @@ public class StudioSettleVO {
   @ApiModelProperty(value = "结算银行")
   @ApiModelProperty(value = "结算银行")
   private String bankName;
   private String bankName;
 
 
+  @ApiModelProperty(value = "失败原因")
+  private String failMsg;
+
   @ApiModelProperty(value = "结算日期")
   @ApiModelProperty(value = "结算日期")
   private Date settleDate;
   private Date settleDate;
 
 

repository/src/main/java/com/jiejing/fitness/finance/repository/entity/StudioSettleRecord.java

@@ -90,6 +90,11 @@ public class StudioSettleRecord implements Serializable {
   private String bankName;
   private String bankName;
 
 
   /**
   /**
+   * 失败原因
+   */
+  private String failMsg;
+
+  /**
    * 备注: 盐 是否允许为null: YES
    * 备注: 盐 是否允许为null: YES
    */
    */
   private String salt;
   private String salt;
@@ -128,6 +133,8 @@ public class StudioSettleRecord implements Serializable {
 
 
   public static final String BANK_NAME = "bank_name";
   public static final String BANK_NAME = "bank_name";
 
 
+  public static final String FAIL_MSG = "fail_msg";
+
   public static final String SALT = "salt";
   public static final String SALT = "salt";
 
 
   public static final String SETTLE_DATE = "settle_date";
   public static final String SETTLE_DATE = "settle_date";

repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioSettleRecordMapper.xml

@@ -17,7 +17,7 @@
 
 
   <!-- 通用查询结果列 -->
   <!-- 通用查询结果列 -->
   <sql id="Base_Column_List">
   <sql id="Base_Column_List">
-    id, studio_id, studio_name, merchant_id, merchant_no, trans_state, trans_amount, card_no, bank_name, salt, settle_date, create_time, update_time
+    id, studio_id, studio_name, merchant_id, merchant_no, trans_state, trans_amount, card_no, bank_name, fail_msg, salt, settle_date, create_time, update_time
   </sql>
   </sql>
 
 
 </mapper>
 </mapper>

service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java

@@ -236,12 +236,13 @@ public class PayConvert {
   }
   }
 
 
   public static List<StudioSettleRecord> convertSettle(StudioMerchantApply apply,
   public static List<StudioSettleRecord> convertSettle(StudioMerchantApply apply,
-      Map<Long, BigDecimal> studioTransAmountMap, SettleVO vo) {
+      Map<Long, BigDecimal> studioTransAmountMap, SettleVO vo, Map<Long, StudioVO> studioMap) {
     String salt = AesUtil.getSalt(8);
     String salt = AesUtil.getSalt(8);
     Date now = new Date();
     Date now = new Date();
     return studioTransAmountMap.keySet().stream().map(studioId -> StudioSettleRecord.builder()
     return studioTransAmountMap.keySet().stream().map(studioId -> StudioSettleRecord.builder()
         .id(IdWorker.getId())
         .id(IdWorker.getId())
         .studioId(studioId)
         .studioId(studioId)
+        .studioName(Optional.ofNullable(studioMap.get(studioId)).map(StudioVO::getName).orElse("-"))
         .merchantId(apply.getMerchantId())
         .merchantId(apply.getMerchantId())
         .merchantNo(apply.getMerchantNo())
         .merchantNo(apply.getMerchantNo())
         .transState(vo.getTransState())
         .transState(vo.getTransState())
@@ -249,6 +250,7 @@ public class PayConvert {
         .settleDate(vo.getTransDate())
         .settleDate(vo.getTransDate())
         .cardNo(AesUtil.encrypt(vo.getCardNo(), salt))
         .cardNo(AesUtil.encrypt(vo.getCardNo(), salt))
         .bankName(vo.getBankName())
         .bankName(vo.getBankName())
+        .failMsg(vo.getFailMsg())
         .salt(salt)
         .salt(salt)
         .createTime(now)
         .createTime(now)
         .updateTime(now)
         .updateTime(now)

service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java

@@ -2,6 +2,7 @@ package com.jiejing.fitness.finance.service.pay.impl;
 
 
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toList;
 
 
+import com.google.common.collect.Lists;
 import com.jiejing.common.exception.BizException;
 import com.jiejing.common.exception.BizException;
 import com.jiejing.common.utils.collection.CollectionUtil;
 import com.jiejing.common.utils.collection.CollectionUtil;
 import com.jiejing.common.utils.time.TimeUtil;
 import com.jiejing.common.utils.time.TimeUtil;
@@ -169,7 +170,8 @@ public class PayServiceImpl implements PayService {
         // 对账成功
         // 对账成功
         Map<Long, BigDecimal> studioTransAmountMap = studioCashierRecordRpService.sumMerchantPaySuccessGroupByStudioId(
         Map<Long, BigDecimal> studioTransAmountMap = studioCashierRecordRpService.sumMerchantPaySuccessGroupByStudioId(
             apply.getMerchantId(), startDate, endDate);
             apply.getMerchantId(), startDate, endDate);
-        studioSettleRecordRpService.insertAll(PayConvert.convertSettle(apply, studioTransAmountMap, vo));
+        Map<Long, StudioVO> studioMap = studioRpcService.mapStudio(Lists.newArrayList(studioTransAmountMap.keySet()));
+        studioSettleRecordRpService.insertAll(PayConvert.convertSettle(apply, studioTransAmountMap, vo, studioMap));
         if (TransStateEnums.SUCCESS == TransStateEnums.getByCode(vo.getTransState())) {
         if (TransStateEnums.SUCCESS == TransStateEnums.getByCode(vo.getTransState())) {
           // 结算成功，则更新收银流水状态为记录为入账成功
           // 结算成功，则更新收银流水状态为记录为入账成功
           this.updatePayIn(apply.getMerchantId(), startDate, endDate);
           this.updatePayIn(apply.getMerchantId(), startDate, endDate);