From 198f3af9f7a8e63e3c766f68a347f859b651e1b3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 22 Aug 2018 13:16:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=9F=AD=E4=BF=A1][=E4=BF=AE=E6=94=B9]:B?= =?UTF-8?q?=E7=AB=AF=E7=94=A8=E6=88=B7=E5=8F=91=E9=80=81=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E3=80=81=E5=95=86?= =?UTF-8?q?=E6=88=B7=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E3=80=81=E5=95=86?= =?UTF-8?q?=E6=88=B7=E7=8A=B6=E6=80=81=E6=98=AF=E5=90=A6=E5=81=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxMsgValidationcodeServiceImpl.java | 50 +++++++++++++++---- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeServiceImpl.java index d31a31204..a5cdc7df6 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeServiceImpl.java @@ -7,19 +7,14 @@ import com.simple.common.ErrorCode; import com.simple.common.IdWorker; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.WxMall; -import com.simple.domain.po.WxMsgConfig; -import com.simple.domain.po.WxMsgValidationcode; -import com.simple.domain.po.WxMsgValidationcodeModel; -import com.simple.mapper.WxMallMapper; -import com.simple.mapper.WxMsgConfigMapper; -import com.simple.mapper.WxMsgValidationcodeMapper; -import com.simple.mapper.WxMsgValidationcodeModelMapper; +import com.simple.domain.po.*; +import com.simple.mapper.*; import com.simple.service.WxMsgValidationcodeService; import com.simple.utils.AesUtil; import com.simple.utils.HMACSHA256; import com.simple.utils.HttpUtil; import com.simple.utils.RsaUtil; +import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,9 +22,13 @@ import java.util.*; import java.util.stream.Collectors; @Service -public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeService { +public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeService {\ - @Autowired + + private Logger logger = Logger.getLogger(WxMsgValidationcodeServiceImpl.class); + + + @Autowired WxMsgValidationcodeMapper wxMsgValidationcodeMapper; @Autowired @@ -41,6 +40,13 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic @Autowired WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; + @Autowired + WxMerchantBUserMapper wxMerchantBUserMapper; + + + @Autowired + WxMerchantMapper wxMerchantMapper; + @Override public PageInfo listAsPage(WxMsgValidationcode record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgValidationcodeMapper.findList(record)); @@ -72,6 +78,30 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic @Override public ResultData sendvalidationcode(WxMsgValidationcode wxMsgValidationcode) { + WxMerchantBUser user = new WxMerchantBUser(); + user.setAppId(wxMsgValidationcode.getAppid()); + user.setPhone(wxMsgValidationcode.getPhone()); + + List userList = wxMerchantBUserMapper.findList(user); + if (userList.size()==0) { + logger.error("B端用户不存在, phone: " + wxMsgValidationcode.getPhone()); + return new ResultData(ErrorCode.USER_IS_EMPTY); + } + + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setId(userList.get(0).getId()); + List merchantList = wxMerchantMapper.findList(wxMerchant); + if (merchantList.size()==0) { + logger.error("B端所在商户不存在, id: " + userList.get(0).getId()); + return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); + } + + wxMerchant = merchantList.get(0); + if(wxMerchant.getStatus()==0){ + logger.error("B端所在商户已停用, id: " + userList.get(0).getId()); + //return new ResultData(ErrorCode.MERCHANT_DISABLED); + } + //1、查看是否存在未过期的短信,有返回成功 没有继续 List wxmsgvalidationcodelist = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); Date currentdate = new Date();