Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
xiezhijun
2021-05-07 18:44:12 +08:00
parent 2033e4cb43 a5c1483076
commit d474e823c3
8 changed files with 169 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserInfo.java
View File

@@ -1,9 +1,10 @@
package com.stdiet.custom.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
/**
* 微信用户对象 sys_wx_user_info
@@ -11,144 +12,77 @@ import com.stdiet.common.core.domain.BaseEntity;
* @author wonder
* @date 2020-11-28
*/
public class SysWxUserInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@Data
public class SysWxUserInfo {
/** 微信openid */
/**
* 微信openid
*/
private String openid;
/** 昵称 */
@JsonIgnore
private Long cusId;
private String customerId;
/**
* 昵称
*/
@Excel(name = "昵称")
private String nickName;
/** 微信appid */
/**
* 微信appid
*/
@Excel(name = "微信appid")
private String appid;
/** 电话 */
/**
* 电话
*/
@Excel(name = "电话")
private String phone;
/** 用户头像 */
/**
* 用户头像
*/
@Excel(name = "用户头像")
private String avatarUrl;
/** 用户性别（0男 1女 2未知） */
/**
* 用户性别（0男 1女 2未知）
*/
@Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
private String sex;
/** 城市 */
/**
* 城市
*/
@Excel(name = "城市")
private String city;
/** 省份 */
/**
* 省份
*/
@Excel(name = "省份")
private String province;
/** 国家 */
private String language;
/**
* 国家
*/
@Excel(name = "国家")
private String country;
public void setOpenid(String openid)
{
this.openid = openid;
}
private Date createTime;
public String getOpenid()
{
return openid;
}
public void setNickName(String nickName)
{
this.nickName = nickName;
}
private String createBy;
public String getNickName()
{
return nickName;
}
public void setAppid(String appid)
{
this.appid = appid;
}
private Date updateTime;
public String getAppid()
{
return appid;
}
public void setPhone(String phone)
{
this.phone = phone;
}
private String updateBy;
public String getPhone()
{
return phone;
}
public void setAvatarUrl(String avatarUrl)
{
this.avatarUrl = avatarUrl;
}
private String remark;
public String getAvatarUrl()
{
return avatarUrl;
}
public void setSex(String sex)
{
this.sex = sex;
}
public String getSex()
{
return sex;
}
public void setCity(String city)
{
this.city = city;
}
public String getCity()
{
return city;
}
public void setProvince(String province)
{
this.province = province;
}
public String getProvince()
{
return province;
}
public void setCountry(String country)
{
this.country = country;
}
public String getCountry()
{
return country;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("openid", getOpenid())
.append("nickName", getNickName())
.append("appid", getAppid())
.append("phone", getPhone())
.append("avatarUrl", getAvatarUrl())
.append("sex", getSex())
.append("city", getCity())
.append("province", getProvince())
.append("country", getCountry())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

3
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
View File

@@ -279,6 +279,9 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
planStartDate = serverEndDate;
breakFlag = false;
}
if(planEndDate == planStartDate && StringUtils.isNotEmpty(pauseResult)) {
continue;
}
//暂停日期
sysRecipesPlan.setPauseDate(pauseResult[3]);
sysRecipesPlan.setStartDate(DateUtils.localDateToDate(planStartDate));

4
stdiet-custom/src/main/resources/mapper/custom/SysOrderPauseMapper.xml
View File

@@ -25,7 +25,7 @@
</sql>
<sql id="selectSysOrderPauseVo">
select id, order_id, cus_id, out_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag from sys_recipes_pause sop
select id, order_id, cus_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag from sys_recipes_pause sop
</sql>
<select id="selectSysOrderPauseList" parameterType="SysOrderPause" resultMap="SysOrderPauseResult">
@@ -86,7 +86,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="orderId != null">order_id = #{orderId},</if>
<if test="cusId != null">cus_id = #{cusId},</if>
<if test="outId != null">out_id = #{outId},</if>
<if test="cusId != null">out_id = md5(#{cusId}),</if>
<if test="pauseStartDate != null">pause_start_date = #{pauseStartDate},</if>
<if test="pauseEndDate != null">pause_end_date = #{pauseEndDate},</if>
<if test="reason != null">reason = #{reason},</if>

10
stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
View File

@@ -6,6 +6,7 @@
<resultMap type="SysWxUserInfo" id="SysWxUserInfoResult">
<result property="openid" column="openid"/>
<result property="cusId" column="cus_id"/>
<result property="nickName" column="nick_name"/>
<result property="appid" column="appid"/>
<result property="phone" column="phone"/>
@@ -19,10 +20,11 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<result property="language" column="language"/>
</resultMap>
<sql id="selectSysWxUserInfoVo">
select openid, nick_name, appid, phone, avatar_url, sex, city, province, country, create_by, create_time, update_by, update_time, remark from sys_wx_user_info
select * from sys_wx_user_info
</sql>
<select id="selectSysWxUserInfoList" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult">
@@ -54,6 +56,7 @@
<if test="openid != null">openid,</if>
<if test="nickName != null">nick_name,</if>
<if test="appid != null">appid,</if>
<if test="cusId != null">cus_id,</if>
<if test="phone != null">phone,</if>
<if test="avatarUrl != null">avatar_url,</if>
<if test="sex != null">sex,</if>
@@ -65,11 +68,13 @@
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="language != null">language,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="openid != null">#{openid},</if>
<if test="nickName != null">#{nickName},</if>
<if test="appid != null">#{appid},</if>
<if test="cusId != null">#{cusId},</if>
<if test="phone != null">#{phone},</if>
<if test="avatarUrl != null">#{avatarUrl},</if>
<if test="sex != null">#{sex},</if>
@@ -81,6 +86,7 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="language != null">#{language},</if>
</trim>
</insert>
@@ -89,6 +95,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="nickName != null">nick_name = #{nickName},</if>
<if test="appid != null">appid = #{appid},</if>
<if test="cusId != null">cus_id = #{cusId},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="avatarUrl != null">avatar_url = #{avatarUrl},</if>
<if test="sex != null">sex = #{sex},</if>
@@ -100,6 +107,7 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="language != null">language = #{language},</if>
</trim>
where openid = #{openid}
</update>