Merge remote-tracking branch 'origin/master'

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

@@ -47,6 +47,7 @@
         <result column="start_time" property="startTime"/>
         <result column="end_time" property="endTime"/>
         <result column="end_date" property="endDate"/>
+        <result column="reservation_rules" property="reservationRules"/>
 
         <collection property="orderCouponMiddleList" ofType="shop.alien.entity.store.vo.OrderCouponMiddleVo">
             <id column="ocmId" property="id" />

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

@@ -242,6 +242,11 @@ public class LifeUserOrderJob {
                                             .set(LifeDiscountCouponUser::getStatus, DiscountCouponEnum.WAITING_USED.getValue())
                                             .eq(LifeDiscountCouponUser::getId, order.getQuanId()));
                                 }
+                            }else {
+                                // 累计退券个数+当前退券个数!=总个数 且 当前退券数量 = 可退券数
+                                lifeUserOrderMapper.update(null,new UpdateWrapper<LifeUserOrder>().eq("id",order.getId())
+                                        .set("status",OrderStatusEnum.COMPLETE.getStatus())
+                                        .set("finish_time",now));
                             }
                             // 4.添加退款记录
                             LifeRefundOrder refundOrder = new LifeRefundOrder()