From ed52669c56c0dbd0abbdbeb9378655b6b26b6756 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 31 Oct 2019 13:14:36 +0800 Subject: [PATCH] =?UTF-8?q?[PO][=E4=BF=AE=E6=94=B9]:=E9=9B=86=E5=9B=A2?= =?UTF-8?q?=E7=89=88=E9=A2=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/mapper/WxShopMapper.java | 2 +- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 1 + .../java/com/iformall/service/impl/WxPayOrderServiceImpl.java | 4 ++-- .../java/com/iformall/service/impl/WxShopServiceImpl.java | 2 +- .../com/iformall/service/msg/impl/SendSmsServiceImpl.java | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 389811786..2f329285f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -19,7 +19,7 @@ public interface WxShopMapper extends CommonMapper { List> notRentListMapAsPage(WxShop record); - List> getbshoplist(Map tenantId); + List> getShopList(Map params); Map getMerchantShopByShopId(Map params); 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 5ccf892eb..ded9ef8e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.dto.OrderSaveDto; import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.FmInsideOrderSuccessMsg; import com.iformall.domain.vo.*; import com.iformall.enums.*; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 942d88525..1a56054ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -223,7 +223,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { Long id = idworker.nextId(); payOrderNo = String.valueOf(id); record.setId(id); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(order); record.setCUserId(user.getId()); record.setCreateTime(currentDate); record.setUpdateTime(currentDate); @@ -454,7 +454,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { Long id = idworker.nextId(); payOrderNo = String.valueOf(id); record.setId(id); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(order); record.setBUserId(user.getId()); record.setCreateTime(currentDate); record.setUpdateTime(currentDate); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index f5b79d217..c97882abd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -169,7 +169,7 @@ public class WxShopServiceImpl implements WxShopService { Map params=new HashMap<>(); params.put("tenantId",tenantId); params.put("shopNumber",shopNumber); - List> list=wxShopMapper.getbshoplist(params); + List> list=wxShopMapper.getShopList(params); return new ResultData(ResultData.SUCCESS,"",list); } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index c3fb47844..465f2908a 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -50,7 +50,7 @@ public class SendSmsServiceImpl implements MsgSendService { //3、从短信配置中查询密钥 bid 等信息 WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(record.getTenantId()); + wxMsgConfig.updateTenantInfo(wxMsgValidationcode); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); if(CollectionUtils.isEmpty(wxMsgConfigs)){ throw new MallinkException(ErrorCode.MSG_CONFIG_NOT_FOUND); @@ -61,7 +61,7 @@ public class SendSmsServiceImpl implements MsgSendService { } WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); - wxMsgValidationcodeModel.setTenantId(record.getTenantId()); + wxMsgValidationcodeModel.updateTenantInfo(wxMsgValidationcode); wxMsgValidationcodeModel.setType(record.getModelType()); wxMsgValidationcodeModel.setOpen(EnumMsgOpen.OPEN.getCode()); List modelList = wxMsgValidationcodeModelMapper.findList(wxMsgValidationcodeModel);