优化

admin-web/src/views/admin/activity/coupon/index.vue

@@ -175,10 +175,10 @@ const state = reactive({
       },
       {label: '券种', prop: 'couponType', resizable: true, width: 130},
       {label: '活动时间', prop: 'period', resizable: true, width: 350},
-      // {label: '结束时间', prop: 'endTime',  resizable: true, width: 150},
       {label: '优惠券描述', prop: 'couponDesc', align: 'center', width: 330},
       {label: '服务费门槛（元）', prop: 'minServiceMoney', resizable: true, width: 180},
       {label: '折扣', prop: 'discount', resizable: true, width: 130},
+      {label: '已领取/发放数量', prop: 'claimedQuantity', resizable: true, width: 140},
       // {label: '优惠允许叠加', prop: 'allowStacke', resizable: true, width: 130},
       // {label: '数量限制', prop: 'quantity', resizable: true, width: 130},
       {label: '创建时间', prop: 'createTime', resizable: true, width: 180},

admin/src/main/java/com/kym/admin/jobs/ActivityDelayJob.java

@@ -111,9 +111,9 @@ public class ActivityDelayJob implements DelayService<DelayActivity> {
 
                         // 修改banner状态为有效
                         bannerService.lambdaUpdate().set(Banner::getStatus, Banner.STATUS_有效).eq(Banner::getActivityId, delayActivity.getId()).update();
-                        log.info("活动id：{},活动名：{}启动中...", delayActivity.getId(), delayActivity.getName());
+                        log.info("活动id：{},活动名：{}已开始...", delayActivity.getId(), delayActivity.getName());
                     } else {
-                        log.info("活动id：{},活动名：{}已停止...", delayActivity.getId(), delayActivity.getName());
+                        log.info("活动id：{},活动名：{}停止中...", delayActivity.getId(), delayActivity.getName());
                         // 停止活动
                         // 修改活动状态为已结束
                         activityService.lambdaUpdate().set(Activity::getStatus, Activity.STATUS_已结束).eq(Activity::getId, delayActivity.getId()).update();

mapper/src/main/resources/mappers/miniapp/UserCouponMapper.xml

@@ -38,7 +38,10 @@
                 LEFT JOIN charge_admin.`t_activity_station` t2
                           ON t1.`activity_id` = t2.`activity_id`
         WHERE t1.`user_id` = #{params.userId}
+          AND t1.`status` = 1
+          AND t1.`usage_status` = 0
           AND t2.`station_id` = #{params.stationId}
+        ORDER BY  t1.`end_time` ASC
     </select>
 
 </mapper>

mapper/src/main/resources/mappers/miniapp/UserRechargeRightsMapper.xml

@@ -32,7 +32,9 @@
                 LEFT JOIN charge_admin.`t_activity_station` t2
                           ON t1.`activity_id` = t2.`activity_id`
         WHERE t1.`user_id` = #{params.userId}
+          AND t1.`status` = 1
           AND t2.`station_id` = #{params.stationId}
+        ORDER BY  t1.`end_time` ASC
     </select>
 
 </mapper>