From 98d2f9deb2d54000d2bf00b4b1c64c20ada4fa0d Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Mon, 20 Oct 2025 12:33:40 +0800
Subject: [PATCH] =?UTF-8?q?10-20=20=E6=94=B6=E6=AC=BE=EF=BC=9A=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E6=89=8B=E7=BB=AD=E8=B4=B9=E5=8E=BB=E9=99=A4=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/mapper/cash/CashCollectionMapper.java     | 1 +
 src/main/resources/cashMapper/CashCollectionMapper.xml              | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java
index 880b37d..935d49d 100644
--- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java
+++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java
@@ -49,4 +49,5 @@ public interface CashCollectionMapper {
     //查找未同步的订单
     List<GOrder>getUnSync(@Param("size")int size);
     //同步g_order订单到cash_record表
+    //int syncToCashRecord(CashRecord record);
 }
diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index f98b7ce..0ae1270 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -61,9 +61,6 @@
             <if test="cashRecord.receivedTime != null">
                 received_time = #{cashRecord.receivedTime},
             </if>
-            <if test="cashRecord.receivedRemark != null and cashRecord.receivedRemark != ''">
-                received_remark = #{cashRecord.receivedRemark},
-            </if>
             <if test="cashRecord.paymentCurrency != null and cashRecord.paymentCurrency != ''">
                 payment_currency = #{cashRecord.paymentCurrency},
             </if>
@@ -81,7 +78,6 @@
             AND received_currency IS NOT NULL AND received_currency != ''
             AND received_amount   IS NOT NULL
             AND received_time     IS NOT NULL
-            AND received_remark   IS NOT NULL AND received_remark != ''
             AND payment_currency  IS NOT NULL AND payment_currency != ''
             AND payment_amount    IS NOT NULL
             AND bank_code         IS NOT NULL AND bank_code != ''
@@ -192,11 +188,13 @@
     <select id="getActivityList" resultType="java.lang.String">
         select distinct activity from cash_record
     </select>
+    <!--查找未同步的订单-->
     <select id="getUnSync" resultType="com.example.demo.domain.entity.GOrder">
         select jwcode,order_no,type,price,count,pay_style,state,
                success_time,ios_environment,ios_transaction_id,ios_receipt_data,
                paypal_order_id,add_time,is_synced
         from g_order
         where is_synced=0 and state=1 and type='gold_coin'
+        limit #{size}
     </select>
 </mapper>
\ No newline at end of file