Просмотр исходного кода

Merge branch 'release_toaliyun_real_202301' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202301

release_toaliyun_real
winter 3 лет назад
Родитель
Сommit
a0f70ad5cf
2 измененных файлов: 4 добавлений и 4 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java Просмотреть файл

@@ -171,9 +171,9 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService {
for (WxMerchantBUser merchantBUser:list) { for (WxMerchantBUser merchantBUser:list) {
merchantBUser.setUserPwd(pwd); merchantBUser.setUserPwd(pwd);
try { try {
wxMerchantBUserMapper.updateById(bUser);
wxMerchantBUserMapper.updateById(merchantBUser);
} catch (Exception e) { } catch (Exception e) {
logger.error("db failed: 商户-" + bUser.getId() + ", e:" + e.getMessage());
logger.error("db failed: 商户-" + merchantBUser.getId() + ", 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());
} }
} }


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java Просмотреть файл

@@ -58,9 +58,9 @@ public class WxMsgConfigServiceImpl implements WxMsgConfigService {
WxMsgConfig wxMsgConfig = new WxMsgConfig(); WxMsgConfig wxMsgConfig = new WxMsgConfig();
wxMsgConfig.updateTenantInfo(tenantInfo); wxMsgConfig.updateTenantInfo(tenantInfo);
wxMsgConfig.setSmsChannel(EnumSMSChannel.ALIYUN.getCode()); wxMsgConfig.setSmsChannel(EnumSMSChannel.ALIYUN.getCode());
wxMsgConfig.setTotal((long) 100000);
wxMsgConfig.setTotal((long) 5000);
wxMsgConfig.setRecharge((long) 0); wxMsgConfig.setRecharge((long) 0);
wxMsgConfig.setRemains((long) 100000);
wxMsgConfig.setRemains((long) 5000);
wxMsgConfig.setReminderstatus(0); wxMsgConfig.setReminderstatus(0);
wxMsgConfigMapper.insert(wxMsgConfig); wxMsgConfigMapper.insert(wxMsgConfig);
} }


Загрузка…
Отмена
Сохранить