Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/advise/controller/BasicsCanteenEvaluateController.java

@@ -15,23 +15,23 @@ import com.bonus.canteen.core.allocation.advise.model.AllocPageDecorationModel;
 import com.bonus.canteen.core.allocation.advise.service.AllocPageDecorationService;
 import com.bonus.canteen.core.allocation.advise.service.BasicsCanteenEvaluateService;
 import com.bonus.canteen.core.allocation.constants.CanteenConstants;
+import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.common.houqin.utils.BRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 @RestController
 @RequestMapping({"/api/v1/canteen/evaluate"})
@@ -64,8 +64,12 @@ public class BasicsCanteenEvaluateController {
 
    @ApiOperation("查询单条食堂评价详情")
    @PostMapping({"/get-evaluate-detail"})
-   public CanteenEvaluateDetailModel getEvaluateDetail(@RequestBody Long evaluateId) {
-      return this.basicsCanteenEvaluateService.getEvaluateDetail(evaluateId);
+   public CanteenEvaluateDetailModel getEvaluateDetail(@RequestBody BRequest<String> request) {
+      String evaluateId = request.getContent();
+      if(Objects.isNull(evaluateId)) {
+         throw new ServiceException("评价编号不能为空");
+      }
+      return this.basicsCanteenEvaluateService.getEvaluateDetail(Long.valueOf(evaluateId));
    }
 
    @ApiOperation("分页查询食堂评价统计")