修改 admin 正在下单搜索

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java

@@ -54,24 +54,27 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
         LambdaUpdateWrapper<GoblinSelfMarketing> queryMapper = Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getDelFlag, 0);
         switch (status) {
             case 0://未开始
-                queryMapper.lt(GoblinSelfMarketing::getStartTime, DateUtil.getNowTime());
+                queryMapper = queryMapper.gt(GoblinSelfMarketing::getStartTime, LocalDateTime.now()).ne(GoblinSelfMarketing::getStatus, GoblinStatusConst.MarketingStatus.STORE_PURCHASE_STATUS_STOP.getValue());
                 break;
             case 1://进行中
-                queryMapper.ge(GoblinSelfMarketing::getStartTime, DateUtil.getNowTime()).le(GoblinSelfMarketing::getEndTime, DateUtil.getNowTime());
+                queryMapper = queryMapper.le(GoblinSelfMarketing::getStartTime, LocalDateTime.now()).ge(GoblinSelfMarketing::getEndTime, LocalDateTime.now()).ne(GoblinSelfMarketing::getStatus, GoblinStatusConst.MarketingStatus.STORE_PURCHASE_STATUS_STOP.getValue());
                 break;
             case 2://已结束
-                queryMapper.gt(GoblinSelfMarketing::getEndTime, DateUtil.getNowTime());
+                queryMapper = queryMapper.lt(GoblinSelfMarketing::getEndTime, LocalDateTime.now()).ne(GoblinSelfMarketing::getStatus, GoblinStatusConst.MarketingStatus.STORE_PURCHASE_STATUS_STOP.getValue());
                 break;
             case 7://停用
-                queryMapper.gt(GoblinSelfMarketing::getStatus, GoblinStatusConst.MarketingStatus.STORE_PURCHASE_STATUS_STOP);
+                queryMapper = queryMapper.eq(GoblinSelfMarketing::getStatus, GoblinStatusConst.MarketingStatus.STORE_PURCHASE_STATUS_STOP.getValue());
                 break;
         }
 
+        if (!purchaseName.equals("")) {
+            queryMapper = queryMapper.like(GoblinSelfMarketing::getName, purchaseName);
+        }
         if ((st != null && !st.equals("")) && (et != null && !et.equals(""))) {
-            queryMapper.ge(GoblinSelfMarketing::getStartTime, st).le(GoblinSelfMarketing::getEndTime, et);
+            queryMapper = queryMapper.ge(GoblinSelfMarketing::getStartTime, st).le(GoblinSelfMarketing::getEndTime, et);
         }
         if (ct != null && !ct.equals("")) {
-            queryMapper.eq(GoblinSelfMarketing::getCreatedAt, ct);
+            queryMapper = queryMapper.eq(GoblinSelfMarketing::getCreatedAt, ct);
         }
         return ResponseDto.success(goblinSelfMarketingMapper.selectList(queryMapper));
     }
@@ -139,7 +142,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
     }
 
     @Override
-    public ResponseDto<Boolean> zhengzaiUpdate(String marketId, String purchaseName,String performanceId, String img, String st, String et) {
+    public ResponseDto<Boolean> zhengzaiUpdate(String marketId, String purchaseName, String performanceId, String img, String st, String et) {
         GoblinSelfMarketing selfMarketing = GoblinSelfMarketing.getNew();
         selfMarketing.setName(purchaseName);
         selfMarketing.setType(GoblinStatusConst.MarketingStatus.SELF_TYPE_ZHENGZAI.getValue());