|
|
|
@@ -90,9 +90,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
wxAppinfo = wxAppinfoMapper.findList(wxAppinfo).get(0); |
|
|
|
|
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
long merchantid = idWorker.nextId(); |
|
|
|
if (wxMerchant.getId() == null) { |
|
|
|
|
|
|
|
if (wxMerchant.getId() == null) { |
|
|
|
long merchantid = idWorker.nextId(); |
|
|
|
wxMerchant.setId(merchantid); |
|
|
|
Date date = new Date(); |
|
|
|
wxMerchant.setStatus(1); |
|
|
|
@@ -122,6 +122,28 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
WxShopMapper.updateByPrimaryKeySelective(wxShop); |
|
|
|
} |
|
|
|
|
|
|
|
//删除之前的关联用户 |
|
|
|
List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); |
|
|
|
|
|
|
|
for(WxMerchantBUser user:bUsers){ |
|
|
|
wxMerchantBUserMapper.deleteByPrimaryKey(user.getId()); |
|
|
|
} |
|
|
|
|
|
|
|
//保存商户关联用户 |
|
|
|
for(WxMerchantBUser user:bUsers){ |
|
|
|
long id = idWorker.nextId(); |
|
|
|
user.setId(id); |
|
|
|
user.setBUserId(id); |
|
|
|
user.setMerchantId(merchantid); |
|
|
|
user.setTenantId(wxMerchant.getTenantId()); |
|
|
|
user.setAppId(wxAppinfo.getAppId()); |
|
|
|
date = new Date(); |
|
|
|
user.setCreateDate(date); |
|
|
|
user.setUpdateDate(date); |
|
|
|
wxMerchantBUserMapper.insertSelective(user); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
//更新商户 |
|
|
|
@@ -166,30 +188,27 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
WxShopMapper.updateByPrimaryKeySelective(wxShop); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//删除之前的关联用户 |
|
|
|
List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); |
|
|
|
|
|
|
|
//删除之前的关联用户 |
|
|
|
List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); |
|
|
|
for(WxMerchantBUser user:bUsers){ |
|
|
|
wxMerchantBUserMapper.deleteByPrimaryKey(user.getId()); |
|
|
|
} |
|
|
|
|
|
|
|
for(WxMerchantBUser user:bUsers){ |
|
|
|
wxMerchantBUserMapper.deleteByPrimaryKey(user.getId()); |
|
|
|
} |
|
|
|
//保存商户关联用户 |
|
|
|
for(WxMerchantBUser user:bUsers){ |
|
|
|
long id = idWorker.nextId(); |
|
|
|
user.setId(id); |
|
|
|
user.setBUserId(id); |
|
|
|
user.setMerchantId(wxMerchant.getId()); |
|
|
|
user.setTenantId(wxMerchant.getTenantId()); |
|
|
|
user.setAppId(wxAppinfo.getAppId()); |
|
|
|
date = new Date(); |
|
|
|
user.setCreateDate(date); |
|
|
|
user.setUpdateDate(date); |
|
|
|
wxMerchantBUserMapper.insertSelective(user); |
|
|
|
|
|
|
|
//保存商户关联用户 |
|
|
|
for(WxMerchantBUser user:bUsers){ |
|
|
|
long id = idWorker.nextId(); |
|
|
|
user.setId(id); |
|
|
|
user.setBUserId(id); |
|
|
|
user.setMerchantId(merchantid); |
|
|
|
user.setTenantId(wxMerchant.getTenantId()); |
|
|
|
user.setAppId(wxAppinfo.getAppId()); |
|
|
|
Date date = new Date(); |
|
|
|
user.setCreateDate(date); |
|
|
|
user.setUpdateDate(date); |
|
|
|
wxMerchantBUserMapper.insertSelective(user); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|