From ff7827a607fb2938b95402f76bdbfe3fd79bb1e3 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 23 Apr 2019 13:58:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxMsgValidationcodeServiceImpl.java | 14 ++++---------- .../iformall/service/impl/WxTopicServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index 72b160fc7..59734b9ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -82,8 +82,6 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic @Override public ResultData sendvalidationcode(WxMsgValidationcode wxMsgValidationcode) { - - //1、查看是否存在未过期的短信,有返回成功 没有继续 List wxmsgvalidationcodelist = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); Date currentdate = new Date(); @@ -91,13 +89,11 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList()); if(wxmsgvalidationcodelist.size()>0) return new ResultData(ErrorCode.MSG_REPEAT_SEND.getCode(),ErrorCode.MSG_REPEAT_SEND.getMessage()); - //2、根据tenantid查询出商场名称作为签名 /*WxMall wxMall = new WxMall(); wxMall.setTenantId(wxMsgValidationcode.getTenantId()); List wxmallist = wxMallMapper.findList(wxMall);*/ - //3、从短信配置中查询密钥 bid 等信息 WxMsgConfig wxMsgConfig = new WxMsgConfig(); wxMsgConfig.setTenantId(wxMsgValidationcode.getTenantId()); @@ -114,7 +110,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic String secret = wxMsgConfig.getSecret(); String bid = wxMsgConfig.getBid(); String publickey = wxMsgConfig.getPublickey(); - //验证码 +// //验证码 int code = (int) ((Math.random() * 9 + 1) * 100000); String phone = wxMsgValidationcode.getPhone(); String signature = wxMsgValidationcode.getSignature(); @@ -128,16 +124,15 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic //给发起人发送驳回消息 // Map msgReplaceMap = new HashedMap(); -// msgReplaceMap.put("contract",(String)getVariableByKey(variables,"contractNumber")); -// msgReplaceMap.put("page",Constant.adminPage); +// msgReplaceMap.put("s6",String.valueOf(code)); // WxMsgRecord wxMsgRecord = new WxMsgRecord(); // wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); // wxMsgRecord.setModelType(EnumMsgModel.VALIDATION_CODE.getCode()); // wxMsgRecord.setReceiver(wxMsgValidationcode.getPhone()); -// wxMsgRecord.setTenantId(wxMsgConfig.getTenantId()); +// wxMsgRecord.setTenantId(wxMsgValidationcode.getTenantId()); // wxMsgRecord.setDynamicContentMap(msgReplaceMap); // mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); - +// return new ResultData(Result.SUCCESS,"发送成功"); String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.YES.getCode().toString(), modelId); JSONObject jsonObjectResult = JSONObject.parseObject(result); @@ -158,7 +153,6 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic return new ResultData(Result.SUCCESS,"发送成功"); } return new ResultData(ErrorCode.MSG_SEND_ERROR.getCode(),"发送失败"); - } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index c78e6174c..b99359170 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -129,9 +129,9 @@ public class WxTopicServiceImpl implements WxTopicService { for (int i = 0; i < wxCouponList.size(); i++) { WxCoupon wxCoupon = wxCouponList.get(i); if (i == wxCouponList.size() - 1) { - couponIds += wxCoupon.getId().toString(); + couponIds += wxCoupon.getType() +"-"+ wxCoupon.getId().toString(); } else { - couponIds += wxCoupon.getId().toString() + ","; + couponIds += wxCoupon.getType() +"-"+ wxCoupon.getId().toString() + ","; } } wxTopic.setCouponIds(couponIds);