From f8e90ad97b56108227da933f5f5db6f9aea2ead8 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Thu, 2 Apr 2026 15:53:55 +0800
Subject: [PATCH] =?UTF-8?q?20260412=E4=B8=9A=E7=BB=A9=E5=BD=92=E5=B1=9E?=
 =?UTF-8?q?=E5=9C=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/mapper/coin/UserMapper.java         | 1 +
 .../example/demo/serviceImpl/cash/CashCollectionServiceImpl.java   | 7 ++++++-
 src/main/resources/mapper/UserMapper.xml                           | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/mapper/coin/UserMapper.java b/src/main/java/com/example/demo/mapper/coin/UserMapper.java
index e61d39f..da2f0e3 100644
--- a/src/main/java/com/example/demo/mapper/coin/UserMapper.java
+++ b/src/main/java/com/example/demo/mapper/coin/UserMapper.java
@@ -40,6 +40,7 @@ public interface UserMapper {
 
     //查找用户全部信息
     User selectAllUser(String jwcode);
+    User selectUserMarket(String jwcode);
     //查找用户的首充日期
     Date getFirstRecharge(String jwcode);
 
diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
index e6f08be..730c2a7 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
@@ -138,7 +138,12 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         cashRecord.setSubmitterMarket(cashCollection.getSubmitterMarket());
         cashRecord.setOrderType(1);     //订单类型：1-收款
         cashRecord.setMarket(cashCollection.getMarket());
-        cashRecord.setPerformanceMarket(Integer.valueOf(areaInfo.getArea()));
+        if(areaInfo.getArea().equals("0")){
+            cashRecord.setPerformanceMarket(Integer.valueOf(cashCollection.getMarket()));
+        }else {
+            cashRecord.setPerformanceMarket(Integer.valueOf(areaInfo.getArea()));
+        }
+
         //地区，根据 jwcode 插入
         //cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(cashRecord.getJwcode()));
         //插入新收款订单
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 265bc65..9e4a62c 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -88,6 +88,12 @@
         FROM user
         WHERE jwcode = #{jwcode}
     </select>
+    <select id="selectUserMarket" resultType="com.example.demo.domain.entity.User">
+        SELECT
+            market AS "market"
+        FROM user
+        WHERE jwcode = #{jwcode}
+    </select>
     <!-- 根据精网号查询金币余额 -->
     <select id="selectGold" resultType="com.example.demo.domain.vo.coin.GoldUser">
         SELECT