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} +