From c20ecbce91de3c73e67925a02b6eff58f0cc2b73 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 3 Jun 2019 23:25:41 +0800 Subject: [PATCH 01/16] =?UTF-8?q?[POVO][=E4=BC=98=E5=8C=96]:po,=20vo?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/MallPermission.java | 197 +++------- .../java/com/iformall/domain/po/MallRole.java | 65 +--- .../com/iformall/domain/po/MallUserInfo.java | 170 -------- .../com/iformall/domain/po/WxAppinfo.java | 37 +- .../java/com/iformall/domain/po/WxCUser.java | 367 +----------------- .../com/iformall/domain/po/WxPayAccount.java | 95 +---- .../com/iformall/domain/po/WxPayOrder.java | 182 +-------- .../com/iformall/domain/po/WxTemplateMsg.java | 8 +- .../iformall/domain/po/WxWeappBasicSet.java | 9 +- .../com/iformall/domain/po/WxWeappExtSet.java | 9 +- .../iformall/domain/vo/MallUserInfoVo.java | 38 +- .../com/iformall/domain/vo/WxPayOrderVo.java | 6 + .../domain/vo/WxWeappAuditStatusVo.java | 5 +- .../domain/vo/WxWeappCodeStatusVo.java | 5 +- .../com/iformall/domain/vo/WxWeappInfo.java | 2 + .../domain/vo/WxWeappReleaseStatusVo.java | 5 +- 16 files changed, 88 insertions(+), 1112 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java index 493cb1d..730dcea 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.*; import javax.persistence.Transient; import java.util.List; @@ -7,6 +9,7 @@ import javax.persistence.Id; import java.io.Serializable; @Table(name = "mall_permission") +@Data public class MallPermission implements Serializable { private static final long serialVersionUID = 1L; @@ -17,176 +20,68 @@ public class MallPermission implements Serializable { 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; - } - - /*权限名称[LIKE]**/ - @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="name") + @io.swagger.annotations.ApiModelProperty(value="权限名称",name="name") private String name; @Transient + @io.swagger.annotations.ApiModelProperty(value="权限名称[LIKE]",name="nameLike") private String nameLike; - /*是否可用 Y/N**/ - @io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="available") - private String available; - /*父编号**/ - @io.swagger.annotations.ApiModelProperty(value="父编号",name="parentId") - private Long parentId; - /*父编号列表**/ - @io.swagger.annotations.ApiModelProperty(value="父编号列表",name="parentIds") - private String parentIds; - /*权限字符串[LIST]**/ - @io.swagger.annotations.ApiModelProperty(value="权限字符串[LIST]",name="permission") + @io.swagger.annotations.ApiModelProperty(value="父编号ID,一级菜单为0",name="parentId") + private Long parentId; + @Transient + @io.swagger.annotations.ApiModelProperty(value="父菜单",name="parentName") + private String parentName; + @io.swagger.annotations.ApiModelProperty(value="是否可用 Y/N",name="permission") + private String available; + @io.swagger.annotations.ApiModelProperty(value="授权(多个用逗号分隔,如:user:list,user:create)",name="permission") private String permission; @Transient private List permissions; - /*资源类型0菜单 1,按钮**/ - @io.swagger.annotations.ApiModelProperty(value="资源类型0菜单 1,按钮",name="resourceType") - private String resourceType; - /*资源路径**/ - @io.swagger.annotations.ApiModelProperty(value="资源路径",name="url") + @io.swagger.annotations.ApiModelProperty(value="资源类型0:目录 1:菜单 2:按钮",name="resourceType") + private Integer resourceType; + @io.swagger.annotations.ApiModelProperty(value="菜单背景色-1级菜单使用",name="moduleColor") + private String moduleColor; + @io.swagger.annotations.ApiModelProperty(value="菜单字体颜色-1级菜单使用",name="moduleColorNum") + private String moduleColorNum; + @io.swagger.annotations.ApiModelProperty(value="资源路径(user/list or http://localhost/1.html)",name="url") private String url; - /*排序[FROM][TO][GTE][GT][LTE][LT]**/ - @io.swagger.annotations.ApiModelProperty(value="排序[FROM][TO][GTE][GT][LTE][LT]",name="sort") + @io.swagger.annotations.ApiModelProperty(value="菜单图标",name="icon") + private String icon; + @io.swagger.annotations.ApiModelProperty(value="版本类型(1:标准版)",name="versionType") + private Integer versionType; + @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") private Integer sort; - @Transient - private Integer sortFrom; - @Transient - private Integer sortTo; - @Transient - private Integer sortGte; - @Transient - private Integer sortGt; - @Transient - private Integer sortLte; - @Transient - private Integer sortLt; - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public String getNameLike() { - return nameLike; - } - public void setNameLike( String _nameLike) { - nameLike = _nameLike; - } - public String getAvailable() { - return available; - } - public void setAvailable(String _available) { - available = _available; - } - public Long getParentId() { - return parentId; - } - public void setParentId(Long _parentId) { - parentId = _parentId; - } - public String getParentIds() { - return parentIds; - } - public void setParentIds(String _parentIds) { - parentIds = _parentIds; - } - public String getPermission() { - return permission; - } - public void setPermission(String _permission) { - permission = _permission; - } - public List getPermissions() { - return permissions; - } - public void setPermissions( List _permissions) { - permissions = _permissions; - } - public String getResourceType() { - return resourceType; - } - public void setResourceType(String _resourceType) { - resourceType = _resourceType; - } - public String getUrl() { - return url; - } - public void setUrl(String _url) { - url = _url; - } - public Integer getSort() { - return sort; - } - public void setSort(Integer _sort) { - sort = _sort; - } - public Integer getSortFrom() { - return sortFrom; - } - public void setSortFrom( Integer _sortFrom) { - sortFrom = _sortFrom; - } - public Integer getSortTo() { - return sortTo; - } - public void setSortTo( Integer _sortTo) { - sortTo = _sortTo; - } - public Integer getSortGte() { - return sortGte; - } - public void setSortGte( Integer _sortGte) { - sortGte = _sortGte; - } - public Integer getSortGt() { - return sortGt; - } - public void setSortGt( Integer _sortGt) { - sortGt = _sortGt; - } - public Integer getSortLte() { - return sortLte; - } - public void setSortLte( Integer _sortLte) { - sortLte = _sortLte; - } - public Integer getSortLt() { - return sortLt; - } - public void setSortLt( Integer _sortLt) { - sortLt = _sortLt; - } + @Transient + private Integer sortFrom; + @Transient + private Integer sortTo; + @Transient + private Integer sortGte; + @Transient + private Integer sortGt; + @Transient + private Integer sortLte; + @Transient + private Integer sortLt; + @Transient + @io.swagger.annotations.ApiModelProperty(value="子菜单",name="children") + private List children; public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,ParentId_ASC("`parent_id` ASC"),ParentId_DESC("`parent_id` DESC") ,Available_ASC("`available` ASC"),Available_DESC("`available` DESC") - ,ParentId_ASC("`parentId` ASC"),ParentId_DESC("`parentId` DESC") - ,ParentIds_ASC("`parentIds` ASC"),ParentIds_DESC("`parentIds` DESC") ,Permission_ASC("`permission` ASC"),Permission_DESC("`permission` DESC") - ,ResourceType_ASC("`resourceType` ASC"),ResourceType_DESC("`resourceType` DESC") + ,ResourceType_ASC("`resource_type` ASC"),ResourceType_DESC("`resource_type` DESC") + ,ModuleColor_ASC("`module_color` ASC"),ModuleColor_DESC("`module_color` DESC") + ,ModuleColorNum_ASC("`module_color_num` ASC"),ModuleColorNum_DESC("`module_color_num` DESC") ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") + ,Icon_ASC("`icon` ASC"),Icon_DESC("`icon` DESC") + ,VersionType_ASC("`version_type` ASC"),VersionType_DESC("`version_type` DESC") ,Sort_ASC("`sort` ASC"),Sort_DESC("`sort` DESC") ; private String value; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java index fe8013e..e0b444f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallRole.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.*; import javax.persistence.Transient; import java.util.List; @@ -7,6 +9,7 @@ import javax.persistence.Id; import java.io.Serializable; @Table(name = "mall_role") +@Data public class MallRole implements Serializable { private static final long serialVersionUID = 1L; @@ -17,79 +20,19 @@ public class MallRole implements Serializable { 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; - } - - - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*角色名称**/ @io.swagger.annotations.ApiModelProperty(value="角色名称",name="name") private String name; - /*是否可用 0可用 1不可用**/ @io.swagger.annotations.ApiModelProperty(value="是否可用 0可用 1不可用",name="available") private String available; - /*角色描述**/ @io.swagger.annotations.ApiModelProperty(value="角色描述",name="description") private String description; @Transient + @io.swagger.annotations.ApiModelProperty(value="权限列表",name="menus") private String menus; - - public String getMenus() { - return menus; - } - - public void setMenus(String menus) { - this.menus = menus; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public String getAvailable() { - return available; - } - public void setAvailable(String _available) { - available = _available; - } - public String getDescription() { - return description; - } - public void setDescription(String _description) { - description = _description; - } - - public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index 33ab0c9..aa659df 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -24,50 +24,21 @@ public class MallUserInfo implements Serializable { 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; - } - - - - /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /**登录用户名**/ @io.swagger.annotations.ApiModelProperty(value="登录用户名",name="username") private String username; - /**用户名称**/ @io.swagger.annotations.ApiModelProperty(value="用户名称",name="name") private String name; - /**密码**/ @io.swagger.annotations.ApiModelProperty(value="密码",name="password") private String password; - /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; - /**最后登录时间**/ @io.swagger.annotations.ApiModelProperty(value="最后登录时间",name="lastLoginTime") private Date lastLoginTime; - /**1:有效,0:禁止登录**/ @io.swagger.annotations.ApiModelProperty(value="1:有效,0:禁止登录",name="status") private Integer status; - /**0 不是超管 1是超管**/ @io.swagger.annotations.ApiModelProperty(value="0 不是超管 1是超管",name="isAdmin") private Integer isAdmin; @io.swagger.annotations.ApiModelProperty(value="昵称",name="nickName") @@ -104,122 +75,9 @@ public class MallUserInfo implements Serializable { @Transient private String captcha; - /**1合同审批 2账单审批**/ @io.swagger.annotations.ApiModelProperty(value="1合同审批 2账单审批",name="flowPermission") private String flowPermission; - public String getFlowPermission() { - return flowPermission; - } - - public void setFlowPermission(String flowPermission) { - this.flowPermission = flowPermission; - } - - public String getMenus() { - return menus; - } - - public void setMenus(String menus) { - this.menus = menus; - } - - public String getRoleName() { - return roleName; - } - - public void setRoleName(String roleName) { - this.roleName = roleName; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getUsername() { - return username; - } - public void setUsername(String _username) { - username = _username; - } - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public String getPassword() { - return password; - } - public void setPassword(String _password) { - password = _password; - } - public Date getCreateTime() { - return createTime; - } - public void setCreateTime(Date _createTime) { - createTime = _createTime; - } - public Date getLastLoginTime() { - return lastLoginTime; - } - public void setLastLoginTime(Date _lastLoginTime) { - lastLoginTime = _lastLoginTime; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Integer getIsAdmin() { - return isAdmin; - } - public void setIsAdmin(Integer _isAdmin) { - isAdmin = _isAdmin; - } - public List getRole() { - return role; - } - - public void setRole(List role) { - this.role = role; - } - - public List getPermission() { - return permission; - } - - public void setPermission(List permission) { - this.permission = permission; - } - - public String getNickName() { - return nickName; - } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public Long getRoleId() { - return roleId; - } - - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - public String getCaptcha() { - return captcha; - } - - public void setCaptcha(String captcha) { - this.captcha = captcha; - } - public Integer getWithWechat() { if(StringUtils.isNotBlank(this.webOpenId)) { this.withWechat = EnumUserWechat.HAD.getCode(); @@ -229,34 +87,6 @@ public class MallUserInfo implements Serializable { return this.withWechat; } - public void setWithWechat(Integer withWechat) { - this.withWechat = withWechat; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getBopenId() { - return bopenId; - } - - public void setBopenId(String bopenId) { - this.bopenId = bopenId; - } - - public String getWebOpenId() { - return webOpenId; - } - - public void setWebOpenId(String webOpenId) { - this.webOpenId = webOpenId; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index f0b0f21..65ce9ad 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -8,6 +10,7 @@ import java.util.Date; import java.util.List; @Table(name = "wx_appinfo") +@Data public class WxAppinfo implements Serializable { private static final long serialVersionUID = 1L; @@ -18,63 +21,29 @@ public class WxAppinfo implements Serializable { 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; - } - - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*小程序ID**/ @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; - /*公众号ID**/ @io.swagger.annotations.ApiModelProperty(value="公众号ID",name="parentAppId") private String parentAppId; - /*小程序名**/ @io.swagger.annotations.ApiModelProperty(value="小程序名",name="name") private String name; - /*小程序secret**/ @io.swagger.annotations.ApiModelProperty(value="小程序secret",name="secret") private String secret; - /*消息token**/ @io.swagger.annotations.ApiModelProperty(value="消息token",name="token") private String token; - /*消息aeskey**/ @io.swagger.annotations.ApiModelProperty(value="消息aeskey",name="aesKey") private String aesKey; - /*消息类型**/ @io.swagger.annotations.ApiModelProperty(value="消息类型",name="msgDataFormat") private String msgDataFormat; - /*微信访问token**/ @io.swagger.annotations.ApiModelProperty(value="微信访问token",name="accessToken") private String accessToken; - /*上次生成accesstoken时间**/ @io.swagger.annotations.ApiModelProperty(value="上次生成accesstoken时间",name="lastTokenTime") private Date lastTokenTime; - /*微信token有效时间单位(秒)**/ @io.swagger.annotations.ApiModelProperty(value="微信token有效时间单位(秒)",name="expiresIn") private Integer expiresIn; - /*支付ID,参看wx_pay_account**/ @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account",name="payId") private Long payId; @io.swagger.annotations.ApiModelProperty(value="1B端2C端",name="type") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 8b6c302..7d1630e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -2,6 +2,7 @@ package com.iformall.domain.po; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.utils.Constant; +import lombok.Data; import javax.persistence.*; import java.util.*; @@ -13,6 +14,7 @@ import java.io.Serializable; @Table(name = "wx_c_user") @JsonIgnoreProperties(ignoreUnknown = true) +@Data public class WxCUser implements Serializable { private static final long serialVersionUID = 1L; @@ -24,114 +26,62 @@ public class WxCUser implements Serializable { @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; - } - - - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*微信openId**/ @io.swagger.annotations.ApiModelProperty(value="微信openId",name="openId") private String openId; - /*微信unionId**/ @io.swagger.annotations.ApiModelProperty(value="微信unionId",name="unionId") private String unionId; - /*用户昵称**/ @io.swagger.annotations.ApiModelProperty(value="用户昵称",name="nickName") private String nickName; - /*用户性别**/ @io.swagger.annotations.ApiModelProperty(value="用户性别",name="gender") private Integer gender; - /*用户头像地址**/ @io.swagger.annotations.ApiModelProperty(value="用户头像地址",name="avatarUrl") private String avatarUrl; - /*用户绑定的手机号**/ @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="phone") private String phone; - /*用户没有区号的手机号**/ @io.swagger.annotations.ApiModelProperty(value="用户没有区号的手机号",name="purePhone") private String purePhone; - /*用户所在城市**/ @io.swagger.annotations.ApiModelProperty(value="用户所在城市",name="city") private String city; - /*用户所在省份**/ @io.swagger.annotations.ApiModelProperty(value="用户所在省份",name="province") private String province; - /*用户所在语言**/ @io.swagger.annotations.ApiModelProperty(value="用户所在语言",name="language") private String language; - /*用户手机区号**/ @io.swagger.annotations.ApiModelProperty(value="用户手机区号",name="countryCode") private String countryCode; - /*用户注册IP**/ @io.swagger.annotations.ApiModelProperty(value="用户注册IP",name="registerIp") private String registerIp; - /***/ @io.swagger.annotations.ApiModelProperty(value="",name="verifyCodePhone") private String verifyCodePhone; - /*注册时记录用户扫码渠道,如朋友圈广告**/ @io.swagger.annotations.ApiModelProperty(value="注册时记录用户扫码渠道,如朋友圈广告",name="qrcodeSource") private String qrcodeSource; - /*二维码来源,小程序**/ @io.swagger.annotations.ApiModelProperty(value="二维码来源,小程序",name="scene") private String scene; - /*渠道,小程序**/ @io.swagger.annotations.ApiModelProperty(value="渠道,小程序",name="sceneAddress") private String sceneAddress; - /*session key for 微信小程序**/ @io.swagger.annotations.ApiModelProperty(value="session key for 微信小程序",name="sessionKey") private String sessionKey; - /*成长值**/ @io.swagger.annotations.ApiModelProperty(value="成长值",name="score") private Integer score; - /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /*小程序的appId**/ @io.swagger.annotations.ApiModelProperty(value="小程序的appId",name="appId") private String appId; - /*用户登录用token**/ @io.swagger.annotations.ApiModelProperty(value="用户登录用token",name="token") private String token; - /*用户过期时间**/ @io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime") private Date expireTime; - /*经度**/ @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") private BigDecimal longitude; - /*纬度**/ @io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude") private BigDecimal latitude; - /*登录次数**/ @io.swagger.annotations.ApiModelProperty(value="登录次数",name="loginCount") private Integer loginCount; - /*附加信息**/ @io.swagger.annotations.ApiModelProperty(value="附加信息",name="extraInfo") private String extraInfo; - /**是否关注公众号**/ @io.swagger.annotations.ApiModelProperty(value="是否关注公众号",name="isSubscribe") private Integer isSubscribe; @@ -175,319 +125,6 @@ public class WxCUser implements Serializable { @Transient protected Date endDate; - public Date getStartDate() { - return startDate; - } - - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - - public Date getEndDate() { - return endDate; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - - public List getSceneList() { - return sceneList; - } - - public void setSceneList(List sceneList) { - this.sceneList = sceneList; - } - - public String getChannelName() { - return channelName; - } - - public void setChannelName(String channelName) { - this.channelName = channelName; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getOpenId() { - return openId; - } - public void setOpenId(String _openId) { - openId = _openId; - } - public String getUnionId() { - return unionId; - } - public void setUnionId(String _unionId) { - unionId = _unionId; - } - public String getNickName() { - return nickName; - } - public void setNickName(String _nickName) { - nickName = _nickName; - } - public Integer getGender() { - return gender; - } - public void setGender(Integer _gender) { - gender = _gender; - } - public String getAvatarUrl() { - return avatarUrl; - } - public void setAvatarUrl(String _avatarUrl) { - avatarUrl = _avatarUrl; - } - public String getPhone() { - return phone; - } - public void setPhone(String _phone) { - phone = _phone; - } - public String getPurePhone() { - return purePhone; - } - public void setPurePhone(String _purePhone) { - purePhone = _purePhone; - } - public String getCity() { - return city; - } - public void setCity(String _city) { - city = _city; - } - public String getProvince() { - return province; - } - public void setProvince(String _province) { - province = _province; - } - public String getLanguage() { - return language; - } - public void setLanguage(String _language) { - language = _language; - } - public String getCountryCode() { - return countryCode; - } - public void setCountryCode(String _countryCode) { - countryCode = _countryCode; - } - public String getRegisterIp() { - return registerIp; - } - public void setRegisterIp(String _registerIp) { - registerIp = _registerIp; - } - public String getVerifyCodePhone() { - return verifyCodePhone; - } - public void setVerifyCodePhone(String _verifyCodePhone) { - verifyCodePhone = _verifyCodePhone; - } - public String getQrcodeSource() { - return qrcodeSource; - } - public void setQrcodeSource(String _qrcodeSource) { - qrcodeSource = _qrcodeSource; - } - public String getScene() { - return scene; - } - public void setScene(String _scene) { - scene = _scene; - } - public String getSceneAddress() { - return sceneAddress; - } - public void setSceneAddress(String _sceneAddress) { - sceneAddress = _sceneAddress; - } - public String getSessionKey() { - return sessionKey; - } - public void setSessionKey(String _sessionKey) { - sessionKey = _sessionKey; - } - public Integer getScore() { - return score; - } - public void setScore(Integer _score) { - score = _score; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public String getAppId() { - return appId; - } - public void setAppId(String _appId) { - appId = _appId; - } - public String getToken() { - return token; - } - public void setToken(String _token) { - token = _token; - } - public Date getExpireTime() { - return expireTime; - } - public void setExpireTime(Date _expireTime) { - expireTime = _expireTime; - } - - public BigDecimal getLongitude() { - return longitude; - } - - public void setLongitude(BigDecimal longitude) { - this.longitude = longitude; - } - - public BigDecimal getLatitude() { - return latitude; - } - - public void setLatitude(BigDecimal latitude) { - this.latitude = latitude; - } - - public Integer getLoginCount() { - return loginCount; - } - - public void setLoginCount(Integer loginCount) { - this.loginCount = loginCount; - } - - public String getSceneDescription() { - return sceneDescription; - } - - public void setSceneDescription(String sceneDescription) { - this.sceneDescription = sceneDescription; - } - - public String getExtraInfo() { - return extraInfo; - } - - public void setExtraInfo(String extraInfo) { - this.extraInfo = extraInfo; - } - - public Integer getIsSubscribe() { - return isSubscribe; - } - - public void setIsSubscribe(Integer isSubscribe) { - this.isSubscribe = isSubscribe; - } - - public String getOpenAppId() { - return openAppId; - } - - public void setOpenAppId(String openAppId) { - this.openAppId = openAppId; - } - - public String getMpOpenId() { - return mpOpenId; - } - - public void setMpOpenId(String mpOpenId) { - this.mpOpenId = mpOpenId; - } - - public String getMpAppId() { - return mpAppId; - } - - public void setMpAppId(String mpAppId) { - this.mpAppId = mpAppId; - } - - public Integer getMpSubscribe() { - return mpSubscribe; - } - - public void setMpSubscribe(Integer mpSubscribe) { - this.mpSubscribe = mpSubscribe; - } - - public Date getMpSubscribeTime() { - return mpSubscribeTime; - } - - public void setMpSubscribeTime(Date mpSubscribeTime) { - this.mpSubscribeTime = mpSubscribeTime; - } - - public String getMpSubscribeScene() { - return mpSubscribeScene; - } - - public void setMpSubscribeScene(String mpSubscribeScene) { - this.mpSubscribeScene = mpSubscribeScene; - } - - public String getSubsOpenId() { - return subsOpenId; - } - - public void setSubsOpenId(String subsOpenId) { - this.subsOpenId = subsOpenId; - } - - public String getSubsAppId() { - return subsAppId; - } - - public void setSubsAppId(String subsAppId) { - this.subsAppId = subsAppId; - } - - public Integer getSubsSubscribe() { - return subsSubscribe; - } - - public void setSubsSubscribe(Integer subsSubscribe) { - this.subsSubscribe = subsSubscribe; - } - - public Date getSubsSubscribeTime() { - return subsSubscribeTime; - } - - public void setSubsSubscribeTime(Date subsSubscribeTime) { - this.subsSubscribeTime = subsSubscribeTime; - } - - public String getSubsSubscribeScene() { - return subsSubscribeScene; - } - - public void setSubsSubscribeScene(String subsSubscribeScene) { - this.subsSubscribeScene = subsSubscribeScene; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java index 7629bff..7146e63 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.*; import javax.persistence.Transient; import java.util.List; @@ -7,6 +9,7 @@ import javax.persistence.Id; import java.io.Serializable; @Table(name = "wx_pay_account") +@Data public class WxPayAccount implements Serializable { private static final long serialVersionUID = 1L; @@ -17,118 +20,26 @@ public class WxPayAccount implements Serializable { 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; - } - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /**微信商户号/特约服务商号**/ @io.swagger.annotations.ApiModelProperty(value="微信商户号/特约服务商号",name="mchId") private String mchId; - /**微信服务商号*/ @io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="subMchId") private String subMchId; - /**支付密钥**/ @io.swagger.annotations.ApiModelProperty(value="支付密钥",name="apiKey") private String apiKey; - /**微信回调,支持3种回调,(1.url/pay 2.url/refund3.url/separate)**/ @io.swagger.annotations.ApiModelProperty(value="微信回调,支持3种回调,(1.url/pay 2.url/refund3.url/separate)",name="notifyUrl") private String notifyUrl; - /**证书本地存放位置**/ @io.swagger.annotations.ApiModelProperty(value="证书本地存放位置",name="certPath") private String certPath; - /**商户模式**/ @io.swagger.annotations.ApiModelProperty(value="商户模式-0:普通商户模式1:服务商模式",name="type") private Integer type; - /**是否开启分账**/ @io.swagger.annotations.ApiModelProperty(value="0:未开启分账1:开启分账",name="type") private Integer share; - /**手续费**/ @io.swagger.annotations.ApiModelProperty(value="手续费",name="rate") private Integer rate; - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public String getMchId() { - return mchId; - } - public void setMchId(String _mchId) { - mchId = _mchId; - } - - public String getSubMchId() { - return subMchId; - } - - public void setSubMchId(String subMchId) { - this.subMchId = subMchId; - } - - public String getApiKey() { - return apiKey; - } - public void setApiKey(String _apiKey) { - apiKey = _apiKey; - } - public String getNotifyUrl() { - return notifyUrl; - } - public void setNotifyUrl(String _notifyUrl) { - notifyUrl = _notifyUrl; - } - public String getCertPath() { - return certPath; - } - public void setCertPath(String _certPath) { - certPath = _certPath; - } - public Integer getType() { - return type; - } - public void setType(Integer type) { - this.type = type; - } - public Integer getShare() { - return share; - } - public void setShare(Integer share) { - this.share = share; - } - - public Integer getRate() { - return rate; - } - - public void setRate(Integer rate) { - this.rate = rate; - } - public String getPayNotifyUrl() { return notifyUrl + "/pay"; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java index b7d07ab..9b75ce2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.*; import java.util.*; import javax.persistence.Transient; @@ -8,6 +10,7 @@ import javax.persistence.Id; import java.io.Serializable; @Table(name = "wx_pay_order") +@Data public class WxPayOrder implements Serializable { private static final long serialVersionUID = 1L; @@ -18,224 +21,47 @@ public class WxPayOrder implements Serializable { 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; - } - - - - /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; - /**更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") private Date updateTime; - /**订单ID**/ @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") private Long orderId; - /**用户ID**/ @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") private Long cUserId; - /**B端用户ID**/ @io.swagger.annotations.ApiModelProperty(value="B端用户ID",name="bUserId") private Long bUserId; - /**扫码授权编码**/ @io.swagger.annotations.ApiModelProperty(value="扫码授权编码",name="authCode") private String authCode; - /**ip地址**/ @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") private String ip; - /**支付金额(分)**/ @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") private Integer payAmount; - /**支付发起时间**/ @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") private Date payTimeStart; - /**支付结束时间**/ @io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd") private Date payTimeEnd; - /**微信预支付交易会话标识**/ @io.swagger.annotations.ApiModelProperty(value="微信预支付交易会话标识",name="prepayId") private String prepayId; - /**微信生成的订单号**/ @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") private String transactionId; - /**支付渠道: 0-微信 1-支付宝 2-银联 **/ @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="payVendor") private Integer payVendor; - /**支付订单号**/ @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") private String payOrderNo; - /**支付状态: 0-支付中;1-支付成功;2-支付失败**/ @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payOrderStatus") private Integer payOrderStatus; - /**分账状态: 0-未分账;1-分账**/ @io.swagger.annotations.ApiModelProperty(value="分账状态: 0-未分账;1-分账",name="payOrderStatus") private Integer share; - /**分账金额(总金额扣除手续费后的金额)**/ - @io.swagger.annotations.ApiModelProperty(value="分账金额",name="shareAmount") + @io.swagger.annotations.ApiModelProperty(value="分账金额(总金额扣除手续费后的金额)",name="shareAmount") private Integer shareAmount; - /**支付失败原因**/ @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") private String failReason; @io.swagger.annotations.ApiModelProperty(value="支付后结果来源(0:callback, 1:query)",name="payEndFrom") private Integer payEndFrom; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Date getCreateTime() { - return createTime; - } - public void setCreateTime(Date _createTime) { - createTime = _createTime; - } - public Date getUpdateTime() { - return updateTime; - } - public void setUpdateTime(Date _updateTime) { - updateTime = _updateTime; - } - public Long getOrderId() { - return orderId; - } - public void setOrderId(Long _orderId) { - orderId = _orderId; - } - - public Long getcUserId() { - return cUserId; - } - - public void setcUserId(Long cUserId) { - this.cUserId = cUserId; - } - - public Long getbUserId() { - return bUserId; - } - - public void setbUserId(Long bUserId) { - this.bUserId = bUserId; - } - - public String getAuthCode() { - return authCode; - } - - public void setAuthCode(String authCode) { - this.authCode = authCode; - } - - public String getIp() { - return ip; - } - public void setIp(String _ip) { - ip = _ip; - } - public Integer getPayAmount() { - return payAmount; - } - public void setPayAmount(Integer _payAmount) { - payAmount = _payAmount; - } - public Date getPayTimeStart() { - return payTimeStart; - } - public void setPayTimeStart(Date _payTimeStart) { - payTimeStart = _payTimeStart; - } - public Date getPayTimeEnd() { - return payTimeEnd; - } - public void setPayTimeEnd(Date _payTimeEnd) { - payTimeEnd = _payTimeEnd; - } - - public String getPrepayId() { - return prepayId; - } - - public void setPrepayId(String prepayId) { - this.prepayId = prepayId; - } - - public String getTransactionId() { - return transactionId; - } - public void setTransactionId(String _transactionId) { - transactionId = _transactionId; - } - public Integer getPayVendor() { - return payVendor; - } - public void setPayVendor(Integer _payVendor) { - payVendor = _payVendor; - } - public String getPayOrderNo() { - return payOrderNo; - } - public void setPayOrderNo(String _payOrderNo) { - payOrderNo = _payOrderNo; - } - public Integer getPayOrderStatus() { - return payOrderStatus; - } - public void setPayOrderStatus(Integer _payOrderStatus) { - payOrderStatus = _payOrderStatus; - } - - public Integer getShare() { - return share; - } - public void setShare(Integer share) { - this.share = share; - } - - public Integer getShareAmount() { - return shareAmount; - } - - public void setShareAmount(Integer shareAmount) { - this.shareAmount = shareAmount; - } - - public String getFailReason() { - return failReason; - } - public void setFailReason(String _failReason) { - failReason = _failReason; - } - - public Integer getPayEndFrom() { - return payEndFrom; - } - - public void setPayEndFrom(Integer payEndFrom) { - this.payEndFrom = payEndFrom; - } public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java index db4fc6d..5dcd5f2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java @@ -21,21 +21,15 @@ public class WxTemplateMsg implements Serializable { protected List ids; @Transient protected String sortColumns; - - - /**租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /**模板ID**/ @io.swagger.annotations.ApiModelProperty(value="模板ID",name="templateId") private String templateId; - /**模板类型1:核销成功消息, 2:核销失败消息**/ @io.swagger.annotations.ApiModelProperty(value="模板类型1:核销成功消息,2:核销失败消息",name="type") private Integer type; - /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /**更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java index 6cb9888..6f8e533 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java @@ -20,26 +20,19 @@ public class WxWeappBasicSet implements Serializable { protected List ids; @Transient protected String sortColumns; - - /**小程序类型(1-B端 2-C端)*/ + @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") private Integer type; - /**部署类型(1:dev,2:test,3:prod)*/ @io.swagger.annotations.ApiModelProperty(value="部署类型(1:dev,2:test,3:prod)",name="deploy") private Integer deploy; - /**服务器域名*/ @io.swagger.annotations.ApiModelProperty(value="服务器域名",name="domainUrl") private String domainUrl; - /**小程序基础版本*/ @io.swagger.annotations.ApiModelProperty(value="小程序基础版本",name="version") private String version; - /**模板库信息*/ @io.swagger.annotations.ApiModelProperty(value="模板库信息",name="templateInfo") private String templateInfo; - /**创建时间*/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /**更新时间*/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java index eff1ed1..f2ae99c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java @@ -20,26 +20,19 @@ public class WxWeappExtSet implements Serializable { protected List ids; @Transient protected String sortColumns; - - /**小程序ID*/ + @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; - /**小程序类型(1-B端 2-C端)*/ @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") private Integer type; - /**小程序扩展信息*/ @io.swagger.annotations.ApiModelProperty(value="小程序扩展信息",name="extJson") private String extJson; - /**提交审核列表*/ @io.swagger.annotations.ApiModelProperty(value="提交审核列表",name="releaseJson") private String releaseJson; - /**提交审核列表*/ @io.swagger.annotations.ApiModelProperty(value="停车(0:不支持,1:etcp)",name="carSupport") private Integer carSupport; - /**创建时间*/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /**更新时间*/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserInfoVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserInfoVo.java index 07661de..31f2ada 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserInfoVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserInfoVo.java @@ -1,7 +1,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.MallUserInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class MallUserInfoVo extends MallUserInfo { @io.swagger.annotations.ApiModelProperty(value="商场名",name="mallName") private String mallName; @@ -11,36 +17,4 @@ public class MallUserInfoVo extends MallUserInfo { private String imgUrl; @io.swagger.annotations.ApiModelProperty(value="商场图标",name="imgUrlH") private String imgUrlH; - - public String getMallName() { - return mallName; - } - - public void setMallName(String mallName) { - this.mallName = mallName; - } - - public String getMallGroup() { - return mallGroup; - } - - public void setMallGroup(String mallGroup) { - this.mallGroup = mallGroup; - } - - public String getImgUrl() { - return imgUrl; - } - - public void setImgUrl(String _imgUrl) { - this.imgUrl = _imgUrl; - } - - public String getImgUrlH() { - return imgUrlH; - } - - public void setImgUrlH(String imgUrlH) { - this.imgUrlH = imgUrlH; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxPayOrderVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxPayOrderVo.java index 8ed58c5..c65920c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxPayOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxPayOrderVo.java @@ -1,7 +1,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxPayOrder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxPayOrderVo extends WxPayOrder { @io.swagger.annotations.ApiModelProperty(value="用户绑定的openId",name="openId") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappAuditStatusVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappAuditStatusVo.java index ed9cad7..1969c5c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappAuditStatusVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappAuditStatusVo.java @@ -3,12 +3,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxWeappAuditStatus; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; @Data +@ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxWeappAuditStatusVo extends WxWeappAuditStatus { - - /**小程序名称*/ + @io.swagger.annotations.ApiModelProperty(value="小程序名称",name="name") private String name; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java index c91d1df..3baf43a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java @@ -3,12 +3,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxWeappCodeStatus; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; @Data +@ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxWeappCodeStatusVo extends WxWeappCodeStatus { - - /**小程序名称*/ + @io.swagger.annotations.ApiModelProperty(value="小程序名称",name="name") private String name; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java index 1be27ae..ef0b230 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java @@ -3,11 +3,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxAuthorizerInfo; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.ArrayList; import java.util.List; @Data +@ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxWeappInfo extends WxAuthorizerInfo { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappReleaseStatusVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappReleaseStatusVo.java index 6601de5..94f1118 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappReleaseStatusVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappReleaseStatusVo.java @@ -3,12 +3,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxWeappReleaseStatus; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; @Data +@ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxWeappReleaseStatusVo extends WxWeappReleaseStatus { - - /**小程序名称*/ + @io.swagger.annotations.ApiModelProperty(value="小程序名称",name="name") private String name; } From 680c7e3af01d08322b1e6811ad9931fd292d82e6 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Jun 2019 13:27:22 +0800 Subject: [PATCH 02/16] =?UTF-8?q?[controller][=E4=BF=AE=E6=94=B9]:basecont?= =?UTF-8?q?roller=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/controller/HomeController.java | 1 + .../java/com/iformall/controller/WechatCalllbackController.java | 1 + .../java/com/iformall/controller/WechatMediaController.java | 2 +- .../java/com/iformall/controller/WxWeappBasicSetController.java | 1 + .../java/com/iformall/controller/WxWeappExtSetController.java | 1 + .../java/com/iformall/controller/WxWeappInfoController.java | 2 +- .../java/com/iformall/controller/{ => base}/BaseController.java | 2 +- 7 files changed, 7 insertions(+), 3 deletions(-) rename mlWechatOpen/src/main/java/com/iformall/controller/{ => base}/BaseController.java (97%) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/HomeController.java b/mlWechatOpen/src/main/java/com/iformall/controller/HomeController.java index a2b93a4..b370a68 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/HomeController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/HomeController.java @@ -4,6 +4,7 @@ import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Producer; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.exception.MallinkException; import com.iformall.shiro.UserSession; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java index afefb5d..46a9cb8 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java @@ -7,6 +7,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.service.*; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatMediaController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatMediaController.java index d6ad5ca..db61792 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatMediaController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatMediaController.java @@ -1,6 +1,7 @@ package com.iformall.controller; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.service.WxAuthorizerInfoService; import com.iformall.service.wechat.FmOpenService; import io.swagger.annotations.Api; @@ -23,7 +24,6 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; -import java.util.UUID; /** * Stormeye Wu diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java index c32f35d..cf05151 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxWeappBasicSet; import com.iformall.service.WxWeappBasicSetService; import io.swagger.annotations.Api; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java index 8e394f3..37e2219 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxWeappExtSet; import com.iformall.enums.EnumAppType; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 91ac2e5..0bb1dcf 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -2,7 +2,6 @@ package com.iformall.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.template.WxMaTemplateAddResult; -import cn.binarywang.wx.miniapp.bean.template.WxMaTemplateListResult; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -13,6 +12,7 @@ import com.google.gson.reflect.TypeToken; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxWeappAuditStatusVo; import com.iformall.domain.vo.WxWeappCodeStatusVo; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/BaseController.java b/mlWechatOpen/src/main/java/com/iformall/controller/base/BaseController.java similarity index 97% rename from mlWechatOpen/src/main/java/com/iformall/controller/BaseController.java rename to mlWechatOpen/src/main/java/com/iformall/controller/base/BaseController.java index c77080f..cca8d3e 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/BaseController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/base/BaseController.java @@ -1,4 +1,4 @@ -package com.iformall.controller; +package com.iformall.controller.base; import com.iformall.utils.IPUtil; import org.springframework.web.bind.WebDataBinder; From 9fe889596db32fed69b50de4fac6d0a6c5116c72 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Jun 2019 13:27:41 +0800 Subject: [PATCH 03/16] =?UTF-8?q?[controller][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=8D=A1=E5=88=B8=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/config/ShiroConfig.java | 1 + .../controller/card/WxCardController.java | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java diff --git a/mlWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java b/mlWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java index 62e95a6..7e5d2f3 100644 --- a/mlWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mlWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java @@ -131,6 +131,7 @@ public class ShiroConfig { // 第三方平台 filterChainDefinitionMap.put("/wxOpen/**", "anon"); filterChainDefinitionMap.put("/wx/**", "anon"); + filterChainDefinitionMap.put("/wxCardIO/**", "anon"); // filterChainDefinitionMap.put("/role/**", "corsFilter,token"); diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java new file mode 100644 index 0000000..efe1f4a --- /dev/null +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -0,0 +1,41 @@ +package com.iformall.controller.card; + +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.service.wechat.FmOpenService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.mp.api.WxMpService; +import me.chanjar.weixin.mp.bean.card.WxMpCardUserGetCardListResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("wxCardIO") +@Api(description = "微信卡券接口") +public class WxCardController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private FmOpenService openService; + + @ApiOperation("获取用户卡券") + @GetMapping("getCardList/{appId}") + public ResultData getCardList(@PathVariable String appId, String openId) { + logger.debug("[" + getIpAddr() + "] WxCardController::getCardList"); + try { + WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); + WxMpCardUserGetCardListResult result = mpService.getCardService().getUserCardList(openId, null); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return new ResultData(); + } +} From 9f0c533c24e820391cb40dda9fd6029fe6d347e4 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Jun 2019 14:40:28 +0800 Subject: [PATCH 04/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E6=9F=A5=E8=AF=A2code=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/card/WxCardController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index efe1f4a..cf08dbc 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; +import me.chanjar.weixin.mp.bean.card.WxMpCardResult; import me.chanjar.weixin.mp.bean.card.WxMpCardUserGetCardListResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,4 +39,18 @@ public class WxCardController extends BaseController { } return new ResultData(); } + + @ApiOperation("查询Code接口") + @GetMapping("cardCodeGet/{appId}") + public ResultData cardCodeGet(@PathVariable String appId, String code) { + logger.debug("[" + getIpAddr() + "] WxCardController::cardCodeGet"); + try { + WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); + WxMpCardResult result = mpService.getCardService().queryCardCode(null, code, true); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return new ResultData(); + } } From 30d1838f563e0d4f1f9821fdf491fdbbe39c89c3 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Jun 2019 14:57:50 +0800 Subject: [PATCH 05/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8D=A1=E5=88=B8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/card/WxCardController.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index cf08dbc..8d5119b 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; +import me.chanjar.weixin.mp.bean.card.WxMpCardBatchGetResult; import me.chanjar.weixin.mp.bean.card.WxMpCardResult; import me.chanjar.weixin.mp.bean.card.WxMpCardUserGetCardListResult; import org.slf4j.Logger; @@ -17,6 +18,9 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; +import java.util.List; + @RestController @RequestMapping("wxCardIO") @Api(description = "微信卡券接口") @@ -53,4 +57,35 @@ public class WxCardController extends BaseController { } return new ResultData(); } + + @ApiOperation("查看卡券详情") + @GetMapping("cardGet/{appId}") + public ResultData cardGet(@PathVariable String appId, String cardId) { + logger.debug("[" + getIpAddr() + "] WxCardController::cardGet"); + try { + WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); + String result = mpService.getCardService().getCardDetail(cardId); + logger.info(result); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return new ResultData(); + } + + @ApiOperation("批量查询卡券列表") + @GetMapping("cardBatchGet/{appId}") + public ResultData cardBatchGet(@PathVariable String appId) { + logger.debug("[" + getIpAddr() + "] WxCardController::cardBatchGet"); + List statusList = new ArrayList<>(); + statusList.add("CARD_STATUS_NOT_VERIFY"); + statusList.add("CARD_STATUS_VERIFY_OK"); + try { + WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); + WxMpCardBatchGetResult result = mpService.getCardService().getCardBatchGet(0, 10, statusList); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return new ResultData(); + } } From fa95b1bc12594d5fdfb172588925776105133a60 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Jun 2019 14:59:56 +0800 Subject: [PATCH 06/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8D=A1=E5=88=B8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/card/WxCardController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index 8d5119b..57676a9 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -74,11 +74,10 @@ public class WxCardController extends BaseController { @ApiOperation("批量查询卡券列表") @GetMapping("cardBatchGet/{appId}") - public ResultData cardBatchGet(@PathVariable String appId) { + public ResultData cardBatchGet(@PathVariable String appId, String status) { logger.debug("[" + getIpAddr() + "] WxCardController::cardBatchGet"); List statusList = new ArrayList<>(); - statusList.add("CARD_STATUS_NOT_VERIFY"); - statusList.add("CARD_STATUS_VERIFY_OK"); + statusList.add(status); try { WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); WxMpCardBatchGetResult result = mpService.getCardService().getCardBatchGet(0, 10, statusList); From 509693c15280ceb0ad15883bfb319901579acf8c Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Jun 2019 15:00:52 +0800 Subject: [PATCH 07/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8D=A1=E5=88=B8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/card/WxCardController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index 57676a9..26b094a 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -72,7 +72,7 @@ public class WxCardController extends BaseController { return new ResultData(); } - @ApiOperation("批量查询卡券列表") + @ApiOperation(value = "批量查询卡券列表", notes = "status: CARD_STATUS_NOT_VERIFY”, 待审核 ; “CARD_STATUS_VERIFY_FAIL”, 审核失败; “CARD_STATUS_VERIFY_OK”, 通过审核; “CARD_STATUS_DELETE”, 卡券被商户删除; “CARD_STATUS_DISPATCH”") @GetMapping("cardBatchGet/{appId}") public ResultData cardBatchGet(@PathVariable String appId, String status) { logger.debug("[" + getIpAddr() + "] WxCardController::cardBatchGet"); From f40dee87ee149965d256956895e9f071a7e690f9 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Jun 2019 15:37:05 +0800 Subject: [PATCH 08/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8D=A1=E5=88=B8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/card/WxCardController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index 26b094a..545489d 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -72,7 +72,7 @@ public class WxCardController extends BaseController { return new ResultData(); } - @ApiOperation(value = "批量查询卡券列表", notes = "status: CARD_STATUS_NOT_VERIFY”, 待审核 ; “CARD_STATUS_VERIFY_FAIL”, 审核失败; “CARD_STATUS_VERIFY_OK”, 通过审核; “CARD_STATUS_DELETE”, 卡券被商户删除; “CARD_STATUS_DISPATCH”") + @ApiOperation(value = "批量查询卡券列表", notes = "status: CARD_STATUS_NOT_VERIFY”, 待审核 ; “CARD_STATUS_VERIFY_FAIL”, 审核失败; “CARD_STATUS_VERIFY_OK”, 通过审核; “CARD_STATUS_DELETE”, 卡券被商户删除; “CARD_STATUS_DISPATCH”,在公众平台投放过的卡券") @GetMapping("cardBatchGet/{appId}") public ResultData cardBatchGet(@PathVariable String appId, String status) { logger.debug("[" + getIpAddr() + "] WxCardController::cardBatchGet"); From ca19654f7f2325cee1481f5e2fb4251351749467 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 6 Jun 2019 06:36:37 +0800 Subject: [PATCH 09/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E5=AE=A2=E6=9C=8D=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E9=80=81=E7=BB=99=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/card/WxCardController.java | 236 +++++++++++++++++- 1 file changed, 233 insertions(+), 3 deletions(-) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index 545489d..21c5a6e 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -7,9 +7,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.bean.card.WxMpCardBatchGetResult; -import me.chanjar.weixin.mp.bean.card.WxMpCardResult; -import me.chanjar.weixin.mp.bean.card.WxMpCardUserGetCardListResult; +import me.chanjar.weixin.mp.bean.card.*; +import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage; +import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardCreateMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +30,236 @@ public class WxCardController extends BaseController { @Autowired private FmOpenService openService; + @ApiOperation("创建卡券") + @GetMapping("createCard/{appId}") + public ResultData createCard(@PathVariable String appId, String type) { + logger.debug("[" + getIpAddr() + "] WxCardController::createCard"); + + BaseInfo base = new BaseInfo(); + base.setLogoUrl("http://mmbiz.qpic.cn/mmbiz_png/2kbqxXJ9VM94Uq1YAsZDPKcWnNIOU4lv2PJmgIf1HIicldDibj2xcXjwSeqI7ZTfUj0wOokFmurO6gA7ppzF0pug/0?wx_fmt=png"); + base.setBrandName("测试优惠券"); + base.setCodeType("CODE_TYPE_QRCODE"); + base.setTitle("测试标题"); + base.setColor("Color010"); + base.setNotice("测试Notice"); + base.setServicePhone("020-88888888"); + base.setDescription("不可与其他优惠同享\\n如需团购券发票,请在消费时向商户提出\\n店内均可使用,仅限堂食"); + DateInfo info = new DateInfo(); + info.setType("DATE_TYPE_FIX_TERM"); + info.setFixedBeginTerm(0); + info.setFixedTerm(30); + base.setDateInfo(info); + Sku sku = new Sku(); + sku.setQuantity(100); + base.setSku(sku); + base.setGetLimit(1); + base.setCanShare(true); + base.setCanGiveFriend(true); + base.setUseAllLocations(true); + base.setCenterTitle("顶部居中按钮"); + base.setCenterSubTitle("按钮下方的wording"); + base.setCenterUrl("www.qq.com"); + base.setCustomUrl("http://www.qq.com"); + base.setCustomUrlName("立即使用"); + base.setCustomUrlSubTitle("副标题tip"); + base.setPromotionUrlName("更多优惠"); + base.setPromotionUrl("http://www.qq.com"); + base.setLocationIdList("1234"); + WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); + + if(type.equalsIgnoreCase("groupon")) { + //团购券 + WxMpCardCreateMessage grouponMessage = new WxMpCardCreateMessage(); + GrouponCardCreateRequest grouponCardCreateRequest = new GrouponCardCreateRequest(); + GrouponCard grouponCard = new GrouponCard(); + grouponCard.setBaseInfo(base); + grouponCard.setDealDetail("deal detail"); + + grouponCardCreateRequest.setGroupon(grouponCard); + grouponMessage.setCardCreateRequest(grouponCardCreateRequest); + + try { + + WxMpCardCreateResult result = mpService.getCardService().createCard(grouponMessage); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + } else if(type.equalsIgnoreCase("cash")) { + //现金券 + WxMpCardCreateMessage cashMessage = new WxMpCardCreateMessage(); + CashCardCreateRequest cashCardCreateRequest = new CashCardCreateRequest(); + CashCard cashCard = new CashCard(); + cashCard.setBaseInfo(base); + cashCard.setLeastCost(1000); + cashCard.setReduceCost(100); + + cashCardCreateRequest.setCash(cashCard); + cashMessage.setCardCreateRequest(cashCardCreateRequest); + try { + WxMpCardCreateResult result = mpService.getCardService().createCard(cashMessage); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + } else if(type.equalsIgnoreCase("discount")) { + //折扣券 + WxMpCardCreateMessage discountMessage = new WxMpCardCreateMessage(); + DiscountCardCreateRequest discountCardCreateRequest = new DiscountCardCreateRequest(); + DiscountCard discountCard = new DiscountCard(); + discountCard.setBaseInfo(base); + discountCard.setDiscount(30); + + discountCardCreateRequest.setDiscount(discountCard); + discountMessage.setCardCreateRequest(discountCardCreateRequest); + + try { + WxMpCardCreateResult result = mpService.getCardService().createCard(discountMessage); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + } else if(type.equalsIgnoreCase("gift")) { + //兑换券 + WxMpCardCreateMessage giftMessage = new WxMpCardCreateMessage(); + GiftCardCreateRequest giftCardCreateRequest = new GiftCardCreateRequest(); + GiftCard giftCard = new GiftCard(); + giftCard.setBaseInfo(base); + giftCard.setGift("星巴克雪瑞纳咖啡大杯"); + + giftCardCreateRequest.setGift(giftCard); + giftMessage.setCardCreateRequest(giftCardCreateRequest); + try { + WxMpCardCreateResult result = mpService.getCardService().createCard(giftMessage); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + } else if(type.equalsIgnoreCase("generalcard")) { + //普通兑换券 + WxMpCardCreateMessage generalMessage = new WxMpCardCreateMessage(); + GeneralCardCreateRequest generalCardCreateRequest = new GeneralCardCreateRequest(); + GeneralCard generalCard = new GeneralCard(); + generalCard.setBaseInfo(base); + generalCard.setDefaultDetail("音乐木盒"); + + generalCardCreateRequest.setGeneralCoupon(generalCard); + generalMessage.setCardCreateRequest(generalCardCreateRequest); + try { + WxMpCardCreateResult result = mpService.getCardService().createCard(generalMessage); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + } else if(type.equalsIgnoreCase("membercard")) { + //基本卡券创建 + WxMpMemberCardCreateMessage createMessage = new WxMpMemberCardCreateMessage(); + MemberCardCreateRequest cardCreateRequest = new MemberCardCreateRequest(); + MemberCard memberCard = new MemberCard(); + memberCard.setPrerogative("特权说明"); + //激活方式 + memberCard.setAutoActivate(true);//自动激活 +// memberCard.setActivateUrl("http://www.qq.com"); +// memberCard.setWxActivate(false);//微信激活 + memberCard.setSupplyBonus(true); + memberCard.setSupplyBalance(false); + memberCard.setBackgroundPicUrl(null); + memberCard.setDiscount(0); + + BaseInfo baseInfo = new BaseInfo(); + baseInfo.setLogoUrl("http://mmbiz.qpic.cn/mmbiz_png/2kbqxXJ9VM94Uq1YAsZDPKcWnNIOU4lv2PJmgIf1HIicldDibj2xcXjwSeqI7ZTfUj0wOokFmurO6gA7ppzF0pug/0?wx_fmt=png"); + baseInfo.setCodeType("CODE_TYPE_QRCODE"); + baseInfo.setBrandName("金泸科技"); + baseInfo.setTitle("铂金用户贵宾卡"); + baseInfo.setColor("Color010"); + baseInfo.setNotice("卡券使用提醒"); + baseInfo.setDescription("卡券使用说明"); + baseInfo.setServicePhone("4008803016"); + //商品信息 + Sku sku1 = new Sku(); + baseInfo.setSku(sku1); + //使用日期 + DateInfo dateInfo = new DateInfo(); + baseInfo.setDateInfo(dateInfo); + + memberCard.setBaseInfo(baseInfo); + memberCard.setBonusRules("请参考积分规则"); + + cardCreateRequest.setMemberCard(memberCard); + createMessage.setCardCreateRequest(cardCreateRequest); + + try { + WxMpCardCreateResult result = mpService.getMemberCardService().createMemberCard(createMessage); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + } else if(type.equalsIgnoreCase("giftcard")) { + //基本卡券创建 + WxMpMemberCardCreateMessage createMessage = new WxMpMemberCardCreateMessage(); + MemberCardCreateRequest cardCreateRequest = new MemberCardCreateRequest(); + MemberCard memberCard = new MemberCard(); + memberCard.setPrerogative("特权说明"); + //激活方式 + memberCard.setAutoActivate(true);//自动激活 +// memberCard.setActivateUrl("http://www.qq.com"); +// memberCard.setWxActivate(false);//微信激活 + memberCard.setSupplyBonus(true); + memberCard.setSupplyBalance(false); + memberCard.setBackgroundPicUrl(null); + memberCard.setDiscount(0); + + BaseInfo baseInfo = new BaseInfo(); + baseInfo.setLogoUrl("http://mmbiz.qpic.cn/mmbiz_png/2kbqxXJ9VM94Uq1YAsZDPKcWnNIOU4lv2PJmgIf1HIicldDibj2xcXjwSeqI7ZTfUj0wOokFmurO6gA7ppzF0pug/0?wx_fmt=png"); + baseInfo.setCodeType("CODE_TYPE_QRCODE"); + baseInfo.setBrandName("金泸科技"); + baseInfo.setTitle("铂金用户贵宾卡"); + baseInfo.setColor("Color010"); + baseInfo.setNotice("卡券使用提醒"); + baseInfo.setDescription("卡券使用说明"); + baseInfo.setServicePhone("4008803016"); + //商品信息 + Sku sku1 = new Sku(); + baseInfo.setSku(sku1); + //使用日期 + DateInfo dateInfo = new DateInfo(); + baseInfo.setDateInfo(dateInfo); + + memberCard.setBaseInfo(baseInfo); + memberCard.setBonusRules("请参考积分规则"); + + cardCreateRequest.setMemberCard(memberCard); + createMessage.setCardCreateRequest(cardCreateRequest); + + try { + WxMpCardCreateResult result = mpService.getMemberCardService().createMemberCard(createMessage); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + } + return new ResultData(); + } + + @ApiOperation("发送客服消息-用户卡券") + @GetMapping("sendCard/{appId}") + public ResultData sendCard(@PathVariable String appId, String openId, String cardId) { + logger.debug("[" + getIpAddr() + "] WxCardController::sendCard"); + WxMpKefuMessage kfMessage = new WxMpKefuMessage(); + kfMessage.setToUser(openId); + kfMessage.setMsgType("wxcard"); + kfMessage.setCardId(cardId); + + try { + WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); + boolean result = mpService.getKefuService().sendKefuMessage(kfMessage); + logger.info("{}", result); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return new ResultData(); + } + @ApiOperation("获取用户卡券") @GetMapping("getCardList/{appId}") public ResultData getCardList(@PathVariable String appId, String openId) { From 3a66b647f90c232cf57eec65d17069c686286f6e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 6 Jun 2019 09:44:54 +0800 Subject: [PATCH 10/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E5=AE=A2=E6=9C=8D=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E9=80=81=E7=BB=99=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/card/WxCardController.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index 21c5a6e..029f513 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -5,6 +5,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.service.wechat.FmOpenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.card.*; @@ -67,7 +68,7 @@ public class WxCardController extends BaseController { base.setLocationIdList("1234"); WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); - if(type.equalsIgnoreCase("groupon")) { + if (type.equalsIgnoreCase("groupon")) { //团购券 WxMpCardCreateMessage grouponMessage = new WxMpCardCreateMessage(); GrouponCardCreateRequest grouponCardCreateRequest = new GrouponCardCreateRequest(); @@ -85,7 +86,7 @@ public class WxCardController extends BaseController { } catch (WxErrorException e) { logger.error(e.getMessage()); } - } else if(type.equalsIgnoreCase("cash")) { + } else if (type.equalsIgnoreCase("cash")) { //现金券 WxMpCardCreateMessage cashMessage = new WxMpCardCreateMessage(); CashCardCreateRequest cashCardCreateRequest = new CashCardCreateRequest(); @@ -102,7 +103,7 @@ public class WxCardController extends BaseController { } catch (WxErrorException e) { logger.error(e.getMessage()); } - } else if(type.equalsIgnoreCase("discount")) { + } else if (type.equalsIgnoreCase("discount")) { //折扣券 WxMpCardCreateMessage discountMessage = new WxMpCardCreateMessage(); DiscountCardCreateRequest discountCardCreateRequest = new DiscountCardCreateRequest(); @@ -119,7 +120,7 @@ public class WxCardController extends BaseController { } catch (WxErrorException e) { logger.error(e.getMessage()); } - } else if(type.equalsIgnoreCase("gift")) { + } else if (type.equalsIgnoreCase("gift")) { //兑换券 WxMpCardCreateMessage giftMessage = new WxMpCardCreateMessage(); GiftCardCreateRequest giftCardCreateRequest = new GiftCardCreateRequest(); @@ -135,7 +136,7 @@ public class WxCardController extends BaseController { } catch (WxErrorException e) { logger.error(e.getMessage()); } - } else if(type.equalsIgnoreCase("generalcard")) { + } else if (type.equalsIgnoreCase("generalcard")) { //普通兑换券 WxMpCardCreateMessage generalMessage = new WxMpCardCreateMessage(); GeneralCardCreateRequest generalCardCreateRequest = new GeneralCardCreateRequest(); @@ -151,7 +152,7 @@ public class WxCardController extends BaseController { } catch (WxErrorException e) { logger.error(e.getMessage()); } - } else if(type.equalsIgnoreCase("membercard")) { + } else if (type.equalsIgnoreCase("membercard")) { //基本卡券创建 WxMpMemberCardCreateMessage createMessage = new WxMpMemberCardCreateMessage(); MemberCardCreateRequest cardCreateRequest = new MemberCardCreateRequest(); @@ -194,7 +195,7 @@ public class WxCardController extends BaseController { } catch (WxErrorException e) { logger.error(e.getMessage()); } - } else if(type.equalsIgnoreCase("giftcard")) { + } else if (type.equalsIgnoreCase("giftcard")) { //基本卡券创建 WxMpMemberCardCreateMessage createMessage = new WxMpMemberCardCreateMessage(); MemberCardCreateRequest cardCreateRequest = new MemberCardCreateRequest(); @@ -241,13 +242,15 @@ public class WxCardController extends BaseController { return new ResultData(); } + @ApiOperation("发送客服消息-用户卡券") @GetMapping("sendCard/{appId}") - public ResultData sendCard(@PathVariable String appId, String openId, String cardId) { + public ResultData sendCard(@PathVariable String appId, String cardId) { logger.debug("[" + getIpAddr() + "] WxCardController::sendCard"); WxMpKefuMessage kfMessage = new WxMpKefuMessage(); + String openId = "onxhD5tpknKjLCxMe0FKUULE8zUg"; kfMessage.setToUser(openId); - kfMessage.setMsgType("wxcard"); + kfMessage.setMsgType(WxConsts.KefuMsgType.WXCARD); kfMessage.setCardId(cardId); try { From 92337daa408cbf1bdc4c094987c24e71d14cade5 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 6 Jun 2019 13:36:26 +0800 Subject: [PATCH 11/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E4=BC=9A=E5=91=98=E5=8D=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/card/WxCardController.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index 029f513..8f6abe9 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -11,6 +11,8 @@ import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.card.*; import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage; import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardCreateMessage; +import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateMessage; +import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -320,4 +322,25 @@ public class WxCardController extends BaseController { } return new ResultData(); } + + @ApiOperation(value = "更新卡信息") + @GetMapping("updateCardUser/{appId}") + public ResultData updateCardUser(@PathVariable String appId, String code) { + logger.debug("[" + getIpAddr() + "] WxCardController::updateCardUser"); + String cardId = "pnxhD5rozwYIX7j210S9thySoN0w"; + WxMpMemberCardUpdateMessage updateMessage = new WxMpMemberCardUpdateMessage(); + updateMessage.setAddBounus(100); + updateMessage.setBonus(1000); + updateMessage.setCardId(cardId); + updateMessage.setCode(code); + + WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); + try { + WxMpMemberCardUpdateResult result = mpService.getMemberCardService().updateUserMemberCard(updateMessage); + logger.info(result.toString()); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return new ResultData(); + } } From 8ae052be92f28a1eff6cd06ae277817cec9336e3 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 7 Jun 2019 22:08:49 +0800 Subject: [PATCH 12/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E5=8D=A1=E5=A4=B1=E6=95=88=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/card/WxCardController.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index 8f6abe9..d905b64 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -343,4 +343,21 @@ public class WxCardController extends BaseController { } return new ResultData(); } + + @ApiOperation(value = "失效卡") + @GetMapping("unavailableCardCode/{appId}") + public ResultData unavailableCardCode(@PathVariable String appId, String code) { + logger.debug("[" + getIpAddr() + "] WxCardController::unavailableCardCode"); + String cardId = "pnxhD5rozwYIX7j210S9thySoN0w"; + String reason = "会员卡退卡"; + + WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); + try { + String result = mpService.getCardService().unavailableCardCode(cardId, code, reason); + logger.info(result); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return new ResultData(); + } } From 637f09b1a6e768d9c175de384dd001e41a29ba86 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 10 Jun 2019 11:02:12 +0800 Subject: [PATCH 13/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E6=A0=B8=E9=94=80=E5=8D=A1=E5=88=B8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/card/WxCardController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index d905b64..5c426ff 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -293,6 +293,20 @@ public class WxCardController extends BaseController { return new ResultData(); } + @ApiOperation("核销Code接口") + @GetMapping("consumeCode/{appId}") + public ResultData consumeCode(@PathVariable String appId, String code) { + logger.debug("[" + getIpAddr() + "] WxCardController::consumeCode"); + try { + WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId); + String result = mpService.getCardService().consumeCardCode(code, null); + logger.info(result); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return new ResultData(); + } + @ApiOperation("查看卡券详情") @GetMapping("cardGet/{appId}") public ResultData cardGet(@PathVariable String appId, String cardId) { From e269de0b059e1473a9cd4d9d46006abba5f24edc Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 10 Jun 2019 17:06:33 +0800 Subject: [PATCH 14/16] =?UTF-8?q?[=E6=8E=88=E6=9D=83appId][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E7=B1=BB=E5=9E=8B=E6=9C=AA=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxAuthorizerInfoServiceImpl.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java index 81769be..8022691 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java @@ -99,21 +99,23 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { record.setUpdateTime(curDate); // 授权表 添加 authorizerInfoMapper.insertSelective(record); - if(appinfo.getType().equals(EnumAppType.C.getCode()) || - appinfo.getType().equals(EnumAppType.B.getCode())) { - // C/B 扩展配置表添加 - WxWeappExtSet weappExtSet = new WxWeappExtSet(); - weappExtSet.setId(record.getId()); - weappExtSet.setAppId(record.getAuthorizerAppid()); - if (appinfo.getType().equals(EnumAppType.C.getCode())) { - weappExtSet.setCarSupport(EnumCarSupport.NOCAR.getCode()); + if(appinfo.getType() != null) { + if (appinfo.getType().equals(EnumAppType.C.getCode()) || + appinfo.getType().equals(EnumAppType.B.getCode())) { + // C/B 扩展配置表添加 + WxWeappExtSet weappExtSet = new WxWeappExtSet(); + weappExtSet.setId(record.getId()); + weappExtSet.setAppId(record.getAuthorizerAppid()); + if (appinfo.getType().equals(EnumAppType.C.getCode())) { + weappExtSet.setCarSupport(EnumCarSupport.NOCAR.getCode()); + } + if (appinfo != null) { + weappExtSet.setType(appinfo.getType()); + } + weappExtSet.setCreateDate(curDate); + weappExtSet.setUpdateDate(curDate); + weappExtSetMapper.insertSelective(weappExtSet); } - if (appinfo != null) { - weappExtSet.setType(appinfo.getType()); - } - weappExtSet.setCreateDate(curDate); - weappExtSet.setUpdateDate(curDate); - weappExtSetMapper.insertSelective(weappExtSet); } } else { record.setId(authorizerInfo.getId()); From 741ec103e244939c08e06ea9226d0055ee7b74c2 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 10 Jun 2019 17:06:56 +0800 Subject: [PATCH 15/16] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=8D=A1=E5=88=B8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/card/WxCardController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java index 5c426ff..0a8e005 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java @@ -155,7 +155,7 @@ public class WxCardController extends BaseController { logger.error(e.getMessage()); } } else if (type.equalsIgnoreCase("membercard")) { - //基本卡券创建 + //会员卡 WxMpMemberCardCreateMessage createMessage = new WxMpMemberCardCreateMessage(); MemberCardCreateRequest cardCreateRequest = new MemberCardCreateRequest(); MemberCard memberCard = new MemberCard(); @@ -198,7 +198,7 @@ public class WxCardController extends BaseController { logger.error(e.getMessage()); } } else if (type.equalsIgnoreCase("giftcard")) { - //基本卡券创建 + //礼品卡 WxMpMemberCardCreateMessage createMessage = new WxMpMemberCardCreateMessage(); MemberCardCreateRequest cardCreateRequest = new MemberCardCreateRequest(); MemberCard memberCard = new MemberCard(); @@ -207,7 +207,7 @@ public class WxCardController extends BaseController { memberCard.setAutoActivate(true);//自动激活 // memberCard.setActivateUrl("http://www.qq.com"); // memberCard.setWxActivate(false);//微信激活 - memberCard.setSupplyBonus(true); + memberCard.setSupplyBonus(false); memberCard.setSupplyBalance(false); memberCard.setBackgroundPicUrl(null); memberCard.setDiscount(0); From 64c2c3c3fa0aa61426802228a8971ad9d88e3a05 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 10 Jun 2019 17:28:17 +0800 Subject: [PATCH 16/16] =?UTF-8?q?[=E6=8E=88=E6=9D=83app][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=8F=AA=E6=9B=B4=E6=96=B0=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxAuthorizerInfoServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java index 8022691..f7977c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java @@ -143,7 +143,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setBaseStatus(record.getBaseStatus()); info.setBaseTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(record); + return authorizerInfoMapper.updateByPrimaryKeySelective(info); } @Override @@ -154,7 +154,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setDomainStatus(record.getDomainStatus()); info.setDomainTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(record); + return authorizerInfoMapper.updateByPrimaryKeySelective(info); } @Override @@ -165,7 +165,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setWebdomainStatus(record.getWebdomainStatus()); info.setWebdomainTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(record); + return authorizerInfoMapper.updateByPrimaryKeySelective(info); } @Override @@ -176,7 +176,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setTemplateStatus(record.getTemplateStatus()); info.setTemplateTime(curDate); info.setUpdateTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(record); + return authorizerInfoMapper.updateByPrimaryKeySelective(info); } @Override @@ -186,7 +186,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { info.setId(record.getId()); info.setOpenAppid(record.getOpenAppid()); info.setBindOpenTime(curDate); - return authorizerInfoMapper.updateByPrimaryKeySelective(record); + return authorizerInfoMapper.updateByPrimaryKeySelective(info); } @Override