From 657b7d4010061390e883bd672c20584398ee18d8 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Sep 2018 18:50:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=98=E7=BD=91][=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=85=A5=E9=A9=BB][=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxMallApplyController.java | 7 +++---- .../src/main/java/com/simple/common/ErrorCode.java | 2 +- .../java/com/simple/domain/po/WxMallApply.java | 11 +++++++++-- .../com/simple/service/WxMallApplyService.java | 6 +++--- .../service/impl/WxMallApplyServiceImpl.java | 14 +++++++++++++- .../simple/service/impl/WxMsgModelServiceImpl.java | 2 -- .../impl/WxMsgValidationcodeModelServiceImpl.java | 2 -- 7 files changed, 29 insertions(+), 15 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallApplyController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallApplyController.java index df034af2c..3d18d367b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallApplyController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallApplyController.java @@ -35,14 +35,13 @@ public class WxMallApplyController extends BaseController { public ResultData add(@RequestBody WxMallApply wxMallApply) { //Assert.notNull(wxMallApply.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMallApplyService.saveOrUpdate(wxMallApply); - return new ResultData(); + return wxMallApplyService.saveOrUpdate(wxMallApply); + } @PostMapping("update") public ResultData update(@RequestBody WxMallApply wxMallApply) { - wxMallApplyService.saveOrUpdate(wxMallApply); - return new ResultData(); + return wxMallApplyService.saveOrUpdate(wxMallApply); } @GetMapping("/del") diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index ee67b0594..129aa18d9 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -186,7 +186,7 @@ public enum ErrorCode{ MSG_TEMPLATE_REPEAT(12101,"您添加的短信模板已存在"), MSG_SIGNATURE_CONTENT_ERROR(12102,"短信签名或内容错误"), MSG_TEMPLATE_CREATE_ERROR(12103,"创建模板失败"), - + MSG_VERIFY_CODE_NOT_FOUND(12104,"短信验证码不存在或失效"), ; diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMallApply.java b/mallinkService/src/main/java/com/simple/domain/po/WxMallApply.java index 23b14b565..41934897e 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMallApply.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallApply.java @@ -36,8 +36,9 @@ public class WxMallApply implements Serializable { public void setIds(List ids) { this.ids = ids; } - - + + @Transient + protected String verifyCode; /*购物中心名称**/ @io.swagger.annotations.ApiModelProperty(value="购物中心名称",name="mallName") @@ -76,7 +77,13 @@ public class WxMallApply implements Serializable { applyDate = _applyDate; } + public String getVerifyCode() { + return verifyCode; + } + public void setVerifyCode(String verifyCode) { + this.verifyCode = verifyCode; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/simple/service/WxMallApplyService.java b/mallinkService/src/main/java/com/simple/service/WxMallApplyService.java index 0036d6dbb..c18d62c70 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMallApplyService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMallApplyService.java @@ -28,9 +28,9 @@ public interface WxMallApplyService { /** * 保存或更新实体 * - * @param record - */ - void saveOrUpdate(WxMallApply record); + * @param record + */ + ResultData saveOrUpdate(WxMallApply record); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallApplyServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallApplyServiceImpl.java index e9b3a5a51..54771c44c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMallApplyServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallApplyServiceImpl.java @@ -53,7 +53,18 @@ public class WxMallApplyServiceImpl implements WxMallApplyService { } @Override - public void saveOrUpdate(WxMallApply record) { + public ResultData saveOrUpdate(WxMallApply record) { + + WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); + wxMsgValidationcode.setTenantId("1"); + wxMsgValidationcode.setCode(record.getVerifyCode()); + wxMsgValidationcode.setPhone(record.getPhone()); + List wxmsgvalidationcodelist = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); + Date currentdate = new Date(); + wxmsgvalidationcodelist = wxmsgvalidationcodelist.stream().filter(validationcode -> + validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList()); + if(wxmsgvalidationcodelist.size()==0) return new ResultData(ErrorCode.MSG_VERIFY_CODE_NOT_FOUND.getCode(),ErrorCode.MSG_VERIFY_CODE_NOT_FOUND.getMessage(),true); + if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); @@ -62,6 +73,7 @@ public class WxMallApplyServiceImpl implements WxMallApplyService { } else { wxMallApplyMapper.updateByPrimaryKeySelective(record); } + return new ResultData(200,"操作成功",true); } @Override diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java index 65ac98651..e8d13580a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java @@ -120,8 +120,6 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); wxMsgModel.setTenantId(wxMsgModel.getTenantId()); - String data = jsonObjectResult.get("data").toString(); - wxMsgModel.setModelId(Integer.valueOf(data)); wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(1); wxMsgModelMapper.insertSelective(wxMsgModel); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeModelServiceImpl.java index 16331569c..1823e1156 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeModelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeModelServiceImpl.java @@ -126,8 +126,6 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); wxMsgModel.setTenantId(wxMsgModel.getTenantId()); - String data = jsonObjectResult.get("data").toString(); - wxMsgModel.setModelId(Integer.valueOf(data)); wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(1); wxMsgValidationcodeModelMapper.insertSelective(wxMsgModel);