添加订单和查询结果接口

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

@@ -1,11 +1,15 @@
 package com.usky.dxtop.controller.web;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.dxtop.common.constant.UserConstants;
 import com.usky.dxtop.common.core.domain.AjaxResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.utils.SecurityUtils;
+import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.controller.BaseController;
+import com.usky.dxtop.model.Order;
 import com.usky.dxtop.model.TopChannel;
 import com.usky.dxtop.model.TopRadio;
 import com.usky.dxtop.service.TopChannelService;
@@ -65,14 +69,22 @@ public class TopChannelController extends BaseController {
      * @param
      * @return
      */
-    @GetMapping("/list")
-    public AjaxResult list(@RequestParam Integer current,
+    @GetMapping("/page")
+    public AjaxResult page(@RequestParam Integer current,
                               @RequestParam Integer size,
                               @RequestParam(required = false) String name)
     {
         return AjaxResult.success(topChannelService.list(current, size, name));
     }
 
+    @GetMapping("/list")
+    public AjaxResult list(@RequestParam(required = false) String name)
+    {
+        LambdaQueryWrapper<TopChannel> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(StringUtils.isNotBlank(name),TopChannel::getName,name);
+        return AjaxResult.success(topChannelService.list(queryWrapper));
+    }
+
 
     /**
      * 删除

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.Arith;
+import com.usky.dxtop.common.utils.DateUtils;
 import com.usky.dxtop.common.utils.QRCodeUtil;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.common.utils.http.HttpUtils;
@@ -194,7 +195,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }else if ("等待中".equals(obj.get("status"))){
             payWaiting(order);
         }else if ("交易订单不存在".equals(obj.get("status"))){
-            remove(order.getOrderNumber());
+            dealNo(order);
         }else {
             payError(order);
         }
@@ -244,4 +245,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         order.setOrderFlag(OrderStatus.AWAIT_PAY.getCode());
         this.updateById(order);
     }
+
+    /**
+     * 交易订单不存在
+     * @param order
+     */
+    public void dealNo(Order order){
+
+    }
 }

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

@@ -0,0 +1,41 @@
+package com.usky.dxtop.service.job;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.dxtop.model.Order;
+import com.usky.dxtop.service.OrderService;
+import com.usky.dxtop.service.emun.OrderStatus;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Controller;
+
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/8/30 16:57
+ */
+@Slf4j
+@Component
+public class OrderJob {
+
+    @Autowired
+    private OrderService orderService;
+
+    public void execute(){
+        LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Order::getOrderFlag, OrderStatus.NO_PAYMENT.getCode())
+                .or()
+                .eq(Order::getOrderFlag, OrderStatus.AWAIT_PAY.getCode());
+        List<Order> list = orderService.list(queryWrapper);
+        for (Order order:list) {
+            try {
+                orderService.callTopFindOrderInfoApi(order.getOrderNumber());
+            }catch (Exception e){
+                log.error("---orderJob---异常"+e.getMessage());
+            }
+        }
+        log.info("---orderJob---处理完成");
+    }
+}