Merge remote-tracking branch 'origin/master'

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

@@ -91,23 +91,59 @@ public class OrderController extends BaseController {
     /**
      * 查询订单历史状态
      */
-    @RequestMapping(value = "selectOrderHis", method = RequestMethod.POST)
+    @Permission(menuname = "查询订单历史状态", value = "selectOrderHis", method = RequestMethod.POST)
     public ResponseData<List<Map<String, Object>>> selectOrderHis(@RequestParam("orderId") String orderId) {
         List<Map<String, Object>> list = orderMapper.selectOrderHis(orderId);
         return ResponseData.success(list);
     }
 
     /**
+     * 审核学生证
+     */
+    @Permission(menuname = "审核学生证", value = "reviewStudentIdCard", method = RequestMethod.POST)
+    public ResponseData<String> reviewStudentIdCard(@RequestParam("studentCardCheckStatus") String studentCardCheckStatus,@RequestParam(name = "checkFail", required = false) String checkFail,@RequestParam("id") String id) {
+        ShiroUser user = getShiroUser();
+        /*if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
+            return ResponseData.error("无数据权限");
+        }*/
+        Wrapper wrapper = new EntityWrapper<>();
+        wrapper.eq("id", id);
+        Map<String, Object> dataMapping = new HashMap<>();
+        dataMapping.put("student_card_check_status", studentCardCheckStatus);
+        dataMapping.put("order_status", "已完成");
+       if(StringUtils.isNotBlank(checkFail)){
+           dataMapping.put("check_fail", checkFail);
+       }
+        Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
+        if(integer == 1){
+            if("1".equals(studentCardCheckStatus)){
+                appMapper.inserOrderHis(id,"审核通过!",new Date(),user.getName());
+            }else {
+                appMapper.inserOrderHis(id,"审核不通过:"+checkFail,new Date(),user.getName());
+            }
+
+        }else {
+            return ResponseData.error("审核失败！");
+        }
+        return ResponseData.success("审核成功！");
+    }
+
+    /**
      * 修改为异常单
      */
-    @RequestMapping(value = "abnormal", method = RequestMethod.POST)
+    @Permission(menuname = "修改为异常单",value = "abnormal", method = RequestMethod.POST)
     public ResponseData<String> abnormal(@RequestParam("orderId") String orderId) {
+        ShiroUser user = getShiroUser();
+        /*if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
+            return ResponseData.error("无数据权限");
+        }*/
         Wrapper wrapper = new EntityWrapper<>();
         wrapper.eq("id", orderId);
         Map<String, Object> dataMapping = new HashMap<>();
         dataMapping.put("order_status", "异常单");
         Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
         if (integer == 1) {
+            appMapper.inserOrderHis(orderId,"异常单!",new Date(),user.getName());
             return ResponseData.success("设为异常单成功！");
         }
         return ResponseData.error("设为异常单失败！");