Browse Source

bbbbb

release_toaliyun_real
xhxu 5 years ago
parent
commit
7c522a74e5
3 changed files with 23 additions and 32 deletions
  1. +5
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java
  2. +13
    -13
      mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java
  3. +5
    -15
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java

+ 5
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java View File

@@ -95,12 +95,13 @@ public class WxCUserController extends BaseController {
if (wxCUserFromB == null) {
//TODO phone可能为空
String phone = wxCUser.getPhone();

WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.findInfoByPhone(bUser, phone);
//查询会员信息
List<WxCUserBasicInfo> byPhone = wxCUserBasicInfoService.findByPhone(bUser, phone);
//List<WxCUserBasicInfo> byPhone = wxCUserBasicInfoService.findByPhone(bUser, phone);
//存在会员信息
if (!byPhone.isEmpty()) {
if (wxCUserBasicInfo != null) {
//更新会员信息
WxCUserBasicInfo wxCUserBasicInfo = byPhone.get(0);
if (!StringUtils.isEmpty(wxCUserFromBDto.getName())) {
wxCUserBasicInfo.setName(wxCUserFromBDto.getName());
}
@@ -133,7 +134,7 @@ public class WxCUserController extends BaseController {
} else {
//新增来自B端的会员
long cUserId = idWorker.nextId();
WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo();
wxCUserBasicInfo = new WxCUserBasicInfo();
wxCUserBasicInfo.setId(cUserId);
if (!StringUtils.isEmpty(wxCUserFromBDto.getName())) {
wxCUserBasicInfo.setName(wxCUserFromBDto.getName());


+ 13
- 13
mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java View File

@@ -67,25 +67,25 @@ public class WxMemController extends BaseController {

WxMerchantBUser bUser = getUser();

WxCUser cUser = userService.getById(id);
if(cUser == null) {
return new ResultData(ErrorCode.USER_IS_EMPTY);
}
// WxCUser cUser = userService.getById(id);
// if(cUser == null) {
// return new ResultData(ErrorCode.USER_IS_EMPTY);
// }

WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUser.getId());
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(id);
if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) {
return new ResultData(ErrorCode.MEMBER_IS_LOCKED);
}

WxCUserVo userVo = new WxCUserVo();
org.springframework.beans.BeanUtils.copyProperties(cUser, userVo);
if (wxCUserBasicInfo != null) {
userVo.setName(wxCUserBasicInfo.getName());
userVo.setBirthdate(wxCUserBasicInfo.getBirthdate());
userVo.setSex(wxCUserBasicInfo.getSex());
userVo.setAddress(wxCUserBasicInfo.getAddress());
}
org.springframework.beans.BeanUtils.copyProperties(wxCUserBasicInfo, userVo);
// if (wxCUserBasicInfo != null) {
// userVo.setName(wxCUserBasicInfo.getName());
// userVo.setBirthdate(wxCUserBasicInfo.getBirthdate());
// userVo.setSex(wxCUserBasicInfo.getSex());
// userVo.setAddress(wxCUserBasicInfo.getAddress());
// }

userVo.setLevelName(WxLevelConfigService.DEFAULT_LEVEL);
userVo.setDiscountRate(WxLevelConfigService.DEFAULT_MERCHANT_DISCOUNT);


+ 5
- 15
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java View File

@@ -311,7 +311,7 @@ public class WxMicroPayController extends BaseController {
}

// 获取C用户
WxCUser cUser = null;
WxCUserBasicInfo cUser = null;
if (StringUtils.isNotBlank(cUserIdStr)) {
Long cUserId = 0L;
try {
@@ -321,12 +321,9 @@ public class WxMicroPayController extends BaseController {
logger.error("cUserId参数不正确: " + paramMap.toString());
return new ResultData(ErrorCode.SYS_CLASSCAST_ERROR);
}
cUser = wxCUserService.getById(cUserId);
cUser = wxCUserBasicInfoService.getById(cUserId);
} else {
WxCUser userQ = new WxCUser();
userQ.updateTenantInfo(user);
userQ.setPhone(phone);
cUser = wxCUserService.getByObject(userQ);
cUser = wxCUserBasicInfoService.findInfoByPhone(user,phone);
}
if (cUser == null) {
logger.error("cUser不存在: " + cUserIdStr);
@@ -342,15 +339,8 @@ public class WxMicroPayController extends BaseController {

WxOrder order = null;
try {
if (!cUser.isBasicInfo()) {
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER);
}
WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.getById(cUser.getUserId());
if ( null == basicInfo) {
logger.error("会员用户未找到."+cUser.getUserId());
return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"会员用户未找到."+cUser.getUserId());
}
order = wxOrderService.saveMicroPayOrderV2(user, basicInfo, payment);

order = wxOrderService.saveMicroPayOrderV2(user, cUser, payment);
} catch (MallinkException e) {
logger.error("saveMicopayOrder 1" + e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());


Loading…
Cancel
Save