5G加装包-接口字段调整

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

@@ -1489,6 +1489,7 @@ public class OrderController extends BaseController {
             wrapper.eq(StringUtils.isNotBlank(businessNumber),"business_number",businessNumber);
             wrapper.eq("kapin","5G加装包");
             wrapper.eq("user_type","1");
+            wrapper.eq("order_status","待受理");
             List<Order> orderByNumber = orderMapper.selectList(wrapper);
             if(orderByNumber.size()==0){
                 continue;
@@ -1500,7 +1501,7 @@ public class OrderController extends BaseController {
             dataOrder.setAcceptComment("批量受理："+orderStatus);
             dataOrder.setAcceptName(user.getName());
             dataOrder.setAcceptDate(date);
-            if("已完成".equals(orderStatus)){
+            if("已完成".equals(orderStatus.toString())){
                 dataOrder.setAcceptResult("受理成功");
             }else {
                 dataOrder.setAcceptResult("受理失败");
@@ -1511,7 +1512,7 @@ public class OrderController extends BaseController {
             try {
                 integer = orderMapper.update(dataOrder,wrapper);
                 // 新增受理记录
-                appMapper.inserOrderHis(dataOrder.getId(), "5G加装包受理状态："+orderStatus, date, user.getName());
+                appMapper.inserOrderHis(dataOrder.getId(), "5G加装包批量受理状态："+orderStatus, date, user.getName());
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -1522,16 +1523,16 @@ public class OrderController extends BaseController {
                 sales.setName(orderByNumber.get(0).getHehuorenName());
                 sales.setAccount(user.getAccount());
                 sales.setCreateTime(date);
-                sales.setStatus(orderStatus);
+                sales.setStatus("5");
                 sales.setRemark("批量受理："+orderStatus);
                 sales.setSalesSubst(orderByNumber.get(0).getHehuorenArea());
                 sales.setSalesSchool(orderByNumber.get(0).getHehuorenSchool());
-                sales.setOrderType(orderByNumber.get(0).getUserType());
+                sales.setOrderType("2");
                 sales.setOrderNum(orderByNumber.get(0).getOrderNumber());
                 sales.setUpgradeCombo(orderByNumber.get(0).getBusinessPackage());
                 sales.setOldCombo(orderByNumber.get(0).getNowPackage());
                 sales.setDelFlag("0");
-                sales.setLockState("0");
+                sales.setLockState("否");
                 salesListMapper.insert(sales);
                 number++;
             } else {
@@ -2088,10 +2089,10 @@ public class OrderController extends BaseController {
     @Permission(menuname = "更新存量升级订单状态", value = "setUpgradeStatus", method = RequestMethod.POST)
     public ResponseData setUpgradeStatus(@RequestParam("orderId")String orderId,@RequestParam("auditType")String auditType,@RequestParam("contentMsg")String contentMsg){
         ShiroUser user = getShiroUser();
-        if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员","受理人员","楼长"))) {
-
-        }else{
-            return ResponseData.error("无数据权限");
+        // 当前是否有数据权限
+        boolean hasDataPermission = user.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "营业员", "超级管理员"));
+        if (!hasDataPermission) {
+            return ResponseData.error("无数据权限！");
         }
         Order order = new Order();
         Wrapper<Order> wrapper = new EntityWrapper<>();
@@ -2111,16 +2112,16 @@ public class OrderController extends BaseController {
             sales.setName(orderByNumber.get(0).getHehuorenName());
             sales.setAccount(user.getAccount());
             sales.setCreateTime(date);
-            sales.setStatus("已完成");
+            sales.setStatus("5");
             sales.setRemark(contentMsg);
             sales.setSalesSubst(orderByNumber.get(0).getHehuorenArea());
             sales.setSalesSchool(orderByNumber.get(0).getHehuorenSchool());
-            sales.setOrderType(orderByNumber.get(0).getUserType());
+            sales.setOrderType("2");
             sales.setOrderNum(orderByNumber.get(0).getOrderNumber());
             sales.setUpgradeCombo(orderByNumber.get(0).getBusinessPackage());
             sales.setOldCombo(orderByNumber.get(0).getNowPackage());
             sales.setDelFlag("0");
-            sales.setLockState("0");
+            sales.setLockState("否");
             salesListMapper.insert(sales);
         }else {
             order.setOrderStatus("异常单");