Merge remote-tracking branch 'origin/developer' into developerH

src/main/java/com/caimei365/order/model/dto/ReceiptOperateDto.java

@@ -79,7 +79,7 @@ public class ReceiptOperateDto implements Serializable {
     /**
      * 收款款项二级类别
      */
-    @ApiModelProperty("收款款项二级类别1.上架费2.订单返佣3.认证通会员4.认证通企划")
+    @ApiModelProperty("收款款项二级类别1.上架费2.订单返佣3.认证通会员4.认证通企划5.其他")
     private Integer newReceiptType;
     /**
      * 关联供应ID

src/main/resources/mapper/ReceiptMapper.xml

@@ -1087,11 +1087,11 @@
                  LEFT JOIN cm_discern_receipt csp ON csp.shopOrderID = cms.shopOrderID
                  <where>
                      <if test="keyWord !=null and keyWord !=''">
-                         AND s.name LIKE concat('%',#{keyWord},'%')
+                         AND (s.name LIKE concat('%',#{keyWord},'%') or cmo.orderId=#{keyWord})
                      </if>
                      AND cms.payStatus=3
                      AND cmo.receiptStatus = 3
-                     AND cmo.confirmTime >= '2022-01-01 00:00:00'
+                     AND cmo.confirmTime >= '2021-09-01 00:01:00'
                      AND cmo.rebateFlag != 1
                      AND cms.shopId != 998
                      AND csp.newReceiptType is null