订单处理

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

@@ -2,14 +2,14 @@ package com.chelvc.cloud.maintain.controller;
 
 import com.chelvc.cloud.maintain.copier.MerchantCopier;
 import com.chelvc.cloud.maintain.vo.SimpleMerchantVO;
-import com.chelvc.cloud.vehicle.api.dto.MerchantBalanceDetailDTO;
+import com.chelvc.cloud.vehicle.api.dto.BalanceDetailDTO;
 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.QueryMerchantBalanceParam;
 import com.chelvc.cloud.vehicle.api.service.FavoriteService;
-import com.chelvc.cloud.vehicle.api.service.MerchantBalanceDetailService;
+import com.chelvc.cloud.vehicle.api.service.BalanceDetailService;
 import com.chelvc.cloud.vehicle.api.service.MerchantService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
@@ -42,7 +42,7 @@ public class MerchantController {
     private FavoriteService favoriteService;
 
     @DubboReference
-    private MerchantBalanceDetailService merchantBalanceDetailService;
+    private BalanceDetailService balanceDetailService;
 
     /**
      * 获取商家列表
@@ -99,13 +99,13 @@ public class MerchantController {
      * @return 收藏ID
      */
     @GetMapping("/merchant/balance/detail")
-    public Pagination<MerchantBalanceDetailDTO> queryBalanceDetail(@Validated QueryMerchantBalanceParam param, Integer pageNum, Integer pageSize) {
+    public Pagination<BalanceDetailDTO> queryBalanceDetail(@Validated QueryMerchantBalanceParam param, Integer pageNum, Integer pageSize) {
         if (pageNum == null) {
             pageNum = 1;
         }
         if (pageSize == null) {
             pageSize = 20;
         }
-        return this.merchantBalanceDetailService.queryByUserId(param, pageNum, pageSize, SessionContextHolder.getId());
+        return this.balanceDetailService.queryByUserId(param, pageNum, pageSize, SessionContextHolder.getId(), 2);
     }
 }