优化预制卡后台下单

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

@@ -243,6 +243,9 @@ public class OrderController extends BaseController {
                         String hehuoren_id = order.getHehuorenId();
                         String hehuoren_id = order.getHehuorenId();
                         String business_number = order.getBusinessNumber();
                         String business_number = order.getBusinessNumber();
                         String business_iccid = order.getBusinessIccid();
                         String business_iccid = order.getBusinessIccid();
+                        if (StringUtils.isBlank(business_iccid)) {
+                            business_iccid = businessNumber;
+                        }
                         HhrUser hhrUser = hhrUserMapper.selectById(hehuoren_id);
                         HhrUser hhrUser = hhrUserMapper.selectById(hehuoren_id);
                         Map<String, Object> map1 = new HashMap<>();
                         Map<String, Object> map1 = new HashMap<>();
 
 
@@ -391,7 +394,7 @@ public class OrderController extends BaseController {
     @Permission(menuname = "修改为异常单", value = "setAbnormal", method = RequestMethod.POST)
     @Permission(menuname = "修改为异常单", value = "setAbnormal", method = RequestMethod.POST)
     public ResponseData<String> abnormal(@RequestParam("orderId") String orderId,@RequestParam("errorMsg") String errorMsg) {
     public ResponseData<String> abnormal(@RequestParam("orderId") String orderId,@RequestParam("errorMsg") String errorMsg) {
         ShiroUser user = getShiroUser();
         ShiroUser user = getShiroUser();
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员","受理人员","楼长"))) {
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员","县分管理员（订单）","受理人员"))) {
             return ResponseData.error("无数据权限");
             return ResponseData.error("无数据权限");
         }
         }
         Wrapper wrapper = new EntityWrapper<>();
         Wrapper wrapper = new EntityWrapper<>();
@@ -1226,10 +1229,7 @@ public class OrderController extends BaseController {
             try {
             try {
                 // 更新订单
                 // 更新订单
                 Integer num = orderMapper.updateById(dataOrder);
                 Integer num = orderMapper.updateById(dataOrder);
-                number+=num;
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+                if (num > 0) {
                     executorService.execute(new Runnable() {
                     executorService.execute(new Runnable() {
                         public void run() {
                         public void run() {
                             String id = dataOrder.getId();
                             String id = dataOrder.getId();
@@ -1303,6 +1303,12 @@ public class OrderController extends BaseController {
                             }
                             }
                         }
                         }
                     });
                     });
+                }
+                number+=num;
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
 
 
             try {
             try {
                 // 新增订单流转记录
                 // 新增订单流转记录