10-20 收款：补充手续费去除收款备注

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);
 }

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>