Merge branch 'refs/heads/huangqizheng/feature-20251104113536-现金管理二期退款修改' into milestone-20251104-现金管理二期

# Conflicts:
#	src/main/resources/cashMapper/CashCollectionMapper.xml
#	src/main/resources/cashMapper/CashRefundMapper.xml
#	src/main/resources/mapper/MarketMapper.xml

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -255,23 +255,25 @@
         where cr.id=#{id}
     </select>
     <select id="selectBatchIds" resultType="com.example.demo.domain.vo.cash.CashCollection">
-        select cr.id,cr.jwcode,cr.name,cr.market,
-        cr.order_code,cr.bank_code,cr.goods_name,cr.good_num,cr.num_unit,cr.permanent_gold,cr.free_gold,
-        cr.payment_currency,cr.payment_amount,cr.received_currency,cr.received_amount,cr.handling_charge,
-        cr.pay_type,cr.received_market,cr.pay_time,cr.received_time,cr.audit_id,cr.status,cr.submitter_id,
-        cr.submitter_market,cr.voucher,cr.remark,cr.audit_time,a1.admin_name as submitterName,
-        a2.admin_name as auditName,ra.activity_name as activity
+        select
+        cr.id, cr.jwcode, cr.name, cr.market,
+        cr.order_code, cr.bank_code, cr.goods_name, cr.good_num, cr.num_unit, cr.permanent_gold, cr.free_gold,
+        cr.payment_currency, cr.payment_amount, cr.received_currency, cr.received_amount, cr.handling_charge,
+        cr.pay_type, cr.received_market, cr.pay_time, cr.received_time, cr.audit_id, cr.status, cr.submitter_id,
+        cr.submitter_market, cr.voucher, cr.remark, cr.audit_time,
+        a1.admin_name as submitterName,
+        a2.admin_name as auditName,
+        ra.activity_name as activity
         from cash_record_collection cr
         left join admin a1 on cr.submitter_id = a1.id
         left join admin a2 on cr.audit_id = a2.id
         left join recharge_activity ra on ra.id = cr.activity
-        <where>
+        where 1 = 0
         <if test="relatedIds != null and relatedIds.size() > 0">
-                cr.id IN
+            OR cr.id IN
             <foreach collection="relatedIds" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
         </if>
-        </where>
     </select>
 </mapper>

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -144,6 +144,7 @@
                     crr.submitter_id,
                     crr.submitter_market,
                     crr.executor,
+                    crr.order_code,
                     crr.refund_channels,
                     crr.refund_time,
                     crr.create_time,
@@ -224,6 +225,7 @@
         crr.name,
         crr.market,
         crc.goods_name,
+        crr.order_code,
         crc.good_num as goodsNum,
         crc.num_unit,
         crr.refund_model,
@@ -308,6 +310,7 @@
         crr.name,
         crr.market,
         crc.goods_name,
+        crc.order_code,
         crc.good_num as goodsNum,
         crc.num_unit,
         crr.refund_model,
@@ -318,6 +321,7 @@
         crr.refund_time,
         crr.status,
         crr.audit_id,
+        crr.submitter_id,
         crr.related_id,
        la.area_servise,
        la.area_finance,
@@ -379,15 +383,15 @@
     </select>
 
     <select id="getAuditBatch" resultType="com.example.demo.domain.vo.cash.LhlAudit">
-        select * from lhl_audit
-         <where>
+        SELECT *
+        FROM lhl_audit
+        WHERE 1 = 0
         <if test="auditIds != null and auditIds.size() > 0">
-                 id in
+            OR id IN
             <foreach collection="auditIds" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
         </if>
-     </where>
     </select>
 
 </mapper>

src/main/resources/mapper/MarketMapper.xml

@@ -39,14 +39,13 @@
         select name from market where id=#{market}
     </select>
     <select id="getMarketByIds" resultType="com.example.demo.domain.entity.Market">
-        select id,name from market
-        <where>
+        select id, name from market
+        where 1 = 0
         <if test="marketIds != null and marketIds.size() > 0">
-                id in
+            OR id IN
             <foreach collection="marketIds" item="marketId" open="(" separator="," close=")">
                 #{marketId}
             </foreach>
         </if>
-        </where>
     </select>
 </mapper>