| @@ -7,19 +7,14 @@ import com.simple.common.ErrorCode; | |||||
| import com.simple.common.IdWorker; | import com.simple.common.IdWorker; | ||||
| import com.simple.common.Result; | import com.simple.common.Result; | ||||
| import com.simple.common.ResultData; | 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.service.WxMsgValidationcodeService; | ||||
| import com.simple.utils.AesUtil; | import com.simple.utils.AesUtil; | ||||
| import com.simple.utils.HMACSHA256; | import com.simple.utils.HMACSHA256; | ||||
| import com.simple.utils.HttpUtil; | import com.simple.utils.HttpUtil; | ||||
| import com.simple.utils.RsaUtil; | import com.simple.utils.RsaUtil; | ||||
| import org.apache.log4j.Logger; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| @@ -27,9 +22,13 @@ import java.util.*; | |||||
| import java.util.stream.Collectors; | import java.util.stream.Collectors; | ||||
| @Service | @Service | ||||
| public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeService { | |||||
| public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeService {\ | |||||
| @Autowired | |||||
| private Logger logger = Logger.getLogger(WxMsgValidationcodeServiceImpl.class); | |||||
| @Autowired | |||||
| WxMsgValidationcodeMapper wxMsgValidationcodeMapper; | WxMsgValidationcodeMapper wxMsgValidationcodeMapper; | ||||
| @Autowired | @Autowired | ||||
| @@ -41,6 +40,13 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic | |||||
| @Autowired | @Autowired | ||||
| WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; | WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; | ||||
| @Autowired | |||||
| WxMerchantBUserMapper wxMerchantBUserMapper; | |||||
| @Autowired | |||||
| WxMerchantMapper wxMerchantMapper; | |||||
| @Override | @Override | ||||
| public PageInfo<WxMsgValidationcode> listAsPage(WxMsgValidationcode record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxMsgValidationcode> listAsPage(WxMsgValidationcode record, Integer pageIndex, Integer pageSize) { | ||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgValidationcodeMapper.findList(record)); | return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgValidationcodeMapper.findList(record)); | ||||
| @@ -72,6 +78,30 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic | |||||
| @Override | @Override | ||||
| public ResultData sendvalidationcode(WxMsgValidationcode wxMsgValidationcode) { | public ResultData sendvalidationcode(WxMsgValidationcode wxMsgValidationcode) { | ||||
| WxMerchantBUser user = new WxMerchantBUser(); | |||||
| user.setAppId(wxMsgValidationcode.getAppid()); | |||||
| user.setPhone(wxMsgValidationcode.getPhone()); | |||||
| List<WxMerchantBUser> 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<WxMerchant> 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、查看是否存在未过期的短信,有返回成功 没有继续 | //1、查看是否存在未过期的短信,有返回成功 没有继续 | ||||
| List<WxMsgValidationcode> wxmsgvalidationcodelist = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); | List<WxMsgValidationcode> wxmsgvalidationcodelist = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); | ||||
| Date currentdate = new Date(); | Date currentdate = new Date(); | ||||