修改job的查询条件

src/main/java/com/usky/dxtop/controller/web/TestController.java

@@ -3,15 +3,25 @@ package com.usky.dxtop.controller.web;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.dxtop.common.core.domain.AjaxResult;
 import com.usky.dxtop.common.utils.http.HttpUtils;
+import com.usky.dxtop.model.Order;
+import com.usky.dxtop.service.OrderService;
 import com.usky.dxtop.service.api.TopApi;
+import com.usky.dxtop.service.emun.OrderPayType;
+import com.usky.dxtop.service.emun.OrderStatus;
+import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.core.util.JsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.TreeMap;
 
 /**
@@ -22,25 +32,19 @@ import java.util.TreeMap;
 @RestController
 public class TestController {
 
-    @PostMapping("test")
-    public void test(@RequestParam(required = false) String merchantNo,
-                     @RequestParam(required = false) String storeNo,
-                     @RequestParam(required = false) String trxamt,
-                     @RequestParam(required = false) String payTime,
-                     @RequestParam(required = false) String chnltrxid,
-                     @RequestParam(required = false) String trxstatus,
-                     @RequestParam(required = false) String orderNo,
-                     @RequestParam(required = false) String merchantOrderNo,
-                     @RequestParam(required = false) String acct,
-                     @RequestParam(required = false) String fee,
-                     @RequestParam(required = false) String note,
-                     @RequestParam(required = false) String label,
-                     @RequestParam(required = false) String chnldata,
-                     @RequestParam(required = false) String initamt,
-                     @RequestParam(required = false) String groupNo,
-                     @RequestParam(required = false) String employee,
-                     @RequestParam(required = false) String sign){
+    @Autowired
+    private OrderService orderService;
 
+    @GetMapping("test1")
+    public AjaxResult test1(){
+        LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper
+                .ne(Order::getPayType, OrderPayType.XJ.getPayCode())
+                .and(wrapper -> wrapper.eq(Order::getOrderFlag, OrderStatus.NO_PAYMENT.getCode())
+                        .or()
+                        .eq(Order::getOrderFlag, OrderStatus.AWAIT_PAY.getCode()));
+        List<Order> list = orderService.list(queryWrapper);
+        return AjaxResult.success(list);
     }
 
     public static void main(String[] args) {

src/main/java/com/usky/dxtop/service/job/OrderJob.java

@@ -34,7 +34,6 @@ public class OrderJob {
                 .ne(Order::getPayType, OrderPayType.XJ.getPayCode())
                 .and(wrapper -> wrapper.eq(Order::getOrderFlag, OrderStatus.NO_PAYMENT.getCode())
                         .or()
-                        .eq(Order::getOrderFlag, OrderStatus.NO_PAYMENT.getCode())
                         .eq(Order::getOrderFlag, OrderStatus.AWAIT_PAY.getCode()));
         List<Order> list = orderService.list(queryWrapper);
         for (Order order:list) {