Forráskód Böngészése

康年堂收款管理微信一键线下自提发货

yh 2 hete
szülő
commit
5ab26ff315

+ 3 - 0
fs-service/src/main/java/com/fs/hisStore/param/FsStorePaymentParam.java

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class FsStorePaymentParam  extends BaseEntity implements Serializable
@@ -50,4 +51,6 @@ public class FsStorePaymentParam  extends BaseEntity implements Serializable
     // 小程序ID
     private Long coursePlaySourceConfigId;
     private String appId;
+
+    private List<Long> paymentIdList;
 }

+ 12 - 3
fs-service/src/main/resources/mapper/hisStore/FsStorePaymentScrmMapper.xml

@@ -209,7 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getPaymentUsetInfoList" resultType="com.fs.hisStore.vo.FsStorePaymentUsetVo">
         SELECT
             sp.bank_transaction_id,
-            sp.open_id,
+            fu.ma_open_id open_id,
             sp.app_id,
             CASE
                 WHEN TRIM(fu.phone) IS NOT NULL AND TRIM(fu.phone) != '' THEN fu.phone
@@ -222,8 +222,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             fs_store_payment_scrm sp
                 LEFT JOIN fs_user fu ON sp.user_id = fu.user_id
         WHERE
-            sp.status = 1  and sp.app_id is not null  and sp.is_shipment = 0 and sp.business_type = #{businessType} AND sp.pay_time > '2025-11-27 00:00:00'
-            order by sp.pay_time desc LIMIT 500
+            sp.status = 1  and sp.app_id is not null  and sp.is_shipment in (0,-1) and sp.business_type = #{businessType} AND sp.pay_time > '2025-11-27 00:00:00' AND fu.status = 1
+        <if test="appId != null and appId != ''">
+            and sp.app_id = #{appId}
+        </if>
+        <if test="paymentIdList != null and paymentIdList.size() > 0">
+            and sp.payment_id IN
+            <foreach collection="paymentIdList" item="paymentId" open="(" close=")" separator=",">
+                #{paymentId}
+            </foreach>
+        </if>
+            order by sp.pay_time
     </select>
 
     <update id="batchUpadte">