提交部分代码

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinStorePurchasingController.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfZhengzaiController.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -22,7 +23,7 @@ import java.util.List;
 @RestController
 @Api(tags = "活动-正在下单")
 @RequestMapping("goblin/marketing")
-public class GoblinStorePurchasingController extends BaseController {
+public class GoblinSelfZhengzaiController extends BaseController {
 
     @Autowired
     IGoblinZhengzaiMarketService goblinZhengzaiMarketService;
@@ -44,8 +45,20 @@ public class GoblinStorePurchasingController extends BaseController {
                                         @RequestParam(value = "startTime", required = false) String st,
                                         @RequestParam(value = "endTime", required = false) String et,
                                         @RequestParam(value = "createdAt", required = false) String ct) {
-        startPage();
+        LocalDateTime now = LocalDateTime.now();
         List<GoblinSelfMarketing> list = goblinZhengzaiMarketService.zhengzaiList(page, purchaseName, status, st, et, ct).getData();
+        startPage();
+        for (GoblinSelfMarketing item : list) {
+            if (item.getStatus() != 7) {
+                if (now.isBefore(item.getStartTime())) {
+                    item.setStatus(0);
+                } else if (now.isAfter(item.getEndTime())) {
+                    item.setStatus(2);
+                } else {
+                    item.setStatus(1);
+                }
+            }
+        }
         return getDataTable(list);
     }
 

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

@@ -38,7 +38,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
 
     @Override
     public ResponseDto<List<GoblinSelfMarketing>> zhengzaiList(int page, String purchaseName, int status, String st, String et, String ct) {
-        LambdaUpdateWrapper<GoblinSelfMarketing> queryMapper = Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew());
+        LambdaUpdateWrapper<GoblinSelfMarketing> queryMapper = Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getDelFlag,0);
         switch (status) {
             case 0://未开始
                 queryMapper.lt(GoblinSelfMarketing::getStartTime, DateUtil.getNowTime());