收款订单列表-返回类型

src/main/java/com/caimei365/order/controller/ReceiptApi.java

@@ -4,9 +4,7 @@ import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.ReceiptAuthDto;
 import com.caimei365.order.model.dto.ReceiptDto;
 import com.caimei365.order.model.po.ReceiptPo;
-import com.caimei365.order.model.vo.ReceiptTypeVo;
-import com.caimei365.order.model.vo.ReceiptVo;
-import com.caimei365.order.model.vo.ReceiptUserVo;
+import com.caimei365.order.model.vo.*;
 import com.caimei365.order.service.ReceiptService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -179,14 +177,14 @@ public class ReceiptApi {
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
     })
     @GetMapping("/list")
-    public ResponseJson<PageInfo<ReceiptVo>> getReceiptOrderList(Integer id,
-                                                                 Integer type,
-                                                                 Integer organizeId,
-                                                            String orderReceiptStatus,
-                                                            String userName,
-                                                            String openid,
-                                                            @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                            @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+    public ResponseJson<PageInfo<OrderVo>> getReceiptOrderList(Integer id,
+                                                               Integer type,
+                                                               Integer organizeId,
+                                                               String orderReceiptStatus,
+                                                               String userName,
+                                                               String openid,
+                                                               @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                               @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
         if (!StringUtils.hasLength(openid)) {
             return ResponseJson.error("微信openid不能为空！", null);
         }
@@ -207,13 +205,13 @@ public class ReceiptApi {
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
     })
     @GetMapping("/list")
-    public ResponseJson<PageInfo<ReceiptVo>> getRefundShopOrderList(Integer id,
-                                                                 Integer confirmedType,
-                                                                 String shopName,
-                                                                 String userName,
-                                                                 String openid,
-                                                                 @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                 @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+    public ResponseJson<PageInfo<ShopOrderVo>> getRefundShopOrderList(Integer id,
+                                                                      Integer confirmedType,
+                                                                      String shopName,
+                                                                      String userName,
+                                                                      String openid,
+                                                                      @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                                      @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
         if (!StringUtils.hasLength(openid)) {
             return ResponseJson.error("微信openid不能为空！", null);
         }

src/main/java/com/caimei365/order/service/ReceiptService.java

@@ -3,9 +3,7 @@ package com.caimei365.order.service;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.ReceiptDto;
 import com.caimei365.order.model.po.ReceiptPo;
-import com.caimei365.order.model.vo.ReceiptTypeVo;
-import com.caimei365.order.model.vo.ReceiptUserVo;
-import com.caimei365.order.model.vo.ReceiptVo;
+import com.caimei365.order.model.vo.*;
 import com.github.pagehelper.PageInfo;
 import org.springframework.http.HttpHeaders;
 
@@ -86,7 +84,7 @@ public interface ReceiptService {
      * @param pageNum            页码
      * @param pageSize           每页数量
      */
-    ResponseJson<PageInfo<ReceiptVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String userName, String openid, int pageNum, int pageSize);
+    ResponseJson<PageInfo<OrderVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String userName, String openid, int pageNum, int pageSize);
 
     /**
      * @param id            返佣收款ID
@@ -97,5 +95,5 @@ public interface ReceiptService {
      * @param pageNum       页码
      * @param pageSize      每页数量
      */
-    ResponseJson<PageInfo<ReceiptVo>> getRefundShopOrderList(Integer id, Integer confirmedType, String shopName, String userName, String openid, int pageNum, int pageSize);
+    ResponseJson<PageInfo<ShopOrderVo>> getRefundShopOrderList(Integer id, Integer confirmedType, String shopName, String userName, String openid, int pageNum, int pageSize);
 }

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -523,7 +523,7 @@ public class ReceiptServiceImpl implements ReceiptService {
      * @param pageSize           每页数量
      */
     @Override
-    public ResponseJson<PageInfo<ReceiptVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String userName, String openid, int pageNum, int pageSize) {
+    public ResponseJson<PageInfo<OrderVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String userName, String openid, int pageNum, int pageSize) {
         // 操作用户
         ReceiptUserVo receiptUser = checkPermissions(1, openid);
         if (null == receiptUser) {
@@ -618,7 +618,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 order.setSurplusAmount(getUnPayMoney(order, true));
             }
         }
-        PageInfo<ReceiptVo> pageInfo = new PageInfo(orderList);
+        PageInfo<OrderVo> pageInfo = new PageInfo(orderList);
         return ResponseJson.success(pageInfo);
     }
 
@@ -632,7 +632,7 @@ public class ReceiptServiceImpl implements ReceiptService {
      * @param pageSize      每页数量
      */
     @Override
-    public ResponseJson<PageInfo<ReceiptVo>> getRefundShopOrderList(Integer id, Integer confirmedType, String shopName, String userName, String openid, int pageNum, int pageSize) {
+    public ResponseJson<PageInfo<ShopOrderVo>> getRefundShopOrderList(Integer id, Integer confirmedType, String shopName, String userName, String openid, int pageNum, int pageSize) {
         // 操作用户
         ReceiptUserVo receiptUser = checkPermissions(1, openid);
         if (null == receiptUser) {
@@ -657,7 +657,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 }
             }
         }
-        PageInfo<ReceiptVo> pageInfo = new PageInfo(shopOrderList);
+        PageInfo<ShopOrderVo> pageInfo = new PageInfo(shopOrderList);
         return ResponseJson.success(pageInfo);
     }