|
|
|
@@ -99,7 +99,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
|
|
|
|
WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); |
|
|
|
wxMerchantBUser.setMerchantId(wxMerchant.getId()); |
|
|
|
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.BOUND.getCode()); |
|
|
|
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode()); |
|
|
|
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); |
|
|
|
wxMerchant.setbUsers(bUserList); |
|
|
|
return wxMerchant; |
|
|
|
@@ -217,7 +217,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
date = new Date(); |
|
|
|
user.setCreateDate(date); |
|
|
|
user.setUpdateDate(date); |
|
|
|
user.setStatus(EnumMerchantBUserStatus.NOT_BOUND.getCode()); |
|
|
|
user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); |
|
|
|
wxMerchantBUserMapper.insertSelective(user); |
|
|
|
|
|
|
|
} //添加商户的分账账户(不是必选) |
|
|
|
@@ -296,7 +296,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
bUser.setMerchantId(wxMerchant.getId()); |
|
|
|
List<WxMerchantBUser> wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); |
|
|
|
for(WxMerchantBUser wxMerchantBUser:wxMerchantBUserMapperList){ |
|
|
|
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.NOT_BOUND.getCode()); |
|
|
|
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); |
|
|
|
wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -313,7 +313,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
date = new Date(); |
|
|
|
user.setCreateDate(date); |
|
|
|
user.setUpdateDate(date); |
|
|
|
user.setStatus(EnumMerchantBUserStatus.BOUND.getCode()); |
|
|
|
user.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode()); |
|
|
|
wxMerchantBUserMapper.insertSelective(user); |
|
|
|
}else{//有id的更新 |
|
|
|
user.setBUserId(user.getId()); |
|
|
|
@@ -322,7 +322,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
user.setAppId(wxAppinfo.getAppId()); |
|
|
|
date = new Date(); |
|
|
|
user.setUpdateDate(date); |
|
|
|
user.setStatus(EnumMerchantBUserStatus.BOUND.getCode()); |
|
|
|
user.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode()); |
|
|
|
wxMerchantBUserMapper.updateByPrimaryKeySelective(user); |
|
|
|
} |
|
|
|
|
|
|
|
|