返佣订单接口bugfix

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

@@ -125,11 +125,11 @@ public class ReceiptApi {
      * crm:/api/user/receivables/save
      *
      * @param receiptOperateDto {
-     *                   id：收款Id
-     *                   receiptType: 1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）, 5供应商退款
-     *                   noOrderReason: 非订单款说明
-     *                   delFlag: 作废标记: 0否，其余是
-     *                   }
+     *                          id：收款Id
+     *                          receiptType: 1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）, 5供应商退款
+     *                          noOrderReason: 非订单款说明
+     *                          delFlag: 作废标记: 0否，其余是
+     *                          }
      */
     @ApiOperation("操作收款信息（作废，设为返佣/普通/供应商退款/非订单款）")
     @PostMapping("/operate")
@@ -156,14 +156,14 @@ public class ReceiptApi {
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
     })
     @GetMapping("/list")
-    public ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer newReceiptType,Integer receiptType, Integer receiptStatus, String smsContent, String startDate, String endDate,
+    public ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer newReceiptType, Integer receiptType, Integer receiptStatus, String smsContent, String startDate, String endDate,
                                                             @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                             @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
                                                             @RequestHeader HttpHeaders headers) {
         if (null == receiptType || receiptType <= 0) {
             return ResponseJson.error("款项类型不能为空", null);
         }
-        return receiptService.getReceiptList(newReceiptType,receiptType, receiptStatus, smsContent, startDate, endDate, pageNum, pageSize, headers);
+        return receiptService.getReceiptList(newReceiptType, receiptType, receiptStatus, smsContent, startDate, endDate, pageNum, pageSize, headers);
     }
 
     /**
@@ -309,11 +309,11 @@ public class ReceiptApi {
      * crm:/api/user/receivables/confirmReceipt
      *
      * @param receiptOperateDto {
-     *                            id: 收款Id
-     *                            orderIds: 关联订单IDS
-     *                            confirmType: 确认订单类型：1小额抹平确认，2大额抹平确认，3大额退款余额，4确认关联
-     *                            noOrderReason: 非订单款说明
-     *                            }
+     *                          id: 收款Id
+     *                          orderIds: 关联订单IDS
+     *                          confirmType: 确认订单类型：1小额抹平确认，2大额抹平确认，3大额退款余额，4确认关联
+     *                          noOrderReason: 非订单款说明
+     *                          }
      */
     @ApiOperation("确认收款-关联订单款")
     @PostMapping("/confirm")
@@ -332,9 +332,9 @@ public class ReceiptApi {
      * crm:/api/user/shop/relation
      *
      * @param receiptOperateDto {
-     *                            id:          收款Id
-     *                            shopOrderId: 关联供应商退款子订单ID
-     *                            }
+     *                          id:          收款Id
+     *                          shopOrderId: 关联供应商退款子订单ID
+     *                          }
      */
     @ApiOperation("确认收款-关联供应商退款")
     @PostMapping("/confirm/refund")
@@ -353,10 +353,10 @@ public class ReceiptApi {
      * crm:/api/user/rebate/relation
      *
      * @param receiptOperateDto {
-     *                            id:           收款Id
-     *                            shopOrderId: 关联返佣子订单ID
-     *                            rebateRemarks:关联返佣备注
-     *                            }
+     *                          id:           收款Id
+     *                          shopOrderId: 关联返佣子订单ID
+     *                          rebateRemarks:关联返佣备注
+     *                          }
      */
     @ApiOperation("确认收款-关联返佣款")
     @PostMapping("/confirm/rebate")
@@ -375,10 +375,10 @@ public class ReceiptApi {
      * crm:/api/user/rebate/verballyReceipt
      *
      * @param receiptOperateDto {
-     *                            verbalAmount: 口头返佣佣金
-     *                            shopOrderId: 关联返佣子订单ID
-     *                            rebateRemarks:关联返佣备注
-     *                            }
+     *                          verbalAmount: 口头返佣佣金
+     *                          shopOrderId: 关联返佣子订单ID
+     *                          rebateRemarks:关联返佣备注
+     *                          }
      */
     @ApiOperation("确认收款-关联口头佣金")
     @PostMapping("/confirm/rebate/verbal")
@@ -400,7 +400,7 @@ public class ReceiptApi {
      *                          id            收款Id
      *                          receiptStatus 收款状态
      *                          reviewReason  审核不通过原因
-     * }
+     *                          }
      */
     @ApiOperation("审核收款信息")
     @PostMapping("/audit")
@@ -417,29 +417,31 @@ public class ReceiptApi {
 
     @ApiOperation("待确认订单款供应商信息")
     @GetMapping("/shop")
-    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetailVo(String keyWord,Integer newReceiptType,@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                           @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
-
-        if(newReceiptType !=1){
+    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetailVo(String keyWord,
+                                                               Integer newReceiptType,
+                                                               @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                               @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+        if (newReceiptType != 1) {
             //1采美已上线供应商  3，4：认证通供应商
-            return receiptService.ReceiptDetails(keyWord,pageNum,pageSize);
-        }else {return receiptService.ReceiptDetailVo(keyWord,pageNum,pageSize);}
+            return receiptService.ReceiptDetails(keyWord, pageNum, pageSize);
+        } else {
+            return receiptService.ReceiptDetailVo(keyWord, pageNum, pageSize);
+        }
     }
 
     @ApiOperation("订单返佣-非返佣订单信息")
     @GetMapping("/shoporder")
-    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetail(String keyWord,@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
-
-        return receiptService.ReceiptDetail(keyWord,pageNum,pageSize);
+    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetail(String keyWord,
+                                                             @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                             @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+        return receiptService.ReceiptDetail(keyWord, pageNum, pageSize);
     }
+
 //    @ApiOperation("认证通会员-非返佣订单信息")
 //    @GetMapping("/shoporders")
 //    public ResponseJson<List<ShopOrderVo>> ReceiptDetails(String keyWord) {
 //
 //        return receiptService.ReceiptDetails(keyWord);
 //    }
-
-
-
 }
 

src/main/resources/mapper/ReceiptMapper.xml

@@ -1064,7 +1064,7 @@
 
     </select>
     <select id="ReceiptDetail" resultType="com.caimei365.order.model.vo.ShopOrderVo">
-        SELECT
+        SELECT DISTINCT
                cms.orderID,
                cms.shopOrderID,
                cms.shopOrderNo,
@@ -1084,10 +1084,10 @@
                      <if test="keyWord !=null and keyWord !=''">
                          AND s.name LIKE concat('%',#{keyWord},'%')
                      </if>
-                    and csp.newReceiptType IS NOT NULL
                      AND cms.payStatus=3
                      AND cmo.receiptStatus = 3
                      AND cmo.confirmTime >= '2022-05-01 00:00:00'
+                     AND cmo.rebateFlag != 1
                 </where>
     </select>