列表根据时间排序，优化代码结构

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanPushListVo.java

@@ -31,7 +31,7 @@ public class PlanPushListVo {
         this.goodsLogo = plan.getGoodsLogo();
         this.principalName = plan.getPrincipalName();
         this.principalTelephone = plan.getPrincipalTelephone();
-        //this.planCreateTime = plan.getPlanCreateTime();
+        this.planCreateTime = plan.getPlanCreateTime();
         this.planStartTime = plan.getPlanStartTime();
         this.planEndTime = plan.getPlanEndTime();
         this.state = StateUtil.getStateName(plan.getState());

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/GoodsServiceImpl.java

@@ -28,10 +28,10 @@ public class GoodsServiceImpl implements GoodsService {
     @Override
     public int addGoods(Goods goods) {
         QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
-        goodsQueryWrapper.eq("appkey", goods.getAppkey());
-        goodsQueryWrapper.eq("goods_id", goods.getGoodsId());
-        goodsQueryWrapper.eq("vendor_id", goods.getVendorId());
-        goodsQueryWrapper.eq("deleted", "0");
+        goodsQueryWrapper.eq("appkey", goods.getAppkey())
+            .eq("goods_id", goods.getGoodsId())
+            .eq("vendor_id", goods.getVendorId())
+            .eq("deleted", "0");
         Goods one = goodsMapper.selectOne(goodsQueryWrapper);
         if (one != null)
             return 2;
@@ -42,9 +42,9 @@ public class GoodsServiceImpl implements GoodsService {
     @Override
     public int deleteGoods(GoodsDeleteBo bo) {
         QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
-        goodsQueryWrapper.eq("appkey", bo.getAppkey());
-        goodsQueryWrapper.eq("goods_id", bo.getGoodsId());
-        goodsQueryWrapper.eq("vendor_id", bo.getVendorId());
+        goodsQueryWrapper.eq("appkey", bo.getAppkey())
+            .eq("goods_id", bo.getGoodsId())
+            .eq("vendor_id", bo.getVendorId());
         return goodsMapper.delete(goodsQueryWrapper);
     }
 
@@ -79,10 +79,10 @@ public class GoodsServiceImpl implements GoodsService {
     @Override
     public GoodsDetailVo getGoodsDetail(GoodsBo bo) {
         QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
-        goodsQueryWrapper.eq("appkey", bo.getAppkey());
-        goodsQueryWrapper.eq("goods_id", bo.getGoodsId());
-        goodsQueryWrapper.eq("vendor_id", bo.getVendorId());
-        goodsQueryWrapper.eq("deleted", "0");
+        goodsQueryWrapper.eq("appkey", bo.getAppkey())
+            .eq("goods_id", bo.getGoodsId())
+            .eq("vendor_id", bo.getVendorId())
+            .eq("deleted", "0");
         Goods goods = goodsMapper.selectOne(goodsQueryWrapper);
         return new GoodsDetailVo(goods);
     }
@@ -90,10 +90,10 @@ public class GoodsServiceImpl implements GoodsService {
     @Override
     public int editGoods(Goods goods) {
         QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
-        goodsQueryWrapper.eq("appkey", goods.getAppkey());
-        goodsQueryWrapper.eq("goods_id", goods.getGoodsId());
-        goodsQueryWrapper.eq("vendor_id", goods.getVendorId());
-        goodsQueryWrapper.eq("deleted", "0");
+        goodsQueryWrapper.eq("appkey", goods.getAppkey())
+            .eq("goods_id", goods.getGoodsId())
+            .eq("vendor_id", goods.getVendorId())
+            .eq("deleted", "0");
         return goodsMapper.update(goods, goodsQueryWrapper);
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/OrderServiceImpl.java

@@ -39,9 +39,9 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public String getSign(OrderAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
-        appQueryWrapper.eq("appkey", bo.getAppkey());
-        appQueryWrapper.eq("state", 1);
-        appQueryWrapper.eq("deleted", "0");
+        appQueryWrapper.eq("appkey", bo.getAppkey())
+            .eq("state", 1)
+            .eq("deleted", "0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return "error";
@@ -69,9 +69,9 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public int addOrder(OrderAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
-        appQueryWrapper.eq("appkey", bo.getAppkey());
-        appQueryWrapper.eq("state", 1);
-        appQueryWrapper.eq("deleted", "0");
+        appQueryWrapper.eq("appkey", bo.getAppkey())
+            .eq("state", 1)
+            .eq("deleted", "0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return -1;

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/PlanServiceImpl.java

@@ -154,16 +154,16 @@ public class PlanServiceImpl implements PlanService {
     public int checkPlan(PlanBo bo, Long userId, String userName) {
         // 是否有该计划
         QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
-        planQueryWrapper.eq("plan_id", bo.getPlanId());
-        planQueryWrapper.eq("deleted", "0");
+        planQueryWrapper.eq("plan_id", bo.getPlanId())
+            .eq("deleted", "0");
         Plan plan = planMapper.selectOne(planQueryWrapper);
         if (plan == null)
             return -1;
         // 没有该app或者该app已经被禁用，则不允许审核
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
-        appQueryWrapper.eq("appkey", plan.getAppkey());
-        appQueryWrapper.eq("state", 1);
-        appQueryWrapper.eq("deleted", "0");
+        appQueryWrapper.eq("appkey", plan.getAppkey())
+            .eq("state", 1)
+            .eq("deleted", "0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return -1;
@@ -206,8 +206,9 @@ public class PlanServiceImpl implements PlanService {
             planQueryWrapper.apply("plan_create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getStartTime());
         if (bo.getEndTime() != null) // 搜索结束时间大于等于广告计划创建时间
             planQueryWrapper.apply("plan_create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getEndTime());
-        planQueryWrapper.eq("state", StateUtil.APPROVED);
-        planQueryWrapper.eq("deleted", "0");
+        planQueryWrapper.eq("state", StateUtil.APPROVED)
+            .eq("deleted", "0")
+            .orderByDesc("plan_create_time");
         Page<Plan> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         Page<Plan> planPage = planMapper.selectPage(page, planQueryWrapper);
         List<Plan> plans = planPage.getRecords();
@@ -326,8 +327,8 @@ public class PlanServiceImpl implements PlanService {
             planQueryWrapper.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getStartTime());
         if (bo.getEndTime() != null)
             planQueryWrapper.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getEndTime());
-        planQueryWrapper.eq("deleted", "0");
-
+        planQueryWrapper.eq("deleted", "0")
+            .orderByDesc("plan_create_time");
         Page<Plan> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         List<Plan> plans = planMapper.selectPage(page, planQueryWrapper).getRecords();
         List<PlanManageListVo> vos = new ArrayList<>();
@@ -344,14 +345,14 @@ public class PlanServiceImpl implements PlanService {
     @Override
     public PlanManageDetailVo getPlanManageDetail(String planId) {
         QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
-        planQueryWrapper.eq("plan_id", planId);
-        planQueryWrapper.eq("deleted", "0");
+        planQueryWrapper.eq("plan_id", planId)
+            .eq("deleted", "0");
         Plan plan = planMapper.selectOne(planQueryWrapper);
         if (plan == null)
             return null;
         QueryWrapper<PlanItem> itemQueryWrapper = new QueryWrapper<>();
-        itemQueryWrapper.eq("plan_id", planId);
-        itemQueryWrapper.eq("deleted", "0");
+        itemQueryWrapper.eq("plan_id", planId)
+            .eq("deleted", "0");
         List<PlanItem> items = planItemMapper.selectList(itemQueryWrapper);
         List<PlanManageItemVo> itemVos = new ArrayList<>();
         for (PlanItem item : items) { // 补齐店铺信息
@@ -386,7 +387,8 @@ public class PlanServiceImpl implements PlanService {
             planQueryWrapper.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getStartTime());
         if (bo.getEndTime() != null)
             planQueryWrapper.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getEndTime());
-        planQueryWrapper.eq("deleted", "0");
+        planQueryWrapper.eq("deleted", "0")
+            .orderByDesc("plan_create_time");
         Page<Plan> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         List<Plan> plans = planMapper.selectPage(page, planQueryWrapper).getRecords();
         List<PlanPushListVo> vos = new ArrayList<>();

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/StatisticsServiceImpl.java

@@ -42,6 +42,7 @@ public class StatisticsServiceImpl implements StatisticsService {
             queryWrapper.apply("`time` >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getStartTime());
         if (bo.getEndTime() != null)
             queryWrapper.apply("`time` <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getEndTime());
+        queryWrapper.orderByDesc("time");
         Page<Statistics> page = new Page<>();
         List<Statistics> list = statisticsMapper.selectPage(page, queryWrapper).getRecords();
         List<ScanListVo> vos = new ArrayList<>();
@@ -62,9 +63,9 @@ public class StatisticsServiceImpl implements StatisticsService {
     @Override
     public String getSign(StatisticsAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
-        appQueryWrapper.eq("appkey", bo.getAppkey());
-        appQueryWrapper.eq("state", 1);
-        appQueryWrapper.eq("deleted", "0");
+        appQueryWrapper.eq("appkey", bo.getAppkey())
+            .eq("state", 1)
+            .eq("deleted", "0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return "error";
@@ -87,9 +88,9 @@ public class StatisticsServiceImpl implements StatisticsService {
     @Override
     public int add(StatisticsAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
-        appQueryWrapper.eq("appkey", bo.getAppkey());
-        appQueryWrapper.eq("state", 1);
-        appQueryWrapper.eq("deleted", "0");
+        appQueryWrapper.eq("appkey", bo.getAppkey())
+            .eq("state", 1)
+            .eq("deleted", "0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return -1;