feat:bind cashier record

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

@@ -32,9 +32,12 @@ public class StudioCashierRecordVO {
   @ApiModelProperty("交易流水号")
   private String transNo;
 
-  @ApiModelProperty("业务订单号")
+  @ApiModelProperty("业务订单ID")
   private String orderNo;
 
+  @ApiModelProperty("业务订单号")
+  private String businessNo;
+
   @ApiModelProperty("业务子订单号")
   private String subOrderNo;
 

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

@@ -187,11 +187,6 @@ public class StudioCashierRecord implements Serializable {
   private String failMessage;
 
   /**
-   * 扩展信息
-   */
-  private String extra;
-
-  /**
    * 备注: 交易发生时间 是否允许为null: YES
    */
   private Date tradingTime;
@@ -271,8 +266,6 @@ 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";

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, business_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
+    id, trans_no, order_no, business_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
   </sql>
 
   <select id="sumRefundActualAmountByPayTransNo" resultType="java.math.BigDecimal">

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

@@ -97,7 +97,6 @@ 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())