bugfix:退款增加字段

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

@@ -75,6 +75,8 @@ public class LifeUserOrderVo {
 
     private String storeAddress;
 
+    private String storeTel;
+
     /**
      * 距离
      */
@@ -102,10 +104,12 @@ public class LifeUserOrderVo {
     private BigDecimal expectIncome;
 
     @ApiModelProperty(value = "有效日期类型")
-    private Integer effectiveDateType;
+    private String effectiveDateType;
 
     @ApiModelProperty(value = "有效日期")
-    private Integer effectiveDateValue;
+    private String effectiveDateValue;
+
+    private Integer singleQty;
 
     @ApiModelProperty(value = "使用规则")
     private String useRules;

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

@@ -19,7 +19,7 @@ public interface LifeUserDynamicsMapper extends BaseMapper<LifeUserDynamics> {
             "    from life_user_dynamics " +
             "    where delete_flag = 0 and draft = 0 order by created_time desc" +
             ") " +
-            "select dynamice.*, info.store_name userName, user.head_img userImage, info.id storeUserId, user.id storeOrUserId, 0 isExpert " +
+            "select dynamice.*, user.name userName, user.head_img userImage, info.id storeUserId, user.id storeOrUserId, 0 isExpert " +
             "from dynamice " +
             "join store_user user on dynamice.phone = user.phone and user.delete_flag = 0 " +
             "join store_info info on info.id = user.store_id and info.delete_flag = 0 " +

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

@@ -22,6 +22,7 @@
         <result column="pay_time" property="payTime"/>
         <result column="finish_time" property="finishTime"/>
         <result column="coupon_type" property="couponType"/>
+        <result column="coupon_id" property="couponId"/>
         <result column="offprice" property="finalPrice"/>
         <result column="store_id" property="storeId"/>
         <result column="store_name" property="storeName"/>
@@ -37,6 +38,7 @@
         <result column="applicable_num" property="applicableNum"/>
         <result column="quota_type" property="quotaType"/>
         <result column="quota_value" property="quotaValue"/>
+        <result column="store_tel" property="storeTel"/>
 
         <result column="business_type" property="businessType"/>
         <result column="business_date" property="businessDate"/>
@@ -58,11 +60,11 @@
     <select id="queryUserOrderDetail" resultMap="BaseResultMap">
         with total_coupon as(
         select id coupon_id,2 coupon_type,lgbm.group_name coupon_name,preferential_price offprice,SUBSTRING_INDEX(image_id, ',', 1) AS image_id,
-               effective_date_type,effective_date_value,use_rules,reservation_rules,applicable_num,quota_type,quota_value
+               effective_date_type,effective_date_value,use_rules,reservation_rules,applicable_num,quota_type,quota_value,inventory_num single_qty
         from life_group_buy_main lgbm where lgbm.delete_flag = 0
         union all
         select id coupon_id,1 coupon_type,lc.name coupon_name,lc.offprice offprice,SUBSTRING_INDEX(image_path, ',', 1) AS image_id,
-               0 effective_date_type,expiration_date effective_date_value,use_rule use_rules,reservation_rules,applicable_num,1 quota_type,buy_limit quota_value
+               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
@@ -71,7 +73,7 @@
         ldc.nominal_value,
         lu.user_phone,lu.user_name,lu.id user_id,
         ocm.id ocmId,ocm.status,ocm.coupon_code,ocm.refund_time,ocm.refund_reason,ocm.price refundPrice,
-        si.id store_id,si.store_name,si.commission_rate,si.store_address,
+        si.id store_id,si.store_name,si.commission_rate,si.store_address,si.store_tel,
         <if test="position != null and position != ''">
             ROUND(
             ST_Distance_Sphere(

alien-job/src/main/java/shop/alien/job/store/LifeUserOrderJob.java

@@ -125,8 +125,8 @@ public class LifeUserOrderJob {
                 .groupBy(OrderCouponMiddle::getOrderId));
         // 批量更新为已完成
         lifeUserOrderMapper.update(null,new UpdateWrapper<LifeUserOrder>()
-                .setSql("status=" + OrderStatusEnum.COMPLETE.getStatus())
-                .in("id",orderCouponMiddles.stream().map(OrderCouponMiddle::getOrderId).collect(Collectors.toList())));
+                .set("status",OrderStatusEnum.COMPLETE.getStatus())
+                .notIn("id",orderCouponMiddles.stream().map(OrderCouponMiddle::getOrderId).collect(Collectors.toList())));
         return "success";
     }
 }

alien-store/src/main/java/shop/alien/store/controller/LifeUserOrderController.java

@@ -92,7 +92,7 @@ public class LifeUserOrderController {
             @ApiImplicitParam(name = "userId", value = "用户id", required = false),
             @ApiImplicitParam(name = "storeId", value = "商户id", required = false),
             @ApiImplicitParam(name = "couponType", value = "订单类型,-1,全部（可以不传）,1,代金券；2，团购；", required = false),
-            @ApiImplicitParam(name = "orderStatus", value = "订单状态,-1，全部（可以不传）；0，待支付;1，已支付/待使用;2，已核销；3，已过期;4，已取消;5.已退款，全退款了才算", required = false),
+            @ApiImplicitParam(name = "orderStatus", value = "订单状态,-1，全部（可以不传）；0，待支付;1，已支付/待使用;2，已核销；3，已过期;4，已取消;5.已退款，全退款了才算;6,退款失败;7,已完成", required = false),
             @ApiImplicitParam(name = "name", value = "订单名称", required = false)
     })
     @GetMapping("/queryUserOrderList")

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

@@ -428,6 +428,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         }
         Date now = new Date();
         LifeUserOrder order = lifeUserOrderMapper.selectById(refundOrder.getOrderId());
+        // TODO 退款
 //        String result = alipayTradeRefund.processRefund(order.getOrderNo(), refundOrder.getRefundMoney(), refundOrder.getDescription());
         String result = refundOrder.getDescription();
         String refundMessage = "";