| @@ -311,15 +311,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| receiver.setReceiverComments(wxMerchant.getName()); | receiver.setReceiverComments(wxMerchant.getName()); | ||||
| receiver.setReceiverType(wxMerchant.getAccountTypeValue()); | receiver.setReceiverType(wxMerchant.getAccountTypeValue()); | ||||
| receiver.setTrueName(wxMerchant.getAccountName()); | receiver.setTrueName(wxMerchant.getAccountName()); | ||||
| wxProfitSharingReceiverService.updateReceiver(wxMerchant, receiver); | |||||
| return wxProfitSharingReceiverService.updateReceiver(wxMerchant, receiver); | |||||
| } else { | } else { | ||||
| wxProfitSharingReceiverService.delReceiver(wxMerchant); | |||||
| return wxProfitSharingReceiverService.delReceiver(wxMerchant); | |||||
| } | } | ||||
| return new ResultData(Result.SUCCESS, "账户操作成功"); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("db failed: 账户操作失败, e:" + e.getMessage()); | logger.error("db failed: 账户操作失败, e:" + e.getMessage()); | ||||
| throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | ||||
| } | } | ||||
| } | } | ||||
| @Transactional(rollbackFor = {Exception.class}) | @Transactional(rollbackFor = {Exception.class}) | ||||
| @@ -332,7 +332,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| WxAppinfo wxAppinfo = new WxAppinfo(); | WxAppinfo wxAppinfo = new WxAppinfo(); | ||||
| wxAppinfo.setTenantId(wxMerchant.getTenantId()); | wxAppinfo.setTenantId(wxMerchant.getTenantId()); | ||||
| wxAppinfo.setType(EnumAppType.B.getCode()); | wxAppinfo.setType(EnumAppType.B.getCode()); | ||||
| wxAppinfo = wxAppinfoMapper.findList(wxAppinfo).get(0); | |||||
| List<WxAppinfo> list = wxAppinfoMapper.findList(wxAppinfo); | |||||
| if(list.size()==0){ | |||||
| return new ResultData(ErrorCode.APP_ID_NOT_FOUND); | |||||
| } | |||||
| wxAppinfo=list.get(0); | |||||
| List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); | List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); | ||||
| //删除之前的关联用户 | //删除之前的关联用户 | ||||