Merge branch 'dev-chw-wwz' into dev-chw

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserCommentBiz.java

@@ -12,6 +12,7 @@ import com.github.wxiaoqi.security.admin.mapper.UserCommentMapper;
 import com.github.wxiaoqi.security.admin.vo.UserCommentVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.entity.BaseOrder;
@@ -156,10 +157,12 @@ public class UserCommentBiz extends BaseBiz<UserCommentMapper, UserComment>{
         if(no == null || ("").equals(no)){
             throw  new BaseException("订单号不能为空", ResultCode.FAILED_CODE);
         }
-        BaseOrder baseOrder = orderFeign.queryByNo(no);
-        if(baseOrder == null){
+        ObjectRestResponse<BaseOrder> ba = orderFeign.queryByNo(no);
+
+        if(ba.getData() == null){
             throw  new BaseException("订单错误", ResultCode.FAILED_CODE);
         }
+        BaseOrder baseOrder = ba.getData();
         if(baseOrder.getIsAppraise() == 1){
             throw  new BaseException("订单已评价，不能重复评论", ResultCode.FAILED_CODE);
         }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -53,7 +53,7 @@ public interface OrderFeign {
     ObjectRestResponse<BaseOrder> add(@RequestBody PulishReceiveBO bo);
 
     @GetMapping(value = "/baseOrder/queryByNo")
-    BaseOrder queryByNo(@RequestParam("no")String no);
+    ObjectRestResponse<BaseOrder> queryByNo(@RequestParam("no")String no);
 
     @PostMapping(value = "/baseOrder/updateBaseOrder")
     BaseOrder updateBaseOrder(@RequestBody BaseOrder baseOrder);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -524,11 +524,11 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     }
 
     @RequestMapping(value = "/queryByNo", method = RequestMethod.GET)
-    @IgnoreClientToken
-    public BaseOrder queryByNo(@RequestParam("no") String no) {
+    @ResponseBody
+    public ObjectRestResponse<BaseOrder>  queryByNo(String no) {
         BaseOrder baseOrder = new BaseOrder();
         baseOrder.setNo(no);
-        return baseOrderBiz.selectOne(baseOrder);
+        return ObjectRestResponse.succ(baseOrderBiz.selectOne(baseOrder));
     }
 
     @RequestMapping(value = "/updateBaseOrder", method = RequestMethod.POST)