非订单款-二级类别

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

@@ -156,14 +156,14 @@ public class ReceiptApi {
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
     })
     @GetMapping("/list")
-    public ResponseJson<PageInfo<ReceiptVo>> getReceiptList(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(receiptType, receiptStatus, smsContent, startDate, endDate, pageNum, pageSize, headers);
+        return receiptService.getReceiptList(newReceiptType,receiptType, receiptStatus, smsContent, startDate, endDate, pageNum, pageSize, headers);
     }
 
     /**
@@ -420,7 +420,8 @@ public class ReceiptApi {
     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 ==2){
+        if(newReceiptType !=1){
+            //1采美已上线供应商  3，4：认证通供应商
             return receiptService.ReceiptDetails(keyWord,pageNum,pageSize);
         }else {return receiptService.ReceiptDetailVo(keyWord,pageNum,pageSize);}
     }

src/main/java/com/caimei365/order/model/bo/ReceiptParamsBo.java

@@ -63,5 +63,9 @@ public class ReceiptParamsBo implements Serializable {
      * 组织Id
      */
     private Integer organizeId;
+    /**
+     * 关联订单类型
+     */
+    private Integer newReceiptType;
 
 }

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

@@ -76,7 +76,7 @@ public interface ReceiptService {
      * @param pageNum       页码
      * @param pageSize      每页数量
      */
-    ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer receiptType, Integer receiptStatus, String smsContent, String startDate, String endDate, int pageNum, int pageSize, HttpHeaders headers);
+    ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer newReceiptType,Integer receiptType, Integer receiptStatus, String smsContent, String startDate, String endDate, int pageNum, int pageSize, HttpHeaders headers);
 
     /**
      * 收款详情（订单/非订单）

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

@@ -530,7 +530,7 @@ public class ReceiptServiceImpl implements ReceiptService {
      * @param pageSize      每页数量
      */
     @Override
-    public ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer receiptType, Integer receiptStatus, String smsContent, String startDate, String endDate, int pageNum, int pageSize, HttpHeaders headers) {
+    public ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer newReceiptType,Integer receiptType, Integer receiptStatus, String smsContent, String startDate, String endDate, int pageNum, int pageSize, HttpHeaders headers) {
         ReceiptParamsBo paramsBo = new ReceiptParamsBo();
         PageInfo<ReceiptVo> emptyInfo = new PageInfo();
         if (null != receiptStatus && receiptStatus > 0) {
@@ -605,6 +605,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         paramsBo.setReceiptType(receiptType);
         paramsBo.setStartDate(startDate);
         paramsBo.setEndDate(endDate);
+        paramsBo.setNewReceiptType(newReceiptType);
         // 分页请求数据
         PageHelper.startPage(pageNum, pageSize);
         List<ReceiptVo> list = receiptMapper.getReceiptList(paramsBo);

src/main/resources/mapper/ReceiptMapper.xml

@@ -307,6 +307,7 @@
         cdr.orderFlag,
         cdr.noOrderReason,
         cdr.reviewReason,
+        cdr.newReceiptType,
         CASE WHEN cror.relationType = 2 THEN co.organizeID
         WHEN cror.relationType = 1 THEN cso.organizeID
         ELSE '' END AS organizeId,
@@ -336,6 +337,9 @@
         <if test="endDate != null  and endDate != ''">
             AND cdr.receiptDate <![CDATA[  <  ]]> #{endDate}
         </if>
+          <if test="newReceiptType !=null and newReceiptType !=''">
+             and cdr.newReceiptType=#{newReceiptType}
+          </if>
         <if test="receiptStatusArr != null">
             AND cdr.receiptStatus in
             <foreach collection="receiptStatusArr" open="(" close=")" separator="," item="val">
@@ -1052,7 +1056,7 @@
             <if test="keyWord!=null and keyWord!=''">
                 AND name LIKE concat('%',#{keyWord},'%')
                 or linkMan LIKE CONCAT('%', #{keyWord}, '%')
-
+                AND status=90
             </if>
             AND status=90
         </where>
@@ -1069,15 +1073,18 @@
                cmo.orderNo,
                u.userName,
                cmo.confirmTime,
-               cms.receiptAmount
+               cms.receiptAmount,
+               cms.needPayAmount
         FROM cm_shop_order cms
                  LEFT JOIN shop s ON s.shopID = cms.shopID
                  LEFT JOIN cm_order cmo ON cmo.orderID = cms.orderID
                  LEFT JOIN `user` u ON u.userID = cms.userID
+                 LEFT JOIN cm_discern_receipt csp ON csp.shopOrderID = cms.shopOrderID
                  <where>
                      <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'
@@ -1090,8 +1097,9 @@
             <if test="keyWord!=null and keyWord !=''">
                 AND name LIKE concat('%',#{keyWord},'%')
                 or linkMan LIKE CONCAT('%', #{keyWord}, '%')
+                AND userIdentity = 2 AND status=1
             </if>
-            AND status=1
+            AND userIdentity = 2 AND status=1
         </where>