Merge remote-tracking branch 'origin/milestone-20250727-金币重构三期' into milestone-20250727-金币重构三期

src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java

@@ -143,15 +143,16 @@ public class MysqlServiceImpl implements MysqlService {
                         if (operation_platform.equals("1")){
                             mysqlStmt.setString(8, "ERP");
                         }
-                        if (operation_platform.equals("2")){
+                        else if (operation_platform.equals("2")){
                             mysqlStmt.setString(8, "HomilyLink");
                         }
-                        if(operation_platform.equals("3")){
+                        else if(operation_platform.equals("3")){
                             mysqlStmt.setString(8, "HomilyChart");
                         }
-                        if(operation_platform.equals("4")){
+                        else if(operation_platform.equals("4")){
                             continue;
-                        }if(operation_platform.equals("0")){
+                        }
+                        else if(operation_platform.equals("0")){
                             mysqlStmt.setString(8, "初始化金币");
                         }
                         else {

src/main/resources/mapper/ConsumeMapper.xml

@@ -96,11 +96,10 @@
         <where>
             ugr.type = 1 AND ugr.flag = 1
             <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
-                AND (
-                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
-                    u.market = #{market}
+                AND u.market IN
+                <foreach collection="markets" item="market" open="(" separator="," close=")">
+                    #{market}
                 </foreach>
-                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}

src/main/resources/mapper/GoldDetailMapper.xml

@@ -62,7 +62,7 @@
             </if>
             <if test="markets!= null and markets.size > 0">
                 AND user.market IN
-                <foreach collection="markets" item="markets" open="(" separator="," close=")">
+                <foreach collection="markets" item="market" open="(" separator="," close=")">
                     #{market}
                 </foreach>
             </if>

src/main/resources/mapper/RechargeMapper.xml

@@ -100,11 +100,10 @@
             AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
-                AND (
-                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
-                    u.market = #{market}
+                AND u.market IN
+                <foreach collection="markets" item="market" open="(" separator="," close=")">
+                    #{market}
                 </foreach>
-                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}

src/main/resources/mapper/RefundMapper.xml

@@ -98,11 +98,10 @@
         <where>
             ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
             <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
-                AND (
-                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
-                    u.market = #{market}
+                AND u.market IN
+                <foreach collection="markets" item="market" open="(" separator="," close=")">
+                    #{market}
                 </foreach>
-                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}