diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java index 797eb070c..f7dcb8b9d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java @@ -54,6 +54,7 @@ public class WxScoreHistoryController extends BaseController { if (checkMemberStatus(wxScoreHistory.getCUserId())) { return new ResultData(ErrorCode.MEMBER_IS_LOCKED); } + wxScoreHistory.updateTenantInfo(getTenantInfo()); wxScoreHistoryService.saveOrUpdate(wxScoreHistory); return new ResultData(); } @@ -66,6 +67,7 @@ public class WxScoreHistoryController extends BaseController { if (checkMemberStatus(wxScoreHistory.getCUserId())) { return new ResultData(ErrorCode.MEMBER_IS_LOCKED); } + wxScoreHistory.updateTenantInfo(getTenantInfo()); wxScoreHistoryService.saveOrUpdate(wxScoreHistory); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java index 6b226eb6b..ca0711d16 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java @@ -43,6 +43,7 @@ public class WxMsgConfigController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgConfigController::add"); //Assert.notNull(wxMsgConfig.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgConfig.updateTenantInfo(getTenantInfo()); wxMsgConfigService.saveOrUpdate(wxMsgConfig); return new ResultData(); } @@ -52,6 +53,7 @@ public class WxMsgConfigController extends BaseController { @SystemControllerLog(description = "短信-配置-更新") public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) { logger.debug("[" + getIpAddr() + "] WxMsgConfigController::update"); + wxMsgConfig.updateTenantInfo(getTenantInfo()); wxMsgConfigService.saveOrUpdate(wxMsgConfig); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java index 07c812f20..7e720295a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java @@ -56,6 +56,7 @@ public class WxMsgSignatureController extends BaseController { @SystemControllerLog(description = "消息签名-更新") public ResultData update(@RequestBody WxMsgSignature wxMsgSignature) { logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::update"); + wxMsgSignature.updateTenantInfo(getTenantInfo()); wxMsgSignatureService.saveOrUpdate(wxMsgSignature); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java index 18582b229..ba42f6a3d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java @@ -41,6 +41,7 @@ public class WxMsgValidationcodeController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::add"); //Assert.notNull(wxMsgValidationcode.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgValidationcode.updateTenantInfo(getTenantInfo()); wxMsgValidationcodeService.saveOrUpdate(wxMsgValidationcode); return new ResultData(); } @@ -49,6 +50,7 @@ public class WxMsgValidationcodeController extends BaseController { @SystemControllerLog(description = "消息验证码-更新") public ResultData update(@RequestBody WxMsgValidationcode wxMsgValidationcode) { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::update"); + wxMsgValidationcode.updateTenantInfo(getTenantInfo()); wxMsgValidationcodeService.saveOrUpdate(wxMsgValidationcode); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index d9a39543d..6d7c4c677 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -41,6 +41,9 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { @Autowired WxCouponPasswordMapper wxCouponPasswordMapper; + @Autowired + WxMallMapper wxMallMapper; + @Override public PageInfo listAsPage(WxMsgCallback record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgCallbackMapper.findList(record)); @@ -74,6 +77,10 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { logger.info("短信发送回调SIGN校验成功"); WxMsgConfig wxMsgConfig = new WxMsgConfig(); wxMsgConfig.setTenantId(tenantId); + WxMall byTenantId = wxMallMapper.getByTenantId(tenantId); + if(StringUtils.isNotBlank(byTenantId.getParentTenantId())){ + wxMsgConfig.setParentTenantId(byTenantId.getParentTenantId()); + } List list = wxMsgConfigMapper.findList(wxMsgConfig); List wxMsgCallbacks = JSONArray.parseArray(param.get("item"), WxMsgCallback.class); wxMsgConfig = list.get(0); @@ -109,7 +116,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { Long callbackId = wxMsgCallback.getId(); wxMsgCallback.setId(idWorker.nextId()); wxMsgCallback.setCallbackId(callbackId); - wxMsgCallback.setTenantId(tenantId); + wxMsgCallback.updateTenantInfo(wxMsgConfig); wxMsgCallback.setSign(param.get("sign")); wxMsgCallback.setCreatetime(new Date()); wxMsgCallbackMapper.insert(wxMsgCallback); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java index 5ffd00974..936e5892c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java @@ -83,7 +83,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { if (wxMsgModel.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); - wxMsgModel.setTenantId(wxMsgModel.getTenantId()); + wxMsgModel.updateTenantInfo(wxMsgModel); if(jsonObjectResult.get("data") != null){ String data = jsonObjectResult.get("data").toString(); wxMsgModel.setModelId(Integer.valueOf(data)); @@ -110,7 +110,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { if (wxMsgModel.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); - wxMsgModel.setTenantId(wxMsgModel.getTenantId()); + wxMsgModel.updateTenantInfo(wxMsgModel); wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(1); wxMsgModelMapper.insert(wxMsgModel); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java index 2a18a7f11..c435879ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java @@ -36,16 +36,19 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService { }else if(data instanceof WxMsg){ WxMsg wxMsg = (WxMsg)data; msgRecord.setTenantId(wxMsg.getTenantId()); + msgRecord.setParentTenantId(wxMsg.getParentTenantId()); msgRecord.setMsgType(wxMsg.getMsgType()); msgRecord.setReceiver(wxMsg.getPhones()); }else if(data instanceof MailMsg){ MailMsg wxMsg = (MailMsg)data; msgRecord.setTenantId(wxMsg.getTenantId()); + msgRecord.setParentTenantId(wxMsg.getParentTenantId()); msgRecord.setMsgType(wxMsg.getMsgType()); msgRecord.setReceiver(JsonUtil.obj2Json(wxMsg.getTo())); }else if(data instanceof SmartAppMsg){ SmartAppMsg wxMsg = (SmartAppMsg)data; msgRecord.setTenantId(wxMsg.getTenantId()); + msgRecord.setParentTenantId(wxMsg.getParentTenantId()); msgRecord.setMsgType(wxMsg.getMsgType()); msgRecord.setReceiver(wxMsg.getTo()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 307c98f92..cd7125b59 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -323,6 +323,7 @@ public class WxMsgServiceImpl implements WxMsgService { wxMsgCallback.setId(idWorker.nextId()); wxMsgCallback.setPhone(phone); wxMsgCallback.setTenantId(wxmsg.getTenantId()); + wxMsgCallback.setParentTenantId(wxmsg.getParentTenantId()); wxMsgCallback.setBatchNo(batchNo); wxMsgCallback.setMsgId(wxmsg.getId()); wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java index 0d3538acc..a5b29b668 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java @@ -137,7 +137,6 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM if (wxMsgModel.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); - wxMsgModel.setTenantId(wxMsgModel.getTenantId()); if(jsonObjectResult.get("data") != null){ String data = jsonObjectResult.get("data").toString(); wxMsgModel.setModelId(Integer.valueOf(data)); @@ -164,7 +163,6 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM if (wxMsgModel.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); - wxMsgModel.setTenantId(wxMsgModel.getTenantId()); wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(1); wxMsgValidationcodeModelMapper.insert(wxMsgModel); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index 9d28bac78..2f86394ca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -124,7 +124,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic WxMsgCallback wxMsgCallback = new WxMsgCallback(); wxMsgCallback.setId(idWorker.nextId()); wxMsgCallback.setPhone(phone); - wxMsgCallback.setTenantId(wxmsg.getTenantId()); + wxMsgCallback.updateTenantInfo(wxmsg); wxMsgCallback.setBatchNo(batchNo); wxMsgCallback.setMsgId(wxmsg.getId()); wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java index 2eb8afc17..51858999e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java @@ -92,7 +92,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { int total = coupon.getPrice() - coupon.getSalePrice(); WxOrderPress orderPress = new WxOrderPress(); orderPress.setId(idWorker.nextId()); - orderPress.setTenantId(order.getTenantId()); + orderPress.updateTenantInfo(order); orderPress.setCouponId(order.getProductId()); orderPress.setOrderId(order.getId()); orderPress.setUserId(cUserId); @@ -189,7 +189,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { * 检查 小程序模板消息是否超限 */ WxMsgLimit msgLimit = new WxMsgLimit(); - msgLimit.setTenantId(user.getTenantId()); + msgLimit.updateTenantInfo(user); msgLimit.setType(formType); msgLimit.setLimitId(formId); if(wxMsgLimitService.checkIsLimit(msgLimit)) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 90b350818..41603e578 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2244,6 +2244,7 @@ public class WxOrderServiceImpl implements WxOrderService { int left_total = total; WxOrderPress orderPress = new WxOrderPress(); orderPress.setId(IdWorker.get().nextId()); + orderPress.updateTenantInfo(user); orderPress.setCouponId(record.getProductId()); orderPress.setOrderId(orderNumber); orderPress.setUserId(user.getId()); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 4a6e95a17..be365ed8f 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -117,6 +117,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新账户") public ResultData updateMerchantAccount(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAccount"); + wxMerchant.updateTenantInfo(getTenantInfo()); return wxMerchantService.updateMerchantAccount(wxMerchant); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java index 6b226eb6b..ca0711d16 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java @@ -43,6 +43,7 @@ public class WxMsgConfigController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgConfigController::add"); //Assert.notNull(wxMsgConfig.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgConfig.updateTenantInfo(getTenantInfo()); wxMsgConfigService.saveOrUpdate(wxMsgConfig); return new ResultData(); } @@ -52,6 +53,7 @@ public class WxMsgConfigController extends BaseController { @SystemControllerLog(description = "短信-配置-更新") public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) { logger.debug("[" + getIpAddr() + "] WxMsgConfigController::update"); + wxMsgConfig.updateTenantInfo(getTenantInfo()); wxMsgConfigService.saveOrUpdate(wxMsgConfig); return new ResultData(); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java index 4ecdcb5c7..9f847b203 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java @@ -40,6 +40,7 @@ public class WxMsgValidationcodeController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::add"); //Assert.notNull(wxMsgValidationcode.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgValidationcode.updateTenantInfo(getTenantInfo()); wxMsgValidationcodeService.saveOrUpdate(wxMsgValidationcode); return new ResultData(); } @@ -48,6 +49,7 @@ public class WxMsgValidationcodeController extends BaseController { @SystemControllerLog(description = "消息验证码-更新") public ResultData update(@RequestBody WxMsgValidationcode wxMsgValidationcode) { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::update"); + wxMsgValidationcode.updateTenantInfo(getTenantInfo()); wxMsgValidationcodeService.saveOrUpdate(wxMsgValidationcode); return new ResultData(); }