From d3d8c0fd325ffa8cc5777876a7d7338d8df63824 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 7 Mar 2022 10:16:16 +0800 Subject: [PATCH] =?UTF-8?q?/.=20=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mem/WxCUserBasicInfoController.java | 2 +- .../service/impl/WxCUserBasicInfoServiceImpl.java | 9 ++++----- .../com/iformall/service/impl/WxPayOrderServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 5388068ba..128fb62fb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -214,7 +214,7 @@ public class WxCUserBasicInfoController extends BaseController { private int checkUniquePhone(String phone, TenantEntity tenantEntity) { WxCUserBasicInfo baseInfoQ = new WxCUserBasicInfo(); baseInfoQ.setPhone(phone); - baseInfoQ.undateFinalTenantId(getTenantInfo()); + baseInfoQ.setFinalTenantId(tenantEntity.getFinalTenantId()); return wxCUserBasicInfoService.countUser(baseInfoQ); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index ccbf4bbc6..9e1fa5a48 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -632,7 +632,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc @Override public List findByPhone(TenantEntity tenantEntity, String phone) { WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); - basicQ.undateFinalTenantId(tenantEntity); + basicQ.setFinalTenantId(tenantEntity.getFinalTenantId()); basicQ.setPhone(phone); List basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); if (basicInfos != null && basicInfos.size() > 0) { @@ -658,7 +658,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc public WxCUserBasicInfo findInfoByPhone(TenantEntity tenantEntity, String phone) { WxCUserBasicInfo basic = null; WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); - basicQ.undateFinalTenantId(tenantEntity); + basicQ.setFinalTenantId(tenantEntity.getFinalTenantId()); basicQ.setPhone(phone); basic = wxCUserBasicInfoMapper.selectOne(new QueryWrapper(basicQ)); @@ -927,7 +927,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc WxCUserBasicInfo userBase = new WxCUserBasicInfo(); userBase.setTenantId("," + tenantEntity.getTenantId() + ","); - userBase.undateFinalTenantId(tenantEntity); + userBase.setFinalTenantId(tenantEntity.getFinalTenantId()); userBase.setName(uBase.getName()); if (uBase.getSex() == null) { userBase.setSex(0); @@ -1009,8 +1009,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc // WxCUserBasicInfo oldUserBase = null; WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo(); -// userBaseQ.updateTenantInfo(mallUserInfo); - userBaseQ.undateFinalTenantId(mallUserInfo); + userBaseQ.setFinalTenantId(mallUserInfo.getFinalTenantId()); userBaseQ.setPhone(userBase.getPhone()); WxCUserBasicInfo oldUserBase = wxCUserBasicInfoMapper.selectOne(new QueryWrapper(userBaseQ)); // List userBList = wxCUserBasicInfoMapper.selectList(new QueryWrapper(userBaseQ)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 645b1cfb4..7a5e54204 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -963,7 +963,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { basicInfo.setPhone("1111111"+record.getTenantId()); basicInfo.setNickName("商场["+record.getTenantId()+"]B端扫C端码支付专用账户"); basicInfo.setSex(EnumCUserBaseInfoSex.UNKNOWN.getCode()); - basicInfo.undateFinalTenantId(record); + basicInfo.setFinalTenantId(record.getFinalTenantId()); basicInfo.setCreateDate(new Date()); int count = wxCUserBasicInfoMapper.insert(basicInfo); if (count <=0 ) {