|
|
@@ -147,8 +147,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); |
|
|
WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); |
|
|
wxMerchantBUser.setMerchantId(wxMerchant.getId()); |
|
|
wxMerchantBUser.setMerchantId(wxMerchant.getId()); |
|
|
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); |
|
|
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); |
|
|
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); |
|
|
|
|
|
wxMerchant.setbUsers(bUserList); |
|
|
|
|
|
|
|
|
List<WxMerchantBUser> userList = wxMerchantBUserMapper.findList(wxMerchantBUser); |
|
|
|
|
|
wxMerchant.setUsers(userList); |
|
|
|
|
|
|
|
|
//分账信息 |
|
|
//分账信息 |
|
|
WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); |
|
|
WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); |
|
|
@@ -470,7 +470,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
return new ResultData(ErrorCode.APP_ID_NOT_FOUND); |
|
|
return new ResultData(ErrorCode.APP_ID_NOT_FOUND); |
|
|
} |
|
|
} |
|
|
wxAppinfo = list.get(0); |
|
|
wxAppinfo = list.get(0); |
|
|
List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); |
|
|
|
|
|
|
|
|
List<WxMerchantBUser> users = wxMerchant.getUsers(); |
|
|
|
|
|
|
|
|
//删除之前的关联用户 |
|
|
//删除之前的关联用户 |
|
|
WxMerchantBUser bUser = new WxMerchantBUser(); |
|
|
WxMerchantBUser bUser = new WxMerchantBUser(); |
|
|
@@ -482,7 +482,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
} |
|
|
} |
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
//保存商户关联用户 |
|
|
//保存商户关联用户 |
|
|
for (WxMerchantBUser user : bUsers) { |
|
|
|
|
|
|
|
|
for (WxMerchantBUser user : users) { |
|
|
if (user.getId() == null) { |
|
|
if (user.getId() == null) { |
|
|
long id = idWorker.nextId(); |
|
|
long id = idWorker.nextId(); |
|
|
user.setId(id); |
|
|
user.setId(id); |
|
|
|