wrj 10 місяців тому
батько
коміт
6aa1436c45

+ 7 - 1
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ComplaintController.java

@@ -61,7 +61,13 @@ public class ComplaintController extends BaseController {
     @GetMapping("{id}")
     @ApiOperation("通过主键查询单条数据")
     public R selectOne(@PathVariable Serializable id) {
-        return R.ok(this.complaintService.getById(id));
+
+        Complaint byId = this.complaintService.getById(id);
+        if (byId == null) {
+            return R.fail("该投诉不存在");
+        }
+        byId.setComplaintType(ComplaintEnum.getDescByCode(byId.getComplaintType()));
+        return R.ok(byId);
     }
 
     /**

+ 6 - 0
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TCommentController.java

@@ -46,6 +46,12 @@ public class TCommentController extends BaseController {
         return R.ok(commentService.saveComment(comment,wxLoginUser));
     }
 
+    @ApiOperation("后台管理新增评论")
+    @RequestMapping(value = "black/add", method = RequestMethod.POST)
+    public R blackAdd(@RequestBody TComment comment) {
+        return R.ok(commentService.save(comment));
+
+    }
     @ApiOperation("查询评论")
     @ApiImplicitParam(name = "cJsid", value = "技师id", required = true, dataType = "String", paramType = "query", dataTypeClass = String.class)
     @RequestMapping(value = "wx/select", method = RequestMethod.POST)

+ 2 - 1
nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/MaTechnicianServiceImpl.java

@@ -80,12 +80,13 @@ public class MaTechnicianServiceImpl implements IMaTechnicianService
     /**
      * 修改技师
      *
-     * @param maTechnician 技师
+     * @param  maTechnicianAppAddVo
      * @return 结果
      */
     @Override
     public int updateMaTechnician(MaTechnicianAppAddVo maTechnicianAppAddVo)
     {
+
         MaTechnician maTechnician = new MaTechnician();
         BeanUtils.copyProperties(maTechnicianAppAddVo, maTechnician);