From 9c7545ec9211e5cf17b8de0a9f5b0cfd101531d2 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 20 Aug 2018 15:29:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E9=93=BA=E5=95=86=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E9=80=BB=E8=BE=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxMerchantServiceImpl.java | 27 ++++++++++--------- .../simple/service/impl/WxMsgServiceImpl.java | 2 +- .../mapper/WxMerchantBUserMapper.xml | 2 +- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index b1f55f880..982b9337b 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -1,19 +1,11 @@ package com.simple.service.impl; -import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.common.IdWorker; -import com.simple.common.ResultData; -import com.simple.domain.po.WxMerchant; -import com.simple.domain.po.WxMerchantBUser; -import com.simple.domain.po.WxMerchantShop; -import com.simple.domain.po.WxShop; +import com.simple.domain.po.*; import com.simple.enums.EnumCarVendor; -import com.simple.mapper.WxMerchantBUserMapper; -import com.simple.mapper.WxMerchantMapper; -import com.simple.mapper.WxMerchantShopMapper; -import com.simple.mapper.WxShopMapper; +import com.simple.mapper.*; import com.simple.service.WxMerchantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,8 +14,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @Service public class WxMerchantServiceImpl implements WxMerchantService { @@ -40,6 +30,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxMerchantBUserMapper wxMerchantBUserMapper; + @Autowired + WxAppinfoMapper wxAppinfoMapper; + @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); @@ -91,6 +84,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public void saveOrUpdate(WxMerchant wxMerchant) { + WxAppinfo wxAppinfo = new WxAppinfo(); + wxAppinfo.setTenantId(wxMerchant.getTenantId()); + wxAppinfo.setType(1); + wxAppinfo = wxAppinfoMapper.findList(wxAppinfo).get(0); + final IdWorker idWorker = IdWorker.get(); long merchantid = idWorker.nextId(); if (wxMerchant.getId() == null) { @@ -170,6 +168,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { } + + + //删除之前的关联用户 List bUsers = wxMerchant.getbUsers(); @@ -183,6 +184,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { user.setId(id); user.setBUserId(id); user.setMerchantId(merchantid); + user.setTenantId(wxMerchant.getTenantId()); + user.setAppId(wxAppinfo.getAppId()); Date date = new Date(); user.setCreateDate(date); user.setUpdateDate(date); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java index 09229afd1..289f68b4e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java @@ -55,7 +55,7 @@ public class WxMsgServiceImpl implements WxMsgService { } if(phones.equals("")){ - return new ResultData(Result.SUCCESS, "您需要添加要发送的手机号"); + return new ResultData(Result.SUCCESS, "您需要添 加要发送的手机号"); } if (wxMsg.getId() == null) { diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index 6eb59a647..e35e13063 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -40,7 +40,7 @@ - and `phone` like concat('%', #{phone},'%') + and `phone` = #{phone}