废弃代码清除

src/main/java/com/caimei/modules/info/dao/InfoDao.java

@@ -28,8 +28,6 @@ public interface InfoDao extends CrudDao<Info> {
 
 	void insertInfoPage(String id, String[] str);
 
-	List<Info> findByProjectId(String projectId);
-
 	int updateReplaceByLabel(String label, String reLabel);
 
 	void auditInfo(@Param("id") String id, @Param("auditStatus") Integer auditStatus, @Param("failReason") String failReason, @Param("pubdate") Date pubdate);

src/main/java/com/caimei/modules/miniprogram/dao/CmMiniProgramUserDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.miniprogram.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.miniprogram.entity.CmMiniProgramUser;
-
-/**
- * 小程序用户管理DAO接口
- * @author lwt
- * @version 2018-12-24
- */
-@MyBatisDao
-public interface CmMiniProgramUserDao extends CrudDao<CmMiniProgramUser> {
-	
-}

src/main/java/com/caimei/modules/miniprogram/dao/CmWxArticleDao.java

@@ -1,40 +0,0 @@
-package com.caimei.modules.miniprogram.dao;
-
-import com.caimei.modules.miniprogram.entity.CmWxArticlePo;
-import com.caimei.modules.miniprogram.entity.ProductPo;
-import com.caimei.modules.product.entity.Product;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.miniprogram.entity.CmWxArticle;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 微信文章存取DAO接口
- * @author ye.qin
- * @version 2018-12-17
- */
-@MyBatisDao
-public interface CmWxArticleDao extends CrudDao<CmWxArticle> {
-
-    int insert(CmWxArticle cmWxArticle);
-
-    void insertProduct(ProductPo product);
-
-    void insertArtile(CmWxArticlePo cmWxArticlePo);
-
-    List<CmWxArticlePo> getUnionArticle(@Param("articleId")String articleId);
-
-    List<ProductPo> getUnionProduct(@Param("articleId")String articleId);
-
-    List<CmWxArticle> findAllList(CmWxArticle cmWxArticle);
-
-    void deleteAllUnionArticle(@Param("articleId")String articleId);
-
-    void deleteAllUnionProduct(@Param("articleId")String articleId);
-
-    void deploy(CmWxArticle cmWxArticle);
-
-    void persist(CmWxArticle cmWxArticle);
-}

src/main/java/com/caimei/modules/miniprogram/dao/CmWxMenuDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.miniprogram.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.miniprogram.entity.CmWxMenu;
-
-/**
- * 小程序菜单DAO接口
- * @author lwt
- * @version 2018-12-24
- */
-@MyBatisDao
-public interface CmWxMenuDao extends CrudDao<CmWxMenu> {
-	
-}

src/main/java/com/caimei/modules/miniprogram/dao/CmWxPopularSearchDao.java

@@ -1,16 +0,0 @@
-package com.caimei.modules.miniprogram.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.miniprogram.entity.CmWxPopularSearch;
-
-import java.util.List;
-
-/**
- * 热门搜索配置DAO接口
- * @author ye.qin
- * @version 2018-12-27
- */
-@MyBatisDao
-public interface CmWxPopularSearchDao extends CrudDao<CmWxPopularSearch> {
-}

src/main/java/com/caimei/modules/miniprogram/dao/CmWxTagDao.java

@@ -1,19 +0,0 @@
-package com.caimei.modules.miniprogram.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.miniprogram.entity.CmWxTag;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 小程序标签DAO接口
- * @author lwt
- * @version 2018-12-25
- */
-@MyBatisDao
-public interface CmWxTagDao extends CrudDao<CmWxTag> {
-
-    List<CmWxTag> findByTagName(@Param("tagName") String tagName);
-}

src/main/java/com/caimei/modules/miniprogram/dao/CmWxXpsxProductDao.java

@@ -1,21 +0,0 @@
-package com.caimei.modules.miniprogram.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.miniprogram.entity.CmWxXpsxProduct;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 小程序新品上线商品DAO接口
- * @author lwt
- * @version 2018-12-26
- */
-@MyBatisDao
-public interface CmWxXpsxProductDao extends CrudDao<CmWxXpsxProduct> {
-
-    List<CmWxXpsxProduct> getByArticleId(@Param("articleId") String articleId);
-
-    void deleteByArticleId(@Param("articleId") String articleId);
-}

src/main/java/com/caimei/modules/miniprogram/entity/AccessToken.java

@@ -1,98 +0,0 @@
-package com.caimei.modules.miniprogram.entity;
-
-
-
-import com.caimei.modules.miniprogram.utils.JsonUtils;
-import com.caimei.modules.miniprogram.utils.ReturnCode;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * 封装 access_token
- */
-@SuppressWarnings("unchecked")
-public class AccessToken implements  Serializable {
-    private static final long serialVersionUID = -822464425433824314L;
-
-    private String access_token;    // 正确获取到 access_token 时有值
-    private Integer expires_in;        // 正确获取到 access_token 时有值
-    private Integer errcode;        // 出错时有值
-    private String errmsg;            // 出错时有值
-
-    private Long expiredTime;        // 正确获取到 access_token 时有值，存放过期时间
-    private String json;
-
-    public AccessToken(String jsonStr) {
-        this.json = jsonStr;
-
-        try {
-            Map<String, Object> temp = JsonUtils.json2Obj(jsonStr, Map.class);
-            access_token = (String) temp.get("access_token");
-            expires_in = (Integer) temp.get("expires_in");
-            errcode = (Integer) temp.get("errcode");
-            errmsg = (String) temp.get("errmsg");
-
-            if (expires_in != null) {
-                // expires_in - 9  用于控制在 access token 过期之前 9 秒就 "主动" 再次获取 access token
-                // 避免大并发场景下多线程同时获取 access token，造成公众平台 api 调用额度的浪费
-                expiredTime = System.currentTimeMillis() + ((expires_in - 9) * 1000);
-            }
-
-            // 用户缓存时还原
-            if (temp.containsKey("expiredTime")) {
-                expiredTime = (Long) temp.get("expiredTime");
-            }
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public String getJson() {
-        return json;
-    }
-
-    public String getCacheJson() {
-        Map<String, Object> temp = JsonUtils.json2Obj(json, Map.class);
-        temp.put("expiredTime", expiredTime);
-        temp.remove("expires_in");
-        return JsonUtils.obj2Json(temp);
-    }
-
-    public boolean isAvailable() {
-        if (expiredTime == null)
-            return false;
-        if (errcode != null)
-            return false;
-        if (expiredTime < System.currentTimeMillis())
-            return false;
-        return access_token != null;
-    }
-
-    public String getAccessToken() {
-        return access_token;
-    }
-
-    public Integer getExpiresIn() {
-        return expires_in;
-    }
-
-    public Long getExpiredTime() {
-        return expiredTime;
-    }
-
-    public Integer getErrorCode() {
-        return errcode;
-    }
-
-    public String getErrorMsg() {
-        if (errcode != null) {
-            String result = ReturnCode.get(errcode);
-            if (result != null)
-                return result;
-        }
-        return errmsg;
-    }
-}
-

src/main/java/com/caimei/modules/miniprogram/entity/CmMiniProgramUser.java

@@ -1,792 +0,0 @@
-package com.caimei.modules.miniprogram.entity;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-import org.hibernate.validator.constraints.Length;
-
-import java.beans.Transient;
-
-/**
- * 小程序用户管理Entity
- * @author lwt
- * @version 2018-12-24
- */
-public class CmMiniProgramUser extends DataEntity<CmMiniProgramUser> {
-	
-	private static final long serialVersionUID = 1L;
-	private String userID;		// userID
-	private String account;		// 企业账号名
-	private String mobile;		// 手机号码
-	private String email;		// 邮箱
-	private String userPermission;		// 用户权限 0游客 1 普通用户 2 会所 3 供应商 4 协销
-	private String userName;		// 用户名
-	private String bindMobile;		// 企业绑定手机号
-	private String image;		// 头像
-	private String password;		// 密码
-	private String userLevelID;		// 用户会员等级，见表c_userlevel或枚举UserLevel
-	private String name;		// 组织名称
-	private String realName;		// 真实姓名
-	private String nick;		// 昵称
-	private String sex;		// 性别
-	private String userIdentity;		// 用户身份 0、个人 1、协销 2、会所 3、供应商
-	private String registerUserTypeID;		// 用户类型，见表c_usertype或枚举UserType
-	private String companyUserID;		// 所属企业用户对应UserID
-	private String openID;		// 微信openID
-	private String manufacturerFlag;		// 【已废弃】是否是供应商，1是 空或0否
-	private String manufacturerStatus;		// 供应商状态，见表c_shopstatus或枚举ShopStatus
-	private String upgradeBy;		// 企业账号由哪一个用户升级而来,对应一个userID
-	private String shopID;		// 供应商Id
-	private String serviceProviderFlag;		// 【已废弃】是否创客，1是 空或0否
-	private String clubFlag;		// 【已废弃】是否会所，1是 空或0否
-	private String masterFlag;		// 【已废弃】达人标志
-	private String normalFlag;		// 【已废弃】
-	private String auditStatus;		// 审核状态
-	private String auditTime;		// 审核时间
-	private String auditNote;		// 审核备注
-	private String registerTime;		// 注册时间
-	private String registerIP;		// 注册ip
-	private String loginTime;		// 登录时间
-	private String loginIP;		// 登录ip
-	private String validFlag;		// 用户状态，1正常，0冻结
-	private String emailCheckFlag;		// emailCheckFlag
-	private String mobileCheckFlag;		// mobileCheckFlag
-	private String clubStatus;		// 会所状态，见表c_clubstatus或枚举ClubStatus
-	private String clubID;		// 会所Id
-	private String agreeFlag;		// 同意协议标志
-	private String activationCode;		// 【已废弃】
-	private String activationDate;		// 【已废弃】
-	private String serviceProviderStatus;		// 创客状态
-	private String serviceProviderID;		// 创客Id
-	private String masterStatus;		// 【已废弃】达人状态
-	private String masterID;		// 【已废弃】达人ID
-	private String userMoney;		// 账户余额
-	private String point;		// 积分
-	private String shopERPFlag;		// 开通ERP标志
-	private String fromUserID;		// 邀请人Id
-	private String fromUserName;		// 邀请人名称
-	private String logoffTime;		// 退出时间
-	private String appKey;		// appKey
-	private String appSecret;		// appSecret
-	private String sampleFlag;		// 【已废弃】
-	private String scanFlag;		// 扫描标志(4 CRM拉上来的会所) 0待扫描 1 已扫描 2已上线
-	private String sysroleid;		// 【已废弃】
-	private String gender;		// 【已废弃】
-	private String age;		// 年龄
-	private String salerbuyer;		// salerbuyer
-	private String position;		// position
-	private String skill;		// skill
-	private String workage;		// workage
-	private String wechat;		// 微信号
-	private String qq;		// QQ号
-	private String smsFlag;		// 短信是否发送成功
-	private String userBeans;		// 采美豆数量
-	private String privateShopFlag;		// 【已废弃】平台商标志位0非平台商 1平台商
-	private String privateClubFlag;		// 【已废弃】平台会所标志位0非平台会所 1平台会所
-	private String isMeiDaoAuthorized;		// 是否创客授权
-	private String guideFlag;		// 是否已经引导过(供应商首次登陆操作引导)
-	private String loginFailTime;		// loginFailTime
-	private String tipStatus;		// 用户登录时的提示状态：0 未提示 1 已提示
-	private String applyTime;		// 用户申请加入企业的时间
-	private String miniProgramOpenId;		// 小程序openId
-	private String miniProgramId;		// 小程序用户Id eg: x0001目的是用来记录小程序的用户数量
-	private String weixinNick; // 虚拟字段 关联wx_bind 表读取微信nick
-	private String userSearchID; // 用来查询的虚拟字段
-	
-	public CmMiniProgramUser() {
-		super();
-	}
-
-	public CmMiniProgramUser(String id){
-		super(id);
-	}
-
-	@Length(min=1, max=11, message="userID长度必须介于 1 和 11 之间")
-	public String getUserID() {
-		return userID;
-	}
-
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-	
-	@Length(min=0, max=20, message="企业账号名长度必须介于 0 和 20 之间")
-	public String getAccount() {
-		return account;
-	}
-
-	public void setAccount(String account) {
-		this.account = account;
-	}
-	
-	@Length(min=0, max=20, message="手机号码长度必须介于 0 和 20 之间")
-	public String getMobile() {
-		return mobile;
-	}
-
-	public void setMobile(String mobile) {
-		this.mobile = mobile;
-	}
-	
-	@Length(min=0, max=50, message="邮箱长度必须介于 0 和 50 之间")
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-	
-	@Length(min=0, max=11, message="用户权限 0游客 1 普通用户 2 会所 3 供应商 4 协销长度必须介于 0 和 11 之间")
-	public String getUserPermission() {
-		return userPermission;
-	}
-
-	public void setUserPermission(String userPermission) {
-		this.userPermission = userPermission;
-	}
-	
-	@Length(min=0, max=50, message="用户名长度必须介于 0 和 50 之间")
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-	
-	@Length(min=0, max=20, message="企业绑定手机号长度必须介于 0 和 20 之间")
-	public String getBindMobile() {
-		return bindMobile;
-	}
-
-	public void setBindMobile(String bindMobile) {
-		this.bindMobile = bindMobile;
-	}
-	
-	@Length(min=0, max=200, message="头像长度必须介于 0 和 200 之间")
-	public String getImage() {
-		return image;
-	}
-
-	public void setImage(String image) {
-		this.image = image;
-	}
-	
-	@Length(min=0, max=50, message="密码长度必须介于 0 和 50 之间")
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-	
-	@Length(min=0, max=11, message="用户会员等级，见表c_userlevel或枚举UserLevel长度必须介于 0 和 11 之间")
-	public String getUserLevelID() {
-		return userLevelID;
-	}
-
-	public void setUserLevelID(String userLevelID) {
-		this.userLevelID = userLevelID;
-	}
-	
-	@Length(min=0, max=20, message="组织名称长度必须介于 0 和 20 之间")
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	@Length(min=0, max=20, message="真实姓名长度必须介于 0 和 20 之间")
-	public String getRealName() {
-		return realName;
-	}
-
-	public void setRealName(String realName) {
-		this.realName = realName;
-	}
-	
-	@Length(min=0, max=50, message="昵称长度必须介于 0 和 50 之间")
-	public String getNick() {
-		return nick;
-	}
-
-	public void setNick(String nick) {
-		this.nick = nick;
-	}
-	
-	@Length(min=0, max=1, message="性别长度必须介于 0 和 1 之间")
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-	}
-	
-	@Length(min=0, max=11, message="用户身份 0、个人 1、协销 2、会所 3、供应商长度必须介于 0 和 11 之间")
-	public String getUserIdentity() {
-		return userIdentity;
-	}
-
-	public void setUserIdentity(String userIdentity) {
-		this.userIdentity = userIdentity;
-	}
-	
-	@Length(min=0, max=11, message="用户类型，见表c_usertype或枚举UserType长度必须介于 0 和 11 之间")
-	public String getRegisterUserTypeID() {
-		return registerUserTypeID;
-	}
-
-	public void setRegisterUserTypeID(String registerUserTypeID) {
-		this.registerUserTypeID = registerUserTypeID;
-	}
-	
-	@Length(min=0, max=11, message="所属企业用户对应UserID长度必须介于 0 和 11 之间")
-	public String getCompanyUserID() {
-		return companyUserID;
-	}
-
-	public void setCompanyUserID(String companyUserID) {
-		this.companyUserID = companyUserID;
-	}
-	
-	@Length(min=0, max=20, message="微信openID长度必须介于 0 和 20 之间")
-	public String getOpenID() {
-		return openID;
-	}
-
-	public void setOpenID(String openID) {
-		this.openID = openID;
-	}
-	
-	@Length(min=0, max=1, message="【已废弃】是否是供应商，1是 空或0否长度必须介于 0 和 1 之间")
-	public String getManufacturerFlag() {
-		return manufacturerFlag;
-	}
-
-	public void setManufacturerFlag(String manufacturerFlag) {
-		this.manufacturerFlag = manufacturerFlag;
-	}
-	
-	@Length(min=0, max=11, message="供应商状态，见表c_shopstatus或枚举ShopStatus长度必须介于 0 和 11 之间")
-	public String getManufacturerStatus() {
-		return manufacturerStatus;
-	}
-
-	public void setManufacturerStatus(String manufacturerStatus) {
-		this.manufacturerStatus = manufacturerStatus;
-	}
-	
-	@Length(min=0, max=11, message="企业账号由哪一个用户升级而来,对应一个userID长度必须介于 0 和 11 之间")
-	public String getUpgradeBy() {
-		return upgradeBy;
-	}
-
-	public void setUpgradeBy(String upgradeBy) {
-		this.upgradeBy = upgradeBy;
-	}
-	
-	@Length(min=0, max=11, message="供应商Id长度必须介于 0 和 11 之间")
-	public String getShopID() {
-		return shopID;
-	}
-
-	public void setShopID(String shopID) {
-		this.shopID = shopID;
-	}
-	
-	@Length(min=0, max=1, message="【已废弃】是否创客，1是 空或0否长度必须介于 0 和 1 之间")
-	public String getServiceProviderFlag() {
-		return serviceProviderFlag;
-	}
-
-	public void setServiceProviderFlag(String serviceProviderFlag) {
-		this.serviceProviderFlag = serviceProviderFlag;
-	}
-	
-	@Length(min=0, max=1, message="【已废弃】是否会所，1是 空或0否长度必须介于 0 和 1 之间")
-	public String getClubFlag() {
-		return clubFlag;
-	}
-
-	public void setClubFlag(String clubFlag) {
-		this.clubFlag = clubFlag;
-	}
-	
-	@Length(min=0, max=1, message="【已废弃】达人标志长度必须介于 0 和 1 之间")
-	public String getMasterFlag() {
-		return masterFlag;
-	}
-
-	public void setMasterFlag(String masterFlag) {
-		this.masterFlag = masterFlag;
-	}
-	
-	@Length(min=0, max=1, message="【已废弃】长度必须介于 0 和 1 之间")
-	public String getNormalFlag() {
-		return normalFlag;
-	}
-
-	public void setNormalFlag(String normalFlag) {
-		this.normalFlag = normalFlag;
-	}
-	
-	@Length(min=0, max=1, message="审核状态长度必须介于 0 和 1 之间")
-	public String getAuditStatus() {
-		return auditStatus;
-	}
-
-	public void setAuditStatus(String auditStatus) {
-		this.auditStatus = auditStatus;
-	}
-	
-	@Length(min=0, max=19, message="审核时间长度必须介于 0 和 19 之间")
-	public String getAuditTime() {
-		return auditTime;
-	}
-
-	public void setAuditTime(String auditTime) {
-		this.auditTime = auditTime;
-	}
-	
-	@Length(min=0, max=100, message="审核备注长度必须介于 0 和 100 之间")
-	public String getAuditNote() {
-		return auditNote;
-	}
-
-	public void setAuditNote(String auditNote) {
-		this.auditNote = auditNote;
-	}
-	
-	@Length(min=0, max=19, message="注册时间长度必须介于 0 和 19 之间")
-	public String getRegisterTime() {
-		return registerTime;
-	}
-
-	public void setRegisterTime(String registerTime) {
-		this.registerTime = registerTime;
-	}
-	
-	@Length(min=0, max=20, message="注册ip长度必须介于 0 和 20 之间")
-	public String getRegisterIP() {
-		return registerIP;
-	}
-
-	public void setRegisterIP(String registerIP) {
-		this.registerIP = registerIP;
-	}
-	
-	@Length(min=0, max=19, message="登录时间长度必须介于 0 和 19 之间")
-	public String getLoginTime() {
-		return loginTime;
-	}
-
-	public void setLoginTime(String loginTime) {
-		this.loginTime = loginTime;
-	}
-	
-	@Length(min=0, max=20, message="登录ip长度必须介于 0 和 20 之间")
-	public String getLoginIP() {
-		return loginIP;
-	}
-
-	public void setLoginIP(String loginIP) {
-		this.loginIP = loginIP;
-	}
-	
-	@Length(min=0, max=1, message="用户状态，1正常，0冻结长度必须介于 0 和 1 之间")
-	public String getValidFlag() {
-		return validFlag;
-	}
-
-	public void setValidFlag(String validFlag) {
-		this.validFlag = validFlag;
-	}
-	
-	@Length(min=0, max=1, message="emailCheckFlag长度必须介于 0 和 1 之间")
-	public String getEmailCheckFlag() {
-		return emailCheckFlag;
-	}
-
-	public void setEmailCheckFlag(String emailCheckFlag) {
-		this.emailCheckFlag = emailCheckFlag;
-	}
-	
-	@Length(min=0, max=1, message="mobileCheckFlag长度必须介于 0 和 1 之间")
-	public String getMobileCheckFlag() {
-		return mobileCheckFlag;
-	}
-
-	public void setMobileCheckFlag(String mobileCheckFlag) {
-		this.mobileCheckFlag = mobileCheckFlag;
-	}
-	
-	@Length(min=0, max=11, message="会所状态，见表c_clubstatus或枚举ClubStatus长度必须介于 0 和 11 之间")
-	public String getClubStatus() {
-		return clubStatus;
-	}
-
-	public void setClubStatus(String clubStatus) {
-		this.clubStatus = clubStatus;
-	}
-	
-	@Length(min=0, max=11, message="会所Id长度必须介于 0 和 11 之间")
-	public String getClubID() {
-		return clubID;
-	}
-
-	public void setClubID(String clubID) {
-		this.clubID = clubID;
-	}
-	
-	@Length(min=0, max=1, message="同意协议标志长度必须介于 0 和 1 之间")
-	public String getAgreeFlag() {
-		return agreeFlag;
-	}
-
-	public void setAgreeFlag(String agreeFlag) {
-		this.agreeFlag = agreeFlag;
-	}
-	
-	@Length(min=0, max=50, message="【已废弃】长度必须介于 0 和 50 之间")
-	public String getActivationCode() {
-		return activationCode;
-	}
-
-	public void setActivationCode(String activationCode) {
-		this.activationCode = activationCode;
-	}
-	
-	@Length(min=0, max=10, message="【已废弃】长度必须介于 0 和 10 之间")
-	public String getActivationDate() {
-		return activationDate;
-	}
-
-	public void setActivationDate(String activationDate) {
-		this.activationDate = activationDate;
-	}
-	
-	@Length(min=0, max=11, message="创客状态长度必须介于 0 和 11 之间")
-	public String getServiceProviderStatus() {
-		return serviceProviderStatus;
-	}
-
-	public void setServiceProviderStatus(String serviceProviderStatus) {
-		this.serviceProviderStatus = serviceProviderStatus;
-	}
-	
-	@Length(min=0, max=11, message="创客Id长度必须介于 0 和 11 之间")
-	public String getServiceProviderID() {
-		return serviceProviderID;
-	}
-
-	public void setServiceProviderID(String serviceProviderID) {
-		this.serviceProviderID = serviceProviderID;
-	}
-	
-	@Length(min=0, max=11, message="【已废弃】达人状态长度必须介于 0 和 11 之间")
-	public String getMasterStatus() {
-		return masterStatus;
-	}
-
-	public void setMasterStatus(String masterStatus) {
-		this.masterStatus = masterStatus;
-	}
-	
-	@Length(min=0, max=11, message="【已废弃】达人ID长度必须介于 0 和 11 之间")
-	public String getMasterID() {
-		return masterID;
-	}
-
-	public void setMasterID(String masterID) {
-		this.masterID = masterID;
-	}
-	
-	public String getUserMoney() {
-		return userMoney;
-	}
-
-	public void setUserMoney(String userMoney) {
-		this.userMoney = userMoney;
-	}
-	
-	@Length(min=0, max=11, message="积分长度必须介于 0 和 11 之间")
-	public String getPoint() {
-		return point;
-	}
-
-	public void setPoint(String point) {
-		this.point = point;
-	}
-	
-	@Length(min=0, max=1, message="开通ERP标志长度必须介于 0 和 1 之间")
-	public String getShopERPFlag() {
-		return shopERPFlag;
-	}
-
-	public void setShopERPFlag(String shopERPFlag) {
-		this.shopERPFlag = shopERPFlag;
-	}
-	
-	@Length(min=0, max=11, message="邀请人Id长度必须介于 0 和 11 之间")
-	public String getFromUserID() {
-		return fromUserID;
-	}
-
-	public void setFromUserID(String fromUserID) {
-		this.fromUserID = fromUserID;
-	}
-	
-	@Length(min=0, max=50, message="邀请人名称长度必须介于 0 和 50 之间")
-	public String getFromUserName() {
-		return fromUserName;
-	}
-
-	public void setFromUserName(String fromUserName) {
-		this.fromUserName = fromUserName;
-	}
-	
-	@Length(min=0, max=19, message="退出时间长度必须介于 0 和 19 之间")
-	public String getLogoffTime() {
-		return logoffTime;
-	}
-
-	public void setLogoffTime(String logoffTime) {
-		this.logoffTime = logoffTime;
-	}
-	
-	@Length(min=0, max=20, message="appKey长度必须介于 0 和 20 之间")
-	public String getAppKey() {
-		return appKey;
-	}
-
-	public void setAppKey(String appKey) {
-		this.appKey = appKey;
-	}
-	
-	@Length(min=0, max=25, message="appSecret长度必须介于 0 和 25 之间")
-	public String getAppSecret() {
-		return appSecret;
-	}
-
-	public void setAppSecret(String appSecret) {
-		this.appSecret = appSecret;
-	}
-	
-	@Length(min=0, max=1, message="【已废弃】长度必须介于 0 和 1 之间")
-	public String getSampleFlag() {
-		return sampleFlag;
-	}
-
-	public void setSampleFlag(String sampleFlag) {
-		this.sampleFlag = sampleFlag;
-	}
-	
-	@Length(min=0, max=11, message="扫描标志(4 CRM拉上来的会所) 0待扫描 1 已扫描 2已上线长度必须介于 0 和 11 之间")
-	public String getScanFlag() {
-		return scanFlag;
-	}
-
-	public void setScanFlag(String scanFlag) {
-		this.scanFlag = scanFlag;
-	}
-	
-	@Length(min=0, max=11, message="【已废弃】长度必须介于 0 和 11 之间")
-	public String getSysroleid() {
-		return sysroleid;
-	}
-
-	public void setSysroleid(String sysroleid) {
-		this.sysroleid = sysroleid;
-	}
-	
-	@Length(min=0, max=2, message="【已废弃】长度必须介于 0 和 2 之间")
-	public String getGender() {
-		return gender;
-	}
-
-	public void setGender(String gender) {
-		this.gender = gender;
-	}
-	
-	@Length(min=0, max=11, message="年龄长度必须介于 0 和 11 之间")
-	public String getAge() {
-		return age;
-	}
-
-	public void setAge(String age) {
-		this.age = age;
-	}
-	
-	@Length(min=0, max=11, message="salerbuyer长度必须介于 0 和 11 之间")
-	public String getSalerbuyer() {
-		return salerbuyer;
-	}
-
-	public void setSalerbuyer(String salerbuyer) {
-		this.salerbuyer = salerbuyer;
-	}
-	
-	@Length(min=0, max=128, message="position长度必须介于 0 和 128 之间")
-	public String getPosition() {
-		return position;
-	}
-
-	public void setPosition(String position) {
-		this.position = position;
-	}
-	
-	@Length(min=0, max=128, message="skill长度必须介于 0 和 128 之间")
-	public String getSkill() {
-		return skill;
-	}
-
-	public void setSkill(String skill) {
-		this.skill = skill;
-	}
-	
-	public String getWorkage() {
-		return workage;
-	}
-
-	public void setWorkage(String workage) {
-		this.workage = workage;
-	}
-	
-	@Length(min=0, max=64, message="微信号长度必须介于 0 和 64 之间")
-	public String getWechat() {
-		return wechat;
-	}
-
-	public void setWechat(String wechat) {
-		this.wechat = wechat;
-	}
-	
-	@Length(min=0, max=32, message="QQ号长度必须介于 0 和 32 之间")
-	public String getQq() {
-		return qq;
-	}
-
-	public void setQq(String qq) {
-		this.qq = qq;
-	}
-	
-	@Length(min=0, max=1, message="短信是否发送成功长度必须介于 0 和 1 之间")
-	public String getSmsFlag() {
-		return smsFlag;
-	}
-
-	public void setSmsFlag(String smsFlag) {
-		this.smsFlag = smsFlag;
-	}
-	
-	@Length(min=0, max=11, message="采美豆数量长度必须介于 0 和 11 之间")
-	public String getUserBeans() {
-		return userBeans;
-	}
-
-	public void setUserBeans(String userBeans) {
-		this.userBeans = userBeans;
-	}
-	
-	@Length(min=0, max=11, message="【已废弃】平台商标志位0非平台商 1平台商长度必须介于 0 和 11 之间")
-	public String getPrivateShopFlag() {
-		return privateShopFlag;
-	}
-
-	public void setPrivateShopFlag(String privateShopFlag) {
-		this.privateShopFlag = privateShopFlag;
-	}
-	
-	@Length(min=0, max=11, message="【已废弃】平台会所标志位0非平台会所 1平台会所长度必须介于 0 和 11 之间")
-	public String getPrivateClubFlag() {
-		return privateClubFlag;
-	}
-
-	public void setPrivateClubFlag(String privateClubFlag) {
-		this.privateClubFlag = privateClubFlag;
-	}
-	
-	@Length(min=0, max=11, message="是否创客授权长度必须介于 0 和 11 之间")
-	public String getIsMeiDaoAuthorized() {
-		return isMeiDaoAuthorized;
-	}
-
-	public void setIsMeiDaoAuthorized(String isMeiDaoAuthorized) {
-		this.isMeiDaoAuthorized = isMeiDaoAuthorized;
-	}
-	
-	@Length(min=0, max=11, message="是否已经引导过(供应商首次登陆操作引导)长度必须介于 0 和 11 之间")
-	public String getGuideFlag() {
-		return guideFlag;
-	}
-
-	public void setGuideFlag(String guideFlag) {
-		this.guideFlag = guideFlag;
-	}
-	
-	@Length(min=0, max=11, message="loginFailTime长度必须介于 0 和 11 之间")
-	public String getLoginFailTime() {
-		return loginFailTime;
-	}
-
-	public void setLoginFailTime(String loginFailTime) {
-		this.loginFailTime = loginFailTime;
-	}
-	
-	@Length(min=0, max=1, message="用户登录时的提示状态：0 未提示 1 已提示长度必须介于 0 和 1 之间")
-	public String getTipStatus() {
-		return tipStatus;
-	}
-
-	public void setTipStatus(String tipStatus) {
-		this.tipStatus = tipStatus;
-	}
-	
-	@Length(min=0, max=19, message="用户申请加入企业的时间长度必须介于 0 和 19 之间")
-	public String getApplyTime() {
-		return applyTime;
-	}
-
-	public void setApplyTime(String applyTime) {
-		this.applyTime = applyTime;
-	}
-	
-	@Length(min=0, max=50, message="小程序openId长度必须介于 0 和 50 之间")
-	public String getMiniProgramOpenId() {
-		return miniProgramOpenId;
-	}
-
-	public void setMiniProgramOpenId(String miniProgramOpenId) {
-		this.miniProgramOpenId = miniProgramOpenId;
-	}
-	
-	@Length(min=0, max=20, message="小程序用户Id eg: x0001目的是用来记录小程序的用户数量长度必须介于 0 和 20 之间")
-	public String getMiniProgramId() {
-		return miniProgramId;
-	}
-
-	public void setMiniProgramId(String miniProgramId) {
-		this.miniProgramId = miniProgramId;
-	}
-
-	@Transient
-	public String getWeixinNick() {
-		return weixinNick;
-	}
-
-	public void setWeixinNick(String weixinNick) {
-		this.weixinNick = weixinNick;
-	}
-
-	@Transient
-	public String getUserSearchID() {
-		return userSearchID;
-	}
-
-	public void setUserSearchID(String userSearchID) {
-		this.userSearchID = userSearchID;
-	}
-}

src/main/java/com/caimei/modules/miniprogram/entity/CmWxArticle.java

@@ -1,338 +0,0 @@
-package com.caimei.modules.miniprogram.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-import java.util.List;
-
-/**
- * 微信文章存取Entity
- * @author ye.qin
- * @version 2018-12-17
- */
-public class CmWxArticle extends DataEntity<CmWxArticle> {
-	
-	private static final long serialVersionUID = 1L;
-	private String source;		// 文章来源（1：后台，2：微信公众号）
-	private String type;		// 文章类型（关联cm_wx_menu）
-	private String mediaId;		// 素材ID
-	private String title;		// 标题
-	private String subtitle;		// 副标题
-	private String author;		// 作者
-	private String digest;		// 摘要\
-	private String content;		// 内容
-	private String contentSourceUrl;		// 内容链接
-	private String thumbMediaId;		// 封面图片素材id
-	private String showCoverPic;		// 是否显示封面，0为false，即不显示，1为true，即显示
-	private String url;		// 图文页的URL
-	private String thumbUrl;		// thumbUrl
-	private String needOpenComment;		// needOpenComment
-	private String onlyFansCanComment;		// onlyFansCanComment
-	private String actType;		// 活动类型
-	private String actName;		// 活动名称
-	private String actTime;		// 活动开始时间
-	private String actEndTime;		// 活动结束时间
-	private String actStatus;		// 活动状态
-	private String deployTime;		// 发布时间
-	private String deployStatus;		// 发布状态(1:未发布2:已发布3:已下架)
-	private String points;		// 点赞数
-	private String readings;		// 阅读数（访问量）
-	private String pv;		// 访客数
-	private String basePoints;		// 基础点赞数
-	private String baseReadings;		// 基础阅读数
-	private String createTime;		// createTime
-	private String updateTime;		// updateTime
-    private String keyWord;         //关键字
-    private String tagId;         //标签ID
-    private String tagName;         //标签名
-
-    private List<ProductPo> product;   //相关商品集合
-    private List<CmWxArticlePo> articleList;   //相关文章集合
-    private List<CmWxXpsxProduct> cmWxXpsxProduct;  //新品上线商品集合
-
-
-    public String getKeyWord() {
-        return keyWord;
-    }
-
-    public void setKeyWord(String keyWord) {
-        this.keyWord = keyWord;
-    }
-
-    public String getTagId() {
-        return tagId;
-    }
-
-    public void setTagId(String tagId) {
-        this.tagId = tagId;
-    }
-
-    public String getTagName() {
-        return tagName;
-    }
-
-    public void setTagName(String tagName) {
-        this.tagName = tagName;
-    }
-
-    public List<ProductPo> getProduct() {
-        return product;
-    }
-
-    public void setProduct(List<ProductPo> product) {
-        this.product = product;
-    }
-
-
-    public List<CmWxArticlePo> getArticleList() {
-        return articleList;
-    }
-
-    public void setArticleList(List<CmWxArticlePo> articleList) {
-        this.articleList = articleList;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getMediaId() {
-        return mediaId;
-    }
-
-    public void setMediaId(String mediaId) {
-        this.mediaId = mediaId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    public String getDigest() {
-        return digest;
-    }
-
-    public void setDigest(String digest) {
-        this.digest = digest;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getContentSourceUrl() {
-        return contentSourceUrl;
-    }
-
-    public void setContentSourceUrl(String contentSourceUrl) {
-        this.contentSourceUrl = contentSourceUrl;
-    }
-
-    public String getThumbMediaId() {
-        return thumbMediaId;
-    }
-
-    public void setThumbMediaId(String thumbMediaId) {
-        this.thumbMediaId = thumbMediaId;
-    }
-
-    public String getShowCoverPic() {
-        return showCoverPic;
-    }
-
-    public void setShowCoverPic(String showCoverPic) {
-        this.showCoverPic = showCoverPic;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getThumbUrl() {
-        return thumbUrl;
-    }
-
-    public void setThumbUrl(String thumbUrl) {
-        this.thumbUrl = thumbUrl;
-    }
-
-    public String getNeedOpenComment() {
-        return needOpenComment;
-    }
-
-    public void setNeedOpenComment(String needOpenComment) {
-        this.needOpenComment = needOpenComment;
-    }
-
-    public String getOnlyFansCanComment() {
-        return onlyFansCanComment;
-    }
-
-    public void setOnlyFansCanComment(String onlyFansCanComment) {
-        this.onlyFansCanComment = onlyFansCanComment;
-    }
-
-    public String getActType() {
-        return actType;
-    }
-
-    public void setActType(String actType) {
-        this.actType = actType;
-    }
-
-    public String getActName() {
-        return actName;
-    }
-
-    public void setActName(String actName) {
-        this.actName = actName;
-    }
-
-    public String getActTime() {
-        return actTime;
-    }
-
-    public void setActTime(String actTime) {
-        this.actTime = actTime;
-    }
-
-    public String getActEndTime() {
-        return actEndTime;
-    }
-
-    public void setActEndTime(String actEndTime) {
-        this.actEndTime = actEndTime;
-    }
-
-    public String getActStatus() {
-        return actStatus;
-    }
-
-    public void setActStatus(String actStatus) {
-        this.actStatus = actStatus;
-    }
-
-    public String getDeployTime() {
-        return deployTime;
-    }
-
-    public void setDeployTime(String deployTime) {
-        this.deployTime = deployTime;
-    }
-
-    public String getDeployStatus() {
-        return deployStatus;
-    }
-
-    public void setDeployStatus(String deployStatus) {
-        this.deployStatus = deployStatus;
-    }
-
-    public String getPoints() {
-        return points;
-    }
-
-    public void setPoints(String points) {
-        this.points = points;
-    }
-
-    public String getReadings() {
-        return readings;
-    }
-
-    public void setReadings(String readings) {
-        this.readings = readings;
-    }
-
-    public String getPv() {
-        return pv;
-    }
-
-    public void setPv(String pv) {
-        this.pv = pv;
-    }
-
-    public String getBasePoints() {
-        return basePoints;
-    }
-
-    public void setBasePoints(String basePoints) {
-        this.basePoints = basePoints;
-    }
-
-    public String getBaseReadings() {
-        return baseReadings;
-    }
-
-    public void setBaseReadings(String baseReadings) {
-        this.baseReadings = baseReadings;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getSubtitle() {
-        return subtitle;
-    }
-
-    public void setSubtitle(String subtitle) {
-        this.subtitle = subtitle;
-    }
-
-    public List<CmWxXpsxProduct> getCmWxXpsxProduct() {
-        return cmWxXpsxProduct;
-    }
-
-    public void setCmWxXpsxProduct(List<CmWxXpsxProduct> cmWxXpsxProduct) {
-        this.cmWxXpsxProduct = cmWxXpsxProduct;
-    }
-}

src/main/java/com/caimei/modules/miniprogram/entity/CmWxArticlePo.java

@@ -1,329 +0,0 @@
-package com.caimei.modules.miniprogram.entity;
-
-import com.caimei.modules.product.entity.Product;
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-import java.util.List;
-
-/**
- * 微信文章存取Entity
- * @author ye.qin
- * @version 2018-12-17
- */
-public class CmWxArticlePo extends DataEntity<CmWxArticlePo> {
-	
-	private static final long serialVersionUID = 1L;
-	private String source;		// 文章来源（1：后台，2：微信公众号）
-	private String type;		// 文章类型（关联cm_wx_menu）
-	private String mediaId;		// 素材ID
-	private String title;		// 标题
-	private String author;		// 作者
-	private String digest;		// 摘要
-	private String content;		// 内容
-	private String contentSourceUrl;		// 内容链接
-	private String thumbMediaId;		// 封面图片素材id
-	private String showCoverPic;		// 是否显示封面，0为false，即不显示，1为true，即显示
-	private String url;		// 图文页的URL
-	private String thumbUrl;		// thumbUrl
-	private String needOpenComment;		// needOpenComment
-	private String onlyFansCanComment;		// onlyFansCanComment
-	private String actType;		// 活动类型
-	private String actName;		// 活动名称
-	private String actTime;		// 活动开始时间
-	private String actEndTime;		// 活动结束时间
-	private String actStatus;		// 活动状态
-	private String deployTime;		// 发布时间
-	private String deployStatus;		// 发布状态(1:未发布2:已发布3:已下架)
-	private String points;		// 点赞数
-	private String readings;		// 阅读数（访问量）
-	private String pv;		// 访客数
-	private String basePoints;		// 基础点赞数
-	private String baseReadings;		// 基础阅读数
-	private String createTime;		// createTime
-	private String updateTime;		// updateTime
-
-
-    private String articleListJson;     //文章json
-    private String articleId;       //文章ID
-    private String sort;        //排序
-
-    private String keyWord;         //关键字
-    private String tagId;         //标签ID
-    private String tagName;         //标签名
-
-    public String getKeyWord() {
-        return keyWord;
-    }
-
-    public void setKeyWord(String keyWord) {
-        this.keyWord = keyWord;
-    }
-
-    public String getTagId() {
-        return tagId;
-    }
-
-    public void setTagId(String tagId) {
-        this.tagId = tagId;
-    }
-
-    public String getTagName() {
-        return tagName;
-    }
-
-    public void setTagName(String tagName) {
-        this.tagName = tagName;
-    }
-
-    public String getArticleId() {
-        return articleId;
-    }
-
-    public void setArticleId(String articleId) {
-        this.articleId = articleId;
-    }
-
-    public String getSort() {
-        return sort;
-    }
-
-    public void setSort(String sort) {
-        this.sort = sort;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getMediaId() {
-        return mediaId;
-    }
-
-    public void setMediaId(String mediaId) {
-        this.mediaId = mediaId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    public String getDigest() {
-        return digest;
-    }
-
-    public void setDigest(String digest) {
-        this.digest = digest;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getContentSourceUrl() {
-        return contentSourceUrl;
-    }
-
-    public void setContentSourceUrl(String contentSourceUrl) {
-        this.contentSourceUrl = contentSourceUrl;
-    }
-
-    public String getThumbMediaId() {
-        return thumbMediaId;
-    }
-
-    public void setThumbMediaId(String thumbMediaId) {
-        this.thumbMediaId = thumbMediaId;
-    }
-
-    public String getShowCoverPic() {
-        return showCoverPic;
-    }
-
-    public void setShowCoverPic(String showCoverPic) {
-        this.showCoverPic = showCoverPic;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getThumbUrl() {
-        return thumbUrl;
-    }
-
-    public void setThumbUrl(String thumbUrl) {
-        this.thumbUrl = thumbUrl;
-    }
-
-    public String getNeedOpenComment() {
-        return needOpenComment;
-    }
-
-    public void setNeedOpenComment(String needOpenComment) {
-        this.needOpenComment = needOpenComment;
-    }
-
-    public String getOnlyFansCanComment() {
-        return onlyFansCanComment;
-    }
-
-    public void setOnlyFansCanComment(String onlyFansCanComment) {
-        this.onlyFansCanComment = onlyFansCanComment;
-    }
-
-    public String getActType() {
-        return actType;
-    }
-
-    public void setActType(String actType) {
-        this.actType = actType;
-    }
-
-    public String getActName() {
-        return actName;
-    }
-
-    public void setActName(String actName) {
-        this.actName = actName;
-    }
-
-    public String getActTime() {
-        return actTime;
-    }
-
-    public void setActTime(String actTime) {
-        this.actTime = actTime;
-    }
-
-    public String getActEndTime() {
-        return actEndTime;
-    }
-
-    public void setActEndTime(String actEndTime) {
-        this.actEndTime = actEndTime;
-    }
-
-    public String getActStatus() {
-        return actStatus;
-    }
-
-    public void setActStatus(String actStatus) {
-        this.actStatus = actStatus;
-    }
-
-    public String getDeployTime() {
-        return deployTime;
-    }
-
-    public void setDeployTime(String deployTime) {
-        this.deployTime = deployTime;
-    }
-
-    public String getDeployStatus() {
-        return deployStatus;
-    }
-
-    public void setDeployStatus(String deployStatus) {
-        this.deployStatus = deployStatus;
-    }
-
-    public String getPoints() {
-        return points;
-    }
-
-    public void setPoints(String points) {
-        this.points = points;
-    }
-
-    public String getReadings() {
-        return readings;
-    }
-
-    public void setReadings(String readings) {
-        this.readings = readings;
-    }
-
-    public String getPv() {
-        return pv;
-    }
-
-    public void setPv(String pv) {
-        this.pv = pv;
-    }
-
-    public String getBasePoints() {
-        return basePoints;
-    }
-
-    public void setBasePoints(String basePoints) {
-        this.basePoints = basePoints;
-    }
-
-    public String getBaseReadings() {
-        return baseReadings;
-    }
-
-    public void setBaseReadings(String baseReadings) {
-        this.baseReadings = baseReadings;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getArticleListJson() {
-        return articleListJson;
-    }
-
-    public void setArticleListJson(String articleListJson) {
-        this.articleListJson = articleListJson;
-    }
-}

src/main/java/com/caimei/modules/miniprogram/entity/CmWxMenu.java

@@ -1,54 +0,0 @@
-package com.caimei.modules.miniprogram.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 小程序菜单Entity
- * @author lwt
- * @version 2018-12-24
- */
-public class CmWxMenu extends DataEntity<CmWxMenu> {
-	
-	private static final long serialVersionUID = 1L;
-	private String menuName;		// 菜单名
-	private String sort;		// 排序值
-	private String status;		// 状态（1：启动中	2：已关闭）
-	
-	public CmWxMenu() {
-		super();
-	}
-
-	public CmWxMenu(String id){
-		super(id);
-	}
-
-	@Length(min=0, max=50, message="菜单名长度必须介于 0 和 50 之间")
-	public String getMenuName() {
-		return menuName;
-	}
-
-	public void setMenuName(String menuName) {
-		this.menuName = menuName;
-	}
-	
-	@Length(min=0, max=11, message="排序值长度必须介于 0 和 11 之间")
-	public String getSort() {
-		return sort;
-	}
-
-	public void setSort(String sort) {
-		this.sort = sort;
-	}
-	
-	@Length(min=0, max=1, message="状态（1：启动中	2：已关闭）长度必须介于 0 和 1 之间")
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	
-}

src/main/java/com/caimei/modules/miniprogram/entity/CmWxPopularSearch.java

@@ -1,74 +0,0 @@
-package com.caimei.modules.miniprogram.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 热门搜索配置Entity
- * @author ye.qin
- * @version 2018-12-27
- */
-public class CmWxPopularSearch extends DataEntity<CmWxPopularSearch> {
-	
-	private static final long serialVersionUID = 1L;
-	private String sort;		// 排序值
-	private String keyword;		// 关键字
-	private String clickCount;		// 点击数
-	private String addTime;		// 添加时间
-	private String status;		// 状态（1：启动中	0：已关闭）
-	
-	public CmWxPopularSearch() {
-		super();
-	}
-
-	public CmWxPopularSearch(String id){
-		super(id);
-	}
-
-	@Length(min=0, max=11, message="排序值长度必须介于 0 和 11 之间")
-	public String getSort() {
-		return sort;
-	}
-
-	public void setSort(String sort) {
-		this.sort = sort;
-	}
-	
-	@Length(min=0, max=50, message="关键字长度必须介于 0 和 50 之间")
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-	
-	@Length(min=0, max=11, message="点击数长度必须介于 0 和 11 之间")
-	public String getClickCount() {
-		return clickCount;
-	}
-
-	public void setClickCount(String clickCount) {
-		this.clickCount = clickCount;
-	}
-	
-	@Length(min=0, max=19, message="添加时间长度必须介于 0 和 19 之间")
-	public String getAddTime() {
-		return addTime;
-	}
-
-	public void setAddTime(String addTime) {
-		this.addTime = addTime;
-	}
-	
-	@Length(min=0, max=1, message="状态（1：启动中	0：已关闭）长度必须介于 0 和 1 之间")
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	
-}

src/main/java/com/caimei/modules/miniprogram/entity/CmWxTag.java

@@ -1,54 +0,0 @@
-package com.caimei.modules.miniprogram.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 小程序标签Entity
- * @author lwt
- * @version 2018-12-25
- */
-public class CmWxTag extends DataEntity<CmWxTag> {
-	
-	private static final long serialVersionUID = 1L;
-	private String tagName;		// 标签名
-	private String addTime;		// 添加时间
-	private String status;		// 状态（1：启动中	2：已关闭）
-	
-	public CmWxTag() {
-		super();
-	}
-
-	public CmWxTag(String id){
-		super(id);
-	}
-
-	@Length(min=1, max=5, message="标签名长度必须介于 1 和 5 之间")
-	public String getTagName() {
-		return tagName;
-	}
-
-	public void setTagName(String tagName) {
-		this.tagName = tagName;
-	}
-	
-	@Length(min=0, max=19, message="添加时间长度必须介于 0 和 19 之间")
-	public String getAddTime() {
-		return addTime;
-	}
-
-	public void setAddTime(String addTime) {
-		this.addTime = addTime;
-	}
-	
-	@Length(min=0, max=1, message="状态（1：启动中	2：已关闭）长度必须介于 0 和 1 之间")
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	
-}

src/main/java/com/caimei/modules/miniprogram/entity/CmWxXpsxProduct.java

@@ -1,71 +0,0 @@
-package com.caimei.modules.miniprogram.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 小程序新品上线商品Entity
- * @author lwt
- * @version 2018-12-26
- */
-public class CmWxXpsxProduct extends DataEntity<CmWxXpsxProduct> {
-	
-	private static final long serialVersionUID = 1L;
-	private Long articleId;		// 文章ID
-	private Long productId;		// 商品ID
-	private String image;		// 商品图片
-	private String description;		// 商品描述
-	private String addTime;		// 添加时间
-	
-	public CmWxXpsxProduct() {
-		super();
-	}
-
-	public CmWxXpsxProduct(String id){
-		super(id);
-	}
-
-	public Long getArticleId() {
-		return articleId;
-	}
-
-	public void setArticleId(Long articleId) {
-		this.articleId = articleId;
-	}
-	
-	public Long getProductId() {
-		return productId;
-	}
-
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-	
-	@Length(min=0, max=50, message="商品图片长度必须介于 0 和 50 之间")
-	public String getImage() {
-		return image;
-	}
-
-	public void setImage(String image) {
-		this.image = image;
-	}
-	
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	
-	@Length(min=0, max=19, message="添加时间长度必须介于 0 和 19 之间")
-	public String getAddTime() {
-		return addTime;
-	}
-
-	public void setAddTime(String addTime) {
-		this.addTime = addTime;
-	}
-	
-}

src/main/java/com/caimei/modules/miniprogram/entity/ProductPo.java

@@ -1,1120 +0,0 @@
-package com.caimei.modules.miniprogram.entity;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-import java.beans.Transient;
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class ProductPo extends DataEntity<ProductPo>{
-
-	private static final long serialVersionUID = 1L;
-
-	private String name;
-	private String shopName;//供应商名称
-	private String validFlag; //0暂存中 1待审核 2已上架 3已下架 8 审核不通过 9已冻结
-	private String displayOnCRMFlag; //是否在crm可以被搜索到 1是 0否
-	private Integer crmBigTypeId;//crm一级商品分类
-	private Integer crmSmallTypeId;//crm二级商品分类
-	private Integer productID;		// productID
-	private Integer brandID;		// 品牌Id
-	private Integer tinyTypeID;		// 三级分类Id
-	private Integer selfTypeID;		// selfTypeID
-	private Integer shopID;		// 所属供应商Id
-	private String searchKey;		// 搜索关键词
-	private Float normalPrice;		// 市场价
-	private Float price;		// price
-	private Float highestUserLevelPrice;		// 最低价
-	private Float lowestUserLevelPrice;		// 最高价
-	private String lowestUserLevelID;		// 最高价会员等级
-	private BigDecimal price0;		// 普通用户价格
-	private String price0Text;		// 普通用户价格文字
-	private String price0TextFlag;		// 普通用户价格展示标志 0 否 1 是
-	private BigDecimal price1;		// 普通会员价
-	private String price1Text;		// 会员用户价格文字
-	private String priceFlag;		// 会员用户价格展示标志 0 否 1 是
-	private BigDecimal price8;		// 游客价格
-	private String beautyActFlag;		// 游客价格文字
-	private String beautyActFlagFlag;		// 游客文字展示标志 0 否 价格 1 是 文字
-	private String ladderPriceFlag;		// 启用阶梯价格标识 0否 1是
-	private BigDecimal price2;		// 银卡价
-	private BigDecimal price3;		// 金卡价
-	private BigDecimal price4;		// 铂金价
-	private BigDecimal price5;		// 钻石价
-	private BigDecimal price6;		// 普通服务商价
-	private BigDecimal price7;		// 金牌服务商价
-	private String fee;		// 运费
-	private String stock;		// 库存
-	private String hasSkuFlag;		// 是否有sku：1有， 0没有
-	private String mainImage;		// 主图
-	private String propertiesInfo;		// sku属性
-	private String addTime;		// 添加时间
-	private String updateTime;		// 更新时间
-	private String sellNumber;		// 销量
-	private String weekSellNumber;		// weekSellNumber
-	private String beforeValidFlag;		// beforeValidFlag
-	private String favoriteTimes;		// 收藏量
-	private String commentScore;		// 评论分数
-	private String commentTimes;		// 评论次数
-	private String selfRecommendFlag;		// selfRecommendFlag
-	private String sysRecommendFlag;		// sysRecommendFlag
-	private String sortIndex;		// 排序值
-	private String featuredFlag;		// 供应商主推商品标志 0否 1是
-	private String featuredSortIndex;		// 供应商主推商品排序
-	private String productCode;		// 商品货号
-	private String rate1;		// rate1
-	private String rate2;		// rate2
-	private String unit;		// 包装规格
-	private String synToERPFlag;		// 是否推送到ERP，1已推送， 空或0未推送
-	private String allAreaFlag;		// 销售区域：1全部区域， 0指定区域
-	private String provinceIDs;		// 指定的销售区域
-	private String serviceNumber;		// 服务起订量
-	private String maxBuyNumber;		// 最大购买量
-	private String virtualFlag;		// virtualFlag
-	private String minBuyNumber;		// 最小购买量
-	private String packageCount;		// 最小包装数量
-	private String byFlag;		// 运费：0买家承担， 1卖家承担
-	private String normalProductFlag;		// 普通商品标志 1是
-	private String wholeSaleProductFlag;		// wholeSaleProductFlag
-	private String promotionProductFlag;		// promotionProductFlag
-	private String groupBuyProductFlag;		// groupBuyProductFlag
-	private String step;		// 购买梯度数（编辑数量时加减的数量）
-	private String speCommisionFlag;		// speCommisionFlag
-	private String speCommision;		// speCommision
-	private String videourl;		// videourl
-	private String props;		// props
-	private String providers;		// providers
-	private String serviceCommissionRatio;		// serviceCommissionRatio
-	private String reCommissionRatio;		// reCommissionRatio
-	private String pushToERPName;		// 推送到ERP的原商品名称 name字段的名称可能做修改已适应平台的搜索
-	private String prodBeans;		// prodBeans
-	private String useBeansFlag;		// 该商品是否可以使用采美豆购买
-	private String privateFlag;		// 0开放市场 1私有市场
-	private String invisibleServiceProviderIDs;		// invisibleServiceProviderIDs
-	private String needServiceFlag;		// needServiceFlag
-	private Float actPrice0;		// 普通用户活动价格
-	private Float actPrice1;		// 普通会员活动价
-	private Float actPrice2;		// 银卡会员活动价
-	private Float actPrice3;		// 金卡会员活动价
-	private Float actPrice4;		// 铂金会员活动价
-	private Float actPrice5;		// 钻石会员活动价
-	private Float actPrice6;		// 普通服务商活动价
-	private Float actPrice7;		// 金牌服务商活动价
-	private Date beginTime;		// 活动开始时间
-	private Date endTime;		// 活动结束时间
-	private String actFlag;		// 是否活动商品：1是，空或0不是
-	private String actType;		// 活动类型
-	private Date onlineTime;		// 上架时间
-	private Date downlineTime;		// 下架时间
-	private String shopIndexModuleID;		// 商品所属供应商主页模块ID
-	private String freePostFlag;		// 是否包邮 0包邮 1不包邮
-	private String costPrice;		// 成本价
-	private String costProportional;		// 比例成本百分比
-	private String costCheckFlag;		// 成本价选中标志：1固定成本 2比例成
-	private String precisehKey;		// 精确关键字
-	private String docBoost;		// 文档加权值
-	private String cmbeanFlag;		// 是否采美豆专区商品(0 否,1 是)
-	private String cmbeanPrice;		// 采美豆专区价格(采美豆)
-	private String cmbeanSort;		// 采美豆专区排序(值越大越前)
-
-	private String giftFlag;//是否可以参加赠送(0:无法参加，1:可以参加赠送，2:已参加过赠送)
-	private Float actFullReduceAmount;//满减金额(达到该金额后可享直减)--满减
-	private Float actReduceAmount;//购买直减金额(达到满金额后)
-	private Float actFullGiftAmount;//满赠金额(达到满赠金额后可享赠品)--满赠
-	private Integer actBuyGiftNum;//买赠数量(达到该数量后可享赠品)--买赠
-	private String beginTimeStr;//活动开始时间串
-	private String endTimeStr;//活动结束时间串
-	private String actStatus;//活动状态 1：即将开始 2：进行中 3：已结束
-
-	//-----------------  虚拟字段 ----
-	private boolean customClass = false;  //是否有自定义分类
-	private String brandName;//品牌名称
-	private String defaultType;// 默认分类 1 是默认分类,,0不是默认分类即自定义分类
-    private String defaultTypeName;
-
-	private String productListJson;     //商品json
-	private String articleId;		//关联文章ID
-	private String sort;		//排序
-
-	public String getArticleId() {
-		return articleId;
-	}
-
-	public void setArticleId(String articleId) {
-		this.articleId = articleId;
-	}
-
-	public String getSort() {
-		return sort;
-	}
-
-	public void setSort(String sort) {
-		this.sort = sort;
-	}
-
-	public String getProductListJson() {
-		return productListJson;
-	}
-
-	public void setProductListJson(String productListJson) {
-		this.productListJson = productListJson;
-	}
-
-	public ProductPo() {
-		super();
-	}
-
-	public ProductPo(String id) {
-		super(id);
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getValidFlag() {
-		return validFlag;
-	}
-
-	public void setValidFlag(String validFlag) {
-		this.validFlag = validFlag;
-	}
-
-	public String getDisplayOnCRMFlag() {
-		return displayOnCRMFlag;
-	}
-
-	public void setDisplayOnCRMFlag(String displayOnCRMFlag) {
-		this.displayOnCRMFlag = displayOnCRMFlag;
-	}
-
-	public Integer getCrmBigTypeId() {
-		return crmBigTypeId;
-	}
-
-	public void setCrmBigTypeId(Integer crmBigTypeId) {
-		this.crmBigTypeId = crmBigTypeId;
-	}
-
-	public Integer getCrmSmallTypeId() {
-		return crmSmallTypeId;
-	}
-
-	public void setCrmSmallTypeId(Integer crmSmallTypeId) {
-		this.crmSmallTypeId = crmSmallTypeId;
-	}
-
-	public Integer getProductID() {
-		return productID;
-	}
-
-	public void setProductID(Integer productID) {
-		this.productID = productID;
-	}
-
-	public Integer getBrandID() {
-		return brandID;
-	}
-
-	public void setBrandID(Integer brandID) {
-		this.brandID = brandID;
-	}
-
-	public Integer getTinyTypeID() {
-		return tinyTypeID;
-	}
-
-	public void setTinyTypeID(Integer tinyTypeID) {
-		this.tinyTypeID = tinyTypeID;
-	}
-
-	public Integer getSelfTypeID() {
-		return selfTypeID;
-	}
-
-	public void setSelfTypeID(Integer selfTypeID) {
-		this.selfTypeID = selfTypeID;
-	}
-
-	public Integer getShopID() {
-		return shopID;
-	}
-
-	public void setShopID(Integer shopID) {
-		this.shopID = shopID;
-	}
-
-	public String getSearchKey() {
-		return searchKey;
-	}
-
-	public void setSearchKey(String searchKey) {
-		this.searchKey = searchKey;
-	}
-
-	public String getLowestUserLevelID() {
-		return lowestUserLevelID;
-	}
-
-	public void setLowestUserLevelID(String lowestUserLevelID) {
-		this.lowestUserLevelID = lowestUserLevelID;
-	}
-
-	public BigDecimal getPrice0() {
-		return price0;
-	}
-
-	public void setPrice0(BigDecimal price0) {
-		this.price0 = price0;
-	}
-
-	public String getPrice0Text() {
-		return price0Text;
-	}
-
-	public void setPrice0Text(String price0Text) {
-		this.price0Text = price0Text;
-	}
-
-	public String getPrice0TextFlag() {
-		return price0TextFlag;
-	}
-
-	public void setPrice0TextFlag(String price0TextFlag) {
-		this.price0TextFlag = price0TextFlag;
-	}
-
-	public BigDecimal getPrice1() {
-		return price1;
-	}
-
-	public void setPrice1(BigDecimal price1) {
-		this.price1 = price1;
-	}
-
-	public String getPrice1Text() {
-		return price1Text;
-	}
-
-	public void setPrice1Text(String price1Text) {
-		this.price1Text = price1Text;
-	}
-
-	public String getPriceFlag() {
-		return priceFlag;
-	}
-
-	public void setPriceFlag(String priceFlag) {
-		this.priceFlag = priceFlag;
-	}
-
-	public BigDecimal getPrice8() {
-		return price8;
-	}
-
-	public void setPrice8(BigDecimal price8) {
-		this.price8 = price8;
-	}
-
-	public String getbeautyActFlag() {
-		return beautyActFlag;
-	}
-
-	public void setbeautyActFlag(String beautyActFlag) {
-		this.beautyActFlag = beautyActFlag;
-	}
-
-	public String getbeautyActFlagFlag() {
-		return beautyActFlagFlag;
-	}
-
-	public void setbeautyActFlagFlag(String beautyActFlagFlag) {
-		this.beautyActFlagFlag = beautyActFlagFlag;
-	}
-
-	public String getLadderPriceFlag() {
-		return ladderPriceFlag;
-	}
-
-	public void setLadderPriceFlag(String ladderPriceFlag) {
-		this.ladderPriceFlag = ladderPriceFlag;
-	}
-
-	public BigDecimal getPrice2() {
-		return price2;
-	}
-
-	public void setPrice2(BigDecimal price2) {
-		this.price2 = price2;
-	}
-
-	public BigDecimal getPrice3() {
-		return price3;
-	}
-
-	public void setPrice3(BigDecimal price3) {
-		this.price3 = price3;
-	}
-
-	public BigDecimal getPrice4() {
-		return price4;
-	}
-
-	public void setPrice4(BigDecimal price4) {
-		this.price4 = price4;
-	}
-
-	public BigDecimal getPrice5() {
-		return price5;
-	}
-
-	public void setPrice5(BigDecimal price5) {
-		this.price5 = price5;
-	}
-
-	public BigDecimal getPrice6() {
-		return price6;
-	}
-
-	public void setPrice6(BigDecimal price6) {
-		this.price6 = price6;
-	}
-
-	public BigDecimal getPrice7() {
-		return price7;
-	}
-
-	public void setPrice7(BigDecimal price7) {
-		this.price7 = price7;
-	}
-
-	public String getFee() {
-		return fee;
-	}
-
-	public void setFee(String fee) {
-		this.fee = fee;
-	}
-
-	public String getStock() {
-		return stock;
-	}
-
-	public void setStock(String stock) {
-		this.stock = stock;
-	}
-
-	public String getHasSkuFlag() {
-		return hasSkuFlag;
-	}
-
-	public void setHasSkuFlag(String hasSkuFlag) {
-		this.hasSkuFlag = hasSkuFlag;
-	}
-
-	public String getMainImage() {
-		return mainImage;
-	}
-
-	public void setMainImage(String mainImage) {
-		this.mainImage = mainImage;
-	}
-
-	public String getPropertiesInfo() {
-		return propertiesInfo;
-	}
-
-	public void setPropertiesInfo(String propertiesInfo) {
-		this.propertiesInfo = propertiesInfo;
-	}
-
-	public String getAddTime() {
-		return addTime;
-	}
-
-	public void setAddTime(String addTime) {
-		this.addTime = addTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getSellNumber() {
-		return sellNumber;
-	}
-
-	public void setSellNumber(String sellNumber) {
-		this.sellNumber = sellNumber;
-	}
-
-	public String getWeekSellNumber() {
-		return weekSellNumber;
-	}
-
-	public void setWeekSellNumber(String weekSellNumber) {
-		this.weekSellNumber = weekSellNumber;
-	}
-
-	public String getBeforeValidFlag() {
-		return beforeValidFlag;
-	}
-
-	public void setBeforeValidFlag(String beforeValidFlag) {
-		this.beforeValidFlag = beforeValidFlag;
-	}
-
-	public String getFavoriteTimes() {
-		return favoriteTimes;
-	}
-
-	public void setFavoriteTimes(String favoriteTimes) {
-		this.favoriteTimes = favoriteTimes;
-	}
-
-	public String getCommentScore() {
-		return commentScore;
-	}
-
-	public void setCommentScore(String commentScore) {
-		this.commentScore = commentScore;
-	}
-
-	public String getCommentTimes() {
-		return commentTimes;
-	}
-
-	public void setCommentTimes(String commentTimes) {
-		this.commentTimes = commentTimes;
-	}
-
-	public String getSelfRecommendFlag() {
-		return selfRecommendFlag;
-	}
-
-	public void setSelfRecommendFlag(String selfRecommendFlag) {
-		this.selfRecommendFlag = selfRecommendFlag;
-	}
-
-	public String getSysRecommendFlag() {
-		return sysRecommendFlag;
-	}
-
-	public void setSysRecommendFlag(String sysRecommendFlag) {
-		this.sysRecommendFlag = sysRecommendFlag;
-	}
-
-	public String getSortIndex() {
-		return sortIndex;
-	}
-
-	public void setSortIndex(String sortIndex) {
-		this.sortIndex = sortIndex;
-	}
-
-	public String getFeaturedFlag() {
-		return featuredFlag;
-	}
-
-	public void setFeaturedFlag(String featuredFlag) {
-		this.featuredFlag = featuredFlag;
-	}
-
-	public String getFeaturedSortIndex() {
-		return featuredSortIndex;
-	}
-
-	public void setFeaturedSortIndex(String featuredSortIndex) {
-		this.featuredSortIndex = featuredSortIndex;
-	}
-
-	public String getProductCode() {
-		return productCode;
-	}
-
-	public void setProductCode(String productCode) {
-		this.productCode = productCode;
-	}
-
-	public String getRate1() {
-		return rate1;
-	}
-
-	public void setRate1(String rate1) {
-		this.rate1 = rate1;
-	}
-
-	public String getRate2() {
-		return rate2;
-	}
-
-	public void setRate2(String rate2) {
-		this.rate2 = rate2;
-	}
-
-	public String getUnit() {
-		return unit;
-	}
-
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-
-	public String getSynToERPFlag() {
-		return synToERPFlag;
-	}
-
-	public void setSynToERPFlag(String synToERPFlag) {
-		this.synToERPFlag = synToERPFlag;
-	}
-
-	public String getAllAreaFlag() {
-		return allAreaFlag;
-	}
-
-	public void setAllAreaFlag(String allAreaFlag) {
-		this.allAreaFlag = allAreaFlag;
-	}
-
-	public String getProvinceIDs() {
-		return provinceIDs;
-	}
-
-	public void setProvinceIDs(String provinceIDs) {
-		this.provinceIDs = provinceIDs;
-	}
-
-	public String getServiceNumber() {
-		return serviceNumber;
-	}
-
-	public void setServiceNumber(String serviceNumber) {
-		this.serviceNumber = serviceNumber;
-	}
-
-	public String getMaxBuyNumber() {
-		return maxBuyNumber;
-	}
-
-	public void setMaxBuyNumber(String maxBuyNumber) {
-		this.maxBuyNumber = maxBuyNumber;
-	}
-
-	public String getVirtualFlag() {
-		return virtualFlag;
-	}
-
-	public void setVirtualFlag(String virtualFlag) {
-		this.virtualFlag = virtualFlag;
-	}
-
-	public String getMinBuyNumber() {
-		return minBuyNumber;
-	}
-
-	public void setMinBuyNumber(String minBuyNumber) {
-		this.minBuyNumber = minBuyNumber;
-	}
-
-	public String getPackageCount() {
-		return packageCount;
-	}
-
-	public void setPackageCount(String packageCount) {
-		this.packageCount = packageCount;
-	}
-
-	public String getByFlag() {
-		return byFlag;
-	}
-
-	public void setByFlag(String byFlag) {
-		this.byFlag = byFlag;
-	}
-
-	public String getNormalProductFlag() {
-		return normalProductFlag;
-	}
-
-	public void setNormalProductFlag(String normalProductFlag) {
-		this.normalProductFlag = normalProductFlag;
-	}
-
-	public String getWholeSaleProductFlag() {
-		return wholeSaleProductFlag;
-	}
-
-	public void setWholeSaleProductFlag(String wholeSaleProductFlag) {
-		this.wholeSaleProductFlag = wholeSaleProductFlag;
-	}
-
-	public String getPromotionProductFlag() {
-		return promotionProductFlag;
-	}
-
-	public void setPromotionProductFlag(String promotionProductFlag) {
-		this.promotionProductFlag = promotionProductFlag;
-	}
-
-	public String getGroupBuyProductFlag() {
-		return groupBuyProductFlag;
-	}
-
-	public void setGroupBuyProductFlag(String groupBuyProductFlag) {
-		this.groupBuyProductFlag = groupBuyProductFlag;
-	}
-
-	public String getStep() {
-		return step;
-	}
-
-	public void setStep(String step) {
-		this.step = step;
-	}
-
-	public String getSpeCommisionFlag() {
-		return speCommisionFlag;
-	}
-
-	public void setSpeCommisionFlag(String speCommisionFlag) {
-		this.speCommisionFlag = speCommisionFlag;
-	}
-
-	public String getSpeCommision() {
-		return speCommision;
-	}
-
-	public void setSpeCommision(String speCommision) {
-		this.speCommision = speCommision;
-	}
-
-	public String getVideourl() {
-		return videourl;
-	}
-
-	public void setVideourl(String videourl) {
-		this.videourl = videourl;
-	}
-
-	public String getProps() {
-		return props;
-	}
-
-	public void setProps(String props) {
-		this.props = props;
-	}
-
-	public String getProviders() {
-		return providers;
-	}
-
-	public void setProviders(String providers) {
-		this.providers = providers;
-	}
-
-	public String getServiceCommissionRatio() {
-		return serviceCommissionRatio;
-	}
-
-	public void setServiceCommissionRatio(String serviceCommissionRatio) {
-		this.serviceCommissionRatio = serviceCommissionRatio;
-	}
-
-	public String getReCommissionRatio() {
-		return reCommissionRatio;
-	}
-
-	public void setReCommissionRatio(String reCommissionRatio) {
-		this.reCommissionRatio = reCommissionRatio;
-	}
-
-	public String getPushToERPName() {
-		return pushToERPName;
-	}
-
-	public void setPushToERPName(String pushToERPName) {
-		this.pushToERPName = pushToERPName;
-	}
-
-	public String getProdBeans() {
-		return prodBeans;
-	}
-
-	public void setProdBeans(String prodBeans) {
-		this.prodBeans = prodBeans;
-	}
-
-	public String getUseBeansFlag() {
-		return useBeansFlag;
-	}
-
-	public void setUseBeansFlag(String useBeansFlag) {
-		this.useBeansFlag = useBeansFlag;
-	}
-
-	public String getPrivateFlag() {
-		return privateFlag;
-	}
-
-	public void setPrivateFlag(String privateFlag) {
-		this.privateFlag = privateFlag;
-	}
-
-	public String getInvisibleServiceProviderIDs() {
-		return invisibleServiceProviderIDs;
-	}
-
-	public void setInvisibleServiceProviderIDs(String invisibleServiceProviderIDs) {
-		this.invisibleServiceProviderIDs = invisibleServiceProviderIDs;
-	}
-
-	public String getNeedServiceFlag() {
-		return needServiceFlag;
-	}
-
-	public void setNeedServiceFlag(String needServiceFlag) {
-		this.needServiceFlag = needServiceFlag;
-	}
-
-
-	public Date getBeginTime() {
-		return beginTime;
-	}
-
-	public void setBeginTime(Date beginTime) {
-		this.beginTime = beginTime;
-	}
-
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-
-	public String getActFlag() {
-		return actFlag;
-	}
-
-	public void setActFlag(String actFlag) {
-		this.actFlag = actFlag;
-	}
-
-	public String getActType() {
-		return actType;
-	}
-
-	public void setActType(String actType) {
-		this.actType = actType;
-	}
-
-	public Date getOnlineTime() {
-		return onlineTime;
-	}
-
-	public void setOnlineTime(Date onlineTime) {
-		this.onlineTime = onlineTime;
-	}
-
-	public Date getDownlineTime() {
-		return downlineTime;
-	}
-
-	public void setDownlineTime(Date downlineTime) {
-		this.downlineTime = downlineTime;
-	}
-
-	public String getShopIndexModuleID() {
-		return shopIndexModuleID;
-	}
-
-	public void setShopIndexModuleID(String shopIndexModuleID) {
-		this.shopIndexModuleID = shopIndexModuleID;
-	}
-
-	public String getFreePostFlag() {
-		return freePostFlag;
-	}
-
-	public void setFreePostFlag(String freePostFlag) {
-		this.freePostFlag = freePostFlag;
-	}
-
-	public String getCostPrice() {
-		return costPrice;
-	}
-
-	public void setCostPrice(String costPrice) {
-		this.costPrice = costPrice;
-	}
-
-	public String getCostProportional() {
-		return costProportional;
-	}
-
-	public void setCostProportional(String costProportional) {
-		this.costProportional = costProportional;
-	}
-
-	public String getCostCheckFlag() {
-		return costCheckFlag;
-	}
-
-	public void setCostCheckFlag(String costCheckFlag) {
-		this.costCheckFlag = costCheckFlag;
-	}
-
-	public String getPrecisehKey() {
-		return precisehKey;
-	}
-
-	public void setPrecisehKey(String precisehKey) {
-		this.precisehKey = precisehKey;
-	}
-
-	public String getDocBoost() {
-		return docBoost;
-	}
-
-	public void setDocBoost(String docBoost) {
-		this.docBoost = docBoost;
-	}
-
-	public String getCmbeanFlag() {
-		return cmbeanFlag;
-	}
-
-	public void setCmbeanFlag(String cmbeanFlag) {
-		this.cmbeanFlag = cmbeanFlag;
-	}
-
-	public String getCmbeanPrice() {
-		return cmbeanPrice;
-	}
-
-	public void setCmbeanPrice(String cmbeanPrice) {
-		this.cmbeanPrice = cmbeanPrice;
-	}
-
-	public String getCmbeanSort() {
-		return cmbeanSort;
-	}
-
-	public void setCmbeanSort(String cmbeanSort) {
-		this.cmbeanSort = cmbeanSort;
-	}
-
-
-	public String getShopName() {
-		return shopName;
-	}
-
-	public void setShopName(String shopName) {
-		this.shopName = shopName;
-	}
-
-	public String getGiftFlag() {
-		return giftFlag;
-	}
-
-	public void setGiftFlag(String giftFlag) {
-		this.giftFlag = giftFlag;
-	}
-
-	public Float getActFullReduceAmount() {
-		return actFullReduceAmount;
-	}
-
-	public void setActFullReduceAmount(Float actFullReduceAmount) {
-		this.actFullReduceAmount = actFullReduceAmount;
-	}
-
-	public Float getActReduceAmount() {
-		return actReduceAmount;
-	}
-
-	public void setActReduceAmount(Float actReduceAmount) {
-		this.actReduceAmount = actReduceAmount;
-	}
-
-	public Float getActFullGiftAmount() {
-		return actFullGiftAmount;
-	}
-
-	public void setActFullGiftAmount(Float actFullGiftAmount) {
-		this.actFullGiftAmount = actFullGiftAmount;
-	}
-
-	public Integer getActBuyGiftNum() {
-		return actBuyGiftNum;
-	}
-
-	public void setActBuyGiftNum(Integer actBuyGiftNum) {
-		this.actBuyGiftNum = actBuyGiftNum;
-	}
-
-	public Float getActPrice0() {
-		return actPrice0;
-	}
-
-	public void setActPrice0(Float actPrice0) {
-		this.actPrice0 = actPrice0;
-	}
-
-	public Float getActPrice1() {
-		return actPrice1;
-	}
-
-	public void setActPrice1(Float actPrice1) {
-		this.actPrice1 = actPrice1;
-	}
-
-	public Float getActPrice2() {
-		return actPrice2;
-	}
-
-	public void setActPrice2(Float actPrice2) {
-		this.actPrice2 = actPrice2;
-	}
-
-	public Float getActPrice3() {
-		return actPrice3;
-	}
-
-	public void setActPrice3(Float actPrice3) {
-		this.actPrice3 = actPrice3;
-	}
-
-	public Float getActPrice4() {
-		return actPrice4;
-	}
-
-	public void setActPrice4(Float actPrice4) {
-		this.actPrice4 = actPrice4;
-	}
-
-	public Float getActPrice5() {
-		return actPrice5;
-	}
-
-	public void setActPrice5(Float actPrice5) {
-		this.actPrice5 = actPrice5;
-	}
-
-	public Float getActPrice6() {
-		return actPrice6;
-	}
-
-	public void setActPrice6(Float actPrice6) {
-		this.actPrice6 = actPrice6;
-	}
-
-	public Float getActPrice7() {
-		return actPrice7;
-	}
-
-	public void setActPrice7(Float actPrice7) {
-		this.actPrice7 = actPrice7;
-	}
-
-	public Float getNormalPrice() {
-		return normalPrice;
-	}
-
-	public void setNormalPrice(Float normalPrice) {
-		this.normalPrice = normalPrice;
-	}
-
-	public Float getPrice() {
-		return price;
-	}
-
-	public void setPrice(Float price) {
-		this.price = price;
-	}
-
-	public Float getHighestUserLevelPrice() {
-		return highestUserLevelPrice;
-	}
-
-	public void setHighestUserLevelPrice(Float highestUserLevelPrice) {
-		this.highestUserLevelPrice = highestUserLevelPrice;
-	}
-
-	public Float getLowestUserLevelPrice() {
-		return lowestUserLevelPrice;
-	}
-
-	public void setLowestUserLevelPrice(Float lowestUserLevelPrice) {
-		this.lowestUserLevelPrice = lowestUserLevelPrice;
-	}
-
-	public String getBeginTimeStr() {
-		return beginTimeStr;
-	}
-
-	public void setBeginTimeStr(String beginTimeStr) {
-		this.beginTimeStr = beginTimeStr;
-	}
-
-	public String getEndTimeStr() {
-		return endTimeStr;
-	}
-
-	public void setEndTimeStr(String endTimeStr) {
-		this.endTimeStr = endTimeStr;
-	}
-
-	public String getActStatus() {
-		return actStatus;
-	}
-
-	public void setActStatus(String actStatus) {
-		this.actStatus = actStatus;
-	}
-
-	@Transient
-	public boolean isCustomClass() {
-		return customClass;
-	}
-
-	public void setCustomClass(boolean customClass) {
-		this.customClass = customClass;
-	}
-
-	@Transient
-	public String getBrandName() {
-		return brandName;
-	}
-
-	public void setBrandName(String brandName) {
-		this.brandName = brandName;
-	}
-
-	@Transient
-	public String getDefaultType() {
-		return defaultType;
-	}
-
-	public void setDefaultType(String defaultType) {
-		this.defaultType = defaultType;
-	}
-
-    @Transient
-    public String getDefaultTypeName() {
-        return defaultTypeName;
-    }
-
-    public void setDefaultTypeName(String defaultTypeName) {
-        this.defaultTypeName = defaultTypeName;
-    }
-}

src/main/java/com/caimei/modules/miniprogram/entity/WxArticle.java

@@ -1,31 +0,0 @@
-package com.caimei.modules.miniprogram.entity;
-
-public class WxArticle {
-    private String media_id;
-    private String content;
-    private String update_time;
-
-    public String getMedia_id() {
-        return media_id;
-    }
-
-    public void setMedia_id(String media_id) {
-        this.media_id = media_id;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getUpdate_time() {
-        return update_time;
-    }
-
-    public void setUpdate_time(String update_time) {
-        this.update_time = update_time;
-    }
-}

src/main/java/com/caimei/modules/miniprogram/service/CmMiniProgramUserService.java

@@ -1,54 +0,0 @@
-package com.caimei.modules.miniprogram.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.miniprogram.entity.CmMiniProgramUser;
-import com.caimei.modules.miniprogram.dao.CmMiniProgramUserDao;
-
-import javax.annotation.Resource;
-
-/**
- * 小程序用户管理Service
- * @author lwt
- * @version 2018-12-24
- */
-@Service
-@Transactional(readOnly = true)
-public class CmMiniProgramUserService extends CrudService<CmMiniProgramUserDao, CmMiniProgramUser> {
-
-	@Resource
-	private CmMiniProgramUserDao cmMiniProgramUserDao;
-
-	public CmMiniProgramUser get(String id) {
-		return super.get(id);
-	}
-	
-	public List<CmMiniProgramUser> findList(CmMiniProgramUser cmMiniProgramUser) {
-		return super.findList(cmMiniProgramUser);
-	}
-	
-	public Page<CmMiniProgramUser> findPage(Page<CmMiniProgramUser> page, CmMiniProgramUser cmMiniProgramUser) {
-		return super.findPage(page, cmMiniProgramUser);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmMiniProgramUser cmMiniProgramUser) {
-		super.save(cmMiniProgramUser);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CmMiniProgramUser cmMiniProgramUser) {
-		super.delete(cmMiniProgramUser);
-	}
-
-	@Transactional(readOnly = false)
-	public int update(CmMiniProgramUser cmMiniProgramUser) {
-		return cmMiniProgramUserDao.update(cmMiniProgramUser);
-	}
-	
-}

src/main/java/com/caimei/modules/miniprogram/service/CmWxArticleService.java

@@ -1,317 +0,0 @@
-package com.caimei.modules.miniprogram.service;
-
-import com.caimei.dfs.image.beens.ImageUploadInfo;
-import com.caimei.modules.brand.utils.ImagePathUtils;
-import com.caimei.modules.common.utils.UploadUtils;
-import com.caimei.modules.miniprogram.dao.CmWxArticleDao;
-import com.caimei.modules.miniprogram.dao.CmWxXpsxProductDao;
-import com.caimei.modules.miniprogram.entity.CmWxArticle;
-import com.caimei.modules.miniprogram.entity.CmWxArticlePo;
-import com.caimei.modules.miniprogram.entity.CmWxXpsxProduct;
-import com.caimei.modules.miniprogram.entity.ProductPo;
-import com.caimei.modules.miniprogram.utils.ArticleType;
-import com.caimei.modules.miniprogram.utils.DateUtils;
-import com.caimei.modules.product.dao.ProductDao;
-import com.caimei.modules.product.entity.Product;
-import com.caimei.modules.sys.utils.UploadImageUtils;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.mapper.JsonMapper;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.Encodes;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 微信文章存取Service
- *
- * @author ye.qin
- * @version 2018-12-17
- */
-@Service
-@Transactional(readOnly = true)
-public class CmWxArticleService extends CrudService<CmWxArticleDao, CmWxArticle> {
-
-    @Resource
-    private CmWxArticleDao cmWxArticleDao;
-    @Resource
-    private CmWxXpsxProductDao cmWxXpsxProductDao;
-
-    @Resource
-    private ProductDao productDao;
-
-	public CmWxArticle get(String id) {
-	    CmWxArticle cmWxArticle = new CmWxArticle();
-	    try{
-            cmWxArticle = cmWxArticleDao.get(id);
-            cmWxArticle.setArticleList(cmWxArticleDao.getUnionArticle(id));
-            cmWxArticle.setProduct(cmWxArticleDao.getUnionProduct(id));
-        }catch (Exception e){
-	        e.printStackTrace();
-        }
-		return cmWxArticle;
-	}
-	
-	public List<CmWxArticle> findList(CmWxArticle cmWxArticle) {
-		return super.findList(cmWxArticle);
-	}
-
-    public List<CmWxArticle> findAllList(CmWxArticle cmWxArticle) {
-        return cmWxArticleDao.findAllList(cmWxArticle);
-    }
-	
-	public Page<CmWxArticle> findPage(Page<CmWxArticle> page, CmWxArticle cmWxArticle) {
-	    try{
-
-	        page.setOrderBy("createTime");
-            //设置不返回的source类型
-            cmWxArticle.setPage(page);
-            List<CmWxArticle> list = cmWxArticleDao.findList(cmWxArticle);
-            //判断文章是否是商城促销下的
-            if(cmWxArticle.getType() != null && cmWxArticle.getType().equals(ArticleType.SCCX.getTypeID().toString())){
-                if (list != null && list.size() > 0){
-                    for(CmWxArticle bean : list){
-                        if(bean.getActTime()!=null && bean.getActTime()!="" && bean.getActEndTime()!=null && bean.getActEndTime()!=""){
-                            Date beginTime = DateUtils.parse(bean.getActTime(),DateUtils.YMDHMS);
-                            Date endTime = DateUtils.parse(bean.getActEndTime(),DateUtils.YMDHMS);
-                            bean.setActTime(DateUtils.format(beginTime,DateUtils.YMDHMS)+"--"+DateUtils.format(endTime,DateUtils.YMDHMS));
-                            Date currentTime = new Date();
-                            if(currentTime.before(beginTime)){
-                                bean.setActStatus("未开始");
-                            }else if(currentTime.before(endTime) && currentTime.after(beginTime)){
-                                bean.setActStatus("活动中");
-                            }else{
-                                bean.setActStatus("已结束");
-                            }
-                        }
-                    }
-                }
-            }
-            page.setList(list);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-	    return page;
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmWxArticle cmWxArticle, HttpServletRequest request) {
-	    try{
-            if(cmWxArticle.getThumbUrl() != null && cmWxArticle.getThumbUrl() != ""){
-                saveImageToServer(cmWxArticle,request);
-            }
-            cmWxArticle.setSource("1");
-            String currentTime = DateUtils.format(new Date(),DateUtils.YMDHMS);
-            if(cmWxArticle.getCreateTime() == null){
-                cmWxArticle.setCreateTime(currentTime);
-            }
-            cmWxArticle.setUpdateTime(currentTime);
-
-            //替换content里面的图片链接(新品上线的除外)
-            if(null != cmWxArticle.getType() && !ArticleType.XPSX.getTypeID().toString().equals(cmWxArticle.getType())){
-                saveContentImageToServer(cmWxArticle,request);
-            } else {
-                saveXpsxProductImg(cmWxArticle,request);
-            }
-
-            if(cmWxArticle.getId() == null || cmWxArticle.getId() == ""){
-                    cmWxArticle.setId(null);
-                    cmWxArticle.setDeployTime(DateUtils.format(new Date(),DateUtils.YMDHMS));
-                    cmWxArticleDao.insert(cmWxArticle);
-                }else{
-                    cmWxArticleDao.update(cmWxArticle);
-                }
-                if(cmWxArticle.getProduct() != null && cmWxArticle.getProduct().size() > 0){
-                    if(cmWxArticle.getId() != null){
-                        cmWxArticleDao.deleteAllUnionProduct(cmWxArticle.getId());
-                    }
-                    for(ProductPo productBean : cmWxArticle.getProduct()){
-                        ProductPo bean = (ProductPo) JsonMapper.fromJsonString(productBean.getProductListJson(), ProductPo.class);
-                        //bean.setSort(productBean.getSort());
-                        if(bean != null){
-                            bean.setArticleId(cmWxArticle.getId());
-                            cmWxArticleDao.insertProduct(bean);
-                        }
-                    }
-                }
-                if(cmWxArticle.getArticleList()!=null && cmWxArticle.getArticleList().size() > 0){
-                    if(cmWxArticle.getId() != null){
-                        cmWxArticleDao.deleteAllUnionArticle(cmWxArticle.getId());
-                    }
-                    for(CmWxArticlePo articleBean : cmWxArticle.getArticleList()){
-                        CmWxArticlePo bean = (CmWxArticlePo) JsonMapper.fromJsonString(articleBean.getArticleListJson(), CmWxArticlePo.class);
-                        //bean.setSort(articleBean.getSort());
-                        if(bean != null){
-                            bean.setArticleId(cmWxArticle.getId());
-                            cmWxArticleDao.insertArtile(bean);
-                        }
-                    }
-                }
-                if (!CollectionUtils.isEmpty(cmWxArticle.getCmWxXpsxProduct())) {
-                    cmWxXpsxProductDao.deleteByArticleId(cmWxArticle.getId());
-                    for (CmWxXpsxProduct p : cmWxArticle.getCmWxXpsxProduct()) {
-                        if (StringUtils.isEmpty(p.getImage()) || StringUtils.isEmpty(p.getDescription()))
-                            continue;
-                        p.setArticleId(Long.valueOf(cmWxArticle.getId()));
-                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-                        String date = sdf.format(new Date());
-                        p.setAddTime(date);
-                        cmWxXpsxProductDao.insert(p);
-                    }
-                }
-
-        }catch (Exception e) {
-	        e.printStackTrace();
-        }
-	}
-
-    @Transactional(readOnly = false)
-	public void delete(CmWxArticle cmWxArticle) {
-		super.delete(cmWxArticle);
-	}
-
-    public Page<Product> findProductPage(Page<Product> page, Product product) {
-        try{
-            product.setPage(page);
-            product.setValidFlag("2");//已上架商品
-            List<Product> list = productDao.findList(product);
-            page.setList(list);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return page;
-    }
-
-    @Transactional(readOnly = false)
-    public void deploy(CmWxArticle cmWxArticle) {
-        try{
-            cmWxArticle.setDeployTime(DateUtils.format(new Date(),DateUtils.YMDHMS));
-            cmWxArticleDao.deploy(cmWxArticle);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    public void saveImageToServer(CmWxArticle bean,HttpServletRequest request){
-        String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
-        ImageUploadInfo saveImageSerivce=new ImageUploadInfo();
-        String imagesHead=bean.getThumbUrl();
-        if(StringUtils.isNotBlank(imagesHead) && !imagesHead.startsWith("http:") && !imagesHead.startsWith("https:")){
-            imagesHead= Encodes.urlDecode(imagesHead);
-//            String realPath = request.getSession().getServletContext().getRealPath(imagesHead);
-            String realPath = UploadImageUtils.getAbsolutePath(imagesHead);
-            //			realPath=Encodes.urlDecode(realPath);
-            int pointerIndex = realPath.lastIndexOf(".");
-            try {
-                saveImageSerivce = UploadUtils.saveImageSerivce(realPath, pointerIndex,realPath);
-                bean.setThumbUrl(photoServer+saveImageSerivce.getSource());
-            } catch (Exception e) {
-                logger.error("图片上传错误:"+e.toString(),e);
-            }
-        }
-    }
-    public void saveContentImageToServer(CmWxArticle cmWxArticle,HttpServletRequest request) {
-        String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
-        /**
-         * 富文本内容处理+内置图片上传
-         */
-        String infoContent = Encodes.unescapeHtml(cmWxArticle.getContent());
-        infoContent = StringUtils.replace(infoContent, "<body", "<div");
-        infoContent = StringUtils.replace(infoContent, "</body>", "</div>");
-        //infoContent=Encodes.urlDecode(infoContent);
-        Document doc = Jsoup.parse(infoContent);
-        Elements links = doc.getElementsByTag("img");
-        for (Element link : links) {
-            String linkSrc = link.attr("src");
-            String linkSrcOld = link.attr("src");
-            if (StringUtils.isNotBlank(linkSrc) && !linkSrc.contains("http:") && !linkSrc.contains("https:") && !linkSrc.contains("uploadFile/ueditor")) {//不包含http开头的
-//                String realPath = Encodes.urlDecode(request.getSession().getServletContext().getRealPath(linkSrc));
-                linkSrc= Encodes.urlDecode(linkSrc);
-                String realPath = UploadImageUtils.getAbsolutePath(linkSrc);
-                int pointerIndex = realPath.lastIndexOf(".");
-                ImageUploadInfo saveImageSerivce = new ImageUploadInfo();
-                try {
-                    saveImageSerivce = ImagePathUtils.saveImageSerivce(realPath, pointerIndex, realPath);
-                    String src = photoServer + saveImageSerivce.getSource();
-                    infoContent = StringUtils.replace(infoContent, linkSrcOld, src);
-                } catch (Exception e) {
-                    logger.error("图片上传错误:" + e.toString(), e);
-                }
-
-            }
-        }
-        cmWxArticle.setContent(infoContent);
-    }
-    private void saveXpsxProductImg(CmWxArticle cmWxArticle, HttpServletRequest request) {
-	    if (CollectionUtils.isEmpty(cmWxArticle.getCmWxXpsxProduct()))  return;
-
-        String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
-        /**
-         * 富文本内容处理+内置图片上传
-         */
-        for (CmWxXpsxProduct xpsx : cmWxArticle.getCmWxXpsxProduct()) {
-
-            ImageUploadInfo saveImageSerivce = new ImageUploadInfo();
-            String imagesHead = xpsx.getImage();
-            if(StringUtils.isNotBlank(imagesHead) && !imagesHead.startsWith("http:") && !imagesHead.startsWith("https:")){
-                imagesHead= Encodes.urlDecode(imagesHead);
-//                String realPath = request.getSession().getServletContext().getRealPath(imagesHead);
-                String realPath = UploadImageUtils.getAbsolutePath(imagesHead);
-                //			realPath=Encodes.urlDecode(realPath);
-                int pointerIndex = realPath.lastIndexOf(".");
-                try {
-                    saveImageSerivce = UploadUtils.saveImageSerivce(realPath, pointerIndex,realPath);
-                    xpsx.setImage(photoServer + saveImageSerivce.getSource());
-                } catch (Exception e) {
-                    logger.error("图片上传错误:"+e.toString(),e);
-                }
-            }
-
-            /**
-             * 富文本内容处理+内置图片上传
-             */
-            String infoContent = Encodes.unescapeHtml(xpsx.getDescription());
-            infoContent = StringUtils.replace(infoContent, "<body", "<div");
-            infoContent = StringUtils.replace(infoContent, "</body>", "</div>");
-            Document doc = Jsoup.parse(infoContent);
-            Elements links = doc.getElementsByTag("img");
-            for (Element link : links) {
-                String linkSrc = link.attr("src");
-                String linkSrcOld = link.attr("src");
-                if (StringUtils.isNotBlank(linkSrc) && !linkSrc.contains("http:") && !linkSrc.contains("https:") && !linkSrc.contains("uploadFile/ueditor")) {//不包含http开头的
-//                    String realPath = Encodes.urlDecode(request.getSession().getServletContext().getRealPath(linkSrc));
-                    linkSrc= Encodes.urlDecode(linkSrc);
-                    String realPath = UploadImageUtils.getAbsolutePath(linkSrc);
-                    int pointerIndex = realPath.lastIndexOf(".");
-                    ImageUploadInfo uploadInfo = new ImageUploadInfo();
-                    try {
-                        uploadInfo = ImagePathUtils.saveImageSerivce(realPath, pointerIndex, realPath);
-                        String src = photoServer + uploadInfo.getSource();
-                        infoContent = StringUtils.replace(infoContent, linkSrcOld, src);
-                    } catch (Exception e) {
-                        logger.error("图片上传错误:" + e.toString(), e);
-                    }
-
-                }
-            }
-            xpsx.setDescription(infoContent);
-        }
-    }
-
-    @Transactional(readOnly = false)
-    public void persist(CmWxArticle bean) {
-        cmWxArticleDao.persist(bean);
-    }
-}

src/main/java/com/caimei/modules/miniprogram/service/CmWxMenuService.java

@@ -1,54 +0,0 @@
-package com.caimei.modules.miniprogram.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.miniprogram.entity.CmWxMenu;
-import com.caimei.modules.miniprogram.dao.CmWxMenuDao;
-
-import javax.annotation.Resource;
-
-/**
- * 小程序菜单Service
- * @author lwt
- * @version 2018-12-24
- */
-@Service
-@Transactional(readOnly = true)
-public class CmWxMenuService extends CrudService<CmWxMenuDao, CmWxMenu> {
-
-	@Resource
-	private CmWxMenuDao cmWxMenuDao;
-
-	public CmWxMenu get(String id) {
-		return super.get(id);
-	}
-	
-	public List<CmWxMenu> findList(CmWxMenu cmWxMenu) {
-		return super.findList(cmWxMenu);
-	}
-	
-	public Page<CmWxMenu> findPage(Page<CmWxMenu> page, CmWxMenu cmWxMenu) {
-		return super.findPage(page, cmWxMenu);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmWxMenu cmWxMenu) {
-		super.save(cmWxMenu);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CmWxMenu cmWxMenu) {
-		super.delete(cmWxMenu);
-	}
-
-	@Transactional(readOnly = false)
-	public int update(CmWxMenu cmWxMenu) {
-		return cmWxMenuDao.update(cmWxMenu);
-	}
-	
-}

src/main/java/com/caimei/modules/miniprogram/service/CmWxPopularSearchService.java

@@ -1,59 +0,0 @@
-package com.caimei.modules.miniprogram.service;
-
-import java.util.Date;
-import java.util.List;
-
-import com.caimei.modules.miniprogram.entity.CmWxArticle;
-import com.caimei.modules.miniprogram.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.miniprogram.entity.CmWxPopularSearch;
-import com.caimei.modules.miniprogram.dao.CmWxPopularSearchDao;
-
-/**
- * 热门搜索配置Service
- * @author ye.qin
- * @version 2018-12-27
- */
-@Service
-@Transactional(readOnly = true)
-public class CmWxPopularSearchService extends CrudService<CmWxPopularSearchDao, CmWxPopularSearch> {
-
-	@Autowired
-	private CmWxPopularSearchDao cmWxPopularSearchDao;
-
-	public CmWxPopularSearch get(String id) {
-		return super.get(id);
-	}
-	
-	public List<CmWxPopularSearch> findList(CmWxPopularSearch cmWxPopularSearch) {
-		return super.findList(cmWxPopularSearch);
-	}
-	
-	public Page<CmWxPopularSearch> findPage(Page<CmWxPopularSearch> page, CmWxPopularSearch cmWxPopularSearch) {
-		page.setOrderBy("addTime");
-		return super.findPage(page, cmWxPopularSearch);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmWxPopularSearch cmWxPopularSearch) {
-		if(cmWxPopularSearch.getId() == null || cmWxPopularSearch.getId() == ""){
-			cmWxPopularSearch.setId(null);
-			cmWxPopularSearch.setAddTime(DateUtils.format(new Date(), DateUtils.YMDHMS));
-		}
-		super.save(cmWxPopularSearch);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CmWxPopularSearch cmWxPopularSearch) {
-		super.delete(cmWxPopularSearch);
-	}
-
-	public List<CmWxPopularSearch> findAllList(CmWxPopularSearch cmWxPopularSearch) {
-		return cmWxPopularSearchDao.findAllList(cmWxPopularSearch);
-	}
-}

src/main/java/com/caimei/modules/miniprogram/service/CmWxTagService.java

@@ -1,57 +0,0 @@
-package com.caimei.modules.miniprogram.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.miniprogram.entity.CmWxTag;
-import com.caimei.modules.miniprogram.dao.CmWxTagDao;
-
-import javax.annotation.Resource;
-
-/**
- * 小程序标签Service
- * @author lwt
- * @version 2018-12-25
- */
-@Service
-@Transactional(readOnly = true)
-public class CmWxTagService extends CrudService<CmWxTagDao, CmWxTag> {
-
-	@Resource
-	private CmWxTagDao cmWxTagDao;
-
-	public CmWxTag get(String id) {
-		return super.get(id);
-	}
-	
-	public List<CmWxTag> findList(CmWxTag cmWxTag) {
-		return super.findList(cmWxTag);
-	}
-	
-	public Page<CmWxTag> findPage(Page<CmWxTag> page, CmWxTag cmWxTag) {
-		return super.findPage(page, cmWxTag);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmWxTag cmWxTag) {
-		super.save(cmWxTag);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CmWxTag cmWxTag) {
-		super.delete(cmWxTag);
-	}
-
-	@Transactional(readOnly = false)
-	public void update(CmWxTag cmWxTag) {
-		cmWxTagDao.update(cmWxTag);
-	}
-
-	public List<CmWxTag> findByTagName(String tagName) {
-		return cmWxTagDao.findByTagName(tagName);
-	}
-}

src/main/java/com/caimei/modules/miniprogram/service/CmWxXpsxProductService.java

@@ -1,52 +0,0 @@
-package com.caimei.modules.miniprogram.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.miniprogram.entity.CmWxXpsxProduct;
-import com.caimei.modules.miniprogram.dao.CmWxXpsxProductDao;
-
-import javax.annotation.Resource;
-
-/**
- * 小程序新品上线商品Service
- * @author lwt
- * @version 2018-12-26
- */
-@Service
-@Transactional(readOnly = true)
-public class CmWxXpsxProductService extends CrudService<CmWxXpsxProductDao, CmWxXpsxProduct> {
-
-	@Resource
-	private CmWxXpsxProductDao cmWxXpsxProductDao;
-
-	public CmWxXpsxProduct get(String id) {
-		return super.get(id);
-	}
-	
-	public List<CmWxXpsxProduct> findList(CmWxXpsxProduct cmWxXpsxProduct) {
-		return super.findList(cmWxXpsxProduct);
-	}
-	
-	public Page<CmWxXpsxProduct> findPage(Page<CmWxXpsxProduct> page, CmWxXpsxProduct cmWxXpsxProduct) {
-		return super.findPage(page, cmWxXpsxProduct);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmWxXpsxProduct cmWxXpsxProduct) {
-		super.save(cmWxXpsxProduct);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CmWxXpsxProduct cmWxXpsxProduct) {
-		super.delete(cmWxXpsxProduct);
-	}
-
-	public List<CmWxXpsxProduct> getByArticleId(String articleId) {
-		return cmWxXpsxProductDao.getByArticleId(articleId);
-	}
-}

src/main/java/com/caimei/modules/miniprogram/utils/ArticleType.java

@@ -1,43 +0,0 @@
-package com.caimei.modules.miniprogram.utils;
-
-
-/**
- * @Author ye.qin
- * @Description //TODO 文章分类枚举
- * @Date 2018\12\18 0018 11:52
- */
-public enum ArticleType {
-    SCCX(2, "商城促销"),
-    MYXBK(4, "美业小百科"),
-    CMDJT(1, "采美大讲堂"),
-    RMYQ(6, "热门仪器"),
-    XPSX(3, "新品上线");
-
-    /** 等级编号 */
-    private Integer typeID;
-    /** 等级名称 */
-    private String typeName;
-
-    private ArticleType(Integer typeID, String typeName) {
-        this.typeID = typeID;
-        this.typeName = typeName;
-    }
-
-    public Integer getTypeID() {
-        return typeID;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public static String ArticleType(int typeID){
-        for(ArticleType type : ArticleType.values()){
-            if(type.getTypeID() == typeID){
-                return type.typeName;
-            }
-        }
-        return "";
-    }
-
-}

src/main/java/com/caimei/modules/miniprogram/utils/DateUtils.java

@@ -1,158 +0,0 @@
-package com.caimei.modules.miniprogram.utils;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-
-public class DateUtils {
-    /**
-     * 国际化时间格式 2017-11-7T17:02:07+08:00
-     *
-     * @Date:17:01 2017/11/7
-     */
-    public static final String YMDHMSXXX = "yyyy-MM-dd'T'HH:mm:ssXXX";
-    /**
-     * yyyy-MM-dd HH:mm:ss
-     */
-    public static final String YMDHMS = "yyyy-MM-dd HH:mm:ss";
-    /**
-     * dd-MM-yyyy
-     */
-    public static final String DMY = "dd-MM-yyyy";
-    /**
-     * MM-dd-yyyy
-     */
-    public static final String MDY = "MM-dd-yyyy";
-    /**
-     * dd-MM-yyyy HH:mm
-     */
-    public static final String DMYHM = "dd-MM-yyyy HH:mm";
-
-
-    /**
-     * 时间格式化
-     *
-     * @param date
-     * @param formatPattern
-     * @return java.lang.String
-     * @Date:17:10 2017/11/7
-     */
-    public static String format(Date date, String formatPattern) {
-        if (date == null) {
-            return "";
-        }
-        SimpleDateFormat f = new SimpleDateFormat(formatPattern);
-        return f.format(date);
-    }
-
-    /**
-     * 时间戳转换成日期格式字符串
-     * @param seconds 精确到秒的字符串
-     * @param
-     * @return
-     */
-    public static String timeStamp2Date(String seconds,String format) {
-        if(seconds == null || seconds.isEmpty() || seconds.equals("null")){
-            return "";
-        }
-        if(format == null || format.isEmpty()){
-            format = "yyyy-MM-dd HH:mm:ss";
-        }
-        SimpleDateFormat sdf = new SimpleDateFormat(format);
-        return sdf.format(new Date(Long.valueOf(seconds+"000")));
-    }
-
-    /**
-     * 文本转换成时间
-     *
-     * @param text
-     * @param formatPattern
-     * @return java.util.Date
-     * @Date:17:11 2017/11/7
-     */
-    public static Date parse(String text, String formatPattern) throws ParseException {
-        if (StringUtils.isBlank(text)) {
-            return null;
-        }
-        SimpleDateFormat f = new SimpleDateFormat(formatPattern);
-        return f.parse(text);
-    }
-
-    /**
-     * 当前时间+day,指定hour，分秒置为零
-     *
-     * @param day
-     * @param hour
-     * @return
-     */
-    public static Date addDay(int day, int hour) {
-        // 取时间
-        Date date = new Date();
-        Calendar calendar = new GregorianCalendar();
-        calendar.setTime(date);
-        calendar.set(Calendar.HOUR_OF_DAY, hour);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.add(Calendar.DATE, day);
-        return calendar.getTime();
-    }
-
-    /**
-     * 当前时间+day,时分秒置为零
-     *
-     * @param day
-     * @return
-     */
-    public static Date addDay(int day) {
-        // 取时间
-        Date date = new Date();
-        Calendar calendar = new GregorianCalendar();
-        calendar.setTime(date);
-        calendar.set(Calendar.HOUR_OF_DAY, 0);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.add(Calendar.DATE, day);// 把日期往后增加一天.整数往后推,负数往前移动
-        // 这个时间就是日期往后推一天的结果
-        return calendar.getTime();
-    }
-
-
-    /**
-     * 指定时间+day 时分秒置为零
-     *
-     * @param day
-     * @param date
-     * @return
-     */
-    public static Date addDay(int day, Date date) {
-        Calendar calendar = new GregorianCalendar();
-        calendar.setTime(date);
-        calendar.set(Calendar.HOUR_OF_DAY, 0);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.add(Calendar.DATE, day);// 把日期往后增加一天.整数往后推,负数往前移动
-        // 这个时间就是日期往后推一天的结果
-        return calendar.getTime();
-    }
-
-    /**
-     * 指定时间+day 时分秒不变
-     *
-     * @param day
-     * @param date
-     * @return
-     */
-    public static Date addDay2(int day, Date date) {
-        Calendar calendar = new GregorianCalendar();
-        calendar.setTime(date);
-        calendar.add(Calendar.DATE, day);// 把日期往后增加一天.整数往后推,负数往前移动
-        // 这个时间就是日期往后推一天的结果
-        return calendar.getTime();
-    }
-
-}

src/main/java/com/caimei/modules/miniprogram/utils/JsonUtils.java

@@ -1,38 +0,0 @@
-package com.caimei.modules.miniprogram.utils;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.io.IOException;
-
-public class JsonUtils {
-    /**
-     * json转对象
-     * @param json
-     * @param t
-     * @param <T>
-     * @return
-     */
-    public static <T> T json2Obj(String json, Class<T> t) {
-        ObjectMapper objectMapper = new ObjectMapper();
-        try {
-            return objectMapper.readValue(json, t);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * 对象转json
-     * @param obj
-     * @return
-     */
-    public static String obj2Json(Object obj) {
-        try {
-            return  new ObjectMapper().writeValueAsString(obj);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return  null;
-    }
-}

src/main/java/com/caimei/modules/miniprogram/utils/ReturnCode.java

@@ -1,242 +0,0 @@
-package com.caimei.modules.miniprogram.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 微信接口全局返回码
- */
-public class ReturnCode {
-
-    @SuppressWarnings("serial")
-    private static final Map<Integer, String> errCodeToErrMsg = new HashMap<Integer, String>(){{
-        put(-1, "系统繁忙");
-        put(0, "请求成功");
-        put(40001, "获取access_token时AppSecret错误，或者access_token无效");
-        put(40002, "不合法的凭证类型");
-        put(40003, "不合法的OpenID");
-        put(40004, "不合法的媒体文件类型");
-        put(40005, "不合法的文件类型");
-        put(40006, "不合法的文件大小");
-        put(40007, "不合法的媒体文件id");
-        put(40008, "不合法的消息类型");
-        put(40009, "不合法的图片文件大小");
-        put(40010, "不合法的语音文件大小");
-        put(40011, "不合法的视频文件大小");
-        put(40012, "不合法的缩略图文件大小");
-        put(40013, "不合法的APPID");
-        put(40014, "不合法的access_token");
-        put(40015, "不合法的菜单类型");
-        put(40016, "不合法的按钮个数");
-        put(40017, "不合法的按钮类型");
-        put(40018, "不合法的按钮名字长度");
-        put(40019, "不合法的按钮KEY长度");
-        put(40020, "不合法的按钮URL长度");
-        put(40021, "不合法的菜单版本号");
-        put(40022, "不合法的子菜单级数");
-        put(40023, "不合法的子菜单按钮个数");
-        put(40024, "不合法的子菜单按钮类型");
-        put(40025, "不合法的子菜单按钮名字长度");
-        put(40026, "不合法的子菜单按钮KEY长度");
-        put(40027, "不合法的子菜单按钮URL长度");
-        put(40028, "不合法的自定义菜单使用用户");
-        put(40029, "不合法的oauth_code");
-        put(40030, "不合法的refresh_token");
-        put(40031, "不合法的openid列表");
-        put(40032, "不合法的openid列表长度,一次只能拉黑20个用户");
-        put(40033, "不合法的请求字符，不能包含\\uxxxx格式的字符");
-        put(40035, "不合法的参数");
-        put(40037, "不合法的模板id");
-        put(40038, "不合法的请求格式");
-        put(40039, "不合法的URL长度");
-        put(40050, "不合法的分组id");
-        put(40051, "分组名字不合法");
-        put(40053, "不合法的actioninfo，请开发者确认参数正确");
-        put(40056, "不合法的Code码");
-        put(40059, "不合法的消息id");
-        put(40071, "不合法的卡券类型");
-        put(40072, "不合法的编码方式");
-        put(40078, "card_id未授权");
-        put(40079, "不合法的时间");
-        put(40080, "不合法的CardExt");
-        put(40097, "参数不正确，请参考字段要求检查json字段");
-        put(40099, "卡券已被核销");
-        put(40100, "不合法的时间区间");
-        put(40116, "不合法的Code码");
-        put(40122, "不合法的库存数量");
-        put(40124, "会员卡设置查过限制的 custom_field字段");
-        put(40127, "卡券被用户删除或转赠中");
-        put(40130, "不合法的openid列表长度, 长度至少大于2个");//invalid openid list size, at least two openid
-        put(41001, "缺少access_token参数");
-        put(41002, "缺少appid参数");
-        put(41003, "缺少refresh_token参数");
-        put(41004, "缺少secret参数");
-        put(41005, "缺少多媒体文件数据");
-        put(41006, "缺少media_id参数");
-        put(41007, "缺少子菜单数据");
-        put(41008, "缺少oauth code");
-        put(41009, "缺少openid");
-        put(41011, "缺少必填字段");
-        put(41012, "缺少cardid参数");
-        put(42001, "access_token超时");
-        put(42002, "refresh_token超时");
-        put(42003, "oauth_code超时");
-        put(43001, "需要GET请求");
-        put(43002, "需要POST请求");
-        put(43003, "需要HTTPS请求");
-        put(43004, "需要接收者关注");
-        put(43005, "需要好友关系");
-        put(43009, "自定义SN权限，请前往公众平台申请");
-        put(43010, "无储值权限，请前往公众平台申请");
-        put(43100, "修改模板所属行业太频繁");
-        put(44001, "多媒体文件为空");
-        put(44002, "POST的数据包为空");
-        put(44003, "图文消息内容为空");
-        put(44004, "文本消息内容为空");
-        put(45001, "多媒体文件大小超过限制");
-        put(45002, "消息内容超过限制");
-        put(45003, "标题字段超过限制");
-        put(45004, "描述字段超过限制");
-        put(45005, "链接字段超过限制");
-        put(45006, "图片链接字段超过限制");
-        put(45007, "语音播放时间超过限制");
-        put(45008, "图文消息超过限制");
-        put(45009, "接口调用超过限制");
-        put(45010, "创建菜单个数超过限制");
-        put(45015, "回复时间超过限制");
-        put(45016, "系统分组，不允许修改");
-        put(45017, "分组名字过长");
-        put(45018, "分组数量超过上限");
-        put(45027, "模板与所选行业不符");//template conflict with industry
-        put(45028, "没有群发配额");//has no masssend quota
-        put(45030, "该cardid无接口权限");
-        put(45031, "库存为0");
-        put(45033, "用户领取次数超过限制get_limit");
-        put(45056, "创建的标签数过多，请注意不能超过100个");
-        put(45057, "该标签下粉丝数超过10w，不允许直接删除");
-        put(45058, "不能修改0/1/2这三个系统默认保留的标签");
-        put(45059, "有粉丝身上的标签数已经超过限制");
-        put(45157, "标签名非法，请注意不能和其他标签重名");
-        put(45158, "标签名长度超过30个字节");
-        put(45159, "非法的tag_id");
-        put(46001, "不存在媒体数据");
-        put(46002, "不存在的菜单版本");
-        put(46003, "不存在的菜单数据");
-        put(46004, "不存在的用户");
-        put(46005, "不存在的门店");
-        put(47001, "解析JSON/XML内容错误");
-        put(48001, "api功能未授权");
-        put(48004, "api接口被封禁，请登录mp.weixin.qq.com查看详情");
-        put(49003, "传入的openid不属于此AppID");
-        put(50001, "用户未授权该api");
-        put(50002, "用户受限，可能是违规后接口被封禁");
-        put(61451, "参数错误(invalid parameter)");
-        put(61452, "无效客服账号(invalid kf_account)");
-        put(61453, "客服帐号已存在(kf_account exsited)");
-        put(61454, "客服帐号名长度超过限制(仅允许10个英文字符，不包括@及@后的公众号的微信号)(invalid kf_acount length)");
-        put(61455, "客服帐号名包含非法字符(仅允许英文+数字)(illegal character in kf_account)");
-        put(61456, "客服帐号个数超过限制(10个客服账号)(kf_account count exceeded)");
-        put(61457, "无效头像文件类型(invalid file type)");
-        put(61450, "系统错误(system error)");
-        put(61500, "日期格式错误");
-        put(65104, "门店的类型不合法，必须严格按照附表的分类填写");
-        put(65105, "图片url 不合法，必须使用接口1 的图片上传接口所获取的url");
-        put(65106, "门店状态必须未审核通过");
-        put(65107, "扩展字段为不允许修改的状态");
-        put(65109, "门店名为空");
-        put(65110, "门店所在详细街道地址为空");
-        put(65111, "门店的电话为空");
-        put(65112, "门店所在的城市为空");
-        put(65113, "门店所在的省份为空");
-        put(65114, "图片列表为空");
-        put(65115, "poi_id 不正确");
-        put(65301, "不存在此menuid对应的个性化菜单");
-        put(65302, "没有相应的用户");
-        put(65303, "没有默认菜单，不能创建个性化菜单");
-        put(65304, "MatchRule信息为空");
-        put(65305, "个性化菜单数量受限");
-        put(65306, "不支持个性化菜单的帐号");
-        put(65307, "个性化菜单信息为空");
-        put(65308, "包含没有响应类型的button");
-        put(65309, "个性化菜单开关处于关闭状态");
-        put(65310, "填写了省份或城市信息，国家信息不能为空");
-        put(65311, "填写了城市信息，省份信息不能为空");
-        put(65312, "不合法的国家信息");
-        put(65313, "不合法的省份信息");
-        put(65314, "不合法的城市信息");
-        put(65316, "该公众号的菜单设置了过多的域名外跳（最多跳转到3个域名的链接）");
-        put(65317, "不合法的URL");
-        put(65400, "API不可用，即没有开通/升级到新客服功能");
-        put(65401, "无效客服帐号");
-        put(65402, "帐号尚未绑定微信号，不能投入使用");
-        put(65403, "客服昵称不合法");
-        put(65404, "客服帐号不合法");
-        put(65405, "帐号数目已达到上限，不能继续添加");
-        put(65406, "已经存在的客服帐号");
-        put(65407, "邀请对象已经是本公众号客服");
-        put(65408, "本公众号已发送邀请给该微信号");
-        put(65409, "无效的微信号");
-        put(65410, "邀请对象绑定公众号客服数量达到上限（目前每个微信号最多可以绑定5个公众号客服帐号）");
-        put(65411, "该帐号已经有一个等待确认的邀请，不能重复邀请");
-        put(65412, "该帐号已经绑定微信号，不能进行邀请");
-        put(65413, "不存在对应用户的会话信息");
-        put(65414, "客户正在被其他客服接待");
-        put(65415, "客服不在线");
-        put(65416, "查询参数不合法");
-        put(65417, "查询时间段超出限制");
-        put(72015, "没有操作发票的权限，请检查是否已开通相应权限。");
-        put(72017, "发票抬头不一致");
-        put(72023, "发票已被其他公众号锁定");
-        put(72024, "发票状态错误");
-        put(72025, "wx_invoice_token无效");
-        put(72028, "未设置微信支付商户信息");
-        put(72029, "未设置授权字段");
-        put(72030, "mchid无效");
-        put(72031, "参数错误。可能为请求中包括无效的参数名称或包含不通过后台校验的参数值");
-        put(72035, "发票已经被拒绝开票");
-        put(72036, "发票正在被修改状态，请稍后再试");
-        put(72038, "订单没有授权，可能是开票平台appid、商户appid、订单order_id不匹配");
-        put(72039, "订单未被锁定");
-        put(72040, "Pdf无效，请提供真实有效的pdf");
-        put(72042, "发票号码和发票代码重复");
-        put(72043, "发票号码和发票代码错误");
-        put(72044, "发票抬头二维码超时");
-        put(88000, "没有留言权限");
-        put(9001001, "POST数据参数不合法");
-        put(9001002, "远端服务不可用");
-        put(9001003, "Ticket不合法");
-        put(9001004, "获取摇周边用户信息失败");
-        put(9001005, "获取商户信息失败");
-        put(9001006, "获取OpenID失败");
-        put(9001007, "上传文件缺失");
-        put(9001008, "上传素材的文件类型不合法");
-        put(9001009, "上传素材的文件尺寸不合法");
-        put(9001010, "上传失败");
-        put(9001020, "帐号不合法");
-        put(9001021, "已有设备激活率低于50%，不能新增设备");
-        put(9001022, "设备申请数不合法，必须为大于0的数字");
-        put(9001023, "已存在审核中的设备ID申请");
-        put(9001024, "一次查询设备ID数量不能超过50");
-        put(9001025, "设备ID不合法");
-        put(9001026, "页面ID不合法");
-        put(9001027, "页面参数不合法");
-        put(9001028, "一次删除页面ID数量不能超过10");
-        put(9001029, "页面已应用在设备中，请先解除应用关系再删除");
-        put(9001030, "一次查询页面ID数量不能超过50");
-        put(9001031, "时间区间不合法");
-        put(9001032, "保存设备与页面的绑定关系参数错误");
-        put(9001033, "门店ID不合法");
-        put(9001034, "设备备注信息过长");
-        put(9001035, "设备申请参数不合法");
-        put(9001036, "查询起始值begin不合法");
-    }};
-
-    /**
-     * 通过返回码获取返回信息
-     * @param errCode 错误码
-     * @return {String}
-     */
-    public static String get(int errCode) {
-        return errCodeToErrMsg.get(errCode);
-    }
-}

src/main/java/com/caimei/modules/miniprogram/utils/UploadPicUtils.java

@@ -1,160 +0,0 @@
-package com.caimei.modules.miniprogram.utils;
-
-import com.caimei.dfs.DfsFileManager;
-import com.caimei.dfs.beens.BufferDfsFile;
-import com.caimei.dfs.image.beens.ImageUploadInfo;
-import com.caimei.modules.common.utils.UploadUtils;
-import com.caimei.modules.sys.utils.UploadImageUtils;
-import com.jcraft.jsch.Channel;
-import com.jcraft.jsch.ChannelSftp;
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.Session;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.utils.Encodes;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Properties;
-
-public class UploadPicUtils {
-
-    public static String saveImageToServer(String imgUrl) {
-        String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
-        ImageUploadInfo saveImageSerivce = new ImageUploadInfo();
-        String newImage = imgUrl;
-        if (StringUtils.isNotBlank(newImage) && !newImage.startsWith("http:") && !newImage.startsWith("https:")) {
-            newImage = Encodes.urlDecode(newImage);
-            String realPath = UploadImageUtils.getAbsolutePath(newImage);
-            int pointerIndex = realPath.lastIndexOf(".");
-            try {
-                saveImageSerivce = UploadUtils.saveImageSerivce(realPath, pointerIndex, realPath);
-                newImage = photoServer + saveImageSerivce.getSource();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return newImage;
-    }
-
-    public static String saveImageToDfsServer(String imgUrl) throws IOException {
-        String source = "";
-        try {
-            String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
-            InputStream input = UploadPicUtils.getInputStream(imgUrl);
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            byte[] buffer = new byte[1024];
-            int len;
-            while ((len = input.read(buffer)) > -1) {
-                output.write(buffer, 0, len);
-            }
-            output.flush();
-//            InputStream cloneInput = new ByteArrayInputStream(output.toByteArray());
-            BufferDfsFile bufferDfsFile = new BufferDfsFile();
-
-            int pointerIndex = imgUrl.lastIndexOf("=");
-            if (pointerIndex == -1) {
-                bufferDfsFile.setFileExtName("jpeg");
-            } else {
-                // dfs 上传原图
-                bufferDfsFile.setFileExtName(imgUrl.substring(pointerIndex + 1));
-            }
-            bufferDfsFile.setBufferFile(output.toByteArray());
-            source = photoServer + DfsFileManager.upload1(bufferDfsFile);
-            System.out.println("==================>新图片路径:" + source);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return source;
-    }
-
-
-    public static void uploadPicToServer(String picUrl, String picName) {
-        try {
-            String host = "120.78.158.98";
-            int port = 22;
-            String username = "root";
-            String password = "qy19970328.";
-            String directory = "/home/pic/";
-            //String downloadFile = "upload.txt";
-            //String saveFile = "D:\\tmp\\save.txt";
-            //String deleteFile = "delete.txt";
-            ChannelSftp sftp = connect(host, port, username, password);
-            upload(directory, picUrl, picName, sftp);
-            //sf.download(directory, downloadFile, saveFile, sftp);
-            //sf.delete(directory, deleteFile, sftp);
-            System.out.println("成功");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /*
-	host 主机
-	port 端口
-	username 用户名
-	password 密码
-	*/
-    public static ChannelSftp connect(String host, int port, String username,
-                                      String password) {
-        ChannelSftp sftp = null;
-        try {
-            JSch jsch = new JSch();
-            jsch.getSession(username, host, port);
-            Session sshSession = jsch.getSession(username, host, port);
-            //SSH实现免密连接
-            sshSession.setPassword(password);
-            Properties sshConfig = new Properties();
-            sshConfig.put("StrictHostKeyChecking", "no");
-            sshSession.setConfig(sshConfig);
-            sshSession.connect();
-            Channel channel = sshSession.openChannel("sftp");
-            channel.connect();
-            sftp = (ChannelSftp) channel;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return sftp;
-    }
-
-    /*directory 上传的目录
-    uploadFile 要上传的文件*/
-    public static void upload(String directory, String picUrl, String picName, ChannelSftp sftp) {
-        try {
-            sftp.cd(directory);
-            sftp.put(getInputStream(picUrl), picName);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static InputStream getInputStream(String picUrl) {
-        InputStream is = null;
-        try {
-            if (picUrl == null || picUrl == "") {
-                return is;
-            }
-            URL urlGet = new URL(picUrl);
-            HttpURLConnection http = (HttpURLConnection) urlGet
-                    .openConnection();
-            http.setRequestMethod("GET"); // 必须是get方式请求
-            http.setRequestProperty("Content-Type",
-                    "application/x-www-form-urlencoded");
-            http.setDoOutput(true);
-            http.setDoInput(true);
-            System.setProperty("sun.net.client.defaultConnectTimeout", "300000");// 连接超时300秒
-            System.setProperty("sun.net.client.defaultReadTimeout", "300000"); // 读取超时300秒
-            http.connect();
-            // 获取文件转化为byte流
-            is = http.getInputStream();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return is;
-
-    }
-}

src/main/java/com/caimei/modules/miniprogram/utils/UrlEncoderUtils.java

@@ -1,87 +0,0 @@
-package com.caimei.modules.miniprogram.utils;
-import java.util.BitSet;
-
-
-/**
- * 类UrlEncoderUtils.java的实现描述：TODO 类实现描述
- *
- * @author lwt
- */
-
-public class UrlEncoderUtils {
-    private static BitSet dontNeedEncoding;
-
-    static {
-        dontNeedEncoding = new BitSet(256);
-        int i;
-        for (i = 'a'; i <= 'z'; i++) {
-            dontNeedEncoding.set(i);
-        }
-        for (i = 'A'; i <= 'Z'; i++) {
-            dontNeedEncoding.set(i);
-        }
-        for (i = '0'; i <= '9'; i++) {
-            dontNeedEncoding.set(i);
-        }
-        dontNeedEncoding.set('+');
-        /**
-         * 这里会有误差,比如输入一个字符串 123+456,它到底是原文就是123+456还是123 456做了urlEncode后的内容呢？<br>
-         * 其实问题是一样的，比如遇到123%2B456,它到底是原文即使如此，还是123+456 urlEncode后的呢？ <br>
-         * 在这里，我认为只要符合urlEncode规范的，就当作已经urlEncode过了<br>
-         * 毕竟这个方法的初衷就是判断string是否urlEncode过<br>
-         */
-
-        dontNeedEncoding.set('-');
-        dontNeedEncoding.set('_');
-        dontNeedEncoding.set('.');
-        dontNeedEncoding.set('*');
-    }
-
-    /**
-     * 判断str是否urlEncoder.encode过<br>
-     * 经常遇到这样的情况，拿到一个URL,但是搞不清楚到底要不要encode.<Br>
-     * 不做encode吧，担心出错，做encode吧，又怕重复了<Br>
-     *
-     * @param str
-     * @return
-     */
-    public static boolean hasUrlEncoded(String str) {
-
-        /**
-         * 支持JAVA的URLEncoder.encode出来的string做判断。 即: 将' '转成'+' <br>
-         * 0-9a-zA-Z保留 <br>
-         * '-'，'_'，'.'，'*'保留 <br>
-         * 其他字符转成%XX的格式，X是16进制的大写字符，范围是[0-9A-F]
-         */
-        boolean needEncode = false;
-        for (int i = 0; i < str.length(); i++) {
-            char c = str.charAt(i);
-            if (dontNeedEncoding.get((int) c)) {
-                continue;
-            }
-            if (c == '%' && (i + 2) < str.length()) {
-                // 判断是否符合urlEncode规范
-                char c1 = str.charAt(++i);
-                char c2 = str.charAt(++i);
-                if (isDigit16Char(c1) && isDigit16Char(c2)) {
-                    continue;
-                }
-            }
-            // 其他字符，肯定需要urlEncode
-            needEncode = true;
-            break;
-        }
-
-        return !needEncode;
-    }
-
-    /**
-     * 判断c是否是16进制的字符
-     *
-     * @param c
-     * @return
-     */
-    private static boolean isDigit16Char(char c) {
-        return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F');
-    }
-}

src/main/java/com/caimei/modules/miniprogram/utils/WxUtils.java

@@ -1,58 +0,0 @@
-package com.caimei.modules.miniprogram.utils;
-
-import com.caimei.modules.miniprogram.entity.AccessToken;
-import com.caimei.redis.RedisService;
-import com.caimei.utils.HttpUtils;
-import com.caimei.utils.StringUtils;
-import net.sf.json.JSONObject;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import java.util.Map;
-
-public class WxUtils {
-    public static AccessToken getToken(String url,String appid,String secret,RedisService redisService){
-        url+="?grant_type=client_credential&appid="+appid+"&secret="+secret;
-//        ApplicationContext ac = new ClassPathXmlApplicationContext(new String[]{"spring-context.xml","spring-context-jedis.xml"});
-//        //从Spring容器中根据bean的id取出我们要使用的userService对象
-//        RedisService redisService = (RedisService) ac.getBean(RedisService.class);
-        try {
-            flag:if(redisService.exists("access_token")){
-                AccessToken access_token = new AccessToken(redisService.get("access_token").toString());
-                String checkUrl = "https://api.weixin.qq.com/cgi-bin/getcallbackip?access_token="+access_token.getAccessToken();
-                String jsonResult = HttpUtils.httpRequest(checkUrl, "GET", null);
-                if(StringUtils.isNotBlank(jsonResult)){
-                    if(JsonUtils.json2Obj(jsonResult, Map.class).containsKey("errcode")){
-                        String errcode = JsonUtils.json2Obj(jsonResult,Map.class).get("errcode").toString();
-                        System.out.println("原token失效重新请求Token:=============>"+errcode);
-                        break flag;
-                    }
-                }
-                return access_token;
-            }
-            String jsonResult = HttpUtils.httpRequest(url, "GET", null);
-            if(StringUtils.isNotBlank(jsonResult)){
-                JSONObject jsonObject = JSONObject.fromObject(jsonResult);//转化为JSON类
-                AccessToken access_token = new AccessToken(jsonObject.toString());
-                if(access_token.getErrorCode() != null){
-                    String errmsg = ReturnCode.get(access_token.getErrorCode());
-                    if(errmsg == null || errmsg == ""){
-                        errmsg = access_token.getErrorMsg();
-                    }
-                    System.out.println("token获取错误=============>"+errmsg);
-                }else{
-                    System.out.println("token获取成功=============>"+access_token.getAccessToken());
-                    //提前两分钟刷新
-                    redisService.set("access_token",access_token.getJson(),(60-1)*60*2L);
-                    return	access_token;
-                }
-            }
-        } catch (Exception e) {
-                e.getMessage();
-        }
-        return null;
-    }
-
-
-
-}

src/main/java/com/caimei/modules/miniprogram/web/CmMiniProgramUserController.java

@@ -1,129 +0,0 @@
-package com.caimei.modules.miniprogram.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.caimei.modules.miniprogram.utils.UrlEncoderUtils;
-import com.caimei.vo.JsonModel;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.caimei.modules.miniprogram.entity.CmMiniProgramUser;
-import com.caimei.modules.miniprogram.service.CmMiniProgramUserService;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-
-/**
- * 小程序用户管理Controller
- * @author lwt
- * @version 2018-12-24
- */
-@Controller
-@RequestMapping(value = "${adminPath}/miniprogram/cmMiniProgramUser")
-public class CmMiniProgramUserController extends BaseController {
-
-	@Autowired
-	private CmMiniProgramUserService cmMiniProgramUserService;
-	
-	@ModelAttribute
-	public CmMiniProgramUser get(@RequestParam(required=false) String id) {
-		CmMiniProgramUser entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = cmMiniProgramUserService.get(id);
-		}
-		if (entity == null){
-			entity = new CmMiniProgramUser();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("miniprogram:cmMiniProgramUser:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(CmMiniProgramUser cmMiniProgramUser, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<CmMiniProgramUser> page = cmMiniProgramUserService.findPage(new Page<CmMiniProgramUser>(request, response), cmMiniProgramUser);
-		for (CmMiniProgramUser user : page.getList()) {
-			try {
-				if (StringUtils.isNotBlank(user.getWeixinNick()) && UrlEncoderUtils.hasUrlEncoded(user.getWeixinNick()))
-					user.setWeixinNick(URLDecoder.decode(user.getWeixinNick(),"utf-8"));
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-		}
-		model.addAttribute("page", page);
-		return "modules/miniprogram/cmMiniProgramUserList";
-	}
-
-	@RequiresPermissions("miniprogram:cmMiniProgramUser:view")
-	@RequestMapping(value = "form")
-	public String form(CmMiniProgramUser cmMiniProgramUser, Model model) {
-		model.addAttribute("cmMiniProgramUser", cmMiniProgramUser);
-		return "modules/miniprogram/cmMiniProgramUserForm";
-	}
-
-	@RequiresPermissions("miniprogram:cmMiniProgramUser:edit")
-	@RequestMapping(value = "save")
-	public String save(CmMiniProgramUser cmMiniProgramUser, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, cmMiniProgramUser)){
-			return form(cmMiniProgramUser, model);
-		}
-		cmMiniProgramUserService.save(cmMiniProgramUser);
-		addMessage(redirectAttributes, "保存小程序用户管理成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmMiniProgramUser/?repage";
-	}
-	
-	@RequiresPermissions("miniprogram:cmMiniProgramUser:delete")
-	@RequestMapping(value = "delete")
-	public String delete(CmMiniProgramUser cmMiniProgramUser, RedirectAttributes redirectAttributes) {
-		cmMiniProgramUserService.delete(cmMiniProgramUser);
-		addMessage(redirectAttributes, "删除小程序用户管理成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmMiniProgramUser/?repage";
-	}
-
-	@RequiresPermissions("miniprogram:cmMiniProgramUser:edit")
-	@RequestMapping(value = "updateMobile")
-	@ResponseBody
-	public JsonModel updateMobile(CmMiniProgramUser cmMiniProgramUser, String newMobile) {
-		JsonModel jsonModel = new JsonModel();
-		if ("1".equals(cmMiniProgramUser.getRegisterUserTypeID()) ||
-			"3".equals(cmMiniProgramUser.getRegisterUserTypeID())) {
-			cmMiniProgramUser.setBindMobile(newMobile);
-		} else {
-			cmMiniProgramUser.setMobile(newMobile);
-		}
-		try {
-			cmMiniProgramUserService.update(cmMiniProgramUser);
-			jsonModel.success();
-		} catch (Exception e) {
-			jsonModel.error("数据异常");
-		}
-		return jsonModel;
-	}
-
-	@RequiresPermissions("miniprogram:cmMiniProgramUser:edit")
-	@RequestMapping(value = "unbindMobile")
-	public String unbindMobile(CmMiniProgramUser cmMiniProgramUser) {
-		if ("1".equals(cmMiniProgramUser.getRegisterUserTypeID()) ||
-				"3".equals(cmMiniProgramUser.getRegisterUserTypeID())) {
-			cmMiniProgramUser.setBindMobile(null);
-		} else {
-			cmMiniProgramUser.setMobile(null);
-		}
-		cmMiniProgramUser.setRegisterUserTypeID("5");//微信游客
-		return "";
-	}
-
-}

src/main/java/com/caimei/modules/miniprogram/web/CmWxArticleController.java

@@ -1,510 +0,0 @@
-package com.caimei.modules.miniprogram.web;
-
-import com.alibaba.fastjson.JSONArray;
-import com.caimei.modules.miniprogram.entity.AccessToken;
-import com.caimei.modules.miniprogram.entity.CmWxArticle;
-import com.caimei.modules.miniprogram.entity.CmWxMenu;
-import com.caimei.modules.miniprogram.entity.CmWxTag;
-import com.caimei.modules.miniprogram.service.CmWxArticleService;
-import com.caimei.modules.miniprogram.service.CmWxMenuService;
-import com.caimei.modules.miniprogram.service.CmWxTagService;
-import com.caimei.modules.miniprogram.service.CmWxXpsxProductService;
-import com.caimei.modules.miniprogram.utils.*;
-import com.caimei.modules.product.entity.Product;
-import com.caimei.redis.RedisService;
-import com.caimei.utils.HttpUtils;
-import com.caimei.vo.JsonModel;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.modules.sys.entity.User;
-import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 微信文章存取Controller
- * @author ye.qin
- * @version 2018-12-17
- */
-@Controller
-@RequestMapping(value = "${adminPath}/miniprogram/cmWxArticle")
-public class CmWxArticleController extends BaseController {
-    private JsonModel jsonModel;
-
-    @Autowired
-    private CmWxArticleService cmWxArticleService;
-    @Resource
-    private CmWxTagService cmWxTagService;
-    @Resource
-    private CmWxXpsxProductService cmWxXpsxProductService;
-    @Resource
-    private CmWxMenuService cmWxMenuService;
-    @Autowired
-	private RedisService redisService;
-
-
-    private static HashMap countMap = new HashMap();
-
-	@ModelAttribute
-	public CmWxArticle get(@RequestParam(required=false) String id) {
-		CmWxArticle entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = cmWxArticleService.get(id);
-		}
-		if (entity == null){
-			entity = new CmWxArticle();
-		}
-		return entity;
-	}
-
-    @RequestMapping(value = "getById")
-    @ResponseBody
-    public CmWxArticle getById(@RequestParam(required=false) String id) {
-        CmWxArticle entity = null;
-        if (StringUtils.isNotBlank(id)){
-            entity = cmWxArticleService.get(id);
-        }
-        if (entity == null){
-            entity = new CmWxArticle();
-        }
-        return entity;
-    }
-
-
-	@RequestMapping(value = {"list", "","cmWxArticleMallPromotion","unionArticle","cmWxArticleLectureHall", "cmWxArticleNews", "cmWxArticlePopularInstrument","cmWxArticleEncyclopedias"})
-	public String list(CmWxArticle cmWxArticle, HttpServletRequest request, HttpServletResponse response, Model model) {
-	    String reqSource = request.getServletPath();
-	    String returnUrl = "";
-	    boolean flag = false;
-        String admin2Server = Global.getConfig("admin2Server");//获取admin2文件服务器地址
-	    if(reqSource.contains("cmWxArticleMallPromotion")){
-	        cmWxArticle.setType(ArticleType.SCCX.getTypeID().toString());
-            returnUrl = "modules/miniprogram/cmWxArticleMallPromotionList";
-        } else if (reqSource.contains("cmWxArticleNews")) { //新品上线
-            cmWxArticle.setType(ArticleType.XPSX.getTypeID().toString());
-            returnUrl = "modules/miniprogram/cmWxArticleNewsList";
-        }
-        else if(reqSource.contains("cmWxArticlePopularInstrument")){
-            cmWxArticle.setType(ArticleType.RMYQ.getTypeID().toString());
-            returnUrl = "modules/miniprogram/cmWxArticlePopularInstrumentList";
-        }
-        else if(reqSource.contains("cmWxArticleEncyclopedias")){
-            cmWxArticle.setType(ArticleType.MYXBK.getTypeID().toString());
-            returnUrl = "modules/miniprogram/cmWxArticleEncyclopediasList";
-        }else if(reqSource.contains("cmWxArticleLectureHall")){
-            cmWxArticle.setType(ArticleType.CMDJT.getTypeID().toString());
-            returnUrl = "modules/miniprogram/cmWxArticleLectureHallList";
-        }else if(reqSource.contains("unionArticle")){
-            flag = true;
-            if(cmWxArticle.getSource() != null && cmWxArticle.getSource() != ""){
-                model.addAttribute("source", cmWxArticle.getSource());
-                returnUrl = "modules/miniprogram/selectOldArticleList";
-            }else{
-                cmWxArticle.setDeployStatus("2");
-                returnUrl = "modules/miniprogram/selectArticleList";
-            }
-        }else{
-            returnUrl = "modules/miniprogram/selectArticleList";
-        }
-	    Page<CmWxArticle> page = cmWxArticleService.findPage(new Page<CmWxArticle>(request, response), cmWxArticle);
-        for(CmWxArticle article : page.getList()) {
-            if (flag) article.setContent("");
-            if ("3".equals(article.getSource())) {
-                String image = article.getThumbUrl();
-                if(StringUtils.isNotBlank(image) && !image.contains("http:") && !image.contains("https:")){//不以http开头的
-                    article.setThumbUrl(admin2Server+"/uploadFile/infoImage/"+image);
-                }
-            }
-        }
-		model.addAttribute("page", page);
-		return returnUrl;
-	}
-
-	@RequestMapping(value = "form")
-	public String form(CmWxArticle cmWxArticle, Model model) {
-        String returnUrl = "";
-        CmWxTag cmWxTag = new CmWxTag();
-        cmWxTag.setStatus("1");
-        List<CmWxMenu> menulist = cmWxMenuService.findList(new CmWxMenu());
-        List<CmWxTag> tags = cmWxTagService.findList(cmWxTag);
-        if(cmWxArticle.getType().equals(ArticleType.SCCX.getTypeID().toString())){
-            returnUrl = "modules/miniprogram/cmWxArticleMallPromotionForm";
-        } else if (cmWxArticle.getType().equals(ArticleType.XPSX.getTypeID().toString())) {
-            returnUrl = "modules/miniprogram/cmWxArticleNewsForm";
-            cmWxArticle.setCmWxXpsxProduct(cmWxXpsxProductService.getByArticleId(cmWxArticle.getId()));
-        } else if (cmWxArticle.getType().equals(ArticleType.RMYQ.getTypeID().toString())) {
-            returnUrl = "modules/miniprogram/cmWxArticlePopularInstrumentForm";
-        }
-        else if(cmWxArticle.getType().equals(ArticleType.MYXBK.getTypeID().toString())){
-            returnUrl = "modules/miniprogram/cmWxArticleEncyclopediasForm";
-        }else if(cmWxArticle.getType().equals(ArticleType.CMDJT.getTypeID().toString())){
-            returnUrl = "modules/miniprogram/cmWxArticleLectureHallForm";
-        }
-        else{
-            returnUrl = "modules/miniprogram/cmWxArticleList";
-        }
-        model.addAttribute("menus",menulist);
-        model.addAttribute("tags", tags);
-        model.addAttribute("cmWxArticle", cmWxArticle);
-
-		return returnUrl;
-	}
-
-
-	@RequestMapping(value = "save")
-	public String save(CmWxArticle cmWxArticle, Model model,HttpServletRequest request, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, cmWxArticle)){
-			return form(cmWxArticle, model);
-		}
-        User user = UserUtils.getUser();
-        cmWxArticle.setAuthor(user.getName());
-        String returnUrl = "";
-        if(cmWxArticle.getType().equals(ArticleType.SCCX.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleMallPromotion";
-        }else if(cmWxArticle.getType().equals(ArticleType.XPSX.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleNews";
-        }else if(cmWxArticle.getType().equals(ArticleType.RMYQ.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticlePopularInstrument";
-        }
-        else if(cmWxArticle.getType().equals(ArticleType.MYXBK.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleEncyclopedias";
-        } else if(cmWxArticle.getType().equals(ArticleType.CMDJT.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleLectureHall";
-        }
-        else{
-            returnUrl = "modules/miniprogram/cmWxArticleList";
-        }
-		cmWxArticleService.save(cmWxArticle,request);
-		addMessage(redirectAttributes, "保存微信文章成功");
-		return returnUrl;
-	}
-
-
-	@RequestMapping(value = "delete")
-	public String delete(CmWxArticle cmWxArticle, RedirectAttributes redirectAttributes) {
-		cmWxArticleService.delete(cmWxArticle);
-        String returnUrl = "";
-        if(cmWxArticle.getType().equals(ArticleType.SCCX.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleMallPromotion?repage";
-        }else if(cmWxArticle.getType().equals(ArticleType.XPSX.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleNews?repage";
-        }else if(cmWxArticle.getType().equals(ArticleType.RMYQ.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticlePopularInstrument?repage";
-        }
-        else if(cmWxArticle.getType().equals(ArticleType.MYXBK.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleEncyclopedias?repage";
-        }
-        else if(cmWxArticle.getType().equals(ArticleType.CMDJT.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleLectureHall?repage";
-        }else{
-            returnUrl = "modules/miniprogram/cmWxArticleList";
-        }
-		addMessage(redirectAttributes, "删除微信文章成功");
-		return returnUrl;
-	}
-
-    @RequestMapping(value = "deploy")
-    public String deploy(CmWxArticle cmWxArticle, Model model, RedirectAttributes redirectAttributes) {
-        if (!beanValidator(model, cmWxArticle)){
-            return form(cmWxArticle, model);
-        }
-        String returnUrl = "";
-        if(cmWxArticle.getType().equals(ArticleType.SCCX.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleMallPromotion?repage";
-        }else if(cmWxArticle.getType().equals(ArticleType.XPSX.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleNews?repage";
-        }else if(cmWxArticle.getType().equals(ArticleType.RMYQ.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticlePopularInstrument?repage";
-        }
-        else if(cmWxArticle.getType().equals(ArticleType.MYXBK.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleEncyclopedias?repage";
-        }else if(cmWxArticle.getType().equals(ArticleType.CMDJT.getTypeID().toString())){
-            returnUrl = "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxArticle/cmWxArticleLectureHall?repage";
-        }
-        else{
-            returnUrl = "modules/miniprogram/cmWxArticleList";
-        }
-        cmWxArticleService.deploy(cmWxArticle);
-        addMessage(redirectAttributes, "保存微信文章成功");
-        return returnUrl;
-    }
-
-    /**
-     * @Author ye.qin
-     * @Description //TODO 获取所有的已上架的商品选择列表
-     * @Date 2019\1\2 0002 14:33
-     * @Param
-     * @return
-     */
-    @RequestMapping(value = "getProduct")
-    public String getProduct(Product product, HttpServletRequest request, HttpServletResponse response, Model model) {
-	    Page<Product> page = cmWxArticleService.findProductPage(new Page<Product>(request, response), product);
-        model.addAttribute("page", page);
-        return "modules/miniprogram/productList";
-    }
-
-
-
-	/**
-	 * @Author ye.qin
-	 * @Description //TODO 获取微信公众号的所有文章素材
-	 * @Date 2018\12\18 0018 17:31
-	 * @Param
-	 * @return
-	 */
-    @RequestMapping(value = {"getWxArticle", "getRecentWxArticle"})
-    public void getWxArticle(
-            @RequestParam(value = "pageNo", required = false, defaultValue = "0") int pageNo,
-            @RequestParam(value = "pageSize", required = false, defaultValue = "20") int pageSize,
-            HttpServletRequest request,HttpServletResponse response,CmWxArticle cmWxArticle, Model model) throws IOException {
-            String reqSource = request.getServletPath();
-            String url = Global.getConfig("wx.getToken");   //请求token URL
-            String appId = Global.getConfig("appId");
-            String getMaterialCountUrl = Global.getConfig("wx.getMaterialCount")+"?access_token=";
-            String appSecret = Global.getConfig("appSecret");
-            AccessToken accessToken = WxUtils.getToken(url,appId,appSecret,redisService);
-            String jsonResult = HttpUtils.httpRequest(getMaterialCountUrl+accessToken.getAccessToken(),"GET",null);
-            if(JsonUtils.json2Obj(jsonResult, Map.class).containsKey("errcode")){
-                String errcode = JsonUtils.json2Obj(jsonResult,Map.class).get("errcode").toString();
-                model.addAttribute("message","获取公众号文章总数失败!");
-                String errmsg = ReturnCode.get(Integer.parseInt(errcode));
-                if(errmsg == null || errmsg == ""){
-                    errmsg = JsonUtils.json2Obj(jsonResult,Map.class).get("errmsg").toString();
-                }
-                logger.error(errcode+"===================="+errmsg);
-            }else{
-                Map map = JsonUtils.json2Obj(jsonResult, Map.class);
-                Integer total = (Integer) map.get("news_count");
-                //只获取最近5条数据
-                if(reqSource.contains("getRecentWxArticle") && total >= 5){
-                    total = 5;
-                }
-                loopCmWxArticle(total);
-            }
-    }
-
-
-    @RequestMapping(value = "getPic")
-    public void getPic(
-            @RequestParam(value = "url", required = false) String url,
-            HttpServletRequest request,HttpServletResponse response, Model model) throws IOException {
-        String ccc = UploadPicUtils.saveImageToDfsServer(url);
-        System.out.println("===============>pic:"+ccc);
-    }
-
-    /**
-     * @Author ye.qin
-     * @Description //TODO 循环拉取微信服务器文章素材（微信服务器一次性最大获取20条）
-     * @Date 2019\1\2 0002 10:51
-     * @Param
-     * @return
-     */
-    private void loopCmWxArticle(Integer total) throws IOException {
-        CmWxArticle cmWxArticle = new CmWxArticle();
-        cmWxArticle.setSource("2");
-        List<CmWxArticle> allArticleList  = cmWxArticleService.findAllList(cmWxArticle);
-        int offset = 0;
-        int a = 0;
-        int count = 20;//一次最大拉取数
-        int temp = 0;
-        while(total > 0){
-            if(total <= count){
-                temp = total;
-            }else{
-                temp = count;
-            }
-            getPageArticle(offset,temp,allArticleList);
-            offset = offset+count;
-            a++;
-            total = total - count;
-        }
-        System.out.println("========================>拉取总次数："+a);
-        logger.info("=============>置换所有图片开始：");
-        repalceArticleImg();
-    }
-
-    private void repalceArticleImg() throws IOException {
-        CmWxArticle cmWxArticle = new CmWxArticle();
-        cmWxArticle.setSource("2");
-        cmWxArticle.setType("0");
-        List<CmWxArticle> allArticleList  = cmWxArticleService.findAllList(cmWxArticle);
-        for(CmWxArticle bean : allArticleList){
-            bean.setContent(repalceContentImg((String) bean.getContent()));
-            String newIamge = UploadPicUtils.saveImageToDfsServer((String) bean.getThumbUrl());
-            bean.setThumbUrl(newIamge);
-            bean.setType(null);
-            cmWxArticleService.persist(bean);
-        }
-    }
-
-    /**
-     * @Author ye.qin
-     * @Description //TODO 调用微信接口返回文章数据
-     * @Date 2018\12\26 0026 9:43
-     * @Param
-     * @return
-     */
-    private List<CmWxArticle> getPageArticle(int offset , int temp , List<CmWxArticle> allArticleList) {
-        String url = Global.getConfig("wx.getToken");   //请求token URL
-        String appId = Global.getConfig("appId");
-        String getMaterialUrl = Global.getConfig("wx.getMaterial")+"?access_token=";    //请求公众号下所有素材URL
-        String str ="{\n" +
-        "     \"type\":\"news\",\n" +
-        "     \"offset\":\""+offset+"\",\n" +
-        "	  \"count\":\""+temp+"\"\n" +
-        "}";
-        jsonModel = new JsonModel();
-        List<CmWxArticle> list = new ArrayList<CmWxArticle>();
-        try {
-                String appSecret = Global.getConfig("appSecret");
-                AccessToken accessToken = WxUtils.getToken(url,appId,appSecret,redisService);
-                String jsonResult = HttpUtils.httpRequest(getMaterialUrl+accessToken.getAccessToken(),"POST",str);
-                if(JsonUtils.json2Obj(jsonResult, Map.class).containsKey("errcode")){
-                    String errcode = JsonUtils.json2Obj(jsonResult,Map.class).get("errcode").toString();
-                    logger.error(errcode+"===================="+ReturnCode.get(Integer.parseInt(errcode)));
-                }else{
-                    list = toListCmWxArticle(jsonResult);
-                    if(allArticleList.size() == 0){
-                        for(CmWxArticle bean : list){
-                                cmWxArticleService.save(bean);
-                        }
-                    }else{
-                        for(int i = 0 ; i < list.size() ; i++){
-                            int flag = allArticleList.size();
-                            for(int a = 0 ; a < allArticleList.size() ; a++){
-                                if(allArticleList.get(a).getMediaId() != null && allArticleList.get(a).getMediaId().equals(list.get(i).getMediaId())){
-                                    flag = flag - 1;
-                                }
-                            }
-                            if(flag == allArticleList.size()){
-                                cmWxArticleService.save(list.get(i));
-                            }
-                        }
-//                        for(CmWxArticle bean : list){
-//                            for(CmWxArticle oldBean : allArticleList){
-//                                if(oldBean.getMediaId() != null && !oldBean.getMediaId().equals(bean.getMediaId())){
-//                                    cmWxArticleService.save(bean);
-//                                }
-//                            }
-//                        }
-                    }
-
-
-                }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return list;
-    }
-
-
-
-    /**
-     * @Author ye.qin
-     * @Description //TODO 把json数据转换为对象数组
-     * @Date 2018\12\26 0026 9:56
-     * @Param
-     * @return 
-     */
-    private List<CmWxArticle> toListCmWxArticle(String jsonResult) {
-        ArrayList<CmWxArticle> listArticle = new ArrayList<CmWxArticle>();
-        try{
-            Map map = JsonUtils.json2Obj(jsonResult, Map.class);
-            net.sf.json.JSONArray array = net.sf.json.JSONArray.fromObject(map.get("item"));
-            for (int i = 0; i < array.size(); i++) {
-                Map item = JsonUtils.json2Obj(array.get(i).toString(), Map.class);
-                Map bean = (Map) item.get("content");
-                ArrayList newsItem = (ArrayList) bean.get("news_item");
-                String createTime = bean.get("create_time").toString();
-                String updateTime = bean.get("update_time").toString();
-                countMap.put((String) item.get("media_id"),"mediaId");
-                for (int b = 0; b < newsItem.size(); b++) {
-                    Map articleMap = (Map) newsItem.get(b);
-                    CmWxArticle cmWxArticle = new CmWxArticle();
-                    cmWxArticle.setMediaId((String) item.get("media_id"));
-                    cmWxArticle.setTitle((String) articleMap.get("title"));
-                    cmWxArticle.setAuthor((String) articleMap.get("author"));
-                    cmWxArticle.setDigest((String) articleMap.get("digest"));
-//                    cmWxArticle.setContent(repalceContentImg((String) articleMap.get("content")));
-                    cmWxArticle.setContent((String) articleMap.get("content"));
-                    cmWxArticle.setContentSourceUrl((String) articleMap.get("content_source_url"));
-                    cmWxArticle.setThumbMediaId((String) articleMap.get("thumb_media_id"));
-                    cmWxArticle.setShowCoverPic(articleMap.get("show_cover_pic").toString());
-                    cmWxArticle.setUrl((String) articleMap.get("url"));
-//                    String newIamge = UploadPicUtils.saveImageToDfsServer((String) articleMap.get("thumb_url"));
-                    cmWxArticle.setThumbUrl((String) articleMap.get("thumb_url"));
-                    cmWxArticle.setCreateTime(DateUtils.timeStamp2Date(createTime,DateUtils.YMDHMS));
-                    cmWxArticle.setUpdateTime(DateUtils.timeStamp2Date(updateTime,DateUtils.YMDHMS));
-//                  cmWxArticle.setThumbUrl((String) articleMap.get("thumb_url"));
-//				    cmWxArticle.setUpdateTime((String) articleMap.get("thumb_url"));
-//				    cmWxArticle.setCreateTime((String) articleMap.get("thumb_url"));
-                    cmWxArticle.setSource("2");
-                    //设置type=0方便图片转换，不需要转换已存在的微信文章数据
-                    cmWxArticle.setType("0");
-                    listArticle.add(cmWxArticle);
-                }
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return listArticle;
-    }
-
-    /**
-     * @Author ye.qin
-     * @Description //TODO 替換微信圖片保存到圖片服務器
-     * @Date 2018\12\26 0026 11:04
-     * @Param
-     * @return
-     */
-    private String repalceContentImg(String content) throws IOException {
-        String img = "";
-        String res = content;
-        Pattern p_image;
-        Matcher m_image;
-        String str = "";
-        String[] images = null;
-//        String regEx_img = "(<img.*src\\s*=\\s*(.*?)[^>]*?>)";
-        String regEx_img = "<(img|IMG)(.*?)(/>|></img>|>)";
-        p_image = Pattern.compile(regEx_img, Pattern.CASE_INSENSITIVE);
-        m_image = p_image.matcher(content);
-        while (m_image.find()) {
-            img = m_image.group();
-            Matcher m = Pattern.compile("src\\s*=\\s*\"?(.*?)(\"|>|\\s+)").matcher(img);
-            while (m.find()) {
-                String tempSelected = m.group(1);
-//                UploadPicUtils.uploadPicToServer(tempSelected,picName);
-//                res = res.replace(m.group(1),"http://120.78.158.98/pic/"+picName);
-                String newIamge = UploadPicUtils.saveImageToDfsServer(tempSelected);
-                res = res.replace(m.group(1),newIamge);
-                if ("".equals(str)) {
-                    str = tempSelected;
-                } else {
-                    String temp = tempSelected;
-                    str = str + "," + temp;
-                }
-            }
-        }
-        if (!"".equals(str)) {
-            images = str.split(",");
-        }
-        return res;
-    }
-}
-

src/main/java/com/caimei/modules/miniprogram/web/CmWxMenuController.java

@@ -1,118 +0,0 @@
-package com.caimei.modules.miniprogram.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.caimei.vo.JsonModel;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.caimei.modules.miniprogram.entity.CmWxMenu;
-import com.caimei.modules.miniprogram.service.CmWxMenuService;
-
-import java.util.List;
-
-/**
- * 小程序菜单Controller
- * @author lwt
- * @version 2018-12-24
- */
-@Controller
-@RequestMapping(value = "${adminPath}/miniprogram/cmWxMenu")
-public class CmWxMenuController extends BaseController {
-
-	@Autowired
-	private CmWxMenuService cmWxMenuService;
-	
-	@ModelAttribute
-	public CmWxMenu get(@RequestParam(required=false) String id) {
-		CmWxMenu entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = cmWxMenuService.get(id);
-		}
-		if (entity == null){
-			entity = new CmWxMenu();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("miniprogram:cmWxMenu:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(CmWxMenu cmWxMenu, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<CmWxMenu> page = cmWxMenuService.findPage(new Page<CmWxMenu>(request, response), cmWxMenu); 
-		model.addAttribute("page", page);
-		return "modules/miniprogram/cmWxMenuList";
-	}
-
-//	@RequiresPermissions("miniprogram:cmWxMenu:view")
-//	@RequestMapping(value = {"findAllList"})
-//	public String findAllList(CmWxMenu cmWxMenu, HttpServletRequest request, HttpServletResponse response, Model model) {
-//		List<CmWxMenu> list = cmWxMenuService.findList(cmWxMenu);
-//		model.addAttribute("menuList", list);
-//		return "modules/miniprogram/cmWxMenuList";
-//	}
-
-	@RequiresPermissions("miniprogram:cmWxMenu:view")
-	@RequestMapping(value = "form")
-	public String form(CmWxMenu cmWxMenu, Model model) {
-		model.addAttribute("cmWxMenu", cmWxMenu);
-		return "modules/miniprogram/cmWxMenuForm";
-	}
-
-	@RequiresPermissions("miniprogram:cmWxMenu:edit")
-	@RequestMapping(value = "save")
-	public String save(CmWxMenu cmWxMenu, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, cmWxMenu)){
-			return form(cmWxMenu, model);
-		}
-		cmWxMenuService.save(cmWxMenu);
-		addMessage(redirectAttributes, "保存小程序菜单成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxMenu/?repage";
-	}
-	
-	@RequiresPermissions("miniprogram:cmWxMenu:delete")
-	@RequestMapping(value = "delete")
-	public String delete(CmWxMenu cmWxMenu, RedirectAttributes redirectAttributes) {
-		cmWxMenuService.delete(cmWxMenu);
-		addMessage(redirectAttributes, "删除小程序菜单成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxMenu/?repage";
-	}
-
-	@RequiresPermissions("miniprogram:cmWxMenu:edit")
-	@RequestMapping(value = "changeStatus")
-	public String  changeStatus(CmWxMenu cmWxMenu, RedirectAttributes redirectAttributes) {
-		if ("1".equals(cmWxMenu.getStatus())) {
-			cmWxMenu.setStatus("0");
-		} else {
-			cmWxMenu.setStatus("1");
-		}
-		cmWxMenuService.update(cmWxMenu);
-		addMessage(redirectAttributes, "状态修改成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxMenu/?repage";
-	}
-
-	@RequiresPermissions("miniprogram:cmWxMenu:edit")
-	@RequestMapping(value = "updateInfo")
-	@ResponseBody
-	public JsonModel updateInfo(CmWxMenu cmWxMenu) {
-		JsonModel jsonModel = new JsonModel();
-		if (StringUtils.isEmpty(cmWxMenu.getMenuName()))
-			return jsonModel.error("请输入菜单名称");
-		if (StringUtils.isEmpty(cmWxMenu.getSort()))
-			return jsonModel.error("请输入排序值");
-		cmWxMenuService.update(cmWxMenu);
-		return jsonModel.success();
-	}
-
-}

src/main/java/com/caimei/modules/miniprogram/web/CmWxPopularSearchController.java

@@ -1,123 +0,0 @@
-package com.caimei.modules.miniprogram.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.caimei.vo.JsonModel;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.caimei.modules.miniprogram.entity.CmWxPopularSearch;
-import com.caimei.modules.miniprogram.service.CmWxPopularSearchService;
-
-import java.util.List;
-
-/**
- * 热门搜索配置Controller
- * @author ye.qin
- * @version 2018-12-27
- */
-@Controller
-@RequestMapping(value = "${adminPath}/miniprogram/cmWxPopularSearch")
-public class CmWxPopularSearchController extends BaseController {
-
-	@Autowired
-	private CmWxPopularSearchService cmWxPopularSearchService;
-
-	private JsonModel jsonModel;
-	
-	@ModelAttribute
-	public CmWxPopularSearch get(@RequestParam(required=false) String id) {
-		CmWxPopularSearch entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = cmWxPopularSearchService.get(id);
-		}
-		if (entity == null){
-			entity = new CmWxPopularSearch();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("miniprogram:cmWxPopularSearch:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(CmWxPopularSearch cmWxPopularSearch, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<CmWxPopularSearch> page = cmWxPopularSearchService.findPage(new Page<CmWxPopularSearch>(request, response), cmWxPopularSearch); 
-		model.addAttribute("page", page);
-		return "modules/miniprogram/cmWxPopularSearchList";
-	}
-
-
-	@RequestMapping(value = {"getPopularSearchlist"})
-	@ResponseBody
-	public JsonModel getPopularSearchlist(CmWxPopularSearch cmWxPopularSearch, HttpServletRequest request, HttpServletResponse response, Model model) {
-		jsonModel = new JsonModel();
-		try {
-			List<CmWxPopularSearch> list = cmWxPopularSearchService.findAllList(cmWxPopularSearch);
-			if(null != list){
-				jsonModel.success(list);
-			}else{
-				jsonModel.error("获取热搜关键词异常！");
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			jsonModel.error("获取热搜关键词异常！");
-		}
-		return jsonModel;
-	}
-
-	@RequestMapping(value = {"validateKeyword"})
-	@ResponseBody
-	public JsonModel validateKeyword(CmWxPopularSearch cmWxPopularSearch, HttpServletRequest request, HttpServletResponse response, Model model) {
-		jsonModel = new JsonModel();
-		try {
-			List<CmWxPopularSearch> list = cmWxPopularSearchService.findAllList(cmWxPopularSearch);
-			if(null != list && list.size()>0){
-				jsonModel.error("-1","热搜关键词已存在！");
-			}else{
-				jsonModel.success("0","热搜关键词可用！");
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			jsonModel.error("验证热搜关键词异常！");
-		}
-		return jsonModel;
-	}
-
-	@RequiresPermissions("miniprogram:cmWxPopularSearch:view")
-	@RequestMapping(value = "form")
-	public String form(CmWxPopularSearch cmWxPopularSearch, Model model) {
-		model.addAttribute("cmWxPopularSearch", cmWxPopularSearch);
-		return "modules/miniprogram/cmWxPopularSearchForm";
-	}
-
-	@RequiresPermissions("miniprogram:cmWxPopularSearch:edit")
-	@RequestMapping(value = "save")
-	public String save(CmWxPopularSearch cmWxPopularSearch, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, cmWxPopularSearch)){
-			return form(cmWxPopularSearch, model);
-		}
-		cmWxPopularSearchService.save(cmWxPopularSearch);
-		addMessage(redirectAttributes, "保存热门搜索配置成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxPopularSearch/?repage";
-	}
-	
-	@RequiresPermissions("miniprogram:cmWxPopularSearch:delete")
-	@RequestMapping(value = "delete")
-	public String delete(CmWxPopularSearch cmWxPopularSearch, RedirectAttributes redirectAttributes) {
-		cmWxPopularSearchService.delete(cmWxPopularSearch);
-		addMessage(redirectAttributes, "删除热门搜索配置成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxPopularSearch/?repage";
-	}
-
-}

src/main/java/com/caimei/modules/miniprogram/web/CmWxTagController.java

@@ -1,151 +0,0 @@
-package com.caimei.modules.miniprogram.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
-
-import com.caimei.vo.JsonModel;
-import com.thinkgem.jeesite.common.beanvalidator.BeanValidators;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.caimei.modules.miniprogram.entity.CmWxTag;
-import com.caimei.modules.miniprogram.service.CmWxTagService;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 小程序标签Controller
- * @author lwt
- * @version 2018-12-25
- */
-@Controller
-@RequestMapping(value = "${adminPath}/miniprogram/cmWxTag")
-public class CmWxTagController extends BaseController {
-
-	@Autowired
-	private CmWxTagService cmWxTagService;
-
-	private JsonModel jsonModel;
-	
-	@ModelAttribute
-	public CmWxTag get(@RequestParam(required=false) String id) {
-		CmWxTag entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = cmWxTagService.get(id);
-		}
-		if (entity == null){
-			entity = new CmWxTag();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("miniprogram:cmWxTag:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(CmWxTag cmWxTag, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<CmWxTag> page = cmWxTagService.findPage(new Page<CmWxTag>(request, response), cmWxTag); 
-		model.addAttribute("page", page);
-		return "modules/miniprogram/cmWxTagList";
-	}
-
-	@RequestMapping(value = {"allList"})
-	@ResponseBody
-	public JsonModel allList(CmWxTag cmWxTag, HttpServletRequest request, HttpServletResponse response, Model model) {
-		jsonModel = new JsonModel();
-		try{
-			List<CmWxTag> list = cmWxTagService.findList(cmWxTag);
-			jsonModel.success(list);
-		}catch (Exception e){
-			e.printStackTrace();
-			jsonModel.error("操作异常");
-		}
-		return jsonModel;
-	}
-
-	@RequiresPermissions("miniprogram:cmWxTag:view")
-	@RequestMapping(value = "form")
-	public String form(CmWxTag cmWxTag, Model model) {
-		model.addAttribute("cmWxTag", cmWxTag);
-		return "modules/miniprogram/cmWxTagForm";
-	}
-
-	@RequiresPermissions("miniprogram:cmWxTag:edit")
-	@RequestMapping(value = "save")
-	public String save(CmWxTag cmWxTag, Model model, RedirectAttributes redirectAttributes) {
-		if (!tagValidator(model, cmWxTag)){
-			return form(cmWxTag, model);
-		}
-		if (!beanValidator(model, cmWxTag)){
-			return form(cmWxTag, model);
-		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		String auditTime = sdf.format(new Date());
-		cmWxTag.setAddTime(auditTime);
-		cmWxTagService.save(cmWxTag);
-		addMessage(redirectAttributes, "保存小程序标签成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxTag/?repage";
-	}
-
-	@RequiresPermissions("miniprogram:cmWxTag:edit")
-	@RequestMapping(value = "delete")
-	public String delete(CmWxTag cmWxTag, RedirectAttributes redirectAttributes) {
-		cmWxTagService.delete(cmWxTag);
-		addMessage(redirectAttributes, "删除小程序标签成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxTag/?repage";
-	}
-
-
-	@RequiresPermissions("miniprogram:cmWxTag:edit")
-	@RequestMapping(value = "statusSwitch")
-	public String statusSwitch(CmWxTag cmWxTag, RedirectAttributes redirectAttributes) {
-		String msg = cmWxTag.getTagName();
-		if ("1".equals(cmWxTag.getStatus())) {
-			cmWxTag.setStatus("0");
-			msg = msg + "已关闭";
-		} else {
-			cmWxTag.setStatus("1");
-			msg = msg + "已启动";
-		}
-		cmWxTagService.update(cmWxTag);
-		addMessage(redirectAttributes, msg);
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxTag/?repage";
-	}
-
-	protected boolean tagValidator(Model model, CmWxTag tag) {
-		List<String> list = new ArrayList<>();
-		if (StringUtils.isBlank(tag.getTagName())) {
-			list.add("标签名不能为空");
-			addMessage(model, list.toArray(new String[]{}));
-			return false;
-		}
-		int length = tag.getTagName().length();
-		if (length < 1 || length > 5) {
-			list.add("标签名不能超过5个字");
-			addMessage(model, list.toArray(new String[]{}));
-			return false;
-		}
-		List<CmWxTag> t = cmWxTagService.findByTagName(tag.getTagName().trim());
-		if (CollectionUtils.isNotEmpty(t)) {
-			list.add("标签名已经存在");
-			addMessage(model, list.toArray(new String[]{}));
-			return false;
-		}
-		return true;
-	}
-
-}

src/main/java/com/caimei/modules/miniprogram/web/CmWxXpsxProductController.java

@@ -1,80 +0,0 @@
-package com.caimei.modules.miniprogram.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.caimei.modules.miniprogram.entity.CmWxXpsxProduct;
-import com.caimei.modules.miniprogram.service.CmWxXpsxProductService;
-
-/**
- * 小程序新品上线商品Controller
- * @author lwt
- * @version 2018-12-26
- */
-@Controller
-@RequestMapping(value = "${adminPath}/miniprogram/cmWxXpsxProduct")
-public class CmWxXpsxProductController extends BaseController {
-
-	@Autowired
-	private CmWxXpsxProductService cmWxXpsxProductService;
-	
-	@ModelAttribute
-	public CmWxXpsxProduct get(@RequestParam(required=false) String id) {
-		CmWxXpsxProduct entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = cmWxXpsxProductService.get(id);
-		}
-		if (entity == null){
-			entity = new CmWxXpsxProduct();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("miniprogram:cmWxXpsxProduct:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(CmWxXpsxProduct cmWxXpsxProduct, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<CmWxXpsxProduct> page = cmWxXpsxProductService.findPage(new Page<CmWxXpsxProduct>(request, response), cmWxXpsxProduct); 
-		model.addAttribute("page", page);
-		return "modules/miniprogram/cmWxXpsxProductList";
-	}
-
-	@RequiresPermissions("miniprogram:cmWxXpsxProduct:view")
-	@RequestMapping(value = "form")
-	public String form(CmWxXpsxProduct cmWxXpsxProduct, Model model) {
-		model.addAttribute("cmWxXpsxProduct", cmWxXpsxProduct);
-		return "modules/miniprogram/cmWxXpsxProductForm";
-	}
-
-	@RequiresPermissions("miniprogram:cmWxXpsxProduct:edit")
-	@RequestMapping(value = "save")
-	public String save(CmWxXpsxProduct cmWxXpsxProduct, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, cmWxXpsxProduct)){
-			return form(cmWxXpsxProduct, model);
-		}
-		cmWxXpsxProductService.save(cmWxXpsxProduct);
-		addMessage(redirectAttributes, "保存小程序新品上线商品成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxXpsxProduct/?repage";
-	}
-	
-	@RequiresPermissions("miniprogram:cmWxXpsxProduct:delete")
-	@RequestMapping(value = "delete")
-	public String delete(CmWxXpsxProduct cmWxXpsxProduct, RedirectAttributes redirectAttributes) {
-		cmWxXpsxProductService.delete(cmWxXpsxProduct);
-		addMessage(redirectAttributes, "删除小程序新品上线商品成功");
-		return "redirect:"+Global.getAdminPath()+"/miniprogram/cmWxXpsxProduct/?repage";
-	}
-
-}

src/main/java/com/caimei/modules/product/dao/BigTypeDao.java

@@ -1,19 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.caimei.modules.product.entity.BigType;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * CRM分类管理DAO接口
- * @author LG
- * @version 2016-08-17
- */
-@MyBatisDao
-public interface BigTypeDao extends CrudDao<BigType> {
-
-	int updateHomeStatusByIds(String status, String[] ids);
-
-	int countHomeStatus(String status);
-	
-}

src/main/java/com/caimei/modules/product/dao/BuyerProductHistoryPriceDao.java

@@ -1,16 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.product.entity.BuyerProductHistoryPrice;
-
-/**
- * 买家商品历史记录DAO接口
- * @author LiJun
- * @version 2018-05-31
- */
-@MyBatisDao
-public interface BuyerProductHistoryPriceDao extends CrudDao<BuyerProductHistoryPrice> {
-
-    int updateDelFlag(BuyerProductHistoryPrice buyerProductHistoryPrice);
-}

src/main/java/com/caimei/modules/product/dao/BuyerProductPriceDao.java

@@ -1,25 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.product.entity.BuyerProductPrice;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 买家商品价格DAO接口
- * @author LiJun
- * @version 2018-05-31
- */
-@MyBatisDao
-public interface BuyerProductPriceDao extends CrudDao<BuyerProductPrice> {
-
-    List<BuyerProductPrice> findUserProductList(BuyerProductPrice buyerProductPrice);
-
-    List<BuyerProductPrice> findUserProductPriceList(BuyerProductPrice buyerProductPrice);
-
-    List<BuyerProductPrice> findProductRedPriceList(BuyerProductPrice buyerProductPrice);
-
-}

src/main/java/com/caimei/modules/product/dao/CmIkDictDao.java

@@ -1,22 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.product.entity.CmIkDict;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-
-/**
- * IK扩展字典信息DAO接口
- * @author zcp
- * @version 2017-11-22
- */
-@MyBatisDao
-public interface CmIkDictDao extends CrudDao<CmIkDict> {
-    void updateEnabledStatus(@Param("enabledStatus") String enabledStatus);
-
-    Integer getEnabledStatus();
-
-    Date getEnabledTime();
-}

src/main/java/com/caimei/modules/product/dao/CmMallProductLadderPriceDao.java

@@ -1,19 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.product.entity.CmMallProductLadderPrice;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 小程序商城阶梯价格DAO接口
- * @author Lijun
- * @version 2020-02-26
- */
-@MyBatisDao
-public interface CmMallProductLadderPriceDao extends CrudDao<CmMallProductLadderPrice> {
-
-    List<CmMallProductLadderPrice> getLadderPriceBuyProductID(@Param("productId") String productId);
-}

src/main/java/com/caimei/modules/product/dao/CmMallProductsClassifyDao.java

@@ -1,25 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.product.entity.CmMallProductsClassify;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 小程序商品分类DAO接口
- * @author lijun
- * @version 2019-12-03
- */
-@MyBatisDao
-public interface CmMallProductsClassifyDao extends CrudDao<CmMallProductsClassify> {
-
-    int saveSort(@Param("sort") String sort , @Param("id") String id );
-
-    void updateStatus(CmMallProductsClassify cmMallProductsClassify);
-
-    List<CmMallProductsClassify> getProductsClassifyListByName(CmMallProductsClassify cmMallProductsClassify);
-
-    List<CmMallProductsClassify> findListByEffective(CmMallProductsClassify cmMallProductsClassify);
-}

src/main/java/com/caimei/modules/product/dao/CmSecondHandTransactionDao.java

@@ -1,19 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.caimei.modules.brand.entity.CmBrand;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.product.entity.CmSecondHandTransaction;
-
-import java.util.List;
-
-/**
- * 二手交易DAO接口
- * @author LiJun
- * @version 2019-06-12
- */
-@MyBatisDao
-public interface CmSecondHandTransactionDao extends CrudDao<CmSecondHandTransaction> {
-
-    List<CmBrand> brandList();
-}

src/main/java/com/caimei/modules/product/dao/CmShoporderDao.java

@@ -1,16 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.product.entity.CmShoporder;
-
-/**
- * 普通订单DAO接口
- * @author ZCP
- * @version 2017-10-19
- */
-@MyBatisDao
-public interface CmShoporderDao extends CrudDao<CmShoporder> {
-
-    int updateClubID(Integer clubID,Integer userID);
-}

src/main/java/com/caimei/modules/product/dao/CmThirdPartyProductDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.product.entity.CmThirdPartyProduct;
-
-/**
- * 第三方商品DAO接口
- * @author Lijun
- * @version 2020-06-15
- */
-@MyBatisDao
-public interface CmThirdPartyProductDao extends CrudDao<CmThirdPartyProduct> {
-	
-}

src/main/java/com/caimei/modules/product/dao/CmTinytypeDao.java

@@ -1,6 +1,5 @@
 package com.caimei.modules.product.dao;
 
-import com.caimei.modules.product.entity.CmSmalltype;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import com.caimei.modules.product.entity.CmTinytype;

src/main/java/com/caimei/modules/product/dao/CommentDao.java

@@ -1,18 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.product.entity.Comment;
-
-/**
- * 评价管理DAO接口
- * @author LiJun
- * @version 2019-05-31
- */
-@MyBatisDao
-public interface CommentDao extends CrudDao<Comment> {
-    void saveManager(Comment comment);
-
-    void review(Comment comment);
-	
-}

src/main/java/com/caimei/modules/product/dao/HomeProductDao.java

@@ -1,17 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.product.entity.HomeProduct;
-
-/**
- * CRM首页推荐商品DAO接口
- * @author LG
- * @version 2016-08-16
- */
-@MyBatisDao
-public interface HomeProductDao extends CrudDao<HomeProduct> {
-
-	int insertByProductIds(HomeProduct homeProduct, String[] productIds);
-	
-}

src/main/java/com/caimei/modules/product/dao/KeywordFrequencyDao.java

@@ -14,6 +14,7 @@ public interface KeywordFrequencyDao extends CrudDao<SearchFrequency> {
     List<SearchFrequency> findList(SearchFrequency searchFrequency);
 
     List<SearchFrequency> getSearchFrom(Integer trueStatus);
+
     void addKeyWordList(@Param("idList") int[] idList);
 
     List<SearchFrequency> getvalueListByIds(@Param("idList") int[] idList);
@@ -23,14 +24,17 @@ public interface KeywordFrequencyDao extends CrudDao<SearchFrequency> {
     int insert(SearchFrequency searchFrequency);
 
     int update(SearchFrequency searchFrequency);
+
     List<SearchFrequency> getInfoByIdList(@Param("idList") int[] idList);
 
     List<SearchFrequencyVo> getKeywordList();
 
     List<SearchFrequencyVo> getvalueList(@Param("keyword") String keyword);
+
     SearchFrequency getKeyById(Integer id);
 
     List<String> verificationKeword(@Param("keyword")String keyword);
+
     List<String> verificationKewords(@Param("keywords")String[] keywords);
 
 }

src/main/java/com/caimei/modules/product/dao/ProductNewDao.java

@@ -20,8 +20,6 @@ import java.util.List;
 @MyBatisDao
 public interface ProductNewDao extends CrudDao<Product> {
 
-    void updateIndex(@Param("id") Integer id);
-
     List<ProductParameters> getProductParams(@Param("productId") Integer productId);
 
     void deleteParameters(@Param("productId") Integer productId);

src/main/java/com/caimei/modules/product/dao/ProductsClassifyDao.java

@@ -1,35 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.caimei.modules.product.entity.CmMallProductsClassify;
-import com.caimei.modules.product.entity.Product;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * Description
- *
- * @author : plf
- * @date : 2020/4/16
- */
-@MyBatisDao
-public interface ProductsClassifyDao extends CrudDao<CmMallProductsClassify> {
-
-    List<CmMallProductsClassify> getProductsClassifyListByName(CmMallProductsClassify productsClassify);
-
-    List<Product> findProductsList(String id);
-
-    void saveSort(@Param("sort") String sort, @Param("id") String id);
-
-    List<Product> productList(Product product);
-
-    List<Product> findAddProduct(Product product);
-
-    List<Integer> findClassifyId(Integer classifyId);
-
-    void delectClassifyProduct(@Param("productID") Integer productID, @Param("classifyId") Integer classifyId);
-
-    void insertProductsToClassify(Product product);
-}

src/main/java/com/caimei/modules/product/dao/SmallTypeDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.product.dao;
-
-import com.caimei.modules.product.entity.SmallType;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 二级分类DAO接口
- * @author LG
- * @version 2016-08-18
- */
-@MyBatisDao
-public interface SmallTypeDao extends CrudDao<SmallType> {
-	
-}

src/main/java/com/caimei/modules/product/service/CmActivityService.java

@@ -1,21 +1,16 @@
 package com.caimei.modules.product.service;
 
-import com.alibaba.fastjson.JSONArray;
 import com.caimei.modules.product.dao.CmActivityDao;
 import com.caimei.modules.product.entity.CmActivity;
 import com.caimei.modules.product.entity.Product;
 import com.foxinmy.weixin4j.util.StringUtil;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
+import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -27,60 +22,9 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class CmActivityService extends CrudService<CmActivityDao, CmActivity> {
-    @Autowired
-    private CmActivityDao cmActivityDao;
-
-    public CmActivity get(String id) {
-        return super.get(id);
-    }
-
-    public List<CmActivity> findList(CmActivity cmActivity) {
-        return super.findList(cmActivity);
-    }
-
-    public Page<CmActivity> findPage(Page<CmActivity> page, CmActivity cmActivity) {
-        Page<CmActivity> activityPage = super.findPage(page, cmActivity);
-        List<CmActivity> activityList = activityPage.getList();
-        for (CmActivity activity : activityList) {
-            Date nowTime = new Date();
-            boolean effectiveDate = DateUtils.isEffectiveDate(nowTime, activity.getStartTime(), activity.getEndTime());
-            if (effectiveDate) {
-                //进行中
-                activity.setStatus("1");
-            } else if (nowTime.compareTo(activity.getEndTime()) > 0) {
-                //已结束
-                activity.setStatus("2");
-            } else {
-                //未开始
-                activity.setStatus("3");
-            }
-        }
-        return activityPage;
-    }
 
-    @Transactional(readOnly = false)
-    public void save(CmActivity cmActivity) {
-        if (StringUtil.isBlank(cmActivity.getId())) {
-            cmActivity.setAddTime(new Date());
-            cmActivity.setDelFlag("0");
-        }
-        super.save(cmActivity);
-        if (StringUtil.isNotBlank(cmActivity.getProductIds())) {
-            cmActivityDao.deleteProduct(cmActivity.getId());
-            List<HashMap> list = JSONArray.parseArray(cmActivity.getProductIds(), HashMap.class);
-            for (HashMap map : list) {
-                String productId = (String) map.get("productId");
-                BigDecimal price = new BigDecimal(map.get("price").toString());
-                cmActivityDao.insertProductActivity(cmActivity.getId(), productId, price);
-            }
-        }
-    }
-
-    @Transactional(readOnly = false)
-    public void delete(CmActivity cmActivity) {
-        super.delete(cmActivity);
-        cmActivityDao.deleteProduct(cmActivity.getId());
-    }
+    @Resource
+    private CmActivityDao cmActivityDao;
 
     public List<Product> findProduct(String id) {
         List<Product> products = cmActivityDao.findProduct(id);

src/main/java/com/caimei/modules/project/dao/ApparatusAppointmentDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.entity.ApparatusAppointment;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 仪器预约DAO接口
- * @author LG
- * @version 2016-08-31
- */
-@MyBatisDao
-public interface ApparatusAppointmentDao extends CrudDao<ApparatusAppointment> {
-	
-}

src/main/java/com/caimei/modules/project/dao/ApparatusDao.java

@@ -1,17 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.entity.Apparatus;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 仪器管理DAO接口
- * @author LG
- * @version 2016-08-31
- */
-@MyBatisDao
-public interface ApparatusDao extends CrudDao<Apparatus> {
-
-	Long countProjectNum(String id);
-	
-}

src/main/java/com/caimei/modules/project/dao/ClubDao.java

@@ -13,7 +13,9 @@ import java.util.List;
  */
 @MyBatisDao
 public interface ClubDao extends CrudDao<ClubModel> {
+
     int updateClubByClubId(@Param("clubID") Integer clubID, @Param("newSpID") Integer newSpID, @Param("date") String date);
+
     ClubModel getClubByUserId(@Param("clubID") Integer clubID);
 
     Integer selFirst(@Param("clubId") Integer clubId);

src/main/java/com/caimei/modules/project/dao/ClubsubbranchDao.java

@@ -1,12 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.entity.Clubsubbranch;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * Created by LG on 2017/1/9.
- */
-@MyBatisDao
-public interface ClubsubbranchDao extends CrudDao<Clubsubbranch> {
-}

src/main/java/com/caimei/modules/project/dao/CompanyApparatusDao.java

@@ -1,24 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import java.util.List;
-
-import com.caimei.modules.project.entity.CompanyApparatus;
-import com.caimei.modules.project.model.ClassifyModel;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 公司仪器DAO接口
- * @author LG
- * @version 2016-09-01
- */
-@MyBatisDao
-public interface CompanyApparatusDao extends CrudDao<CompanyApparatus> {
-
-	List<ClassifyModel> findClassifyModel(String companyApparatusId);
-
-	int deleteCompanyApparatusPro(String companyApparatusId);
-
-	int insertCompanyApparatusPro(String id, List<String> iDs);
-	
-}

src/main/java/com/caimei/modules/project/dao/CompanyProClubcaseDao.java

@@ -1,17 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.entity.CompanyProClubcase;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 公司项目会所案例Dao
- * @author LG
- * @date  2016年7月19日
- * @version 1.0
- */
-@MyBatisDao
-public interface CompanyProClubcaseDao extends CrudDao<CompanyProClubcase> {
-
-	int deleteByCompanyProId(String companyId);
-}

src/main/java/com/caimei/modules/project/dao/CompanyProDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.entity.CompanyPro;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 公司项目DAO接口
- * @author LG
- * @version 2016-07-18
- */
-@MyBatisDao
-public interface CompanyProDao extends CrudDao<CompanyPro> {
-	
-}

src/main/java/com/caimei/modules/project/dao/CompanyProImageDao.java

@@ -1,16 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.entity.CompanyProImage;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 公司项目相关图片Dao
- * @author LG
- * @date  2016年7月20日
- * @version 1.0
- */
-@MyBatisDao
-public interface CompanyProImageDao  extends CrudDao<CompanyProImage> {
-
-}

src/main/java/com/caimei/modules/project/dao/CompanyProMarketingDao.java

@@ -1,17 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.entity.CompanyProMarketing;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 公司项目DAO接口
- * @author LG
- * @version 2016-07-18
- */
-@MyBatisDao
-public interface CompanyProMarketingDao extends CrudDao<CompanyProMarketing> {
-
-	int deleteByCompanyProId(String companyId);
-	
-}

src/main/java/com/caimei/modules/project/dao/DissentDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.project.entity.Dissent;
-
-/**
- * 异议操作单DAO接口
- * @author LG
- * @version 2017-01-17
- */
-@MyBatisDao
-public interface DissentDao extends CrudDao<Dissent> {
-	
-}

src/main/java/com/caimei/modules/project/dao/DissentDetailDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.entity.DissentDetail;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 异议DAO接口
- * @author LG
- * @version 2017-01-09
- */
-@MyBatisDao
-public interface DissentDetailDao extends CrudDao<DissentDetail> {
-
-}

src/main/java/com/caimei/modules/project/dao/MarketingconferenceDao.java

@@ -1,27 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.caimei.modules.project.entity.Marketingconference;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 公司会销DAO接口
- * @author demon
- * @version 2016-07-19
- */
-@MyBatisDao
-public interface MarketingconferenceDao extends CrudDao<Marketingconference> {
-
-	/**
-	 * <p>Description: 更改启用状态</p>
-	 * <p>Company: caimei365</p> 
-	 * @author dmeng
-	 * @date 2016年7月19日 下午2:20:01
-	 * @param id	
-	 * @param enabledStatus
-	 */
-	public void changeStatus(@Param("id") String id, @Param("enabledStatus") String enabledStatus);
-	
-}

src/main/java/com/caimei/modules/project/dao/OperationDao.java

@@ -1,20 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.model.FeeModel;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.project.entity.Operation;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 操作单记录DAO接口
- * @author LG
- * @version 2017-01-16
- */
-@MyBatisDao
-public interface OperationDao extends CrudDao<Operation> {
-
-    FeeModel countSumFee(@Param("projectOrderId") Long projectOrderId);
-}

src/main/java/com/caimei/modules/project/dao/ProjectAppointmentDao.java

@@ -1,17 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.entity.ProjectAppointment;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 预约项目DAO接口
- * @author LG
- * @version 2016-07-15
- */
-@MyBatisDao
-public interface ProjectAppointmentDao extends CrudDao<ProjectAppointment> {
-
-	int deleteByProjectId(String ProjectId);
-	
-}

src/main/java/com/caimei/modules/project/dao/ProjectCompanyDao.java

@@ -1,19 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import java.util.List;
-
-import com.caimei.modules.project.entity.ProjectCompany;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 项目公司DAO接口
- * @author LG
- * @version 2016-07-18
- */
-@MyBatisDao
-public interface ProjectCompanyDao extends CrudDao<ProjectCompany> {
-
-	List<ProjectCompany> findByProjectId(String projectId);
-	
-}

src/main/java/com/caimei/modules/project/dao/ProjectDao.java

@@ -1,29 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-import java.util.List;
-
-import com.caimei.modules.project.entity.Project;
-import com.caimei.modules.project.model.ClassifyModel;
-
-/**
- * 项目信息DAO接口
- * @author LG
- * @version 2016-07-14
- */
-@MyBatisDao
-public interface ProjectDao extends CrudDao<Project> {
-
-	void deleteProjectAndInfo(String projectId);
-
-	void insertProjectAndInfo(String projectId, List<String> iDs);
-
-	List<ClassifyModel> findAllPart();
-
-	List<ClassifyModel> findAllFunctionPart();
-
-	Long countApparatusNum(String id);
-	
-}

src/main/java/com/caimei/modules/project/dao/ProjectOrderDao.java

@@ -1,18 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import com.caimei.modules.project.model.ClassifyModel;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.project.entity.ProjectOrder;
-
-import java.util.List;
-
-/**
- * 项目订单DAO接口
- * @author LG
- * @version 2017-01-09
- */
-@MyBatisDao
-public interface ProjectOrderDao extends CrudDao<ProjectOrder> {
-
-}

src/main/java/com/caimei/modules/project/dao/ProjectTerminalDao.java

@@ -1,16 +0,0 @@
-package com.caimei.modules.project.dao;
-
-import java.util.List;
-
-import com.caimei.modules.project.entity.ProjectTerminal;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-@MyBatisDao
-public interface ProjectTerminalDao extends CrudDao<ProjectTerminal> {
-
-	int deleteTerminalAndInfo(String id);
-
-	int insertTerminalAndInfo(String id, List<String> iDs);
-
-}

src/main/java/com/caimei/modules/project/dao/ServiceProviderDao.java

@@ -13,11 +13,7 @@ import java.util.List;
  */
 @MyBatisDao
 public interface ServiceProviderDao extends CrudDao<ServiceProviderModel> {
-    List<ServiceProviderModel> findServiceemployeeById(@Param("id") String id);
-
-    List<ServiceProviderModel> findMentorSpByProjectOrderId(@Param("projectOrderId") String projectOrderId);
 
     List<ServiceProviderModel> getServiceproviderById(@Param("serviceProviderID") Integer serviceProviderID);
 
-
 }

src/main/java/com/caimei/modules/project/entity/Apparatus.java

@@ -1,83 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import java.math.BigDecimal;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 仪器管理Entity
- * @author LG
- * @version 2016-08-31
- */
-public class Apparatus extends DataEntity<Apparatus> {
-	
-	private static final long serialVersionUID = 1L;
-	private String name;		// 名称
-	private BigDecimal price;		// 价格
-	private String images;		// 图片
-	private String details;		// 详情
-	
-	private Long projectNum;//项目数
-	private Long companyNum;//项目公司数
-	
-	
-	public Apparatus() {
-		super();
-	}
-
-	public Apparatus(String id){
-		super(id);
-	}
-
-	@Length(max=101, message="名称长度必须小于等于100个字符串长度")
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	public BigDecimal getPrice() {
-		return price;
-	}
-
-	public void setPrice(BigDecimal price) {
-		this.price = price;
-	}
-	
-	public String getImages() {
-		return images;
-	}
-
-	public void setImages(String images) {
-		this.images = images;
-	}
-	
-	public String getDetails() {
-		return details;
-	}
-
-	public void setDetails(String details) {
-		this.details = details;
-	}
-
-	public Long getProjectNum() {
-		return projectNum;
-	}
-
-	public void setProjectNum(Long projectNum) {
-		this.projectNum = projectNum;
-	}
-
-	public Long getCompanyNum() {
-		return companyNum;
-	}
-
-	public void setCompanyNum(Long companyNum) {
-		this.companyNum = companyNum;
-	}
-	
-}

src/main/java/com/caimei/modules/project/entity/ApparatusAppointment.java

@@ -1,91 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 仪器预约Entity
- * @author LG
- * @version 2016-08-31
- */
-public class ApparatusAppointment extends DataEntity<ApparatusAppointment> {
-	
-	private static final long serialVersionUID = 1L;
-	private String apparatusId;		// 预约仪器ID
-	private String contactName;		// 联系名称
-	private String contactWay;		// 联系方式
-	private String message;		// 留言
-	private String openid;		// openid
-	private Long userId;
-	private String userName;
-	
-	public ApparatusAppointment() {
-		super();
-	}
-
-	public ApparatusAppointment(String id){
-		super(id);
-	}
-
-	public String getApparatusId() {
-		return apparatusId;
-	}
-
-	public void setApparatusId(String apparatusId) {
-		this.apparatusId = apparatusId;
-	}
-	
-	@Length(min=0, max=100, message="联系名称长度必须介于 0 和 100 之间")
-	public String getContactName() {
-		return contactName;
-	}
-
-	public void setContactName(String contactName) {
-		this.contactName = contactName;
-	}
-	
-	@Length(min=0, max=50, message="联系方式长度必须介于 0 和 50 之间")
-	public String getContactWay() {
-		return contactWay;
-	}
-
-	public void setContactWay(String contactWay) {
-		this.contactWay = contactWay;
-	}
-	
-	@Length(min=0, max=50, message="留言长度必须介于 0 和 50 之间")
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-	
-	@Length(min=0, max=100, message="openid长度必须介于 0 和 100 之间")
-	public String getOpenid() {
-		return openid;
-	}
-
-	public void setOpenid(String openid) {
-		this.openid = openid;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-	
-}

src/main/java/com/caimei/modules/project/entity/Clubsubbranch.java

@@ -1,83 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 项目订单会所分店实体表
- * Created by LG on 2017/1/9.
- */
-public class Clubsubbranch extends DataEntity<Clubsubbranch> {
-
-    private static final long serialVersionUID = 1L;
-    private String name;//名称
-    private String projectOrderId;//项目订单ID
-    private String clubId;//会所ID
-    private Integer provinceId;//省级ID
-    private Integer cityId;// 市级ID
-    private Integer townId;// 区级ID
-    private String addressDetails;// 详细地址
-
-    public Clubsubbranch() {
-        super();
-    }
-
-    public Clubsubbranch(String id) {
-        super(id);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getProjectOrderId() {
-        return projectOrderId;
-    }
-
-    public void setProjectOrderId(String projectOrderId) {
-        this.projectOrderId = projectOrderId;
-    }
-
-    public String getClubId() {
-        return clubId;
-    }
-
-    public void setClubId(String clubId) {
-        this.clubId = clubId;
-    }
-
-    public Integer getProvinceId() {
-        return provinceId;
-    }
-
-    public void setProvinceId(Integer provinceId) {
-        this.provinceId = provinceId;
-    }
-
-    public Integer getCityId() {
-        return cityId;
-    }
-
-    public void setCityId(Integer cityId) {
-        this.cityId = cityId;
-    }
-
-    public Integer getTownId() {
-        return townId;
-    }
-
-    public void setTownId(Integer townId) {
-        this.townId = townId;
-    }
-
-    public String getAddressDetails() {
-        return addressDetails;
-    }
-
-    public void setAddressDetails(String addressDetails) {
-        this.addressDetails = addressDetails;
-    }
-}

src/main/java/com/caimei/modules/project/entity/CompanyApparatus.java

@@ -1,54 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import java.util.List;
-
-import com.caimei.modules.project.model.ClassifyModel;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 公司仪器Entity
- * @author LG
- * @version 2016-09-01
- */
-public class CompanyApparatus extends DataEntity<CompanyApparatus> {
-	
-	private static final long serialVersionUID = 1L;
-	private String companyId;		// 项目公司id
-	private Apparatus Apparatus;//仪器
-	private List<ClassifyModel> companyProList=Lists.newArrayList();	//项目
-	
-	public CompanyApparatus() {
-		super();
-	}
-
-	public CompanyApparatus(String id){
-		super(id);
-	}
-
-	public String getCompanyId() {
-		return companyId;
-	}
-
-	public void setCompanyId(String companyId) {
-		this.companyId = companyId;
-	}
-	
-	
-	public Apparatus getApparatus() {
-		return Apparatus;
-	}
-
-	public void setApparatus(Apparatus apparatus) {
-		Apparatus = apparatus;
-	}
-
-	public List<ClassifyModel> getCompanyProList() {
-		return companyProList;
-	}
-
-	public void setCompanyProList(List<ClassifyModel> companyProList) {
-		this.companyProList = companyProList;
-	}
-
-}

src/main/java/com/caimei/modules/project/entity/CompanyPro.java

@@ -1,118 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import java.util.List;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 公司项目Entity
- * @author LG
- * @version 2016-07-18
- */
-public class CompanyPro extends DataEntity<CompanyPro> {
-	
-	private static final long serialVersionUID = 1L;
-	private Long companyId;		// 项目公司id
-	private String companyName;//项目公司名
-	private String experiencePrice;		// 体验价
-	private String enabledStatus;		// 启用/禁用状态
-	
-	private Project project; //项目
-	private List<CompanyProMarketing> companyProMarketingList = Lists.newArrayList();		// 营销方案子表列表
-	private List<CompanyProClubcase> companyProClubcaseList = Lists.newArrayList();		// 会所案例子表列表
-	private List<CompanyProImage> companyProImageList = Lists.newArrayList();		// 相关图片子表列表
-	
-	private String apparatusId;//仪器ID
-	private String apparatusName;//仪器
-	
-	public CompanyPro() {
-		super();
-	}
-
-	public CompanyPro(String id){
-		super(id);
-	}
-
-	public Long getCompanyId() {
-		return companyId;
-	}
-
-	public void setCompanyId(Long companyId) {
-		this.companyId = companyId;
-	}
-	
-	public String getExperiencePrice() {
-		return experiencePrice;
-	}
-
-	public void setExperiencePrice(String experiencePrice) {
-		this.experiencePrice = experiencePrice;
-	}
-	
-	@Length(min=0, max=1, message="启用/禁用状态长度必须介于 0 和 1 之间")
-	public String getEnabledStatus() {
-		return enabledStatus;
-	}
-
-	public void setEnabledStatus(String enabledStatus) {
-		this.enabledStatus = enabledStatus;
-	}
-	
-	public Project getProject() {
-		return project;
-	}
-
-	public void setProject(Project project) {
-		this.project = project;
-	}
-	public List<CompanyProMarketing> getCompanyProMarketingList() {
-		return companyProMarketingList;
-	}
-
-	public void setCompanyProMarketingList(List<CompanyProMarketing> companyProMarketingList) {
-		this.companyProMarketingList = companyProMarketingList;
-	}
-
-	public List<CompanyProClubcase> getCompanyProClubcaseList() {
-		return companyProClubcaseList;
-	}
-
-	public void setCompanyProClubcaseList(List<CompanyProClubcase> companyProClubcaseList) {
-		this.companyProClubcaseList = companyProClubcaseList;
-	}
-
-	public List<CompanyProImage> getCompanyProImageList() {
-		return companyProImageList;
-	}
-
-	public void setCompanyProImageList(List<CompanyProImage> companyProImageList) {
-		this.companyProImageList = companyProImageList;
-	}
-
-	public String getApparatusName() {
-		return apparatusName;
-	}
-
-	public void setApparatusName(String apparatusName) {
-		this.apparatusName = apparatusName;
-	}
-
-	public String getCompanyName() {
-		return companyName;
-	}
-
-	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
-	}
-
-	public String getApparatusId() {
-		return apparatusId;
-	}
-
-	public void setApparatusId(String apparatusId) {
-		this.apparatusId = apparatusId;
-	}
-}

src/main/java/com/caimei/modules/project/entity/CompanyProClubcase.java

@@ -1,48 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 公司项目会所案例Entity
- * @author LG
- * @date  2016年7月19日
- * @version 1.0
- */
-public class CompanyProClubcase extends DataEntity<CompanyProClubcase> {
-
-	private static final long serialVersionUID = 1L;
-	
-	private Long companyProId;		// 公司项目id
-	private String clubName;		//会所名称
-	private String performance;		//业绩
-	
-	public CompanyProClubcase() {
-		super();
-	}
-	public CompanyProClubcase(String id) {
-		super(id);
-	}
-	public CompanyProClubcase(Long companyProId) {
-		super();
-		this.companyProId = companyProId;
-	}
-	public Long getCompanyProId() {
-		return companyProId;
-	}
-	public void setCompanyProId(Long companyProId) {
-		this.companyProId = companyProId;
-	}
-	public String getClubName() {
-		return clubName;
-	}
-	public void setClubName(String clubName) {
-		this.clubName = clubName;
-	}
-	public String getPerformance() {
-		return performance;
-	}
-	public void setPerformance(String performance) {
-		this.performance = performance;
-	}
-	
-}

src/main/java/com/caimei/modules/project/entity/CompanyProImage.java

@@ -1,49 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 公司项目相关图片Entity
- * @author LG
- * @date  2016年7月20日
- * @version 1.0
- */
-public class CompanyProImage extends DataEntity<CompanyProImage> {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private Long companyProId;		// 公司项目id
-	private String title;		//标题
-	private String url;		//地址
-	
-	public CompanyProImage() {
-		super();
-	}
-	public CompanyProImage(String id) {
-		super(id);
-	}
-	public CompanyProImage(Long companyProId) {
-		super();
-		this.companyProId = companyProId;
-	}
-	public Long getCompanyProId() {
-		return companyProId;
-	}
-	public void setCompanyProId(Long companyProId) {
-		this.companyProId = companyProId;
-	}
-	public String getTitle() {
-		return title;
-	}
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	public String getUrl() {
-		return url;
-	}
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	
-}

src/main/java/com/caimei/modules/project/entity/CompanyProMarketing.java

@@ -1,58 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 公司项目营销方案Entity
- * @author LG
- * @version 2016-07-18
- */
-public class CompanyProMarketing extends DataEntity<CompanyProMarketing> {
-	
-	private static final long serialVersionUID = 1L;
-	private Long companyProId;		// 公司项目id
-	private String name;		// 名称
-	private String price;		// 价格
-	
-	public CompanyProMarketing() {
-		super();
-	}
-
-	public CompanyProMarketing(String id){
-		super(id);
-	}
-
-	public CompanyProMarketing(Long companyProId) {
-		super();
-		this.companyProId = companyProId;
-	}
-
-	public Long getCompanyProId() {
-		return companyProId;
-	}
-
-	public void setCompanyProId(Long companyProId) {
-		this.companyProId = companyProId;
-	}
-	
-	@Length(min=0, max=100, message="名称长度必须介于 0 和 100 之间")
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	@Length(min=0, max=100, message="价格长度必须介于 0 和 100 之间")
-	public String getPrice() {
-		return price;
-	}
-
-	public void setPrice(String price) {
-		this.price = price;
-	}
-	
-}

src/main/java/com/caimei/modules/project/entity/Dissent.java

@@ -1,82 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import com.google.common.collect.Lists;
-import org.hibernate.validator.constraints.Length;
-import java.util.Date;
-import java.util.List;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 异议操作单Entity
- * @author LG
- * @version 2017-01-17
- */
-public class Dissent extends DataEntity<Dissent> {
-	
-	private static final long serialVersionUID = 1L;
-	private Long projectOrderId;		// 项目订单ID
-	private Operation operation;//操作单
-	private String dissentFlag;		// 异议状态 1：处理中 2：已确认
-	private Date beginCreateDate;		// 开始 创建时间
-	private Date endCreateDate;		// 结束 创建时间
-
-	private List<DissentDetail> itemList= Lists.newArrayList();
-
-	public Dissent() {
-		super();
-	}
-
-	public Dissent(String id){
-		super(id);
-	}
-
-	public Long getProjectOrderId() {
-		return projectOrderId;
-	}
-
-	public void setProjectOrderId(Long projectOrderId) {
-		this.projectOrderId = projectOrderId;
-	}
-
-	public Operation getOperation() {
-		return operation;
-	}
-
-	public void setOperation(Operation operation) {
-		this.operation = operation;
-	}
-
-	@Length(min=0, max=1, message="异议状态 1：处理中 2：已确认长度必须介于 0 和 1 之间")
-	public String getDissentFlag() {
-		return dissentFlag;
-	}
-
-	public void setDissentFlag(String dissentFlag) {
-		this.dissentFlag = dissentFlag;
-	}
-	
-	public Date getBeginCreateDate() {
-		return beginCreateDate;
-	}
-
-	public void setBeginCreateDate(Date beginCreateDate) {
-		this.beginCreateDate = beginCreateDate;
-	}
-	
-	public Date getEndCreateDate() {
-		return endCreateDate;
-	}
-
-	public void setEndCreateDate(Date endCreateDate) {
-		this.endCreateDate = endCreateDate;
-	}
-
-	public List<DissentDetail> getItemList() {
-		return itemList;
-	}
-
-	public void setItemList(List<DissentDetail> itemList) {
-		this.itemList = itemList;
-	}
-}

src/main/java/com/caimei/modules/project/entity/DissentDetail.java

@@ -1,91 +0,0 @@
-package com.caimei.modules.project.entity;
-import java.util.Date;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-public class DissentDetail extends DataEntity<DissentDetail> {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long dissentId; //异议操作单记录ID
-    private Long userId; //回复人ID
-    private Long projectOrderId;//项目订单ID
-    /**
-     * @see com.caimei.constants.DissentType
-     */
-    private String type; //回复类型:  回复/修改 两种取值
-    private String content; //信息内容
-    private Date createDate; //回复时间
-
-    /**
-     * @see com.caimei.constants.ProjectUserType 
-     */
-    private Integer userType;//回复人类型   3美导  4会所
-    
-    private String userName; // 回复人名称
-
-	public Long getDissentId() {
-		return dissentId;
-	}
-
-	public void setDissentId(Long dissentId) {
-		this.dissentId = dissentId;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public Long getProjectOrderId() {
-		return projectOrderId;
-	}
-
-	public void setProjectOrderId(Long projectOrderId) {
-		this.projectOrderId = projectOrderId;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public Date getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-
-	public Integer getUserType() {
-		return userType;
-	}
-
-	public void setUserType(Integer userType) {
-		this.userType = userType;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-      
-}

src/main/java/com/caimei/modules/project/entity/Marketingconference.java

@@ -1,172 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import org.hibernate.validator.constraints.Length;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 公司会销Entity
- * @author demon
- * @version 2016-07-19
- */
-public class Marketingconference extends DataEntity<Marketingconference> {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private Long companyProId;		// 公司项目ID
-	private Long companyId;		// 项目公司id
-	private String title;		// 标题
-	private Date startTime;		// 开始时间
-	private Date endTime;		// 结束时间
-	private String priority;		// 优先级
-	private String province;		// 省、直辖市
-	private String city;		// 市
-	private String town;		// 县、区
-	private String address;		// 详细地址
-	private String enabledStatus;		// 启用/禁用状态
-	
-	private Date beginStartTime;		// 开始 开始时间
-	private Date endStartTime;		// 结束 开始时间
-	private String projectName; // 项目名称
-	private String companyName; // 项目公司名称
-	
-	public Marketingconference() {
-		super();
-	}
-
-	public Marketingconference(String id){
-		super(id);
-	}
-
-	public Long getCompanyProId() {
-		return companyProId;
-	}
-
-	public void setCompanyProId(Long companyProId) {
-		this.companyProId = companyProId;
-	}
-	
-	public Long getCompanyId() {
-		return companyId;
-	}
-
-	public void setCompanyId(Long companyId) {
-		this.companyId = companyId;
-	}
-	
-	@Length(min=0, max=200, message="标题长度必须介于 0 和 200 之间")
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-	
-	@Length(min=0, max=11, message="优先级长度必须介于 0 和 11 之间")
-	public String getPriority() {
-		return priority;
-	}
-
-	public void setPriority(String priority) {
-		this.priority = priority;
-	}
-	
-	@Length(min=0, max=20, message="省、直辖市长度必须介于 0 和 20 之间")
-	public String getProvince() {
-		return province;
-	}
-
-	public void setProvince(String province) {
-		this.province = province;
-	}
-	
-	@Length(min=0, max=20, message="市长度必须介于 0 和 20 之间")
-	public String getCity() {
-		return city;
-	}
-
-	public void setCity(String city) {
-		this.city = city;
-	}
-	
-	@Length(min=0, max=20, message="县、区长度必须介于 0 和 20 之间")
-	public String getTown() {
-		return town;
-	}
-
-	public void setTown(String town) {
-		this.town = town;
-	}
-	
-	@Length(min=0, max=200, message="详细地址长度必须介于 0 和 200 之间")
-	public String getAddress() {
-		return address;
-	}
-
-	public void setAddress(String address) {
-		this.address = address;
-	}
-	
-	@Length(min=0, max=1, message="启用/禁用状态长度必须介于 0 和 1 之间")
-	public String getEnabledStatus() {
-		return enabledStatus;
-	}
-
-	public void setEnabledStatus(String enabledStatus) {
-		this.enabledStatus = enabledStatus;
-	}
-	
-	public Date getBeginStartTime() {
-		return beginStartTime;
-	}
-
-	public void setBeginStartTime(Date beginStartTime) {
-		this.beginStartTime = beginStartTime;
-	}
-	
-	public Date getEndStartTime() {
-		return endStartTime;
-	}
-
-	public void setEndStartTime(Date endStartTime) {
-		this.endStartTime = endStartTime;
-	}
-
-	public String getProjectName() {
-		return projectName;
-	}
-
-	public void setProjectName(String projectName) {
-		this.projectName = projectName;
-	}
-
-	public String getCompanyName() {
-		return companyName;
-	}
-
-	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
-	}
-		
-}

src/main/java/com/caimei/modules/project/entity/Operation.java

@@ -1,200 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 操作单记录Entity
- * @author LG
- * @version 2017-01-16
- */
-public class Operation extends DataEntity<Operation> {
-	
-	private static final long serialVersionUID = 1L;
-	private Long projectOrderId;		// 项目订单ID
-	private Long clubId;		// 会所ID
-	private Long clubsubbranchId;		// 项目订单会所分店ID
-	private String clubsubbranchName; 	//项目订单会所分店名称
-	private Long mentorSpId;		// 美导ID
-	private String mentorSpName;//美导名称
-	private Date date;		// 日期
-	private String customerName;		// 顾客
-	private String items;		// 开卡事项
-	private Double finishFee;		// 成交金额
-	private Double receivedFee;		// 实收金额
-	private Double arrearageFee;		// 欠款金额
-	private Double closeFee;		// 结算金额
-	private String rewards;		// 奖励
-	private String mentorSpRemarks;		// 美导备注
-	private String clubRemarks;		// 会所备注
-	private Date beginCreateDate;		// 开始 创建日期
-	private Date endCreateDate;		// 结束 创建日期
-
-	private String makerSpId;//创客ID
-
-	public Operation() {
-		super();
-	}
-
-	public Operation(String id){
-		super(id);
-	}
-
-	public Long getProjectOrderId() {
-		return projectOrderId;
-	}
-
-	public void setProjectOrderId(Long projectOrderId) {
-		this.projectOrderId = projectOrderId;
-	}
-	
-	public Long getClubId() {
-		return clubId;
-	}
-
-	public void setClubId(Long clubId) {
-		this.clubId = clubId;
-	}
-	
-	public Long getClubsubbranchId() {
-		return clubsubbranchId;
-	}
-
-	public void setClubsubbranchId(Long clubsubbranchId) {
-		this.clubsubbranchId = clubsubbranchId;
-	}
-
-	public String getClubsubbranchName() {
-		return clubsubbranchName;
-	}
-
-	public void setClubsubbranchName(String clubsubbranchName) {
-		this.clubsubbranchName = clubsubbranchName;
-	}
-
-	public Long getMentorSpId() {
-		return mentorSpId;
-	}
-
-	public void setMentorSpId(Long mentorSpId) {
-		this.mentorSpId = mentorSpId;
-	}
-
-	public String getMentorSpName() {
-		return mentorSpName;
-	}
-
-	public void setMentorSpName(String mentorSpName) {
-		this.mentorSpName = mentorSpName;
-	}
-
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-	
-	@Length(min=0, max=20, message="顾客长度必须介于 0 和 20 之间")
-	public String getCustomerName() {
-		return customerName;
-	}
-
-	public void setCustomerName(String customerName) {
-		this.customerName = customerName;
-	}
-	
-	@Length(min=0, max=100, message="开卡事项长度必须介于 0 和 100 之间")
-	public String getItems() {
-		return items;
-	}
-
-	public void setItems(String items) {
-		this.items = items;
-	}
-	
-	public Double getFinishFee() {
-		return finishFee;
-	}
-
-	public void setFinishFee(Double finishFee) {
-		this.finishFee = finishFee;
-	}
-	
-	public Double getReceivedFee() {
-		return receivedFee;
-	}
-
-	public void setReceivedFee(Double receivedFee) {
-		this.receivedFee = receivedFee;
-	}
-	
-	public Double getArrearageFee() {
-		return arrearageFee;
-	}
-
-	public void setArrearageFee(Double arrearageFee) {
-		this.arrearageFee = arrearageFee;
-	}
-	
-	public Double getCloseFee() {
-		return closeFee;
-	}
-
-	public void setCloseFee(Double closeFee) {
-		this.closeFee = closeFee;
-	}
-	
-	public String getRewards() {
-		return rewards;
-	}
-
-	public void setRewards(String rewards) {
-		this.rewards = rewards;
-	}
-	
-	public String getMentorSpRemarks() {
-		return mentorSpRemarks;
-	}
-
-	public void setMentorSpRemarks(String mentorSpRemarks) {
-		this.mentorSpRemarks = mentorSpRemarks;
-	}
-	
-	public String getClubRemarks() {
-		return clubRemarks;
-	}
-
-	public void setClubRemarks(String clubRemarks) {
-		this.clubRemarks = clubRemarks;
-	}
-	
-	public Date getBeginCreateDate() {
-		return beginCreateDate;
-	}
-
-	public void setBeginCreateDate(Date beginCreateDate) {
-		this.beginCreateDate = beginCreateDate;
-	}
-	
-	public Date getEndCreateDate() {
-		return endCreateDate;
-	}
-
-	public void setEndCreateDate(Date endCreateDate) {
-		this.endCreateDate = endCreateDate;
-	}
-
-	public String getMakerSpId() {
-		return makerSpId;
-	}
-
-	public void setMakerSpId(String makerSpId) {
-		this.makerSpId = makerSpId;
-	}
-}

src/main/java/com/caimei/modules/project/entity/Project.java

@@ -1,186 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import java.util.List;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.caimei.modules.info.entity.Info;
-import com.caimei.modules.project.model.ClassifyModel;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-
-/**
- * 项目信息Entity
- * @author LG
- * @version 2016-07-14
- */
-public class Project extends DataEntity<Project> {
-	
-	private static final long serialVersionUID = 1L;
-	private String name;		// 项目名称
-	private String type;		// 项目类型
-	private Integer priority;		// 优先级
-	private Integer shareNum;		// 分享数
-	private String part;	//部位分类值
-	private String function;//功能分类值
-	private String enabledStatus;		// 启用/禁用状态
-	
-	private List<Info> projectInfoList=Lists.newArrayList();//相关文章
-	private List<ProjectCompany> projectCompanyList=Lists.newArrayList();//相关项目公司
-	
-	private Long infoNum;	//文章数
-	private Long companyNum;//项目公司数
-	private Long apparatusNum;//仪器数
-	
-	private List<ClassifyModel> partList = Lists.newArrayList();//部位分类
-	private List<ClassifyModel> functionList = Lists.newArrayList();//功能分类
-	
-	public Project() {
-		super();
-	}
-
-	public Project(String id){
-		super(id);
-	}
-
-	@Length(min=0, max=100, message="项目名称长度必须介于 0 和 100 之间")
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	@Length(min=0, max=1, message="项目类型长度必须介于 0 和 1 之间")
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-	public Integer getPriority() {
-		return priority;
-	}
-
-	public void setPriority(Integer priority) {
-		this.priority = priority;
-	}
-	
-	public Integer getShareNum() {
-		return shareNum;
-	}
-
-	public void setShareNum(Integer shareNum) {
-		this.shareNum = shareNum;
-	}
-	
-	public String getPart() {
-		return part;
-	}
-
-	public void setPart(String part) {
-		this.part = part;
-	}
-
-	public String getFunction() {
-		return function;
-	}
-
-	public void setFunction(String function) {
-		this.function = function;
-	}
-
-	@Length(min=0, max=1, message="启用/禁用状态长度必须介于 0 和 1 之间")
-	public String getEnabledStatus() {
-		return enabledStatus;
-	}
-
-	public void setEnabledStatus(String enabledStatus) {
-		this.enabledStatus = enabledStatus;
-	}
-
-	public List<Info> getProjectInfoList() {
-		return projectInfoList;
-	}
-
-	public void setProjectInfoList(List<Info> projectInfoList) {
-		this.projectInfoList = projectInfoList;
-	}
-
-	public List<ProjectCompany> getProjectCompanyList() {
-		return projectCompanyList;
-	}
-
-	public void setProjectCompanyList(List<ProjectCompany> projectCompanyList) {
-		this.projectCompanyList = projectCompanyList;
-	}
-
-	public Long getInfoNum() {
-		return infoNum;
-	}
-
-	public void setInfoNum(Long infoNum) {
-		this.infoNum = infoNum;
-	}
-
-	public Long getCompanyNum() {
-		return companyNum;
-	}
-
-	public void setCompanyNum(Long companyNum) {
-		this.companyNum = companyNum;
-	}
-
-	public Long getApparatusNum() {
-		return apparatusNum;
-	}
-
-	public void setApparatusNum(Long apparatusNum) {
-		this.apparatusNum = apparatusNum;
-	}
-
-	public List<ClassifyModel> getPartList() {
-		return partList;
-	}
-
-	public void setPartList(List<ClassifyModel> partList) {
-		this.partList = partList;
-	}
-
-	public List<ClassifyModel> getFunctionList() {
-		return functionList;
-	}
-
-	public void setFunctionList(List<ClassifyModel> functionList) {
-		this.functionList = functionList;
-	}
-	
-	public List<String> getPartClassifyIdList() {
-		List<String> partClassifyIdList = Lists.newArrayList();
-		for (ClassifyModel classify : partList) {
-			partClassifyIdList.add(classify.getId());
-		}
-		return partClassifyIdList;
-	}
-
-	public void setPartClassifyIdList(List<String> partClassifyIdList) {
-		part = StringUtils.join(partClassifyIdList, ',');
-	}
-	
-	public List<String> getFunctionClassifyIdList() {
-		List<String> functionClassifyIdList = Lists.newArrayList();
-		for (ClassifyModel classify : partList) {
-			functionClassifyIdList.add(classify.getId());
-		}
-		return functionClassifyIdList;
-	}
-	
-	public void setFunctionClassifyIdList(List<String> functionClassifyIdList) {
-		function = StringUtils.join(functionClassifyIdList, ',');
-	}
-	
-}

src/main/java/com/caimei/modules/project/entity/ProjectAppointment.java

@@ -1,91 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 预约项目Entity
- * @author LG
- * @version 2016-07-15
- */
-public class ProjectAppointment extends DataEntity<ProjectAppointment> {
-	
-	private static final long serialVersionUID = 1L;
-	private String appointmentClubName;		// 预约会所名称
-	private String contactWay;		// 联系方式
-	private String openid;		// openid
-	private String message;//留言信息
-	private Long userId;
-	private String userName;
-	
-	private Project project;//项目
-	
-	public ProjectAppointment() {
-		super();
-	}
-
-	public ProjectAppointment(String id){
-		super(id);
-	}
-
-	@Length(min=0, max=100, message="预约会所名称长度必须介于 0 和 100 之间")
-	public String getAppointmentClubName() {
-		return appointmentClubName;
-	}
-
-	public void setAppointmentClubName(String appointmentClubName) {
-		this.appointmentClubName = appointmentClubName;
-	}
-	
-	@Length(min=0, max=50, message="联系方式长度必须介于 0 和 50 之间")
-	public String getContactWay() {
-		return contactWay;
-	}
-
-	public void setContactWay(String contactWay) {
-		this.contactWay = contactWay;
-	}
-	
-	@Length(min=0, max=100, message="openid长度必须介于 0 和 100 之间")
-	public String getOpenid() {
-		return openid;
-	}
-
-	public void setOpenid(String openid) {
-		this.openid = openid;
-	}
-
-	public Project getProject() {
-		return project;
-	}
-
-	public void setProject(Project project) {
-		this.project = project;
-	}
-	
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-	
-}

src/main/java/com/caimei/modules/project/entity/ProjectCompany.java

@@ -1,151 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 项目公司Entity
- * @author LG
- * @version 2016-07-18
- */
-public class ProjectCompany extends DataEntity<ProjectCompany> {
-	
-	private static final long serialVersionUID = 1L;
-	private String name;		// 公司名称
-	private String area;		// 区域
-	private String scale;		// 规模
-	private String cooperationWay;		// 合作方式
-	private String maxPerformance;		// 最大业绩
-	private String divideScale;		// 分成比例
-	private String starClub;		// 明星会所
-	private String hotProject;		// 热销项目
-	private Long shareNum;		// 分享数
-	private String enabledStatus;		// 启用/禁用状态
-	
-	private Long projectNum;//项目数量
-	private Long marketingconferenceNum;//会销数量
-	private Long apparatusNum;//仪器数量
-	
-	public ProjectCompany() {
-		super();
-	}
-
-	public ProjectCompany(String id){
-		super(id);
-	}
-
-	@Length(min=1, max=100, message="公司名称长度必须介于 1 和 100 之间")
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	@Length(min=0, max=100, message="区域长度必须介于 0 和 100 之间")
-	public String getArea() {
-		return area;
-	}
-
-	public void setArea(String area) {
-		this.area = area;
-	}
-	
-	@Length(min=0, max=100, message="规模长度必须介于 0 和 100 之间")
-	public String getScale() {
-		return scale;
-	}
-
-	public void setScale(String scale) {
-		this.scale = scale;
-	}
-	
-	@Length(min=0, max=100, message="合作方式长度必须介于 0 和 100 之间")
-	public String getCooperationWay() {
-		return cooperationWay;
-	}
-
-	public void setCooperationWay(String cooperationWay) {
-		this.cooperationWay = cooperationWay;
-	}
-	
-	@Length(min=0, max=100, message="最大业绩长度必须介于 0 和 100 之间")
-	public String getMaxPerformance() {
-		return maxPerformance;
-	}
-
-	public void setMaxPerformance(String maxPerformance) {
-		this.maxPerformance = maxPerformance;
-	}
-	
-	@Length(min=0, max=100, message="分成比例长度必须介于 0 和 100 之间")
-	public String getDivideScale() {
-		return divideScale;
-	}
-
-	public void setDivideScale(String divideScale) {
-		this.divideScale = divideScale;
-	}
-	
-	@Length(min=0, max=100, message="明星会所长度必须介于 0 和 100 之间")
-	public String getStarClub() {
-		return starClub;
-	}
-
-	public void setStarClub(String starClub) {
-		this.starClub = starClub;
-	}
-	
-	@Length(min=0, max=100, message="热销项目长度必须介于 0 和 100 之间")
-	public String getHotProject() {
-		return hotProject;
-	}
-
-	public void setHotProject(String hotProject) {
-		this.hotProject = hotProject;
-	}
-	
-	public Long getShareNum() {
-		return shareNum;
-	}
-
-	public void setShareNum(Long shareNum) {
-		this.shareNum = shareNum;
-	}
-	
-	@Length(min=0, max=1, message="启用/禁用状态长度必须介于 0 和 1 之间")
-	public String getEnabledStatus() {
-		return enabledStatus;
-	}
-
-	public void setEnabledStatus(String enabledStatus) {
-		this.enabledStatus = enabledStatus;
-	}
-
-	public Long getProjectNum() {
-		return projectNum;
-	}
-
-	public void setProjectNum(Long projectNum) {
-		this.projectNum = projectNum;
-	}
-
-	public Long getMarketingconferenceNum() {
-		return marketingconferenceNum;
-	}
-
-	public void setMarketingconferenceNum(Long marketingconferenceNum) {
-		this.marketingconferenceNum = marketingconferenceNum;
-	}
-
-	public Long getApparatusNum() {
-		return apparatusNum;
-	}
-
-	public void setApparatusNum(Long apparatusNum) {
-		this.apparatusNum = apparatusNum;
-	}
-	
-}

src/main/java/com/caimei/modules/project/entity/ProjectInfo.java

@@ -1,20 +0,0 @@
-package com.caimei.modules.project.entity;
-
-public class ProjectInfo {
-	
-	private Long projectId;
-	private Long infoId;
-	public Long getProjectId() {
-		return projectId;
-	}
-	public void setProjectId(Long projectId) {
-		this.projectId = projectId;
-	}
-	public Long getInfoId() {
-		return infoId;
-	}
-	public void setInfoId(Long infoId) {
-		this.infoId = infoId;
-	}
-
-}

src/main/java/com/caimei/modules/project/entity/ProjectOrder.java

@@ -1,163 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import com.caimei.modules.project.model.ClassifyModel;
-import com.caimei.modules.project.model.ClubModel;
-import com.caimei.modules.project.model.ServiceProviderModel;
-import com.google.common.collect.Lists;
-import org.hibernate.validator.constraints.Length;
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 项目订单Entity
- * @author LG
- * @version 2017-01-09
- */
-public class ProjectOrder extends DataEntity<ProjectOrder> {
-	
-	private static final long serialVersionUID = 1L;
-	private Project project;// 项目
-//	private Long serverSpId;		// 项目业务员ID
-	private ServiceProviderModel serverSp;		// 项目业务员
-	//private Long makerSpId;		// 创客ID
-	private ServiceProviderModel makerSp;//创客
-//	private Long clubId;		// 会所ID
-	private ClubModel club;//会所
-	private String clubContactMobile;		// 会所联系方式
-	private String remitAccount;		// 打款账号
-	private Date startDate;		// 开始时间
-	private Date endDate;		// 结束时间
-	private Date beginStartDate;		// 开始 开始时间
-	private Date endStartDate;		// 结束 开始时间
-
-	private List<Clubsubbranch> clubsubbranchList= Lists.newArrayList();//项目订单会所分店
-	private Integer dissentCount;//异议操作单数
-	private Double sumreceivedFee;//实收总额
-	private List<ServiceProviderModel> mentorSps=Lists.newArrayList();//美导
-	
-	public ProjectOrder() {
-		super();
-	}
-
-	public ProjectOrder(String id){
-		super(id);
-	}
-
-	public Project getProject() {
-		return project;
-	}
-
-	public void setProject(Project project) {
-		this.project = project;
-	}
-
-	public ServiceProviderModel getServerSp() {
-		return serverSp;
-	}
-
-	public void setServerSp(ServiceProviderModel serverSp) {
-		this.serverSp = serverSp;
-	}
-
-	public ServiceProviderModel getMakerSp() {
-		return makerSp;
-	}
-
-	public void setMakerSp(ServiceProviderModel makerSp) {
-		this.makerSp = makerSp;
-	}
-
-	public ClubModel getClub() {
-		return club;
-	}
-
-	public void setClub(ClubModel club) {
-		this.club = club;
-	}
-
-	public String getClubContactMobile() {
-		return clubContactMobile;
-	}
-
-	public void setClubContactMobile(String clubContactMobile) {
-		this.clubContactMobile = clubContactMobile;
-	}
-	
-	public String getRemitAccount() {
-		return remitAccount;
-	}
-
-	public void setRemitAccount(String remitAccount) {
-		this.remitAccount = remitAccount;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getStartDate() {
-		return startDate;
-	}
-
-	public void setStartDate(Date startDate) {
-		this.startDate = startDate;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-	
-	public Date getBeginStartDate() {
-		return beginStartDate;
-	}
-
-	public void setBeginStartDate(Date beginStartDate) {
-		this.beginStartDate = beginStartDate;
-	}
-	
-	public Date getEndStartDate() {
-		return endStartDate;
-	}
-
-	public void setEndStartDate(Date endStartDate) {
-		this.endStartDate = endStartDate;
-	}
-
-	public List<Clubsubbranch> getClubsubbranchList() {
-		return clubsubbranchList;
-	}
-
-	public void setClubsubbranchList(List<Clubsubbranch> clubsubbranchList) {
-		this.clubsubbranchList = clubsubbranchList;
-	}
-
-	public Integer getDissentCount() {
-		return dissentCount;
-	}
-
-	public void setDissentCount(Integer dissentCount) {
-		this.dissentCount = dissentCount;
-	}
-
-	public Double getSumreceivedFee() {
-		return sumreceivedFee;
-	}
-
-	public void setSumreceivedFee(Double sumreceivedFee) {
-		this.sumreceivedFee = sumreceivedFee;
-	}
-
-	public List<ServiceProviderModel> getMentorSps() {
-		return mentorSps;
-	}
-
-	public void setMentorSps(List<ServiceProviderModel> mentorSps) {
-		this.mentorSps = mentorSps;
-	}
-}

src/main/java/com/caimei/modules/project/entity/ProjectTerminal.java

@@ -1,37 +0,0 @@
-package com.caimei.modules.project.entity;
-
-import java.util.List;
-
-import com.caimei.modules.info.entity.Info;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-public class ProjectTerminal extends DataEntity<ProjectTerminal> {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String images;
-	
-	private List<Info> projectInfoList=Lists.newArrayList();//相关文章
-	
-	public ProjectTerminal() {
-		super();
-	}
-	public ProjectTerminal(String id) {
-		super(id);
-	}
-	
-	public String getImages() {
-		return images;
-	}
-	public void setImages(String images) {
-		this.images = images;
-	}
-	public List<Info> getProjectInfoList() {
-		return projectInfoList;
-	}
-	public void setProjectInfoList(List<Info> projectInfoList) {
-		this.projectInfoList = projectInfoList;
-	}
-	
-}

src/main/java/com/caimei/modules/project/service/ApparatusAppointmentService.java

@@ -1,44 +0,0 @@
-package com.caimei.modules.project.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.project.dao.ApparatusAppointmentDao;
-import com.caimei.modules.project.entity.ApparatusAppointment;
-
-/**
- * 仪器预约Service
- * @author LG
- * @version 2016-08-31
- */
-@Service
-@Transactional(readOnly = true)
-public class ApparatusAppointmentService extends CrudService<ApparatusAppointmentDao, ApparatusAppointment> {
-
-	public ApparatusAppointment get(String id) {
-		return super.get(id);
-	}
-	
-	public List<ApparatusAppointment> findList(ApparatusAppointment apparatusAppointment) {
-		return super.findList(apparatusAppointment);
-	}
-	
-	public Page<ApparatusAppointment> findPage(Page<ApparatusAppointment> page, ApparatusAppointment apparatusAppointment) {
-		return super.findPage(page, apparatusAppointment);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(ApparatusAppointment apparatusAppointment) {
-		super.save(apparatusAppointment);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(ApparatusAppointment apparatusAppointment) {
-		super.delete(apparatusAppointment);
-	}
-	
-}

src/main/java/com/caimei/modules/project/service/ApparatusService.java

@@ -1,94 +0,0 @@
-package com.caimei.modules.project.service;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.caimei.modules.sys.utils.UploadImageUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.dfs.image.beens.ImageUploadInfo;
-import com.caimei.modules.common.utils.UploadUtils;
-import com.caimei.modules.project.dao.ApparatusDao;
-import com.caimei.modules.project.entity.Apparatus;
-import com.caimei.utils.StringUtils;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.Encodes;
-
-/**
- * 仪器管理Service
- * @author LG
- * @version 2016-08-31
- */
-@Service
-@Transactional(readOnly = true)
-public class ApparatusService extends CrudService<ApparatusDao, Apparatus> {
-	
-	@Autowired
-	private ApparatusDao apparatusDao;
-
-	public Apparatus get(String id) {
-		return super.get(id);
-	}
-	
-	public List<Apparatus> findList(Apparatus apparatus) {
-		return super.findList(apparatus);
-	}
-	
-	public Page<Apparatus> findPage(Page<Apparatus> page, Apparatus apparatus) {
-		Page<Apparatus> findPage = super.findPage(page, apparatus);
-		List<Apparatus> list = findPage.getList();
-		if(CollectionUtils.isNotEmpty(list)){
-			for (Apparatus a : list) {
-				a.setProjectNum(apparatusDao.countProjectNum(a.getId()));
-			}
-		}
-		return findPage;
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(Apparatus apparatus,HttpServletRequest request) {
-		if(StringUtils.isBlank(apparatus.getId())){
-			apparatus.setEnabledStatus("1");
-		}
-		String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
-		/**
-		 * 仪器图片
-		 */
-		String[] iamgeArray = StringUtils.split(apparatus.getImages(),"|");
-		List<String> imagesList=Lists.newArrayList();
-		for (String images : iamgeArray) {
-			if(StringUtils.isNotBlank(images) && !images.startsWith("http:")&& !images.startsWith("https:")){
-				images=Encodes.urlDecode(images);
-//				String realPath = request.getSession().getServletContext().getRealPath(images);
-                String realPath = UploadImageUtils.getAbsolutePath(images);
-//				realPath=Encodes.urlDecode(realPath);
-				int pointerIndex = realPath.lastIndexOf(".");
-				ImageUploadInfo saveImageSerivce=new ImageUploadInfo();
-				try {
-					saveImageSerivce = UploadUtils.saveImageSerivce(realPath, pointerIndex,realPath);
-					imagesList.add(photoServer+saveImageSerivce.getSource());
-				} catch (Exception e) {
-					logger.error("图片上传错误:"+e.toString(),e);
-				}
-			}else{
-				imagesList.add(images);
-			}
-		}
-		apparatus.setImages(StringUtils.join(imagesList, "|"));
-		apparatus.setDetails(UploadUtils.textHandle(apparatus.getDetails(), photoServer, request));
-		super.save(apparatus);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(Apparatus apparatus) {
-		super.delete(apparatus);
-	}
-	
-}

src/main/java/com/caimei/modules/project/service/ClubsubbranchService.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.project.service;
-
-import com.caimei.modules.project.dao.ClubsubbranchDao;
-import com.caimei.modules.project.entity.Clubsubbranch;
-import com.thinkgem.jeesite.common.service.CrudService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * Created by LG on 2017/1/9.
- */
-@Service
-@Transactional(readOnly = true)
-public class ClubsubbranchService extends CrudService<ClubsubbranchDao,Clubsubbranch> {
-}

src/main/java/com/caimei/modules/project/service/CompanyApparatusService.java

@@ -1,96 +0,0 @@
-package com.caimei.modules.project.service;
-
-import java.util.HashSet;
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.modules.project.dao.CompanyApparatusDao;
-import com.caimei.modules.project.dao.CompanyProDao;
-import com.caimei.modules.project.entity.CompanyApparatus;
-import com.caimei.modules.project.entity.CompanyPro;
-import com.caimei.modules.project.entity.Project;
-import com.caimei.modules.project.model.ClassifyModel;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-
-/**
- * 公司仪器Service
- * @author LG
- * @version 2016-09-01
- */
-@Service
-@Transactional(readOnly = true)
-public class CompanyApparatusService extends CrudService<CompanyApparatusDao, CompanyApparatus> {
-	
-	@Autowired
-	private CompanyApparatusDao companyApparatusDao;
-	
-	@Autowired
-	private CompanyProDao companyProDao;
-
-	public CompanyApparatus get(String id) {
-		CompanyApparatus companyApparatus = super.get(id);
-		if(null!=companyApparatus){
-			List<ClassifyModel> list=companyApparatusDao.findClassifyModel(id);
-			companyApparatus.setCompanyProList(list);
-		}
-		return companyApparatus;
-	}
-	
-	public List<CompanyApparatus> findList(CompanyApparatus companyApparatus) {
-		return super.findList(companyApparatus);
-	}
-	
-	public Page<CompanyApparatus> findPage(Page<CompanyApparatus> page, CompanyApparatus companyApparatus) {
-		Page<CompanyApparatus> findPage = super.findPage(page, companyApparatus);
-		List<CompanyApparatus> list = findPage.getList();
-		List<CompanyApparatus> list1 = Lists.newArrayList();
-		if(CollectionUtils.isNotEmpty(list)){
-			for (CompanyApparatus c : list) {
-				list1.add(get(c.getId()));
-			}
-		}
-		findPage.setList(list1);
-		return findPage;
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CompanyApparatus companyApparatus) {
-		super.save(companyApparatus);
-		/**公司仪器-公司项目 关系维护**/
-		companyApparatusDao.deleteCompanyApparatusPro(companyApparatus.getId());//删除关系
-		if(CollectionUtils.isNotEmpty(companyApparatus.getCompanyProList())){
-			String companyId = companyApparatus.getCompanyId();
-			List<String> IDs=Lists.newArrayList();
-			for (ClassifyModel info : companyApparatus.getCompanyProList()) {
-				CompanyPro c=new CompanyPro();
-				c.setCompanyId(Long.parseLong(companyId));
-				if(StringUtils.isNotBlank(info.getId())){
-					c.setProject(new Project(info.getId()));
-					List<CompanyPro> list = companyProDao.findList(c);
-					IDs.add(list.get(0).getId());
-				}
-			}
-			//插入关系
-			HashSet<String> h = new HashSet<String>(IDs);
-			IDs.clear();
-			IDs.addAll(h);
-			if(CollectionUtils.isNotEmpty(IDs))
-				companyApparatusDao.insertCompanyApparatusPro(companyApparatus.getId(), IDs);
-		}
-		
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CompanyApparatus companyApparatus) {
-		companyApparatusDao.deleteCompanyApparatusPro(companyApparatus.getId());//删除关系
-		super.delete(companyApparatus);
-	}
-	
-}

src/main/java/com/caimei/modules/project/service/CompanyProService.java

@@ -1,154 +0,0 @@
-package com.caimei.modules.project.service;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.caimei.modules.sys.utils.UploadImageUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.dfs.image.beens.ImageUploadInfo;
-import com.caimei.modules.brand.utils.ImagePathUtils;
-import com.caimei.modules.project.dao.CompanyProClubcaseDao;
-import com.caimei.modules.project.dao.CompanyProDao;
-import com.caimei.modules.project.dao.CompanyProImageDao;
-import com.caimei.modules.project.dao.CompanyProMarketingDao;
-import com.caimei.modules.project.entity.CompanyPro;
-import com.caimei.modules.project.entity.CompanyProClubcase;
-import com.caimei.modules.project.entity.CompanyProImage;
-import com.caimei.modules.project.entity.CompanyProMarketing;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.Encodes;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-
-/**
- * 公司项目Service
- * @author LG
- * @version 2016-07-18
- */
-@Service
-@Transactional(readOnly = true)
-public class CompanyProService extends CrudService<CompanyProDao, CompanyPro> {
-
-	@Autowired
-	private CompanyProMarketingDao companyProMarketingDao;
-	
-	@Autowired
-	private CompanyProClubcaseDao companyProClubcaseDao;
-	
-	@Autowired
-	private CompanyProImageDao companyProImageDao;
-	
-	public CompanyPro get(String id) {
-		CompanyPro companyPro = super.get(id);
-		if(null!=companyPro){
-			companyPro.setCompanyProMarketingList(companyProMarketingDao.findList(new CompanyProMarketing(Long.parseLong(companyPro.getId()))));
-			companyPro.setCompanyProClubcaseList(companyProClubcaseDao.findList(new CompanyProClubcase(Long.parseLong(companyPro.getId()))));
-			companyPro.setCompanyProImageList(companyProImageDao.findList(new CompanyProImage(Long.parseLong(companyPro.getId()))));
-		}
-		return companyPro;
-	}
-	
-	public List<CompanyPro> findList(CompanyPro companyPro) {
-		return super.findList(companyPro);
-	}
-	
-	public Page<CompanyPro> findPage(Page<CompanyPro> page, CompanyPro companyPro) {
-		Page<CompanyPro> findPage = super.findPage(page, companyPro);
-		List<CompanyPro> list = findPage.getList();
-		List<CompanyPro> list1 = Lists.newArrayList();
-		if(CollectionUtils.isNotEmpty(list)){
-			for (CompanyPro companyPro2 : list) {
-				list1.add(get(companyPro2.getId()));
-			}
-		}
-		findPage.setList(list1);
-		return findPage;
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CompanyPro companyPro, HttpServletRequest request) {
-		super.save(companyPro);
-		for (CompanyProMarketing companyProMarketing : companyPro.getCompanyProMarketingList()){//营销方案
-			if (companyProMarketing.getId() == null){
-				continue;
-			}
-			companyProMarketing.setCompanyProId(Long.parseLong(companyPro.getId()));//公司项目id
-			if (CompanyProMarketing.DEL_FLAG_NORMAL.equals(companyProMarketing.getDelFlag())){
-				if (StringUtils.isBlank(companyProMarketing.getId())){
-					companyProMarketing.preInsert();
-					companyProMarketingDao.insert(companyProMarketing);
-				}else{
-					companyProMarketing.preUpdate();
-					companyProMarketingDao.update(companyProMarketing);
-				}
-			}else{
-				companyProMarketingDao.delete(companyProMarketing);
-			}
-		}
-		for (CompanyProClubcase companyProClubcase : companyPro.getCompanyProClubcaseList()){//会所案例
-			if (companyProClubcase.getId() == null){
-				continue;
-			}
-			companyProClubcase.setCompanyProId(Long.parseLong(companyPro.getId()));//公司项目id
-			if (CompanyProMarketing.DEL_FLAG_NORMAL.equals(companyProClubcase.getDelFlag())){
-				if (StringUtils.isBlank(companyProClubcase.getId())){
-					companyProClubcase.preInsert();
-					companyProClubcaseDao.insert(companyProClubcase);
-				}else{
-					companyProClubcase.preUpdate();
-					companyProClubcaseDao.update(companyProClubcase);
-				}
-			}else{
-				companyProClubcaseDao.delete(companyProClubcase);
-			}
-		}
-		for (CompanyProImage companyProImage : companyPro.getCompanyProImageList()){//相关图片
-			if (companyProImage.getId() == null){
-				continue;
-			}
-			companyProImage.setCompanyProId(Long.parseLong(companyPro.getId()));//公司项目id
-			if (CompanyProMarketing.DEL_FLAG_NORMAL.equals(companyProImage.getDelFlag())){
-				if (StringUtils.isBlank(companyProImage.getId())){
-					String images = companyProImage.getUrl();
-					String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
-				 if(StringUtils.isNotBlank(images) && !images.contains("http:") && !images.contains("https:")){
-					images=Encodes.urlDecode(images);
-//					String realPath = request.getSession().getServletContext().getRealPath(images);
-                     String realPath = UploadImageUtils.getAbsolutePath(images);
-//					realPath=Encodes.urlDecode(realPath);
-					int pointerIndex = realPath.lastIndexOf(".");
-					ImageUploadInfo saveImageSerivce=new ImageUploadInfo();
-					try {
-						saveImageSerivce = ImagePathUtils.saveImageSerivce(realPath, pointerIndex,realPath);
-						companyProImage.setUrl(photoServer+saveImageSerivce.getSource());
-					} catch (Exception e) {
-						logger.error("图片上传错误:"+e.toString(),e);
-					}
-				 }
-					companyProImage.preInsert();
-					companyProImageDao.insert(companyProImage);
-				}else{//这里只有插入跟删除
-//					companyProImage.preUpdate();
-//					companyProImageDao.update(companyProImage);
-				}
-			}else{
-				companyProImageDao.delete(companyProImage);
-			}
-		}
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CompanyPro companyPro) {
-		super.delete(companyPro);
-		companyProMarketingDao.deleteByCompanyProId(companyPro.getId());
-		companyProClubcaseDao.deleteByCompanyProId(companyPro.getId());
-	}
-	
-}

src/main/java/com/caimei/modules/project/service/DissentDetailService.java

@@ -1,45 +0,0 @@
-package com.caimei.modules.project.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.modules.project.dao.DissentDetailDao;
-import com.caimei.modules.project.entity.DissentDetail;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-
-/**
- * 项目订单Service
- * @author LG
- * @version 2017-01-09
- */
-@Service
-@Transactional(readOnly = true)
-public class DissentDetailService extends CrudService<DissentDetailDao, DissentDetail> {
-
-	public DissentDetail get(String id) {
-		return null;
-	}
-	
-	public List<DissentDetail> findList(DissentDetail dissentDetail) {
-		return super.findList(dissentDetail);
-	}
-	
-	public Page<DissentDetail> findPage(Page<DissentDetail> page, DissentDetail dissentDetail) {
-		return super.findPage(page, dissentDetail);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(DissentDetail dissentDetail) {
-		super.save(dissentDetail);
-
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(DissentDetail dissentDetail) {
-		super.delete(dissentDetail);
-	}
-
-}

src/main/java/com/caimei/modules/project/service/DissentService.java

@@ -1,74 +0,0 @@
-package com.caimei.modules.project.service;
-
-import java.util.List;
-
-import com.caimei.modules.project.dao.DissentDetailDao;
-import com.caimei.modules.project.entity.DissentDetail;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.utils.DateUtils;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.project.entity.Dissent;
-import com.caimei.modules.project.dao.DissentDao;
-
-/**
- * 异议操作单Service
- * @author LG
- * @version 2017-01-17
- */
-@Service
-@Transactional(readOnly = true)
-public class DissentService extends CrudService<DissentDao, Dissent> {
-
-	@Autowired
-	private DissentDetailDao dissentDetailDao;
-
-	public Dissent get(String id) {
-		Dissent dissent = super.get(id);
-		if(null!=dissent){
-			DissentDetail dissentDetail = new DissentDetail();
-			dissentDetail.setDissentId(Long.valueOf(id));
-			dissent.setItemList(dissentDetailDao.findList(dissentDetail));
-		}
-		return dissent;
-	}
-	
-	public List<Dissent> findList(Dissent dissent) {
-		return super.findList(dissent);
-	}
-	
-	public Page<Dissent> findPage(Page<Dissent> page, Dissent dissent) {
-		if(null!=dissent.getEndCreateDate()){
-			dissent.setEndCreateDate(DateUtils.parseDate(DateUtils.formatDate(dissent.getEndCreateDate())+" 23:59:59"));
-		}
-		Page<Dissent> resultPage = super.findPage(page, dissent);
-		List<Dissent> list = resultPage.getList();
-		List<Dissent> list1 = Lists.newArrayList();
-		if(CollectionUtils.isNotEmpty(list)){
-			for (Dissent d:list) {
-				list1.add(this.get(d.getId()));
-			}
-		}
-		if(CollectionUtils.isNotEmpty(list1)){
-			resultPage.setList(list1);
-		}
-		return resultPage;
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(Dissent dissent) {
-		super.save(dissent);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(Dissent dissent) {
-		super.delete(dissent);
-	}
-	
-}

src/main/java/com/caimei/modules/project/service/MarketingconferenceService.java

@@ -1,55 +0,0 @@
-package com.caimei.modules.project.service;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.modules.project.dao.MarketingconferenceDao;
-import com.caimei.modules.project.entity.Marketingconference;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-
-/**
- * 公司会销Service
- * @author demon
- * @version 2016-07-19
- */
-@Service
-@Transactional(readOnly = true)
-public class MarketingconferenceService extends CrudService<MarketingconferenceDao, Marketingconference> {
-
-	@Autowired
-	private MarketingconferenceDao marketingconferenceDao;
-	
-	public Marketingconference get(String id) {
-		return super.get(id);
-	}
-	
-	public List<Marketingconference> findList(Marketingconference marketingconference) {
-		return super.findList(marketingconference);
-	}
-	
-	public Page<Marketingconference> findPage(Page<Marketingconference> page, Marketingconference marketingconference) {
-		return super.findPage(page, marketingconference);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(Marketingconference marketingconference) {
-		super.save(marketingconference);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(Marketingconference marketingconference) {
-		super.delete(marketingconference);
-	}
-	
-	@Transactional(readOnly = false)
-	public void changeStatus(Marketingconference marketingconference) {
-		marketingconferenceDao.changeStatus(marketingconference.getId(), marketingconference.getEnabledStatus());
-	}
-	
-	
-	
-}

src/main/java/com/caimei/modules/project/service/OperationService.java

@@ -1,52 +0,0 @@
-package com.caimei.modules.project.service;
-
-import java.util.List;
-
-import com.caimei.modules.project.model.FeeModel;
-import com.thinkgem.jeesite.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.project.entity.Operation;
-import com.caimei.modules.project.dao.OperationDao;
-
-/**
- * 操作单记录Service
- * @author LG
- * @version 2017-01-16
- */
-@Service
-@Transactional(readOnly = true)
-public class OperationService extends CrudService<OperationDao, Operation> {
-
-	public Operation get(String id) {
-		return super.get(id);
-	}
-	
-	public List<Operation> findList(Operation operation) {
-		return super.findList(operation);
-	}
-	
-	public Page<Operation> findPage(Page<Operation> page, Operation operation) {
-		if(null!=operation.getEndCreateDate()){
-			operation.setEndCreateDate(DateUtils.parseDate(DateUtils.formatDate(operation.getEndCreateDate())+" 23:59:59"));
-		}
-		return super.findPage(page, operation);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(Operation operation) {
-		super.save(operation);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(Operation operation) {
-		super.delete(operation);
-	}
-
-    public FeeModel countSumFee(Long projectOrderId) {
-		return dao.countSumFee(projectOrderId);
-    }
-}

src/main/java/com/caimei/modules/project/service/ProjectAppointmentService.java

@@ -1,44 +0,0 @@
-package com.caimei.modules.project.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.project.dao.ProjectAppointmentDao;
-import com.caimei.modules.project.entity.ProjectAppointment;
-
-/**
- * 预约项目Service
- * @author LG
- * @version 2016-07-15
- */
-@Service
-@Transactional(readOnly = true)
-public class ProjectAppointmentService extends CrudService<ProjectAppointmentDao, ProjectAppointment> {
-
-	public ProjectAppointment get(String id) {
-		return super.get(id);
-	}
-	
-	public List<ProjectAppointment> findList(ProjectAppointment projectAppointment) {
-		return super.findList(projectAppointment);
-	}
-	
-	public Page<ProjectAppointment> findPage(Page<ProjectAppointment> page, ProjectAppointment projectAppointment) {
-		return super.findPage(page, projectAppointment);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(ProjectAppointment projectAppointment) {
-		super.save(projectAppointment);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(ProjectAppointment projectAppointment) {
-		super.delete(projectAppointment);
-	}
-	
-}