订单增加接口

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -46,20 +46,20 @@ public class StudentPaymentOrderController extends BaseController {
     @ApiOperation(value = "获取订单列表")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('order/queryPage')")
-    public Object queryOrderPage(StudentPaymentOrderQueryInfo queryInfo){
+    public Object queryOrderPage(StudentPaymentOrderQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(!sysUser.getIsSuperAdmin()){
+        if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
             if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
-            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
                 return failed("用户所在分部异常");
-            }else {
+            } else {
                 List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
                     return failed("非法请求");
                 }
             }
@@ -68,7 +68,7 @@ public class StudentPaymentOrderController extends BaseController {
         PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
 
         int openHideMode = Integer.parseInt(sysConfigDao.findConfigValue("open_hide_mode"));
-        if(openHideMode == 1){
+        if (openHideMode == 1) {
             for (StudentPaymentOrder row : studentPaymentOrderPageInfo.getRows()) {
                 BigDecimal balancePaymentAmount = row.getBalancePaymentAmount() == null ? BigDecimal.ZERO : row.getBalancePaymentAmount();
                 BigDecimal comAmount = row.getComAmount() == null ? BigDecimal.ZERO : row.getComAmount();
@@ -79,11 +79,79 @@ public class StudentPaymentOrderController extends BaseController {
         return succeed(studentPaymentOrderPageInfo);
     }
 
+    @ApiOperation(value = "获取订单列表1")
+    @GetMapping("/queryPage1")
+    @PreAuthorize("@pcs.hasPermissions('order/queryPage1')")
+    public Object queryOrderPage1(StudentPaymentOrderQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (!sysUser.getIsSuperAdmin()) {
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+                queryInfo.setOrganId(employee.getOrganIdList());
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+                return failed("用户所在分部异常");
+            } else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                    return failed("非法请求");
+                }
+            }
+        }
+
+        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
+
+        for (StudentPaymentOrder row : studentPaymentOrderPageInfo.getRows()) {
+            BigDecimal comAmount = row.getComAmount() == null ? BigDecimal.ZERO : row.getComAmount();
+            if(row.getComAmount() != null) {
+                row.setExpectAmount(comAmount);
+                row.setActualAmount(comAmount);
+            }
+        }
+        return succeed(studentPaymentOrderPageInfo);
+    }
+
+    @ApiOperation(value = "获取订单列表2")
+    @GetMapping("/queryPage2")
+    @PreAuthorize("@pcs.hasPermissions('order/queryPage2')")
+    public Object queryOrderPage2(StudentPaymentOrderQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (!sysUser.getIsSuperAdmin()) {
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+                queryInfo.setOrganId(employee.getOrganIdList());
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+                return failed("用户所在分部异常");
+            } else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                    return failed("非法请求");
+                }
+            }
+        }
+
+        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
+
+        for (StudentPaymentOrder row : studentPaymentOrderPageInfo.getRows()) {
+            BigDecimal perAmount = row.getPerAmount() == null ? BigDecimal.ZERO : row.getComAmount();
+            if(row.getPerAmount() != null) {
+                row.setExpectAmount(perAmount);
+                row.setActualAmount(perAmount);
+            }
+        }
+        return succeed(studentPaymentOrderPageInfo);
+    }
+
     @ApiOperation(value = "获取乐器采购清单")
     @GetMapping("/getMusicalList")
     @PreAuthorize("@pcs.hasPermissions('order/getMusicalList')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String")})
-    public Object getMusicalList(String musicGroupId){
+    public Object getMusicalList(String musicGroupId) {
         return succeed(studentPaymentOrderDetailService.getMusicalList(musicGroupId));
     }
 
@@ -91,7 +159,7 @@ public class StudentPaymentOrderController extends BaseController {
     @GetMapping("/verifyMusicalList")
     @PreAuthorize("@pcs.hasPermissions('order/verifyMusicalList')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String")})
-    public Object verifyMusicalListMusicalList(String musicGroupId){
+    public Object verifyMusicalListMusicalList(String musicGroupId) {
         return succeed(studentPaymentOrderDetailService.verifyMusicalList(musicGroupId));
     }