From 91fb3afd0a5090e359345ae96a7f5909dc0890d0 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 18 Aug 2018 15:46:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=A0=87=E7=AD=BE=E7=9F=AD=E4=BF=A1][?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81]:=E6=9B=B4=E6=96=B0=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E3=80=81?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=9B=9E=E8=B0=83=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantBUserController.java | 8 +- .../controller/WxMsgCallbackController.java | 16 +- .../simple/controller/WxMsgController.java | 1 + .../controller/WxMsgModelController.java | 3 +- .../WxMsgValidationcodeController.java | 16 +- .../WxMsgValidationcodeModelController.java | 62 ++++++ .../com/simple/domain/po/WxMsgConfig.java | 43 +++- .../java/com/simple/domain/po/WxMsgModel.java | 24 ++- .../simple/domain/po/WxMsgValidationcode.java | 10 + .../domain/po/WxMsgValidationcodeModel.java | 189 ++++++++++++++++++ .../WxMsgValidationcodeModelMapper.java | 17 ++ .../service/WxMerchantBUserService.java | 3 +- .../simple/service/WxMsgCallbackService.java | 5 + .../com/simple/service/WxMsgModelService.java | 2 +- .../WxMsgValidationcodeModelService.java | 49 +++++ .../impl/WxMerchantBUserServiceImpl.java | 4 +- .../impl/WxMsgCallbackServiceImpl.java | 48 ++++- .../service/impl/WxMsgModelServiceImpl.java | 15 +- .../simple/service/impl/WxMsgServiceImpl.java | 5 +- .../WxMsgValidationcodeModelServiceImpl.java | 139 +++++++++++++ .../impl/WxMsgValidationcodeServiceImpl.java | 32 ++- .../resources/mapper/WxMsgConfigMapper.xml | 7 +- .../resources/mapper/WxMsgModelMapper.xml | 13 +- .../mapper/WxMsgValidationcodeMapper.xml | 4 +- .../mapper/WxMsgValidationcodeModelMapper.xml | 53 +++++ 25 files changed, 715 insertions(+), 53 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeModelController.java create mode 100644 mallinkService/src/main/java/com/simple/domain/po/WxMsgValidationcodeModel.java create mode 100644 mallinkService/src/main/java/com/simple/mapper/WxMsgValidationcodeModelMapper.java create mode 100644 mallinkService/src/main/java/com/simple/service/WxMsgValidationcodeModelService.java create mode 100644 mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeModelServiceImpl.java create mode 100644 mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java index 0f1d79678..b15b21577 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -38,15 +38,15 @@ public class WxMerchantBUserController extends BaseController //Assert.notNull(wxMerchantBUser.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMerchantBUser.setTenantId(getTenantId()); - wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); - return new ResultData(); + Long id = wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); + return new ResultData(Result.SUCCESS,"添加成功",id); } @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMerchantBUser wxMerchantBUser) { - wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); - return new ResultData(); + Long id = wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); + return new ResultData(Result.SUCCESS,"更新成功",id); } @ApiOperation("根据id删除接口") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java index aef04f877..d78cd200a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java @@ -74,5 +74,19 @@ public class WxMsgCallbackController extends BaseController wxMsgCallbackService.saveOrUpdate(bid,item,sign); } - + + @RequestMapping(value = "/receivemodel/{bid}") + public void receivemodel(@PathVariable String bid, @RequestParam Map param) { + //解析param数据插入数据库中 + wxMsgCallbackService.receivemodel(bid,param); + + } + + @RequestMapping(value = "/receiveverifymodel/{bid}") + public void receiveverifymodel(@PathVariable String bid, @RequestParam Map param) { + //解析param数据插入数据库中 + wxMsgCallbackService.receiveverifymodel(bid,param); + + } + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java index 984af8ce3..9e2946256 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java @@ -44,6 +44,7 @@ public class WxMsgController extends BaseController public ResultData add(@RequestBody WxMsg wxMsg) { //Assert.notNull(wxMsg.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsg.setTenantId(getTenantId()); wxMsgService.saveOrUpdate(wxMsg); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java index d24ad1be9..a7e93122e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java @@ -37,6 +37,7 @@ public class WxMsgModelController extends BaseController public ResultData add(@RequestBody WxMsgModel wxMsgModel) { //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgModel.setTenantId(getTenantId()); return wxMsgModelService.saveOrUpdate(wxMsgModel); } @@ -65,7 +66,7 @@ public class WxMsgModelController extends BaseController @ApiOperation("获取所有数据") @GetMapping("getmodellist") public ResultData getmodellist() { - return wxMsgModelService.getmodellist(); + return wxMsgModelService.getmodellist(getTenantId()); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeController.java index 1dd9baf98..e253dda99 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeController.java @@ -61,29 +61,33 @@ public class WxMsgValidationcodeController extends BaseController @GetMapping("sendvalidationcode") @ApiImplicitParams({ - @ApiImplicitParam(name="tenantId",value="租户ID",dataType="String", paramType = "query",required=true), + @ApiImplicitParam(name="tenantId",value="租户ID",dataType="String", paramType = "query"), @ApiImplicitParam(name="phone",value="手机号",dataType="String", paramType = "query",required=true), - @ApiImplicitParam(name="type",value="场景",dataType="Integer", paramType = "query",required=true)}) - public ResultData sendvalidationcode(String tenantId,String phone,Integer type) { + @ApiImplicitParam(name="type",value="场景",dataType="Integer", paramType = "query",required=true), + @ApiImplicitParam(name="appid",value="appid",dataType="String", paramType = "query",required=true)}) + public ResultData sendvalidationcode(String tenantId,String phone,Integer type,String appid) { WxMsgValidationcode wxMsgValidationcode =new WxMsgValidationcode(); wxMsgValidationcode.setTenantId(tenantId); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); + wxMsgValidationcode.setAppid(appid); return wxMsgValidationcodeService.sendvalidationcode(wxMsgValidationcode); } @GetMapping("hasvalidationcode") @ApiImplicitParams({ - @ApiImplicitParam(name="tenantId",value="租户ID",dataType="String", paramType = "query",required=true), + @ApiImplicitParam(name="tenantId",value="租户ID",dataType="String", paramType = "query"), @ApiImplicitParam(name="phone",value="手机号",dataType="String", paramType = "query",required=true), @ApiImplicitParam(name="type",value="场景",dataType="Integer", paramType = "query",required=true), - @ApiImplicitParam(name="code",value="验证码",dataType="String", paramType = "query",required=true)}) - public ResultData hasvalidationcode(String tenantId,String phone,Integer type,String code) { + @ApiImplicitParam(name="code",value="验证码",dataType="String", paramType = "query",required=true), + @ApiImplicitParam(name="appid",value="appid",dataType="String", paramType = "query",required=true)}) + public ResultData hasvalidationcode(String tenantId,String phone,Integer type,String code,String appid) { WxMsgValidationcode wxMsgValidationcode =new WxMsgValidationcode(); wxMsgValidationcode.setTenantId(tenantId); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setCode(code); + wxMsgValidationcode.setAppid(appid); return wxMsgValidationcodeService.hasvalidationcode(wxMsgValidationcode); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeModelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeModelController.java new file mode 100644 index 000000000..d59ab7fb9 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgValidationcodeModelController.java @@ -0,0 +1,62 @@ +package com.simple.controller; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.po.WxMsgValidationcodeModel; +import com.simple.service.WxMsgValidationcodeModelService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("wxMsgValidationcodeModel") +public class WxMsgValidationcodeModelController extends BaseController +{ + @Autowired + private WxMsgValidationcodeModelService wxMsgValidationcodeModelService; + + private Logger logger = Logger.getLogger(WxMsgValidationcodeModelController.class); + + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel,Integer pageNum, Integer pageSize) { + if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); + final PageInfo page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); + return new ResultData(page); + } + + @PostMapping("add") + public ResultData add(@RequestBody WxMsgValidationcodeModel wxMsgValidationcodeModel) { + //Assert.notNull(wxMsgValidationcodeModel.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + + return wxMsgValidationcodeModelService.saveOrUpdate(wxMsgValidationcodeModel); + } + + @PostMapping("update") + public ResultData update(@RequestBody WxMsgValidationcodeModel wxMsgValidationcodeModel) { + wxMsgValidationcodeModelService.saveOrUpdate(wxMsgValidationcodeModel); + return new ResultData(); + } + + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + public ResultData delete(String id) { + wxMsgValidationcodeModelService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) + public ResultData findById(String id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgValidationcodeModelService.getById(id)); + } + + + +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java index 6fd38f73d..210255bdc 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java @@ -1,12 +1,10 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; @Table(name = "wx_msg_config") public class WxMsgConfig implements Serializable { @@ -77,6 +75,18 @@ public class WxMsgConfig implements Serializable { /*回调地址**/ @io.swagger.annotations.ApiModelProperty(value="回调地址",name="notifyurl") private String notifyurl; + + /*模板回调地址**/ + @io.swagger.annotations.ApiModelProperty(value="模板回调地址",name="modelnotifyurl") + private String modelnotifyurl; + + @io.swagger.annotations.ApiModelProperty(value="模板回调地址",name="verifynotifyurl") + private String verifynotifyurl; + + @io.swagger.annotations.ApiModelProperty(value="appid",name="appid") + private String appid; + + public String getTenantId() { return tenantId; } @@ -151,6 +161,29 @@ public class WxMsgConfig implements Serializable { } + public String getModelnotifyurl() { + return modelnotifyurl; + } + + public void setModelnotifyurl(String modelnotifyurl) { + this.modelnotifyurl = modelnotifyurl; + } + + public String getVerifynotifyurl() { + return verifynotifyurl; + } + + public void setVerifynotifyurl(String verifynotifyurl) { + this.verifynotifyurl = verifynotifyurl; + } + + public String getAppid() { + return appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java index 90e0d501b..e887872ea 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java @@ -1,12 +1,11 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; +import java.util.List; @Table(name = "wx_msg_model") public class WxMsgModel implements Serializable { @@ -59,6 +58,11 @@ public class WxMsgModel implements Serializable { /*审核状态 0未通过 1 通过 2审核中**/ @io.swagger.annotations.ApiModelProperty(value="审核状态 0未通过 1 通过 2审核中",name="status") private Integer status; + + @io.swagger.annotations.ApiModelProperty(value="modelid",name="modelId") + private Integer modelId; + + public String getTenantId() { return tenantId; } @@ -96,7 +100,13 @@ public class WxMsgModel implements Serializable { status = _status; } + public Integer getModelId() { + return modelId; + } + public void setModelId(Integer modelId) { + this.modelId = modelId; + } public static enum Field { @@ -107,7 +117,9 @@ public class WxMsgModel implements Serializable { ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC") ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ; + ,ModelId_ASC("`modelId` ASC"),ModelId_DESC("`modelId` DESC") + + ; private String value; Field(String value){ this.value = value; diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgValidationcode.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgValidationcode.java index d7402bf63..fd8116b32 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgValidationcode.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgValidationcode.java @@ -63,6 +63,10 @@ public class WxMsgValidationcode implements Serializable { /***/ @io.swagger.annotations.ApiModelProperty(value="",name="code") private String code; + + @io.swagger.annotations.ApiModelProperty(value="",name="appid") + private String appid; + public String getPhone() { return phone; } @@ -112,7 +116,13 @@ public class WxMsgValidationcode implements Serializable { code = _code; } + public String getAppid() { + return appid; + } + public void setAppid(String appid) { + this.appid = appid; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgValidationcodeModel.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgValidationcodeModel.java new file mode 100644 index 000000000..b7ccf700b --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgValidationcodeModel.java @@ -0,0 +1,189 @@ +package com.simple.domain.po; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Table(name = "wx_msg_validationcode_model") +public class WxMsgValidationcodeModel implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*名称**/ + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") + private String name; + /*签名**/ + @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") + private String signature; + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="content") + private String content; + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="createtime") + private Date createtime; + /*审核状态 0未通过 1 通过 2审核中**/ + @io.swagger.annotations.ApiModelProperty(value="审核状态 0未通过 1 通过 2审核中",name="status") + private Integer status; + /*有效分钟数**/ + @io.swagger.annotations.ApiModelProperty(value="有效分钟数",name="minutes") + private Integer minutes; + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="modelId") + private Integer modelId; + /*场景**/ + @io.swagger.annotations.ApiModelProperty(value="场景",name="type") + private Integer type; + + @io.swagger.annotations.ApiModelProperty(value="tenantid",name="tenantId") + private String tenantId; + + public String getName() { + return name; + } + public void setName(String _name) { + name = _name; + } + public String getSignature() { + return signature; + } + public void setSignature(String _signature) { + signature = _signature; + } + public String getContent() { + return content; + } + public void setContent(String _content) { + content = _content; + } + public Date getCreatetime() { + return createtime; + } + public void setCreatetime(Date _createtime) { + createtime = _createtime; + } + public Integer getStatus() { + return status; + } + public void setStatus(Integer _status) { + status = _status; + } + public Integer getMinutes() { + return minutes; + } + public void setMinutes(Integer _minutes) { + minutes = _minutes; + } + public Integer getModelId() { + return modelId; + } + public void setModelId(Integer _modelId) { + modelId = _modelId; + } + public Integer getType() { + return type; + } + public void setType(Integer _type) { + type = _type; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") + ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC") + ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") + ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") + ,Minutes_ASC("`minutes` ASC"),Minutes_DESC("`minutes` DESC") + ,ModelId_ASC("`modelId` ASC"),ModelId_DESC("`modelId` DESC") + ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMsgValidationcodeModelMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMsgValidationcodeModelMapper.java new file mode 100644 index 000000000..520e21a4f --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxMsgValidationcodeModelMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxMsgValidationcodeModel; + +public interface WxMsgValidationcodeModelMapper extends CommonMapper { + + List findList(WxMsgValidationcodeModel wxMsgValidationcodeModel); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java index 5afbbaf26..4b2d6c1e2 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java @@ -1,6 +1,5 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxMerchantBUser; @@ -37,7 +36,7 @@ public interface WxMerchantBUserService { * * @param record */ - void saveOrUpdate(WxMerchantBUser record); + Long saveOrUpdate(WxMerchantBUser record); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java b/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java index 19393ebc2..9204cc7f4 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java @@ -40,4 +40,9 @@ public interface WxMsgCallbackService { void saveOrUpdate(String bid, String item, String sign); + + void receivemodel(String bid, Map param); + + void receiveverifymodel(String bid, Map param); + } diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java b/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java index a7e72758d..618c4efbf 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java @@ -41,7 +41,7 @@ public interface WxMsgModelService { - ResultData getmodellist(); + ResultData getmodellist(String tenantId); diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgValidationcodeModelService.java b/mallinkService/src/main/java/com/simple/service/WxMsgValidationcodeModelService.java new file mode 100644 index 000000000..5671f1dc7 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxMsgValidationcodeModelService.java @@ -0,0 +1,49 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.common.ResultData; +import com.simple.domain.po.WxMsgValidationcodeModel; + +public interface WxMsgValidationcodeModelService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxMsgValidationcodeModel record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxMsgValidationcodeModel getById(String id); + + /** + * 保存或更新实体 + * + * @param record + */ + ResultData saveOrUpdate(WxMsgValidationcodeModel record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(String id); + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java index 845b38577..75851f985 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java @@ -33,7 +33,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { } @Override - public void saveOrUpdate(WxMerchantBUser record) { + public Long saveOrUpdate(WxMerchantBUser record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); @@ -44,10 +44,12 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { record.setCreateDate(date); record.setUpdateDate(date); wxMerchantBUserMapper.insertSelective(record); + return id; } else { Date date = new Date(); record.setUpdateDate(date); wxMerchantBUserMapper.updateByPrimaryKeySelective(record); + return record.getId(); } } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java index d175db730..dfae67d34 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java @@ -6,15 +6,19 @@ import com.github.pagehelper.PageInfo; import com.simple.common.IdWorker; import com.simple.domain.po.WxMsgCallback; import com.simple.domain.po.WxMsgConfig; +import com.simple.domain.po.WxMsgModel; +import com.simple.domain.po.WxMsgValidationcodeModel; import com.simple.mapper.WxMsgCallbackMapper; import com.simple.mapper.WxMsgConfigMapper; +import com.simple.mapper.WxMsgModelMapper; +import com.simple.mapper.WxMsgValidationcodeModelMapper; import com.simple.service.WxMsgCallbackService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; -import java.util.UUID; +import java.util.Map; @Service public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { @@ -25,6 +29,13 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { @Autowired WxMsgConfigMapper wxMsgConfigMapper; + @Autowired + WxMsgModelMapper wxMsgModelMapper; + + @Autowired + WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; + + @Override public PageInfo listAsPage(WxMsgCallback record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgCallbackMapper.findList(record)); @@ -56,7 +67,6 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { WxMsgConfig wxMsgConfig = new WxMsgConfig(); wxMsgConfig.setBid(bid); - String tenantid=null; List list = wxMsgConfigMapper.findList(wxMsgConfig); if(list.size()==1) { List wxMsgCallbacks = JSONArray.parseArray(item, WxMsgCallback.class); @@ -65,7 +75,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { wxMsgConfigMapper.updateByPrimaryKeySelective(wxMsgConfig); for (WxMsgCallback wxMsgCallback : wxMsgCallbacks) { - wxMsgCallback.setTenantId(tenantid); + wxMsgCallback.setTenantId(wxMsgConfig.getTenantId()); wxMsgCallback.setSign(sign); wxMsgCallback.setCreatetime(new Date()); wxMsgCallbackMapper.insertSelective(wxMsgCallback); @@ -73,5 +83,37 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { } } + @Override + public void receivemodel(String bid, Map param) { + WxMsgConfig wxMsgConfig = new WxMsgConfig(); + wxMsgConfig.setBid(bid); + List list = wxMsgConfigMapper.findList(wxMsgConfig); + if(list.size()==1) { + + WxMsgModel wxMsgModel = new WxMsgModel(); + wxMsgModel.setModelId(Integer.valueOf(param.get("id"))); + wxMsgModel = wxMsgModelMapper.findList(wxMsgModel).get(0); + wxMsgModel.setStatus(param.get("status").equals("1")?Integer.valueOf(param.get("status")):0); + wxMsgModelMapper.updateByPrimaryKeySelective(wxMsgModel); + + } + } + + @Override + public void receiveverifymodel(String bid, Map param) { + WxMsgConfig wxMsgConfig = new WxMsgConfig(); + wxMsgConfig.setBid(bid); + List list = wxMsgConfigMapper.findList(wxMsgConfig); + if(list.size()==1) { + + WxMsgValidationcodeModel wxMsgModel = new WxMsgValidationcodeModel(); + wxMsgModel.setModelId(Integer.valueOf(param.get("id"))); + wxMsgModel = wxMsgValidationcodeModelMapper.findList(wxMsgModel).get(0); + wxMsgModel.setStatus(param.get("status").equals("1")?Integer.valueOf(param.get("status")):0); + wxMsgValidationcodeModelMapper.updateByPrimaryKeySelective(wxMsgModel); + + } + } + } 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 d988eecfe..08ee0f964 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java @@ -42,11 +42,9 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { @Override public ResultData saveOrUpdate(WxMsgModel wxMsgModel) { - String tenantid="1"; - //从短信配置中查询密钥 bid 等信息 WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(tenantid); + wxMsgConfig.setTenantId(wxMsgModel.getTenantId()); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); if(wxMsgConfigs.size()==0)return new ResultData(Result.SUCCESS, "您还未接入短信运营商,请联系平台管理员"); wxMsgConfig = wxMsgConfigs.get(0); @@ -72,6 +70,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { message.put("bid", bid); message.put("signature", signature); message.put("content", content); + message.put("notify_url",wxMsgConfig.getModelnotifyurl()); StringBuilder sb = new StringBuilder(); Set> entries = message.entrySet(); @@ -105,8 +104,11 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { if (wxMsgModel.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); - wxMsgModel.setTenantId(tenantid); + wxMsgModel.setTenantId(wxMsgModel.getTenantId()); + String data = jsonObjectResult.get("data").toString(); + wxMsgModel.setModelId(Integer.valueOf(data)); wxMsgModel.setCreatetime(new Date()); + wxMsgModel.setStatus(2);//审核中 wxMsgModelMapper.insertSelective(wxMsgModel); } else { wxMsgModelMapper.updateByPrimaryKeySelective(wxMsgModel); @@ -124,9 +126,10 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { } @Override - public ResultData getmodellist() { + public ResultData getmodellist(String tenantId) { WxMsgModel wxMsgModel = new WxMsgModel(); - wxMsgModel.setTenantId("1"); + wxMsgModel.setTenantId(tenantId); + wxMsgModel.setStatus(1); List list = wxMsgModelMapper.findList(wxMsgModel); return new ResultData(list); } 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 ad4776c09..09229afd1 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java @@ -63,7 +63,6 @@ public class WxMsgServiceImpl implements WxMsgService { if (wxMsg.getStatus() == 2) { final IdWorker idWorker = IdWorker.get(); wxMsg.setId(idWorker.nextId()); - wxMsg.setTenantId("1"); wxMsg.setCreatetime(new Date()); wxMsgMapper.insertSelective(wxMsg); return new ResultData(Result.SUCCESS, "已保存到草稿箱"); @@ -78,7 +77,6 @@ public class WxMsgServiceImpl implements WxMsgService { wxMsg.setStatus(0); final IdWorker idWorker = IdWorker.get(); wxMsg.setId(idWorker.nextId()); - wxMsg.setTenantId("1"); wxMsg.setCreatetime(new Date()); wxMsgMapper.insertSelective(wxMsg); return new ResultData(Result.SUCCESS, "短信会在预设时间发送"); @@ -128,7 +126,7 @@ public class WxMsgServiceImpl implements WxMsgService { public ResultData sendmsg(WxMsg wxMsg) { //从短信配置中查询密钥 bid 等信息 WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId("1"); + wxMsgConfig.setTenantId(wxMsg.getTenantId()); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); if (wxMsgConfigs.size() == 0) return new ResultData(Result.SUCCESS, "您还未接入短信运营商,请联系平台管理员"); wxMsgConfig = wxMsgConfigs.get(0); @@ -187,7 +185,6 @@ public class WxMsgServiceImpl implements WxMsgService { if (wxMsg.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxMsg.setId(idWorker.nextId()); - wxMsg.setTenantId("1"); wxMsg.setCreatetime(new Date()); wxMsgMapper.insertSelective(wxMsg); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeModelServiceImpl.java new file mode 100644 index 000000000..a90fb0b16 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeModelServiceImpl.java @@ -0,0 +1,139 @@ +package com.simple.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.common.IdWorker; +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.po.WxMsgConfig; +import com.simple.domain.po.WxMsgModel; +import com.simple.domain.po.WxMsgValidationcodeModel; +import com.simple.mapper.WxMsgConfigMapper; +import com.simple.mapper.WxMsgValidationcodeModelMapper; +import com.simple.service.WxMsgValidationcodeModelService; +import com.simple.utils.AesUtil; +import com.simple.utils.HMACSHA256; +import com.simple.utils.HttpUtil; +import com.simple.utils.RsaUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +@Service +public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeModelService { + + @Autowired + WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; + + @Autowired + WxMsgConfigMapper wxMsgConfigMapper; + + @Override + public PageInfo listAsPage(WxMsgValidationcodeModel record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgValidationcodeModelMapper.findList(record)); + } + + @Override + public WxMsgValidationcodeModel getById(String id) { + return wxMsgValidationcodeModelMapper.selectByPrimaryKey(id); + } + + @Override + public ResultData saveOrUpdate(WxMsgValidationcodeModel wxMsgModel) { + + + //从短信配置中查询密钥 bid 等信息 + WxMsgConfig wxMsgConfig = new WxMsgConfig(); + wxMsgConfig.setTenantId(wxMsgModel.getTenantId()); + List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); + if(wxMsgConfigs.size()==0)return new ResultData(Result.SUCCESS, "您还未接入短信运营商,请联系平台管理员"); + wxMsgConfig = wxMsgConfigs.get(0); + + String secret = wxMsgConfig.getSecret(); + String bid = wxMsgConfig.getBid(); + String signature = wxMsgModel.getSignature(); + String content = wxMsgModel.getContent(); + //查看用户最新数据是否存在 + List wxMsgModels = wxMsgValidationcodeModelMapper.findList(wxMsgModel); + if (wxMsgModel.getId() == null && wxMsgModels.size() == 1) { + return new ResultData(Result.SUCCESS, "您添加的短信模板已存在"); + } + if (wxMsgModel.getId() != null && wxMsgModels.size() == 1) { + WxMsgValidationcodeModel wxmsgmodel = wxMsgModels.get(0); + if(wxmsgmodel.getContent().equals(wxMsgModel.getContent()) && wxmsgmodel.getSignature().equals(wxMsgModel.getSignature())) { + return new ResultData(Result.SUCCESS, "您添加的短信模板已存在"); + } + } + + //请求api数据排序 + TreeMap message = new TreeMap<>(); + message.put("bid", bid); + message.put("signature", signature); + message.put("content", content); + message.put("notify_url",wxMsgConfig.getModelnotifyurl()); + message.put("verifysms","1"); + + StringBuilder sb = new StringBuilder(); + Set> entries = message.entrySet(); + for (Map.Entry entry : entries) { + sb.append(entry.getKey()).append("=").append(entry.getValue()); + } + sb.append("&secret=").append(secret); + String sign = HMACSHA256.sha256_HMAC(sb.toString(), secret); + message.put("sign", sign.toUpperCase()); + + String str32 = "198b02e8fd704e96198b02e8fd704e96"; + String iv = "198b02e8fd704e96"; + + Map params = new HashMap<>(); + params.put("iv", iv); + params.put("bid", bid); + try { + String data = AesUtil.AESEncode(str32, JSONObject.toJSONString(message), iv); + String sc = RsaUtil.RSAEncode(str32.getBytes(), wxMsgConfig.getPublickey()); + params.put("data", data); + params.put("sc", sc); + } catch (Exception e) { + e.printStackTrace(); + } + + String requestUrl = "https://webapp.wiwide.com/apisms/addtemplate"; + String result = HttpUtil.doPost(requestUrl, params); + JSONObject jsonObjectResult = JSONObject.parseObject(result); + String ret = jsonObjectResult.get("ret").toString(); + if (ret.equals("1") || ret.equals("-6")) { + if (wxMsgModel.getId() == null) { + 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(2);//审核中 + wxMsgValidationcodeModelMapper.insertSelective(wxMsgModel); + } else { + wxMsgValidationcodeModelMapper.updateByPrimaryKeySelective(wxMsgModel); + } + return new ResultData(Result.SUCCESS, "创建模板成功"); + }else if (ret == "-4") { + return new ResultData(Result.SUCCESS, "短信签名或内容错误"); + } + return new ResultData(Result.SUCCESS, "创建模板失败"); + + } + + @Override + public void deleteById(String id) { + wxMsgValidationcodeModelMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} 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 d2957c49a..75062cb34 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgValidationcodeServiceImpl.java @@ -7,14 +7,18 @@ 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.WxMsg; 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.service.WxMsgValidationcodeService; -import com.simple.utils.*; +import com.simple.utils.AesUtil; +import com.simple.utils.HMACSHA256; +import com.simple.utils.HttpUtil; +import com.simple.utils.RsaUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,6 +37,8 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic @Autowired WxMallMapper wxMallMapper; + @Autowired + WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; @Override public PageInfo listAsPage(WxMsgValidationcode record, Integer pageIndex, Integer pageSize) { @@ -74,17 +80,25 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic //2、根据tenantid查询出商场名称作为签名 - WxMall wxMall = new WxMall(); + /*WxMall wxMall = new WxMall(); wxMall.setTenantId(wxMsgValidationcode.getTenantId()); - List wxmallist = wxMallMapper.findList(wxMall); - wxMsgValidationcode.setSignature(wxmallist.get(0).getName()); + List wxmallist = wxMallMapper.findList(wxMall);*/ + //3、从短信配置中查询密钥 bid 等信息 WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(wxMsgValidationcode.getTenantId()); + wxMsgConfig.setAppid(wxMsgValidationcode.getAppid()); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); if (wxMsgConfigs.size() == 0) new ResultData(500,"发送失败"); wxMsgConfig = wxMsgConfigs.get(0); + + WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); + wxMsgValidationcodeModel.setTenantId(wxMsgConfig.getTenantId()); + wxMsgValidationcodeModel.setType(1); + wxMsgValidationcodeModel = wxMsgValidationcodeModelMapper.findList(wxMsgValidationcodeModel).get(0); + wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature()); + + String secret = wxMsgConfig.getSecret(); String bid = wxMsgConfig.getBid(); String publickey = wxMsgConfig.getPublickey(); @@ -93,7 +107,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic String phone = wxMsgValidationcode.getPhone(); String signature = wxMsgValidationcode.getSignature(); //内容 - String msg=new StringBuilder().append(code).append("(动态验证码),请在15分钟内填写").toString(); + String msg = wxMsgValidationcodeModel.getContent().replace("{s6}", String.valueOf(code)); wxMsgValidationcode.setCode(String.valueOf(code)); wxMsgValidationcode.setMsg(msg); @@ -104,6 +118,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic message.put("signature", signature); message.put("msg", msg); message.put("notify_url", notifyUrl); + message.put("verifysms","1"); StringBuilder sb = new StringBuilder(); Set> entries = message.entrySet(); @@ -140,7 +155,8 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic wxMsgValidationcode.setId(idWorker.nextId()); long currentTime = System.currentTimeMillis() ; Date createtime=new Date(currentTime); - currentTime +=15*60*1000; + Integer minutes = wxMsgValidationcodeModel.getMinutes(); + currentTime +=minutes*60*1000; Date expiredate=new Date(currentTime); wxMsgValidationcode.setExpiretime(expiredate); wxMsgValidationcode.setCreatetime(createtime); diff --git a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml index 31cd66a3c..3faabb287 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml @@ -15,10 +15,15 @@ + + + + + - `id`,`tenant_id`,`secret`,`publickey`,`bid`,`recharge`,`remains`,`total`,`account`,`reminderstatus`,`reminder`,`phone`,`notifyurl` + `id`,`tenant_id`,`secret`,`publickey`,`bid`,`recharge`,`remains`,`total`,`account`,`reminderstatus`,`reminder`,`phone`,`notifyurl`,`modelnotifyurl`,`verifynotifyurl`,`appid` diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml index 9d1c14d11..e05d085df 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml @@ -9,10 +9,12 @@ + + - `id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status` + `id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id` @@ -51,7 +53,11 @@ and `status` = #{status} - + + + and `model_id` = #{modelId} + + and id in @@ -65,7 +71,8 @@ select from wx_msg_model - + + diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml index cebd27877..026c429cc 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml @@ -11,10 +11,12 @@ + + - `id`,`phone`,`expiretime`,`createtime`,`type`,`tenant_id`,`msg`,`signature`,`code` + `id`,`phone`,`expiretime`,`createtime`,`type`,`tenant_id`,`msg`,`signature`,`code`,`appid` diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml new file mode 100644 index 000000000..c2d90d671 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id` + + + + where 1 = 1 + and `id` = #{id} + and `name` = #{name} + and `signature` = #{signature} + and `content` = #{content} + and `createtime` = #{createtime} + and `status` = #{status} + and `minutes` = #{minutes} + and `model_id` = #{modelId} + and `type` = #{type} + and `tenant_id` = #{tenantId} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + +