修改无融合时间下单和合伙人权限

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -442,7 +442,7 @@ public class OrderController extends BaseController {
         Map<String,Object> map = new HashMap<>();
         Map<String,Object> map = new HashMap<>();
 
 
         ShiroUser user = getShiroUser();
         ShiroUser user = getShiroUser();
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）"))) {
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）", "合伙人"))) {
             map.put("error","无数据权限");
             map.put("error","无数据权限");
             return map;
             return map;
         }
         }
@@ -493,7 +493,7 @@ public class OrderController extends BaseController {
     public ResponseData<Page<BroadBandOrder>> getBroadBandOrder(BroadBandOrder broadBandOrder) {
     public ResponseData<Page<BroadBandOrder>> getBroadBandOrder(BroadBandOrder broadBandOrder) {
 
 
         ShiroUser user = getShiroUser();
         ShiroUser user = getShiroUser();
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）", "修改身份证"))) {
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）", "修改身份证", "合伙人"))) {
             ResponseData.error("无权限查询订单");
             ResponseData.error("无权限查询订单");
         }
         }
 
 

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

@@ -100,10 +100,6 @@ public class RhZhiNenTask {
             wrapper.ge("rh_time", sdf.format(calendar.getTime()));
             wrapper.ge("rh_time", sdf.format(calendar.getTime()));
             calendar.add(Calendar.DATE, 1);
             calendar.add(Calendar.DATE, 1);
             wrapper.lt("rh_time", sdf.format(calendar.getTime()));
             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);
             List<Order> orders = orderMapper.selectList(wrapper);
 
 
             // 发送下单请求
             // 发送下单请求
@@ -111,6 +107,18 @@ public class RhZhiNenTask {
                 intelligenceSendOrder.integrateSendOrder(orders.get(i), false);
                 intelligenceSendOrder.integrateSendOrder(orders.get(i), false);
             }
             }
 
 
+            // 无融合时间下单
+            wrapper = new EntityWrapper<>();
+            wrapper.in("user_type", "3,10");
+            wrapper.eq("order_status", "未下单");
+            wrapper.isNull("rh_time");
+            List<Order> noRhOrders = orderMapper.selectList(wrapper);
+
+            // 发送下单请求
+            for(int i = 0; i < noRhOrders.size(); ++i) {
+                intelligenceSendOrder.integrateSendOrder(noRhOrders.get(i), true);
+            }
+
         }catch(Exception e) {
         }catch(Exception e) {
             e.printStackTrace();
             e.printStackTrace();
             log.error("智能平台定时器下单异常");
             log.error("智能平台定时器下单异常");