20260412业绩归属地字段

src/main/java/com/example/demo/domain/entity/CashRecord.java

@@ -83,7 +83,8 @@ public class CashRecord implements Serializable {
     private LocalDateTime refundTime;      // 退款日期（到天）
     private String refundRemark;           // 退款备注（执行人填写）
     private String refundVoucher;          // 退款截图
-
+    private Integer performanceMarket;         // 业绩地区
+    private String performanceMarketName;         // 业绩地区名称
     // 系统字段
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private LocalDateTime createTime;

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -6,6 +6,7 @@ import com.example.demo.config.RabbitMQConfig;
 import com.example.demo.domain.DTO.PerformanceDTO;
 import com.example.demo.domain.entity.*;
 import com.example.demo.domain.vo.cash.*;
+import com.example.demo.domain.vo.coin.AreaInfo;
 import com.example.demo.domain.vo.coin.GoldUser;
 import com.example.demo.domain.vo.coin.Messages;
 import com.example.demo.domain.vo.coin.Result;
@@ -13,6 +14,7 @@ import com.example.demo.mapper.cash.CashCollectionMapper;
 import com.example.demo.mapper.coin.MarketMapper;
 import com.example.demo.mapper.coin.UserMapper;
 import com.example.demo.service.cash.CashCollectionService;
+import com.example.demo.service.coin.RechargeActivityCenterService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import jakarta.servlet.http.HttpServletRequest;
@@ -54,6 +56,8 @@ public class CashCollectionServiceImpl implements CashCollectionService {
     private RabbitTemplate rabbitTemplate;
     @Autowired
     private LanguageTranslationUtil languageTranslationUtil;
+    @Autowired
+    private RechargeActivityCenterService rechargeActivityCenterService;
 
     //新增收款订单
     @Override
@@ -104,7 +108,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         if (cashCollection.getPayTime() == null) {
             throw new IllegalArgumentException("付款时间不能为空");
         }
-
+        AreaInfo areaInfo = rechargeActivityCenterService.queryActivityAreaById(Integer.parseInt(cashCollection.getActivity()));
         // 校验钱包 ID 和到账地区的对应关系
         validateWalletAndMarket(cashCollection.getWalletId(), cashCollection.getReceivedMarket());
 
@@ -134,6 +138,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         cashRecord.setSubmitterMarket(cashCollection.getSubmitterMarket());
         cashRecord.setOrderType(1);     //订单类型：1-收款
         cashRecord.setMarket(cashCollection.getMarket());
+        cashRecord.setPerformanceMarket(Integer.valueOf(areaInfo.getArea()));
         //地区，根据 jwcode 插入
         //cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(cashRecord.getJwcode()));
         //插入新收款订单

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -6,12 +6,12 @@
     <insert id="add" parameterType="com.example.demo.domain.entity.CashRecord"
             useGeneratedKeys="true" keyProperty="id">
         insert into
-            cash_record_collection(order_type,jwcode,name,market,activity,
+            cash_record_collection(order_type,jwcode,name,market,activity,performance_market,
                                    order_code,bank_code,goods_name,good_num,num_unit,permanent_gold,free_gold,
                                    payment_currency,payment_amount,received_market,
                                    pay_type,pay_time,status,submitter_id,submitter_market,payload,audit_time,
                                    voucher,remark,wallet_id)
-        values(#{orderType},#{jwcode},#{name},#{market},#{activity},
+        values(#{orderType},#{jwcode},#{name},#{market},#{activity},#{performanceMarket},
                #{orderCode},#{bankCode},#{goodsName},#{goodNum},#{numUnit},#{permanentGold},#{freeGold},#{paymentCurrency},
                #{paymentAmount},#{receivedMarket},#{payType},#{payTime},
                #{status},#{submitterId},#{submitterMarket},#{payload},#{auditTime},#{voucher},#{remark},#{walletId})