供应商退款-详情

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

@@ -211,10 +211,21 @@ public class ReceiptApi {
     }
 
     /**
-     * 供应商退款列表
+     * 供应商退款-详情
+     * crm:/api/user/shop/shopRefund
+     */
+    @ApiOperation("供应商退款-详情")
+    @ApiImplicitParam(required = true, name = "id", value = "款项Id")
+    @GetMapping("/refund")
+    public ResponseJson<ReceiptVo> getReceiptRefundDetail(Integer id, @RequestHeader HttpHeaders headers) {
+        return receiptService.getReceiptRefundDetail(id, headers);
+    }
+
+    /**
+     * 供应商退款-子订单列表
      * crm:/api/user/shop/refundShopOrder
      */
-    @ApiOperation("供应商退款列表")
+    @ApiOperation("供应商退款-子订单列表")
     @ApiImplicitParams({
             @ApiImplicitParam(required = false, name = "id", value = "返佣收款ID"),
             @ApiImplicitParam(required = false, name = "confirmedType", value = "0待确认，2已确认子订单"),
@@ -223,7 +234,7 @@ public class ReceiptApi {
             @ApiImplicitParam(required = false, name = "pageNum", value = "页码"),
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
     })
-    @GetMapping("/refunds")
+    @GetMapping("/refund/orders")
     public ResponseJson<PageInfo<ShopOrderVo>> getRefundShopOrderList(Integer id,
                                                                       Integer confirmedType,
                                                                       String shopName,
@@ -266,10 +277,10 @@ public class ReceiptApi {
     }
 
 
-    // 返佣关联
-    // /api/user/rebate/rebateDetail
-    // /api/user/rebate/rebateShopOrder
-    // /api/user/rebate/relation
+    // 收款列表-返佣款/api/user/rebate/list    （receiptType==3：/api/user/receivables/list）
+    // 返佣款详情/api/user/rebate/rebateDetail
+        // 返佣款详情-子订单列表 /api/user/rebate/rebateShopOrder
+    // 返佣关联/api/user/rebate/relation
 
 }
 

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

@@ -84,6 +84,11 @@ public interface ReceiptService {
      */
     ResponseJson<ReceiptVo> getReceiptDetail(Integer id, HttpHeaders headers);
 
+    /**
+     * 供应商退款-详情
+     */
+    ResponseJson<ReceiptVo> getReceiptRefundDetail(Integer id, HttpHeaders headers);
+
     /**
      * 获取收款商品订单列表
      *
@@ -129,4 +134,5 @@ public interface ReceiptService {
      * 确认收款-关联供应商退款
      */
     ResponseJson<ReceiptPo> receiptAssociateRefund(ReceiptAssociateDto receiptAssociateDto, HttpHeaders headers);
+
 }

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

@@ -528,14 +528,13 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Override
     public ResponseJson<ReceiptVo> getReceiptDetail(Integer id, HttpHeaders headers) {
         // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(1, headers);
+        ReceiptUserVo receiptUser = checkPermissions(0, headers);
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作！", null);
         }
         ReceiptVo receipt = receiptMapper.getReceiptDetail(id);
         if (null != receipt) {
             setReceiptDetail(receipt);
-            String receiptStatus = receipt.getReceiptStatus().toString();
             List<OrderVo> orderList = new ArrayList<>();
             if (null != receipt.getReceiptStatus() && 1 == receipt.getReceiptStatus()) {
                 // 待确认
@@ -569,6 +568,20 @@ public class ReceiptServiceImpl implements ReceiptService {
         return ResponseJson.success(receipt);
     }
 
+    /**
+     * 供应商退款-详情
+     */
+    @Override
+    public ResponseJson<ReceiptVo> getReceiptRefundDetail(Integer id, HttpHeaders headers) {
+        // 检查收款用户权限
+        ReceiptUserVo receiptUser = checkPermissions(5, headers);
+        if (null == receiptUser) {
+            return ResponseJson.error("无权限操作！", null);
+        }
+        ReceiptVo receipt = receiptMapper.getReceiptDetail(id);
+        return ResponseJson.success(receipt);
+    }
+
     /**
      * 获取收款商品订单列表
      *