| @@ -19,7 +19,7 @@ public interface WxShopMapper extends CommonMapper<WxShop, String> { | |||||
| List<Map<String,Object>> notRentListMapAsPage(WxShop record); | List<Map<String,Object>> notRentListMapAsPage(WxShop record); | ||||
| List<Map<String, Object>> getbshoplist(Map<String, Object> tenantId); | |||||
| List<Map<String, Object>> getShopList(Map<String, Object> params); | |||||
| Map<String, Object> getMerchantShopByShopId(Map<String,Object> params); | Map<String, Object> getMerchantShopByShopId(Map<String,Object> params); | ||||
| @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.dto.OrderSaveDto; | import com.iformall.domain.dto.OrderSaveDto; | ||||
| import com.iformall.domain.dto.WxSharingOrderDto; | import com.iformall.domain.dto.WxSharingOrderDto; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.po.msg.FmInsideOrderSuccessMsg; | import com.iformall.domain.po.msg.FmInsideOrderSuccessMsg; | ||||
| import com.iformall.domain.vo.*; | import com.iformall.domain.vo.*; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| @@ -223,7 +223,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| Long id = idworker.nextId(); | Long id = idworker.nextId(); | ||||
| payOrderNo = String.valueOf(id); | payOrderNo = String.valueOf(id); | ||||
| record.setId(id); | record.setId(id); | ||||
| record.setTenantId(user.getTenantId()); | |||||
| record.updateTenantInfo(order); | |||||
| record.setCUserId(user.getId()); | record.setCUserId(user.getId()); | ||||
| record.setCreateTime(currentDate); | record.setCreateTime(currentDate); | ||||
| record.setUpdateTime(currentDate); | record.setUpdateTime(currentDate); | ||||
| @@ -454,7 +454,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| Long id = idworker.nextId(); | Long id = idworker.nextId(); | ||||
| payOrderNo = String.valueOf(id); | payOrderNo = String.valueOf(id); | ||||
| record.setId(id); | record.setId(id); | ||||
| record.setTenantId(user.getTenantId()); | |||||
| record.updateTenantInfo(order); | |||||
| record.setBUserId(user.getId()); | record.setBUserId(user.getId()); | ||||
| record.setCreateTime(currentDate); | record.setCreateTime(currentDate); | ||||
| record.setUpdateTime(currentDate); | record.setUpdateTime(currentDate); | ||||
| @@ -169,7 +169,7 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| Map<String,Object> params=new HashMap<>(); | Map<String,Object> params=new HashMap<>(); | ||||
| params.put("tenantId",tenantId); | params.put("tenantId",tenantId); | ||||
| params.put("shopNumber",shopNumber); | params.put("shopNumber",shopNumber); | ||||
| List<Map<String,Object>> list=wxShopMapper.getbshoplist(params); | |||||
| List<Map<String,Object>> list=wxShopMapper.getShopList(params); | |||||
| return new ResultData(ResultData.SUCCESS,"",list); | return new ResultData(ResultData.SUCCESS,"",list); | ||||
| } | } | ||||
| @@ -50,7 +50,7 @@ public class SendSmsServiceImpl implements MsgSendService { | |||||
| //3、从短信配置中查询密钥 bid 等信息 | //3、从短信配置中查询密钥 bid 等信息 | ||||
| WxMsgConfig wxMsgConfig = new WxMsgConfig(); | WxMsgConfig wxMsgConfig = new WxMsgConfig(); | ||||
| wxMsgConfig.setTenantId(record.getTenantId()); | |||||
| wxMsgConfig.updateTenantInfo(wxMsgValidationcode); | |||||
| List<WxMsgConfig> wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); | List<WxMsgConfig> wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); | ||||
| if(CollectionUtils.isEmpty(wxMsgConfigs)){ | if(CollectionUtils.isEmpty(wxMsgConfigs)){ | ||||
| throw new MallinkException(ErrorCode.MSG_CONFIG_NOT_FOUND); | throw new MallinkException(ErrorCode.MSG_CONFIG_NOT_FOUND); | ||||
| @@ -61,7 +61,7 @@ public class SendSmsServiceImpl implements MsgSendService { | |||||
| } | } | ||||
| WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); | WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); | ||||
| wxMsgValidationcodeModel.setTenantId(record.getTenantId()); | |||||
| wxMsgValidationcodeModel.updateTenantInfo(wxMsgValidationcode); | |||||
| wxMsgValidationcodeModel.setType(record.getModelType()); | wxMsgValidationcodeModel.setType(record.getModelType()); | ||||
| wxMsgValidationcodeModel.setOpen(EnumMsgOpen.OPEN.getCode()); | wxMsgValidationcodeModel.setOpen(EnumMsgOpen.OPEN.getCode()); | ||||
| List<WxMsgValidationcodeModel> modelList = wxMsgValidationcodeModelMapper.findList(wxMsgValidationcodeModel); | List<WxMsgValidationcodeModel> modelList = wxMsgValidationcodeModelMapper.findList(wxMsgValidationcodeModel); | ||||