Преглед на файлове

/. 用户

release_toaliyun_real
xhxu преди 4 години
родител
ревизия
d3d8c0fd32
променени са 3 файла, в които са добавени 6 реда и са изтрити 7 реда
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  2. +4
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 1
- 1
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) { private int checkUniquePhone(String phone, TenantEntity tenantEntity) {
WxCUserBasicInfo baseInfoQ = new WxCUserBasicInfo(); WxCUserBasicInfo baseInfoQ = new WxCUserBasicInfo();
baseInfoQ.setPhone(phone); baseInfoQ.setPhone(phone);
baseInfoQ.undateFinalTenantId(getTenantInfo());
baseInfoQ.setFinalTenantId(tenantEntity.getFinalTenantId());
return wxCUserBasicInfoService.countUser(baseInfoQ); return wxCUserBasicInfoService.countUser(baseInfoQ);
} }




+ 4
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Целия файл

@@ -632,7 +632,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
@Override @Override
public List<WxCUserBasicInfo> findByPhone(TenantEntity tenantEntity, String phone) { public List<WxCUserBasicInfo> findByPhone(TenantEntity tenantEntity, String phone) {
WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); WxCUserBasicInfo basicQ = new WxCUserBasicInfo();
basicQ.undateFinalTenantId(tenantEntity);
basicQ.setFinalTenantId(tenantEntity.getFinalTenantId());
basicQ.setPhone(phone); basicQ.setPhone(phone);
List<WxCUserBasicInfo> basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); List<WxCUserBasicInfo> basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ));
if (basicInfos != null && basicInfos.size() > 0) { if (basicInfos != null && basicInfos.size() > 0) {
@@ -658,7 +658,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
public WxCUserBasicInfo findInfoByPhone(TenantEntity tenantEntity, String phone) { public WxCUserBasicInfo findInfoByPhone(TenantEntity tenantEntity, String phone) {
WxCUserBasicInfo basic = null; WxCUserBasicInfo basic = null;
WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); WxCUserBasicInfo basicQ = new WxCUserBasicInfo();
basicQ.undateFinalTenantId(tenantEntity);
basicQ.setFinalTenantId(tenantEntity.getFinalTenantId());
basicQ.setPhone(phone); basicQ.setPhone(phone);


basic = wxCUserBasicInfoMapper.selectOne(new QueryWrapper(basicQ)); basic = wxCUserBasicInfoMapper.selectOne(new QueryWrapper(basicQ));
@@ -927,7 +927,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc


WxCUserBasicInfo userBase = new WxCUserBasicInfo(); WxCUserBasicInfo userBase = new WxCUserBasicInfo();
userBase.setTenantId("," + tenantEntity.getTenantId() + ","); userBase.setTenantId("," + tenantEntity.getTenantId() + ",");
userBase.undateFinalTenantId(tenantEntity);
userBase.setFinalTenantId(tenantEntity.getFinalTenantId());
userBase.setName(uBase.getName()); userBase.setName(uBase.getName());
if (uBase.getSex() == null) { if (uBase.getSex() == null) {
userBase.setSex(0); userBase.setSex(0);
@@ -1009,8 +1009,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc


// WxCUserBasicInfo oldUserBase = null; // WxCUserBasicInfo oldUserBase = null;
WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo(); WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo();
// userBaseQ.updateTenantInfo(mallUserInfo);
userBaseQ.undateFinalTenantId(mallUserInfo);
userBaseQ.setFinalTenantId(mallUserInfo.getFinalTenantId());
userBaseQ.setPhone(userBase.getPhone()); userBaseQ.setPhone(userBase.getPhone());
WxCUserBasicInfo oldUserBase = wxCUserBasicInfoMapper.selectOne(new QueryWrapper(userBaseQ)); WxCUserBasicInfo oldUserBase = wxCUserBasicInfoMapper.selectOne(new QueryWrapper(userBaseQ));
// List<WxCUserBasicInfo> userBList = wxCUserBasicInfoMapper.selectList(new QueryWrapper(userBaseQ)); // List<WxCUserBasicInfo> userBList = wxCUserBasicInfoMapper.selectList(new QueryWrapper(userBaseQ));


+ 1
- 1
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.setPhone("1111111"+record.getTenantId());
basicInfo.setNickName("商场["+record.getTenantId()+"]B端扫C端码支付专用账户"); basicInfo.setNickName("商场["+record.getTenantId()+"]B端扫C端码支付专用账户");
basicInfo.setSex(EnumCUserBaseInfoSex.UNKNOWN.getCode()); basicInfo.setSex(EnumCUserBaseInfoSex.UNKNOWN.getCode());
basicInfo.undateFinalTenantId(record);
basicInfo.setFinalTenantId(record.getFinalTenantId());
basicInfo.setCreateDate(new Date()); basicInfo.setCreateDate(new Date());
int count = wxCUserBasicInfoMapper.insert(basicInfo); int count = wxCUserBasicInfoMapper.insert(basicInfo);
if (count <=0 ) { if (count <=0 ) {


Зареждане…
Отказ
Запис