商家核验订单

src/main/java/com/chelvc/cloud/maintain/controller/DynamicCommentController.java

@@ -4,6 +4,7 @@ import com.chelvc.cloud.vehicle.api.dto.DynamicCommentDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicCommentParam;
 import com.chelvc.cloud.vehicle.api.param.QueryDynamicCommentParam;
 import com.chelvc.cloud.vehicle.api.service.DynamicCommentService;
+import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/client/comment")
+@ResponseWrapping
 public class DynamicCommentController {
 
     @DubboReference

src/main/java/com/chelvc/cloud/maintain/controller/DynamicContentController.java

@@ -4,6 +4,7 @@ import com.chelvc.cloud.vehicle.api.dto.DynamicContentDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicContentParam;
 import com.chelvc.cloud.vehicle.api.param.QueryDynamicContentParam;
 import com.chelvc.cloud.vehicle.api.service.DynamicContentService;
+import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
@@ -24,6 +25,7 @@ import java.util.Map;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/client/content")
+@ResponseWrapping
 public class DynamicContentController {
 
     @DubboReference

src/main/java/com/chelvc/cloud/maintain/controller/DynamicEvaluateRecordController.java

@@ -2,6 +2,7 @@ package com.chelvc.cloud.maintain.controller;
 
 import com.chelvc.cloud.vehicle.api.param.AddDynamicEvaluateRecordParam;
 import com.chelvc.cloud.vehicle.api.service.DynamicEvaluateRecordService;
+import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/client/evaluate-record")
+@ResponseWrapping
 public class DynamicEvaluateRecordController {
 
     @DubboReference

src/main/java/com/chelvc/cloud/maintain/controller/InformController.java

@@ -3,6 +3,7 @@ package com.chelvc.cloud.maintain.controller;
 import com.chelvc.cloud.vehicle.api.constant.SystemInformType;
 import com.chelvc.cloud.vehicle.api.dto.*;
 import com.chelvc.cloud.vehicle.api.service.InformService;
+import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
@@ -27,6 +28,7 @@ import javax.validation.Valid;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping
+@ResponseWrapping
 public class InformController {
 
     @DubboReference

src/main/java/com/chelvc/cloud/maintain/controller/MerchantController.java

@@ -5,13 +5,10 @@ import com.chelvc.cloud.maintain.vo.SimpleMerchantVO;
 import com.chelvc.cloud.vehicle.api.dto.BalanceDetailDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDetailDTO;
-import com.chelvc.cloud.vehicle.api.param.LocationQueryParam;
-import com.chelvc.cloud.vehicle.api.param.MerchantQueryParam;
-import com.chelvc.cloud.vehicle.api.param.MerchantRankParam;
-import com.chelvc.cloud.vehicle.api.param.OmsCartItemPagingParam;
-import com.chelvc.cloud.vehicle.api.param.QueryMerchantBalanceParam;
-import com.chelvc.cloud.vehicle.api.service.FavoriteService;
+import com.chelvc.cloud.vehicle.api.dto.MerchantRankDTO;
+import com.chelvc.cloud.vehicle.api.param.*;
 import com.chelvc.cloud.vehicle.api.service.BalanceDetailService;
+import com.chelvc.cloud.vehicle.api.service.FavoriteService;
 import com.chelvc.cloud.vehicle.api.service.MerchantService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
@@ -64,8 +61,8 @@ public class MerchantController {
      * @return 商家信息列表
      */
     @GetMapping("/merchants/rank")
-    public List<SimpleMerchantVO> listRankMerchants(@Valid MerchantRankParam param) {
-        return MerchantCopier.INSTANCE.copying(this.merchantService.listRankMerchants(param, SessionContextHolder.getId()));
+    public List<MerchantRankDTO> listRankMerchants(@Valid MerchantRankParam param) {
+        return this.merchantService.listRankMerchants(param, SessionContextHolder.getId());
     }
 
     /**

src/main/java/com/chelvc/cloud/maintain/controller/UserInviteController.java

@@ -4,6 +4,7 @@ import com.chelvc.cloud.vehicle.api.dto.TeamDTO;
 import com.chelvc.cloud.vehicle.api.param.TeamInvitePageParam;
 import com.chelvc.cloud.vehicle.api.param.UserInviteParams;
 import com.chelvc.cloud.vehicle.api.service.UserInviteService;
+import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -19,6 +20,7 @@ import javax.validation.Valid;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/invite")
+@ResponseWrapping
 public class UserInviteController {
 
     @DubboReference