提交宽带错误问题

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -265,7 +265,7 @@ public class RongHeController {
             if (webOrderAmount.equals("0") || product.getProductIntroductionPic4().equals("1")) {
                 res = createOrder(productId, orderView, partner, rhTime,filePath,"未下单");
                 Order order =(Order) res.getData();
-                orderV.setOrderRf2(order.getId());
+                orderV.setOrderRf2(order.getKdOrderId());
             }else {
                 res = createOrder(productId, orderView, partner, rhTime,filePath,"未支付");
             }

task/src/main/java/com/winsun/TimingTask/RhZhiNenTask.java

@@ -96,9 +96,14 @@ public class RhZhiNenTask {
             Wrapper<Order> wrapper = new EntityWrapper<>();
             wrapper.in("user_type", "3,10");
             wrapper.eq("order_status", "未下单");
+
             wrapper.ge("rh_time", sdf.format(calendar.getTime()));
             calendar.add(Calendar.DATE, 1);
             wrapper.lt("rh_time", sdf.format(calendar.getTime()));
+            wrapper.or();
+            wrapper.in("user_type", "3,10");
+            wrapper.eq("order_status", "未下单");
+            wrapper.isNull("rh_time");
             List<Order> orders = orderMapper.selectList(wrapper);
 
             // 发送下单请求