合并

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserInfo.java

@@ -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();
-    }
 }

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

@@ -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));