Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitSalesItemBean.java

@@ -40,7 +40,7 @@ public class WebsitSalesItemBean {
     private String goodsName;
 
     @NotNull(message = "销售数量不能为空")
-    @Min(value = 1, message = "销售数量不能少于1")
+    @Min(value = 0, message = "销售数量不能少于0")
     @ApiModelProperty(value = "销售数量")
     private BigDecimal salesQty;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/PgAppraiseCategoryVO.java

@@ -16,7 +16,7 @@ public class PgAppraiseCategoryVO {
     @ApiModelProperty(value = "id")
     private String id;
 
-    @ZfireField(tbName = "b", colName = "name", isQuery = false)
+    @ZfireField(tbName = "b", colName = "name", isQuery = false, ignoreSelect = true)
     @ApiModelProperty(value = "问题大类")
     private String parentName;
 

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/AppraiseApplyController.java

@@ -78,11 +78,18 @@ public class AppraiseApplyController {
 
     @PostMapping("/category/save")
     @ApiOperation(value = "评价问题类型-保存")
-    public ResponseHelper categorySave(PgAppraiseCategory category) {
+    public ResponseHelper categorySave(@RequestBody PgAppraiseCategory category) {
         appraiseRelaLogic.categorySave(category);
         return ResponseHelper.success();
     }
 
+    @PostMapping("/category/del")
+    @ApiOperation(value = "评价问题类型-大类删除")
+    public ResponseHelper categoryDel(@RequestBody List<String> ids) {
+        appraiseRelaLogic.categoryDel(ids);
+        return ResponseHelper.success();
+    }
+
     @PostMapping("/category/import")
     @ApiOperation(value = "评价问题类型-导入(下载模板:评价问题类别模板.xlsx)")
     public ResponseHelper<String> categoryImportData(
@@ -150,10 +157,19 @@ public class AppraiseApplyController {
         return ResponseHelper.success();
     }
 
+    @PostMapping("/apply/reject")
+    @ApiOperation(value = "评价申诉-驳回待申诉")
+    public ResponseHelper applyReject(
+            @ApiParam(value = "id", required = true) @RequestParam String id
+    ) {
+        appraiseRelaLogic.applyReject(id);
+        return ResponseHelper.success();
+    }
+
     @PostMapping("/batch/update/reset")
     @ApiOperation(value = "评价申诉-驳回可重申诉")
     public ResponseHelper batchUpdateReset(
-            @ApiParam(value = "id", required = true) @RequestParam List<String> ids
+            @RequestBody List<String> ids
     ) throws Exception {
         appraiseRelaLogic.batchUpdateReset(ids);
         return ResponseHelper.success();
@@ -162,7 +178,7 @@ public class AppraiseApplyController {
     @PostMapping("/batch/update/end")
     @ApiOperation(value = "评价申诉-驳回不可再申诉")
     public ResponseHelper batchUpdateEnd(
-            @ApiParam(value = "id", required = true) @RequestParam List<String> ids
+            @RequestBody List<String> ids
     ) throws Exception {
         appraiseRelaLogic.batchUpdateEnd(ids);
         return ResponseHelper.success();

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/AppraiseRelaLogic.java

@@ -107,6 +107,16 @@ public class AppraiseRelaLogic {
     }
 
     @Transactional
+    public void categoryDel(List<String> ids) {
+        pgAppraiseCategoryService.lambdaUpdate()
+                .in(PgAppraiseCategory::getId, ids)
+                .remove();
+        pgAppraiseCategoryService.lambdaUpdate()
+                .in(PgAppraiseCategory::getParentId, ids)
+                .remove();
+    }
+
+    @Transactional
     public void categoryImportData(MultipartFile file) throws Exception {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         if (adminUser.getType() == 2) {
@@ -234,6 +244,7 @@ public class AppraiseRelaLogic {
                 throw new RemoteServiceException("已超" + str + "申诉时间, 提交失败");
             }
         }
+        bean.setIsSecond(applyCount > 0);
 
         //2、该工单已有中差评申诉数据的，不可再提交；（已申诉、待审核状态的，均不可再创建申诉）
         Integer waitCount = pgAppraiseApplyService.lambdaQuery()
@@ -274,6 +285,22 @@ public class AppraiseRelaLogic {
     }
 
     public void applyConfirm(PgAppraiseApplyBean bean) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        final PgAppraiseApply apply = pgAppraiseApplyService.getById(bean.getId());
+
+        if (StringUtils.isBlank(bean.getParentCategoryId())) {
+            throw new RemoteServiceException("请选择问题大类");
+        }
+        if (StringUtils.isBlank(bean.getCategoryId())) {
+            throw new RemoteServiceException("请选择问题小类");
+        }
+    }
+
+    public void applyReject(String id) {
+        pgAppraiseApplyService.lambdaUpdate()
+                .set(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.WAIT.getKey())
+                .eq(PgAppraiseApply::getId, id)
+                .update();
     }
 
     public void batchUpdateReset(List<String> ids) {

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1568,7 +1568,8 @@
 
     <select id="appraiseCategoryList" resultType="com.gree.mall.manager.bean.workorder.PgAppraiseCategoryVO">
         SELECT
-            ${ex.selected}
+            ${ex.selected},
+            b.name AS parentName
         FROM
             pg_appraise_category a
             LEFT JOIN pg_appraise_category b ON a.parent_id = b.id