Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期

src/main/resources/mapper/AuditMapper.xml

@@ -6,7 +6,8 @@
         update user_gold_record
         set audit_id = #{auditId},
             audit_status = #{auditStatus},
-            reject_reason = #{rejectReason}
+            reject_reason = #{rejectReason},
+            audit_time = #{auditTime}
         where order_code = #{orderCode}
     </update>
     <!--更新用户余额-->
@@ -20,6 +21,7 @@
             current_free_june = current_free_june + COALESCE(#{currentFreeJune},0),
             current_free_december = current_free_december + COALESCE(#{currentFreeDecember},0),
             current_task_gold = current_task_gold + COALESCE(#{currentTaskGold},0)
+
         where jwcode = #{jwcode}
     </update>
     <!--修改消费订单为已退款-->
@@ -53,7 +55,7 @@
                 AND ugr.activity = #{rechargeAudit.activity}
             </if>
             <if test="rechargeAudit.payModel != null and rechargeAudit.payModel != ''">
-                AND ugr.payModel = #{rechargeAudit.payModel}
+                AND ugr.pay_model = #{rechargeAudit.payModel}
             </if>
             <if test="rechargeAudit.market != null and rechargeAudit.market != ''">
                 AND u.market = #{rechargeAudit.market}

src/main/resources/mapper/StatisticsMapper.xml

@@ -78,7 +78,7 @@
         <foreach item="status" collection="auditStatusList" open="(" separator="," close=")">
             #{status}
         </foreach>
-        AND ugr.pay_time BETWEEN #{startTime} AND #{endTime}
+        AND ugr.create_time BETWEEN #{startTime} AND #{endTime}
     </select>
    <!-- 计算该天充值人数-->
     <select id="countRechargeNum" resultType="java.lang.Integer">
@@ -87,7 +87,7 @@
                  INNER JOIN user u ON ugr.jwcode = u.jwcode
         WHERE u.market = #{market}
           AND ugr.audit_status IN (1,3)
-          AND ugr.pay_time BETWEEN #{startTime} AND #{endTime}
+          AND ugr.audit_time BETWEEN #{startTime} AND #{endTime}
     </select>
     <!--计算该天首充人数-->
     <select id="countFirstRecharge" resultType="java.lang.Integer">
@@ -96,9 +96,10 @@
                  INNER JOIN user u ON ugr.jwcode = u.jwcode
         WHERE u.market = #{market}
         AND ugr.audit_status = 1
-        AND ugr.pay_time BETWEEN #{startTime} AND #{endTime}
+        AND ugr.audit_time BETWEEN #{startTime} AND #{endTime}
         AND u.first_recharge = #{startTime}
     </select>
+    <!--获取某地区某时间所在日期的数据（仅一条）-->
     <select id="selectByMarketAndDate" resultType="com.example.demo.domain.entity.Statistics">
         SELECT *
         FROM statistics