bugfix:支付/退款新增字段问题

alien-entity/src/main/java/shop/alien/entity/store/LifeUserOrder.java

@@ -29,6 +29,8 @@ public class LifeUserOrder {
 
     private String orderNo;
 
+    private String orderStr;
+
     private Integer status;
 
     private String price;

alien-entity/src/main/java/shop/alien/entity/store/dto/LifeUserOrderDto.java

@@ -30,6 +30,9 @@ public class LifeUserOrderDto {
     @ApiModelProperty(value = "订单编号")
     private String orderNo;
 
+    @ApiModelProperty(value = "订单字符串")
+    private String orderStr;
+
     @ApiModelProperty(value = "优惠券券id(life_discount_coupon_user)")
     private String yhquanId;
 

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserOrderVo.java

@@ -134,6 +134,9 @@ public class LifeUserOrderVo {
     @ApiModelProperty(value = "预约规则")
     private String reservationRules;
 
+    @ApiModelProperty(value = "订单字符串")
+    private String orderStr;
+
     @ApiModelProperty(value = "营业时间类型")
     private String businessType;
     @ApiModelProperty(value = "营业日")

alien-entity/src/main/java/shop/alien/mapper/LifeUserOrderMapper.java

@@ -42,7 +42,7 @@ public interface LifeUserOrderMapper extends BaseMapper<LifeUserOrder> {
             "\tselect id coupon_id,1 coupon_type,lc.name coupon_name, SUBSTRING_INDEX(image_path, ',', 1) AS image_id,0 effective_date_type,expiration_date effective_date_value \n" +
             "from life_coupon lc where lc.delete_flag = 0\n" +
             ")\n" +
-            "select luo.id,luo.buy_time,luo.status,luo.price,luo.final_price,luo.user_id,luo.store_id,luo.order_no,luo.pay_time,luo.cancel_time,luo.finish_time,\n" +
+            "select luo.id,luo.buy_time,luo.status,luo.price,luo.final_price,luo.user_id,luo.store_id,luo.order_no,luo.pay_time,luo.cancel_time,luo.finish_time,luo.order_str,\n" +
             "si.store_name,si.commission_rate,si.business_section store_type,si.store_status,si.business_status,\n" +
             "count(ocm.coupon_code) coupon_count,\n" +
             "simg.img_url,\n" +

alien-entity/src/main/resources/mapper/LifeUserOrderMapper.xml

@@ -52,6 +52,7 @@
         <result column="end_date" property="endDate"/>
         <result column="reservation_rules" property="reservationRules"/>
         <result column="original_price" property="originalPrice"/>
+        <result column="order_str" property="orderStr"/>
 
         <collection property="orderCouponMiddleList" ofType="shop.alien.entity.store.vo.OrderCouponMiddleVo">
             <id column="ocmId" property="id" />
@@ -75,8 +76,8 @@
                0 effective_date_type,expiration_date effective_date_value,use_rule use_rules,reservation_rules,applicable_num,1 quota_type,buy_limit quota_value,single_qty
         from life_coupon lc where lc.delete_flag = 0
         )
-        select luo.id,luo.order_no,luo.created_time , luo.price ,luo.final_price
-        ,luo.pay_method,luo.buy_time,luo.cancel_time,luo.pay_time,luo.finish_time,luo.status order_status,luo.quan_id,luo.refund_time total_refund_time,
+        select luo.id,luo.order_no,luo.created_time , luo.price ,luo.final_price,luo.order_str,
+        luo.pay_method,luo.buy_time,luo.cancel_time,luo.pay_time,luo.finish_time,luo.status order_status,luo.quan_id,luo.refund_time total_refund_time,
         tc.*,
         ldc.nominal_value,ldc.type,
         lu.user_phone,lu.user_name,lu.id user_id,

alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

@@ -709,6 +709,8 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         lifeUserOrder.setStoreId(lifeUserOrderDto.getStoreId());
         // 订单号
         lifeUserOrder.setOrderNo(lifeUserOrderDto.getOrderNo());
+        // 订单订单字符串
+        lifeUserOrder.setOrderStr(lifeUserOrderDto.getOrderStr());
         // 优惠券id
         lifeUserOrder.setQuanId(lifeUserOrderDto.getYhquanId());
         // 原价金额