feat:bind cashier record

ecbce47d · 程裕兵 · 3f4c105e · ecbce47d · ecbce47d · ecbce47d
Commit ecbce47d authored Apr 17, 2024 by 程裕兵
10 changed files
--- a/api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/BindStudioCashierRequest.java
+++ b/api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/BindStudioCashierRequest.java
 package com.jiejing.fitness.finance.api.cashier.request;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
@@ -30,4 +31,7 @@ public class BindStudioCashierRequest {
  @NotBlank(message = "子订单号不能为空")
  private String subOrderNo;
+  @ApiModelProperty(value = "扩展信息")
+  private JSONObject extra;
 }
--- a/api/src/main/java/com/jiejing/fitness/finance/api/cashier/vo/StudioCashierRecordVO.java
+++ b/api/src/main/java/com/jiejing/fitness/finance/api/cashier/vo/StudioCashierRecordVO.java
 package com.jiejing.fitness.finance.api.cashier.vo;
+import com.alibaba.fastjson.JSONObject;
 import com.jiejing.common.swagger.EnumMapping;
 import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
 import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;

--- a/app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java
+++ b/app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java
@@ -50,7 +50,7 @@ public class StudioCashierController implements StudioCashierApi {
  @PostMapping(value = "/private/studioCashier/bind")
  @Override
  public JsonResult<Void> bind(@Valid @RequestBody BindStudioCashierRequest request) {
-    studioCashierService.bind(request.getIds(), request.getSubOrderNo());
+    studioCashierService.bind(request.getIds(), request.getSubOrderNo(), request.getExtra());
    return JsonResult.success();
  }

--- a/repository/src/main/java/com/jiejing/fitness/finance/repository/entity/StudioCashierRecord.java
+++ b/repository/src/main/java/com/jiejing/fitness/finance/repository/entity/StudioCashierRecord.java
@@ -182,6 +182,11 @@ public class StudioCashierRecord implements Serializable {
  private String failMessage;
  /**
+   * 扩展信息
+   */
+  private String extra;
+  /**
   * 备注: 交易发生时间 是否允许为null: YES
   */
  private Date tradingTime;
@@ -259,6 +264,8 @@ public class StudioCashierRecord implements Serializable {
  public static final String FAIL_MESSAGE = "fail_message";
+  public static final String EXTRA = "extra";
  public static final String TRADING_TIME = "trading_time";
  public static final String SUCCESS_TIME = "success_time";

--- a/repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioCashierRecordMapper.xml
+++ b/repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioCashierRecordMapper.xml
@@ -17,7 +17,7 @@
  <!-- 通用查询结果列 -->
  <sql id="Base_Column_List">
-    id, trans_no, order_no, sub_order_no, order_type, trans_type, brand_id, studio_id, studio_name, merchant_id, merchant_no, channel_no, sub_channel, trans_amount, fee_rate, fee, actual_amount, trans_state, buyer_name, buyer_phone, goods, remark, exist_related_trans, related_trans_no, third_trans_no, fail_message, trading_time, success_time, in_time, create_time, update_time
+    id, trans_no, order_no, sub_order_no, order_type, trans_type, brand_id, studio_id, studio_name, merchant_id, merchant_no, channel_no, sub_channel, trans_amount, fee_rate, fee, actual_amount, trans_state, buyer_name, buyer_phone, goods, remark, exist_related_trans, related_trans_no, third_trans_no, fail_message, extra, trading_time, success_time, in_time, create_time, update_time
  </sql>
  <select id="sumRefundActualAmountByPayTransNo" resultType="java.math.BigDecimal">

--- a/service/src/main/java/com/jiejing/fitness/finance/service/cashier/StudioCashierService.java
+++ b/service/src/main/java/com/jiejing/fitness/finance/service/cashier/StudioCashierService.java
 package com.jiejing.fitness.finance.service.cashier;
+import com.alibaba.fastjson.JSONObject;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierStatisticVO;
@@ -29,7 +30,7 @@ public interface StudioCashierService {
   * @param ids        流水ID集合
   * @param subOrderNo 业务子订单号
   */
-  void bind(List<Long> ids, String subOrderNo);
+  void bind(List<Long> ids, String subOrderNo, JSONObject extra);
  /**
   * 解绑收银流水

--- a/service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java
+++ b/service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java
 package com.jiejing.fitness.finance.service.cashier.impl;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.jiejing.common.exception.BizException;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.common.utils.collection.CollectionUtil;
@@ -63,13 +64,15 @@ public class StudioCashierServiceImpl implements StudioCashierService {
  @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
  @Override
-  public void bind(List<Long> ids, String subOrderNo) {
+  public void bind(List<Long> ids, String subOrderNo, JSONObject extra) {
    List<StudioCashierRecord> records = studioCashierRecordRpService.getListByIds(ids);
    if (records.stream().anyMatch(e -> StringUtil.isNotBlank(e.getSubOrderNo()))) {
      throw new BizException(FinanceErrorEnums.EXIST_BIND_RECORD);
    }
    studioCashierRecordRpService.updateByIds(
-        StudioCashierRecord.builder().subOrderNo(subOrderNo).updateTime(new Date()).build(), ids);
+        StudioCashierRecord.builder().subOrderNo(subOrderNo)
+            .extra(Optional.ofNullable(extra).orElse(new JSONObject()).toJSONString())
+            .updateTime(new Date()).build(), ids);
  }
  @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)

--- a/service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
+++ b/service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
@@ -21,6 +21,7 @@ import com.jiejing.fitness.finance.service.pay.params.StudioMerchantPayParams;
 import com.jiejing.fitness.finance.service.utils.FeeUtil;
 import com.jiejing.fitness.finance.service.utils.MoneyUtil;
 import com.jiejing.paycenter.common.model.vo.MerchantVO;
+import com.jiejing.paycenter.common.model.vo.PayVO;
 import com.jiejing.paycenter.common.model.vo.SettleVO;
 import com.jiejing.paycenter.common.model.vo.SubChannelVO;
 import com.jiejing.paycenter.api.pay.request.PayRequest;
@@ -60,7 +61,7 @@ public class PayConvert {
    request.setTransNo(record.getTransNo());
    request.setMerchantId(record.getMerchantId());
    request.setChannelNo(record.getChannelNo());
-    request.setExtra(new JSONObject()
+    request.setExtra(Optional.ofNullable(params.getExtra()).orElse(new JSONObject())
        .fluentPut("studioId", record.getStudioId())
        .fluentPut("buyerName", record.getBuyerName())
        .fluentPut("buyerPhone", record.getBuyerPhone())
@@ -95,6 +96,7 @@ public class PayConvert {
        .buyerPhone(params.getBuyerPhone())
        .goods(params.getGoods())
        .remark(params.getRemark())
+        .extra(Optional.ofNullable(params.getExtra()).orElse(new JSONObject()).toJSONString())
        .existRelatedTrans(false)
        .tradingTime(new Date())
        .createTime(new Date())
@@ -279,4 +281,17 @@ public class PayConvert {
        .failMsg(vo.getFailMsg())
        .updateTime(new Date()).build();
  }
+  public static PayEvent convertEvent(PayRequest request, PayVO vo) {
+    return PayEvent.builder()
+        .id(Long.parseLong(vo.getTransNo()))
+        .transNo(vo.getTransNo())
+        .payState(vo.getPayState())
+        .channelNo(vo.getChannelNo())
+        .merchantId(request.getMerchantId())
+        .thirdTransNo(vo.getThirdTransNo())
+        .failMsg(vo.getFailMsg())
+        .finishTime(vo.getFinishTime())
+        .build();
+  }
 }
--- a/service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
+++ b/service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
@@ -39,8 +39,10 @@ import com.jiejing.fitness.finance.service.rpc.StudioRpcService;
 import com.jiejing.fitness.finance.service.utils.DingUtil;
 import com.jiejing.fitness.finance.service.utils.FeeUtil;
 import com.jiejing.fitness.finance.service.utils.MoneyUtil;
+import com.jiejing.message.event.SendCommonMsgEvent;
 import com.jiejing.paycenter.common.enums.common.PayChannelEnums;
 import com.jiejing.paycenter.common.enums.common.TransStateEnums;
+import com.jiejing.paycenter.common.enums.pay.PayStateEnums;
 import com.jiejing.paycenter.common.enums.pay.PayTypeEnums;
 import com.jiejing.paycenter.common.model.vo.MerchantVO;
 import com.jiejing.paycenter.api.pay.request.PayRequest;
@@ -53,6 +55,7 @@ import com.jiejing.paycenter.common.model.vo.SettleVO;
 import com.jiejing.studio.api.studio.vo.StudioVO;
 import com.jiejing.wechat.WeChatAuthService;
 import com.jiejing.wechat.vo.weChat.BaseAuthInfoVO;
+import com.xiaomai.event.EventAgent;
 import java.math.BigDecimal;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
@@ -169,7 +172,9 @@ public class PayServiceImpl implements PayService {
    record.setFee(FeeUtil.calPayFee(record.getFeeRate(), params.getTransAmount()));
    record.setActualAmount(MoneyUtil.subtract(params.getTransAmount(), record.getFee()));
    studioCashierRecordRpService.insert(record);
-    return payRpcService.pay(request);
+    PayVO vo = payRpcService.pay(request);
+    this.payCallback(PayConvert.convertEvent(request, vo));
+    return vo;
  }
  @Override
@@ -185,6 +190,10 @@ public class PayServiceImpl implements PayService {
    StudioCashierRecord toModify = PayConvert.convertPay(record, event);
    studioCashierRecordRpService.updateById(toModify);
+    if (PayStateEnums.SUCCESS.getCode().equals(event.getPayState())) {
+      this.sendPaySuccessMessage(event);
+    }
  }
  @Override
@@ -357,6 +366,9 @@ public class PayServiceImpl implements PayService {
    return req;
  }
+  private void sendPaySuccessMessage(PayEvent event) {
+//    EventAgent.of(SendCommonMsgEvent.class).triggerEvent();
+  }
  @Data
  private static class AliInfo {

--- a/service/src/main/java/com/jiejing/fitness/finance/service/pay/params/StudioMerchantPayParams.java
+++ b/service/src/main/java/com/jiejing/fitness/finance/service/pay/params/StudioMerchantPayParams.java
@@ -86,4 +86,7 @@ public class StudioMerchantPayParams {
  @NotNull(message = "过期时间不能为空")
  private Integer timeExpire;
+  @ApiModelProperty(name = "业务扩展信息")
+  private JSONObject extra;
 }