Merge remote-tracking branch 'origin/master'

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

@@ -366,6 +366,7 @@ public class OrderController extends BaseController {
         return ResponseData.error("设为异常单失败！");
         return ResponseData.error("设为异常单失败！");
     }
     }
 
 
+
     /**
     /**
      * @param createTimeStart  订单创建时间开始
      * @param createTimeStart  订单创建时间开始
      * @param createTimeEnd    订单创建时间结束
      * @param createTimeEnd    订单创建时间结束
@@ -1766,5 +1767,28 @@ public class OrderController extends BaseController {
             return null;
             return null;
         }
         }
     }
     }
-
+    @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, "受理人员","楼长"))) {
+            return ResponseData.error("无数据权限");
+        }
+        Order order = new Order();
+        Wrapper<Order> wrapper = new EntityWrapper<>();
+        wrapper.eq("id", orderId);
+        wrapper.eq("user_type","1");
+        order.setAcceptComment(contentMsg);
+        order.setAcceptName(user.getName());
+        order.setAcceptDate(new Date());
+        if("1".equals(auditType)){
+            order.setAcceptResult("受理成功");
+            order.setOrderStatus("已完成");
+        }else {
+            order.setOrderStatus("异常单");
+            order.setAcceptResult("受理失败");
+        }
+        appMapper.inserOrderHis(orderId, "受理意见："+contentMsg, new Date(), user.getName());
+        orderMapper.update(order, wrapper);
+        return ResponseData.success();
+    }
 }
 }