src/main/java/com/xmomen/module/account/realm/UserRealm.java

@@ -17,12 +17,6 @@ import org.apache.shiro.util.ByteSource;
 
 import java.util.Set;
 
-
-/**
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 public class UserRealm extends AuthorizingRealm {
 
     // 注入UserService
@@ -43,9 +37,9 @@ public class UserRealm extends AuthorizingRealm {
         // 获取用户的权限
         Set<String> realmNames = principals.getRealmNames();
         for(String realmName: realmNames) {
-        	if(realmName.contains("UserRealm")) {
+            if(realmName.contains("UserRealm")) {
-        		roles.add("user");
+                roles.add("user");
-        	}
+            }
         }
         // 创建SimpleAuthorizationInfo对象
         SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo();
@@ -56,18 +50,18 @@ public class UserRealm extends AuthorizingRealm {
         return authorizationInfo;
     }
 
-    
+
     // 判断是否支持该类型的token
     @Override
-	public boolean supports(AuthenticationToken token) {
+    public boolean supports(AuthenticationToken token) {
-		if(token instanceof SysUserToken) {
+        if(token instanceof SysUserToken) {
-			return super.supports(token);
+            return super.supports(token);
-		}
+        }
-		return false;
+        return false;
-	}
+    }
-
+
-	// 获取用户的认证信息
+    // 获取用户的认证信息
-	@Override
+    @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
 
         // 获取用户名

src/main/java/com/xmomen/module/account/service/PasswordHelper.java

@@ -5,11 +5,6 @@ import org.apache.shiro.crypto.SecureRandomNumberGenerator;
 import org.apache.shiro.crypto.hash.SimpleHash;
 import org.apache.shiro.util.ByteSource;
 
-/**
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 public class PasswordHelper {
 
     // 随机数生成器

src/main/java/com/xmomen/module/account/service/PermissionServiceImpl.java

@@ -7,29 +7,24 @@ import com.xmomen.framework.mybatis.dao.MybatisDao;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-/**
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 @Service
 public class PermissionServiceImpl implements PermissionService {
 
-	@Autowired
+    @Autowired
-	private MybatisDao mybatisDao;
+    private MybatisDao mybatisDao;
 
     @Override
     @Transactional
     public SysPermissions createPermission(SysPermissions permission) {
-    	// 保存权限信息
+        // 保存权限信息
-    	permission = mybatisDao.saveByModel(permission);
+        permission = mybatisDao.saveByModel(permission);
         return permission;
     }
 
     @Override
     @Transactional
     public void deletePermission(Long permissionId) {
-    	// 根据权限ID删除权限信息
+        // 根据权限ID删除权限信息
-    	mybatisDao.deleteByPrimaryKey(SysPermissions.class, permissionId);
+        mybatisDao.deleteByPrimaryKey(SysPermissions.class, permissionId);
     }
 }

src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java

@@ -20,11 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-/**
+
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 @Service
 public class RoleServiceImpl implements RoleService {
 

src/main/java/com/xmomen/module/account/service/UserServiceImpl.java

@@ -23,11 +23,7 @@ import com.xmomen.module.user.entity.SysUsersExample;
 import com.xmomen.module.user.entity.SysUsersRoles;
 import com.xmomen.module.user.entity.SysUsersRolesExample;
 
-/**
+
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 @Service
 public class UserServiceImpl implements UserService {
 

src/main/java/com/xmomen/module/base/entity/CdCouponRefExample.java

@@ -4,47 +4,60 @@ import com.xmomen.framework.mybatis.model.BaseMybatisExample;
 import java.util.ArrayList;
 import java.util.List;
 
+// 定义一个CdCouponRefExample类，继承自BaseMybatisExample类
 public class CdCouponRefExample extends BaseMybatisExample {
+    // 定义一个orderByClause变量，用于存储排序字段
     protected String orderByClause;
 
+    // 定义一个distinct变量，用于存储是否去重
     protected boolean distinct;
 
+    // 定义一个oredCriteria变量，用于存储查询条件
     protected List<Criteria> oredCriteria;
 
+    // 构造函数，初始化oredCriteria变量
     public CdCouponRefExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
+    // 设置orderByClause变量的值
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
 
+    // 获取orderByClause变量的值
     public String getOrderByClause() {
         return orderByClause;
     }
 
+    // 设置distinct变量的值
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
     }
 
+    // 获取distinct变量的值
     public boolean isDistinct() {
         return distinct;
     }
 
+    // 获取oredCriteria变量的值
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
     }
 
+    // 添加一个查询条件
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
     }
 
+    // 创建一个新的查询条件
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
         oredCriteria.add(criteria);
         return criteria;
     }
 
+    // 创建一个新的查询条件
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
         if (oredCriteria.size() == 0) {
@@ -53,37 +66,46 @@ public class CdCouponRefExample extends BaseMybatisExample {
         return criteria;
     }
 
+    // 创建一个新的查询条件
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
         return criteria;
     }
 
+    // 清空oredCriteria变量和orderByClause变量和distinct变量的值
     public void clear() {
         oredCriteria.clear();
         orderByClause = null;
         distinct = false;
     }
 
+    // 定义一个GeneratedCriteria类，用于存储查询条件
     protected abstract static class GeneratedCriteria {
+        // 定义一个criteria变量，用于存储查询条件
         protected List<Criterion> criteria;
 
+        // 构造函数，初始化criteria变量
         protected GeneratedCriteria() {
             super();
             criteria = new ArrayList<Criterion>();
         }
 
+        // 判断是否有查询条件
         public boolean isValid() {
             return criteria.size() > 0;
         }
 
+        // 获取所有的查询条件
         public List<Criterion> getAllCriteria() {
             return criteria;
         }
 
+        // 获取查询条件
         public List<Criterion> getCriteria() {
             return criteria;
         }
 
+        // 添加一个查询条件
         protected void addCriterion(String condition) {
             if (condition == null) {
                 throw new RuntimeException("Value for condition cannot be null");
@@ -91,6 +113,7 @@ public class CdCouponRefExample extends BaseMybatisExample {
             criteria.add(new Criterion(condition));
         }
 
+        // 添加一个查询条件
         protected void addCriterion(String condition, Object value, String property) {
             if (value == null) {
                 throw new RuntimeException("Value for " + property + " cannot be null");
@@ -98,6 +121,7 @@ public class CdCouponRefExample extends BaseMybatisExample {
             criteria.add(new Criterion(condition, value));
         }
 
+        // 添加一个查询条件
         protected void addCriterion(String condition, Object value1, Object value2, String property) {
             if (value1 == null || value2 == null) {
                 throw new RuntimeException("Between values for " + property + " cannot be null");
@@ -105,246 +129,295 @@ public class CdCouponRefExample extends BaseMybatisExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
+        // 判断ID是否为空
         public Criteria andIdIsNull() {
             addCriterion("ID is null");
             return (Criteria) this;
         }
 
+        // 判断ID是否不为空
         public Criteria andIdIsNotNull() {
             addCriterion("ID is not null");
             return (Criteria) this;
         }
 
+        // 判断ID是否等于某个值
         public Criteria andIdEqualTo(Integer value) {
             addCriterion("ID =", value, "id");
             return (Criteria) this;
         }
 
+        // 判断ID是否不等于某个值
         public Criteria andIdNotEqualTo(Integer value) {
             addCriterion("ID <>", value, "id");
             return (Criteria) this;
         }
 
+        // 判断ID是否大于某个值
         public Criteria andIdGreaterThan(Integer value) {
             addCriterion("ID >", value, "id");
             return (Criteria) this;
         }
 
+        // 判断ID是否大于等于某个值
         public Criteria andIdGreaterThanOrEqualTo(Integer value) {
             addCriterion("ID >=", value, "id");
             return (Criteria) this;
         }
 
+        // 判断ID是否小于某个值
         public Criteria andIdLessThan(Integer value) {
             addCriterion("ID <", value, "id");
             return (Criteria) this;
         }
 
+        // 判断ID是否小于等于某个值
         public Criteria andIdLessThanOrEqualTo(Integer value) {
             addCriterion("ID <=", value, "id");
             return (Criteria) this;
         }
 
+        // 判断ID是否在某个范围内
         public Criteria andIdIn(List<Integer> values) {
             addCriterion("ID in", values, "id");
             return (Criteria) this;
         }
 
+        // 判断ID是否不在某个范围内
         public Criteria andIdNotIn(List<Integer> values) {
             addCriterion("ID not in", values, "id");
             return (Criteria) this;
         }
 
+        // 判断ID是否在某个范围内
         public Criteria andIdBetween(Integer value1, Integer value2) {
             addCriterion("ID between", value1, value2, "id");
             return (Criteria) this;
         }
 
+        // 判断ID是否不在某个范围内
         public Criteria andIdNotBetween(Integer value1, Integer value2) {
             addCriterion("ID not between", value1, value2, "id");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否为空
         public Criteria andCdCouponIdIsNull() {
             addCriterion("CD_COUPON_ID is null");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否不为空
         public Criteria andCdCouponIdIsNotNull() {
             addCriterion("CD_COUPON_ID is not null");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否等于某个值
         public Criteria andCdCouponIdEqualTo(Integer value) {
             addCriterion("CD_COUPON_ID =", value, "cdCouponId");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否不等于某个值
         public Criteria andCdCouponIdNotEqualTo(Integer value) {
             addCriterion("CD_COUPON_ID <>", value, "cdCouponId");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否大于某个值
         public Criteria andCdCouponIdGreaterThan(Integer value) {
             addCriterion("CD_COUPON_ID >", value, "cdCouponId");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否大于等于某个值
         public Criteria andCdCouponIdGreaterThanOrEqualTo(Integer value) {
             addCriterion("CD_COUPON_ID >=", value, "cdCouponId");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否小于某个值
         public Criteria andCdCouponIdLessThan(Integer value) {
             addCriterion("CD_COUPON_ID <", value, "cdCouponId");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否小于等于某个值
         public Criteria andCdCouponIdLessThanOrEqualTo(Integer value) {
             addCriterion("CD_COUPON_ID <=", value, "cdCouponId");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否在某个范围内
         public Criteria andCdCouponIdIn(List<Integer> values) {
             addCriterion("CD_COUPON_ID in", values, "cdCouponId");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否不在某个范围内
         public Criteria andCdCouponIdNotIn(List<Integer> values) {
             addCriterion("CD_COUPON_ID not in", values, "cdCouponId");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否在某个范围内
         public Criteria andCdCouponIdBetween(Integer value1, Integer value2) {
             addCriterion("CD_COUPON_ID between", value1, value2, "cdCouponId");
             return (Criteria) this;
         }
 
+        // 判断CD_COUPON_ID是否不在某个范围内
         public Criteria andCdCouponIdNotBetween(Integer value1, Integer value2) {
             addCriterion("CD_COUPON_ID not between", value1, value2, "cdCouponId");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否为空
         public Criteria andCouponNumberIsNull() {
             addCriterion("COUPON_NUMBER is null");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否不为空
         public Criteria andCouponNumberIsNotNull() {
             addCriterion("COUPON_NUMBER is not null");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否等于某个值
         public Criteria andCouponNumberEqualTo(String value) {
             addCriterion("COUPON_NUMBER =", value, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否不等于某个值
         public Criteria andCouponNumberNotEqualTo(String value) {
             addCriterion("COUPON_NUMBER <>", value, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否大于某个值
         public Criteria andCouponNumberGreaterThan(String value) {
             addCriterion("COUPON_NUMBER >", value, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否大于等于某个值
         public Criteria andCouponNumberGreaterThanOrEqualTo(String value) {
             addCriterion("COUPON_NUMBER >=", value, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否小于某个值
         public Criteria andCouponNumberLessThan(String value) {
             addCriterion("COUPON_NUMBER <", value, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否小于等于某个值
         public Criteria andCouponNumberLessThanOrEqualTo(String value) {
             addCriterion("COUPON_NUMBER <=", value, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否包含某个值
         public Criteria andCouponNumberLike(String value) {
             addCriterion("COUPON_NUMBER like", value, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否不包含某个值
         public Criteria andCouponNumberNotLike(String value) {
             addCriterion("COUPON_NUMBER not like", value, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否在某个范围内
         public Criteria andCouponNumberIn(List<String> values) {
             addCriterion("COUPON_NUMBER in", values, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否不在某个范围内
         public Criteria andCouponNumberNotIn(List<String> values) {
             addCriterion("COUPON_NUMBER not in", values, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否在某个范围内
         public Criteria andCouponNumberBetween(String value1, String value2) {
             addCriterion("COUPON_NUMBER between", value1, value2, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断COUPON_NUMBER是否不在某个范围内
         public Criteria andCouponNumberNotBetween(String value1, String value2) {
             addCriterion("COUPON_NUMBER not between", value1, value2, "couponNumber");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否为空
         public Criteria andRefTypeIsNull() {
             addCriterion("REF_TYPE is null");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否不为空
         public Criteria andRefTypeIsNotNull() {
             addCriterion("REF_TYPE is not null");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否等于某个值
         public Criteria andRefTypeEqualTo(String value) {
             addCriterion("REF_TYPE =", value, "refType");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否不等于某个值
         public Criteria andRefTypeNotEqualTo(String value) {
             addCriterion("REF_TYPE <>", value, "refType");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否大于某个值
         public Criteria andRefTypeGreaterThan(String value) {
             addCriterion("REF_TYPE >", value, "refType");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否大于等于某个值
         public Criteria andRefTypeGreaterThanOrEqualTo(String value) {
             addCriterion("REF_TYPE >=", value, "refType");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否小于某个值
         public Criteria andRefTypeLessThan(String value) {
             addCriterion("REF_TYPE <", value, "refType");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否小于等于某个值
         public Criteria andRefTypeLessThanOrEqualTo(String value) {
             addCriterion("REF_TYPE <=", value, "refType");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否包含某个值
         public Criteria andRefTypeLike(String value) {
             addCriterion("REF_TYPE like", value, "refType");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否不包含某个值
         public Criteria andRefTypeNotLike(String value) {
             addCriterion("REF_TYPE not like", value, "refType");
             return (Criteria) this;
         }
 
+        // 判断REF_TYPE是否在某个范围内
         public Criteria andRefTypeIn(List<String> values) {
             addCriterion("REF_TYPE in", values, "refType");
             return (Criteria) this;
@@ -356,11 +429,13 @@ public class CdCouponRefExample extends BaseMybatisExample {
         }
 
         public Criteria andRefTypeBetween(String value1, String value2) {
+        // 判断REF_TYPE是否在某个范围内
             addCriterion("REF_TYPE between", value1, value2, "refType");
             return (Criteria) this;
         }
 
         public Criteria andRefTypeNotBetween(String value1, String value2) {
+        // 判断REF_TYPE是否不在某个范围内
             addCriterion("REF_TYPE not between", value1, value2, "refType");
             return (Criteria) this;
         }
@@ -372,34 +447,42 @@ public class CdCouponRefExample extends BaseMybatisExample {
 
         public Criteria andRefNameIsNotNull() {
             addCriterion("REF_NAME is not null");
+        // 判断REF_NAME是否不为空
             return (Criteria) this;
         }
 
         public Criteria andRefNameEqualTo(String value) {
             addCriterion("REF_NAME =", value, "refName");
+        // 判断REF_NAME是否等于某个值
             return (Criteria) this;
         }
 
         public Criteria andRefNameNotEqualTo(String value) {
             addCriterion("REF_NAME <>", value, "refName");
+        // 判断REF_NAME是否不等于某个值
             return (Criteria) this;
         }
 
         public Criteria andRefNameGreaterThan(String value) {
             addCriterion("REF_NAME >", value, "refName");
+        // 判断REF_NAME是否大于某个值
             return (Criteria) this;
         }
 
         public Criteria andRefNameGreaterThanOrEqualTo(String value) {
+            // 添加条件，REF_NAME大于等于value
             addCriterion("REF_NAME >=", value, "refName");
+            // 返回当前Criteria对象
             return (Criteria) this;
         }
 
+        // 判断REF_NAME是否小于某个值
         public Criteria andRefNameLessThan(String value) {
             addCriterion("REF_NAME <", value, "refName");
             return (Criteria) this;
         }
 
+        // 判断REF_NAME是否小于等于某个值
         public Criteria andRefNameLessThanOrEqualTo(String value) {
             addCriterion("REF_NAME <=", value, "refName");
             return (Criteria) this;
@@ -408,56 +491,67 @@ public class CdCouponRefExample extends BaseMybatisExample {
         public Criteria andRefNameLike(String value) {
             addCriterion("REF_NAME like", value, "refName");
             return (Criteria) this;
+        // 判断REF_NAME是否包含某个值
         }
 
         public Criteria andRefNameNotLike(String value) {
             addCriterion("REF_NAME not like", value, "refName");
             return (Criteria) this;
+        // 判断REF_NAME是否不包含某个值
         }
 
         public Criteria andRefNameIn(List<String> values) {
             addCriterion("REF_NAME in", values, "refName");
             return (Criteria) this;
+        // 判断REF_NAME是否在某个范围内
         }
 
         public Criteria andRefNameNotIn(List<String> values) {
             addCriterion("REF_NAME not in", values, "refName");
             return (Criteria) this;
+        // 判断REF_NAME是否不在某个范围内
         }
 
         public Criteria andRefNameBetween(String value1, String value2) {
             addCriterion("REF_NAME between", value1, value2, "refName");
             return (Criteria) this;
+        // 判断REF_NAME是否在某个范围内
         }
 
         public Criteria andRefNameNotBetween(String value1, String value2) {
             addCriterion("REF_NAME not between", value1, value2, "refName");
             return (Criteria) this;
+        // 判断REF_NAME是否不在某个范围内
         }
 
         public Criteria andRefValueIsNull() {
             addCriterion("REF_VALUE is null");
             return (Criteria) this;
+        // 判断REF_VALUE是否为空
         }
 
         public Criteria andRefValueIsNotNull() {
             addCriterion("REF_VALUE is not null");
             return (Criteria) this;
+        // 判断REF_VALUE是否不为空
         }
 
         public Criteria andRefValueEqualTo(String value) {
             addCriterion("REF_VALUE =", value, "refValue");
             return (Criteria) this;
+        // 判断REF_VALUE是否等于某个值
         }
 
         public Criteria andRefValueNotEqualTo(String value) {
             addCriterion("REF_VALUE <>", value, "refValue");
             return (Criteria) this;
+        // 判断REF_VALUE是否不等于某个值
         }
 
         public Criteria andRefValueGreaterThan(String value) {
             addCriterion("REF_VALUE >", value, "refValue");
             return (Criteria) this;
+        // 判断REF_VALUE是否大于某个值
         }
 
         public Criteria andRefValueGreaterThanOrEqualTo(String value) {

src/main/java/com/xmomen/module/base/entity/CdExpress.java

@@ -11,19 +11,13 @@ import javax.persistence.Version;
 @Entity
 @Table(name = "cd_express")
 public class CdExpress extends BaseMybatisModel {
-    /**
+
-     * 主键
-     */
     private Integer id;
 
-    /**
+
-     * 快递编号
-     */
     private String expressCode;
 
-    /**
+
-     * 快递公司名
-     */
     private String expressName;
 
     @Column(name = "ID")
@@ -36,8 +30,8 @@ public class CdExpress extends BaseMybatisModel {
     public void setId(Integer id) {
         this.id = id;
         if(id == null){
-              removeValidField("id");
+            removeValidField("id");
-              return;
+            return;
         }
         addValidField("id");
     }
@@ -50,8 +44,8 @@ public class CdExpress extends BaseMybatisModel {
     public void setExpressCode(String expressCode) {
         this.expressCode = expressCode;
         if(expressCode == null){
-              removeValidField("expressCode");
+            removeValidField("expressCode");
-              return;
+            return;
         }
         addValidField("expressCode");
     }
@@ -64,8 +58,8 @@ public class CdExpress extends BaseMybatisModel {
     public void setExpressName(String expressName) {
         this.expressName = expressName;
         if(expressName == null){
-              removeValidField("expressName");
+            removeValidField("expressName");
-              return;
+            return;
         }
         addValidField("expressName");
     }

src/main/java/com/xmomen/module/base/model/ActivityModel.java

@@ -6,42 +6,34 @@ import java.util.Date;
 import java.util.List;
 
 public class ActivityModel implements Serializable {
+	// 活动ID
 	private Integer id;
-	/**
+
-     * 活动名称
+    // 活动名称
-     */
     private String activityName;
-    /**
+
-     * 活动开始时间
+    // 活动开始时间
-     */
     private Date activityBeginTime;
 
-    /**
+    // 活动结束时间
-     * 活动结束时间
-     */
     private Date activityEndTime;
 
-    /**
+    // 活动描述
-     * 活动介绍
-     */
     private String activityDescribe;
 
-    /**
+    // 活动类型
-     * 参与活动的卡类型
-     */
     private Integer activityType;
     
+    // 最低价格
     private BigDecimal lowestPrice;
     
+    // 优惠券类别
     private Integer couponCategory;
-    /**
+
-     * 活动下单时间
+    // 活动天数
-     */
     private Integer activityDay;
 
-    /**
+    // 是否可用
-     * 是否启用（0-不启用，1-启用）
-     */
     private Integer available;
 
 	public String getActivityName() {

src/main/java/com/xmomen/module/base/model/ActivityRefModel.java

@@ -3,11 +3,17 @@ package com.xmomen.module.base.model;
 import java.io.Serializable;
 
 public class ActivityRefModel implements Serializable{
+	//活动引用模型类
 	private Integer cdItemId;
+	//活动ID
 	private String itemName;
+	//活动名称
 	private String itemCode;
+	//活动编码
 	private String categoryName;
+	//活动类别名称
 	private Integer count;
+	//活动数量
 	public Integer getCount() {
 		return count;
 	}

src/main/java/com/xmomen/module/base/model/CompanyCustomerManager.java

@@ -3,17 +3,23 @@ package com.xmomen.module.base.model;
 import java.io.Serializable;
 
 public class CompanyCustomerManager implements Serializable{
+	// 客户经理ID
 	private Integer customerMangerId;
+	// 客户经理
 	private String customerManger;
+	// 获取客户经理ID
 	public Integer getCustomerMangerId() {
 		return customerMangerId;
 	}
+	// 设置客户经理ID
 	public void setCustomerMangerId(Integer customerMangerId) {
 		this.customerMangerId = customerMangerId;
 	}
+	// 获取客户经理
 	public String getCustomerManger() {
 		return customerManger;
 	}
+	// 设置客户经理
 	public void setCustomerManger(String customerManger) {
 		this.customerManger = customerManger;
 	}

src/main/java/com/xmomen/module/base/model/CompanyModel.java

@@ -3,90 +3,94 @@ package com.xmomen.module.base.model;
 import java.util.List;
 
 public class CompanyModel {
-	 /**
+
-     * 
+    // 单位ID
-     */
     private Integer id;
 
-    /**
+    // 单位编号
-     * 单位编号
-     */
     private String companyCode;
 
-    /**
+    // 单位名称
-     * 单位名称
-     */
     private String companyName;
 
-    /**
+    // 单位地址
-     * 单位地址
-     */
     private String companyAddress;
 
-    /**
+    // 单位联系人
-     * 单位联系人
-     */
     private String companyLeader;
 
-    /**
+    // 联系人电话
-     * 联系人电话
-     */
     private String companyLeaderTel;
 
+   // 单位客户经理列表
    List<CompanyCustomerManager> companyCustomerManagers;
     
+	// 获取单位ID
 	public Integer getId() {
 		return id;
 	}
 
+	// 设置单位ID
 	public void setId(Integer id) {
 		this.id = id;
 	}
 
+	// 获取单位编号
 	public String getCompanyCode() {
 		return companyCode;
 	}
 
+	// 设置单位编号
 	public void setCompanyCode(String companyCode) {
 		this.companyCode = companyCode;
 	}
 
+	// 获取单位名称
 	public String getCompanyName() {
 		return companyName;
 	}
 
+	// 设置单位名称
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
 	}
 
+	// 获取单位地址
 	public String getCompanyAddress() {
 		return companyAddress;
 	}
 
+	// 设置单位地址
 	public void setCompanyAddress(String companyAddress) {
 		this.companyAddress = companyAddress;
 	}
 
+	// 获取单位联系人
 	public String getCompanyLeader() {
 		return companyLeader;
 	}
 
+	// 设置单位联系人
 	public void setCompanyLeader(String companyLeader) {
 		this.companyLeader = companyLeader;
 	}
 
+	// 获取联系人电话
 	public String getCompanyLeaderTel() {
 		return companyLeaderTel;
 	}
 
+	// 设置联系人电话
 	public void setCompanyLeaderTel(String companyLeaderTel) {
 		this.companyLeaderTel = companyLeaderTel;
 	}
 
+	// 获取单位客户经理列表
 	public List<CompanyCustomerManager> getCompanyCustomerManagers() {
 		return companyCustomerManagers;
 	}
 
+	// 设置单位客户经理列表
 	public void setCompanyCustomerManagers(
 			List<CompanyCustomerManager> companyCustomerManagers) {
 		this.companyCustomerManagers = companyCustomerManagers;

src/main/java/com/xmomen/module/base/model/ContractItemModel.java

@@ -7,34 +7,33 @@ import lombok.Data;
 
 public @Data class ContractItemModel implements Serializable {
 	
+	// 合同项ID
 	private Integer id;
+	// 合同项编码
 	private String itemCode;
+    // 合同项名称
     private String itemName;
+    // 销售价格
     private BigDecimal sellPrice;
+    // 类别名称
     private String categoryName;
+    // 合同类型名称
     private String contractTypeName;
+    // 折扣文本
     private String discountText;
-    /**
+
-     * 1-固定价格，2-固定金额
+    // 合同类型
-     */
     private Integer contractType;
 
-    /**
+    // 产品合同ID
-     * 产品合同
-     */
     private Integer cdContractId;
 
-    /**
+    // 产品ID
-     * 当合同适用范围为1的时候，每种产品要设定对应的合同价
-     */
     private Integer cdItemId;
 
-    /**
+    // 合同价格
-     * 合同价格
-     */
     private BigDecimal contractValue;
-    /**
+
-     * 合同折扣
+    // 合同折扣
-     */
     private BigDecimal discount;
 }

src/main/java/com/xmomen/module/base/model/ContractModel.java

@@ -8,52 +8,39 @@ import java.util.List;
 import lombok.Data;
 
 public @Data class ContractModel implements Serializable {
+	// 合同ID
 	private Integer id;
-	/**
+
-     * 合同名称
+    // 合同名称
-     */
     private String contractName;
-	/**
+
-     * 合同编号
+    // 合同编码
-     */
     private String contractCode;
-	/**
+
-     * 合同价的客户
+    // 成员ID
-     */
     private Integer cdMemberId;
-    /**
+
-     * 单位名称
+    // 公司名称
-     */
     private String companyName;
-    /**
+
-     * 合同价的单位
+    // 公司ID
-     */
     private Integer cdCompanyId;
 
-    /**
+    // 合同范围
-     * 1-部分产品，2-全部产品
-     */
     private Integer scope;
 
-    /**
+    // 合同价格
-     * 仅当适用范围为全部产品时适用
-     */
     private BigDecimal contractPrice;
 
-    /**
+    // 开始时间
-     * 合同开始时间
-     */
     private Date beginTime;
-    
+
-    /**
+    // 结束时间
-     * 合同开始时间
-     */
     private Date endTime;
-    
+
-    /**
+    // 是否删除
-     * 是否作废
-     */
     private int isDel;
      
+    // 合同项列表
     private List<ContractItemModel> contractItemList;
 }

src/main/java/com/xmomen/module/base/model/CouponActivityAddress.java

@@ -8,28 +8,20 @@ import org.springframework.web.bind.annotation.RequestParam;
 import lombok.Data;
 
 public @Data class CouponActivityAddress implements Serializable {
-	
+
-    /**
+    // 收货人姓名
-     * 收货人
-     */
     private String consignmentName;
-    /**
+
-     * 手机号
+    // 收货人电话
-     */
     private String consignmentPhone;
-    /**
+
-     * 地址
+    // 收货人地址
-     */
     private String consignmentAddress;
 
-    /**
+    // 发货时间
-     * 赠送时间
-     */
     private Date sendTime;
-    
+
-    /**
+    // 发货数量
-     * 赠送数量
-     */
     private Integer sendCount;
     
 }

src/main/java/com/xmomen/module/base/model/CouponActivityAddressHead.java

@@ -6,11 +6,11 @@ import java.util.List;
 import lombok.Data;
 
 public @Data class CouponActivityAddressHead implements Serializable{
-	/**
+
-     * 卡
+    // 优惠券编号
-     */
     private String couponNumber;
-    
+
+    // 优惠券活动地址列表
     private List<CouponActivityAddress> couponActivityAddressList;
     
 }

src/main/java/com/xmomen/module/base/model/CouponCategoryModel.java

@@ -3,52 +3,64 @@ package com.xmomen.module.base.model;
 import java.io.Serializable;
 import java.util.List;
 
-/**
- * Created by Jeng on 16/3/25.
- */
 public class CouponCategoryModel implements Serializable {
 
+    // 优惠券分类ID
     private Integer id;
+    // 优惠券分类名称
     private String name;
+    // 父级分类ID
     private Integer parentId;
+    // 父级分类名称
     private String parentName;
+    // 子分类列表
     private List<CouponCategoryModel> nodes;
 
+    // 获取优惠券分类ID
     public Integer getId() {
         return id;
     }
 
+    // 设置优惠券分类ID
     public void setId(Integer id) {
         this.id = id;
     }
 
+    // 获取优惠券分类名称
     public String getName() {
         return name;
     }
 
+    // 设置优惠券分类名称
     public void setName(String name) {
         this.name = name;
     }
+    // 获取父级分类ID
     public Integer getParentId() {
         return parentId;
     }
 
+    // 设置父级分类ID
     public void setParentId(Integer parentId) {
         this.parentId = parentId;
     }
 
+    // 获取父级分类名称
     public String getParentName() {
         return parentName;
     }
 
+    // 设置父级分类名称
     public void setParentName(String parentName) {
         this.parentName = parentName;
     }
 
+    // 获取子分类列表
     public List<CouponCategoryModel> getNodes() {
         return nodes;
     }
 
+    // 设置子分类列表
     public void setNodes(List<CouponCategoryModel> nodes) {
         this.nodes = nodes;
     }

src/main/java/com/xmomen/module/base/model/CouponCategoryRefModel.java

@@ -3,47 +3,62 @@ package com.xmomen.module.base.model;
 import java.io.Serializable;
 
 public class CouponCategoryRefModel implements Serializable{
+	// 优惠券分类ID
 	private Integer cdItemId;
+	// 优惠券名称
 	private String itemName;
+	// 优惠券编码
 	private String itemCode;
+	// 优惠券分类名称
 	private String categoryName;
+	// 优惠券数量
 	private Integer count;
+	// 获取优惠券数量
 	public Integer getCount() {
 		return count;
 	}
 
+	// 设置优惠券数量
 	public void setCount(Integer count) {
 		this.count = count;
 	}
 
+	// 获取优惠券名称
 	public String getItemName() {
 		return itemName;
 	}
 
+	// 设置优惠券名称
 	public void setItemName(String itemName) {
 		this.itemName = itemName;
 	}
 
+	// 获取优惠券编码
 	public String getItemCode() {
 		return itemCode;
 	}
 
+	// 设置优惠券编码
 	public void setItemCode(String itemCode) {
 		this.itemCode = itemCode;
 	}
 
+	// 获取优惠券分类名称
 	public String getCategoryName() {
 		return categoryName;
 	}
 
+	// 设置优惠券分类名称
 	public void setCategoryName(String categoryName) {
 		this.categoryName = categoryName;
 	}
 
+	// 获取优惠券分类ID
 	public Integer getCdItemId() {
 		return cdItemId;
 	}
 
+	// 设置优惠券分类ID
 	public void setCdItemId(Integer cdItemId) {
 		this.cdItemId = cdItemId;
 	}

src/main/java/com/xmomen/module/base/model/CouponModel.java

@@ -7,146 +7,117 @@ import java.util.List;
 
 import lombok.Data;
 
-/**
- * Created by Jeng on 2016/3/30.
- */
 public @Data class CouponModel implements Serializable {
 
-    /**
+    // 优惠券ID
-     *
-     */
     private Integer id;
 
-    /**
+    // 优惠券类型
-     * 卡或者劵,1-卡，2-劵
-     */
     private Integer couponType;
 
+    // 优惠券类型描述
     private String couponTypeDesc;
     
+    // 优惠券分类ID
     private Integer couponCategoryId;
     
+    // 优惠券分类
     private Integer couponCategory;
 
+	// 会员ID
 	private Integer memberId;
 	
+    // 分类名称
     private String categoryName;
 
-    /**
+    // 优惠券描述
-     * 卡描述
-     */
     private String couponDesc;
 
-    /**
+    // 优惠券编号
-     * 卡号
-     */
     private String couponNumber;
 
-	/**
+	// 用户价格
-	 * 可用金额/可用次数
-	 */
 	private BigDecimal userPrice;
 
-    /**
+    // 优惠券价值
-     * 卡值：初始金额,初始次数
-     */
     private BigDecimal couponValue;
-    
+
-    /**
+    // 最低价格
-     * 最低赠送金额
-     */
     private Integer lowestPrice;
 
-    /**
+    // 优惠券密码
-     * 密码
-     */
     private String couponPassword;
 
-    /**
+    // 开始时间
-     * 有效开始时间
-     */
     private Date beginTime;
 
-    /**
+    // 结束时间
-     * 有效结束时间
-     */
     private Date endTime;
-    
+
-    /**
+    // 审核时间
-     * 审核时间
-     */
     private Date auditDate;
 
-    /**
+    // 是否使用
-     * 0-未使用，1-已使用
-     */
     private Integer isUsed;
 
+    // 是否使用描述
     private String isUsedDesc;
 
-    /**
+    // 是否有效
-     * 0-无效，1-有效
-     */
     private Integer isUseful;
-    /**
+
-     * 0-无效，1-有效
+    // 是否发送
-     */
     private Integer isSend;
-    
+
-    /**
+    // 管理员ID
-     * 客服经理id
-     */
     private Integer managerId;
-    /**
+
-     * 发放单位Id
+	// 公司ID
-     */
 	private Integer companyId;
-    /**
+
-     * 发放单位
+    // 公司名称
-     */
     private String companyName;
-    
+
-    /**
+    // 管理员名称
-     * 发放客户经理
-     */
     private String managerName;
-    /**
+
-     * 是否预付款 1-预付款,2-后付款
+    // 支付类型
-     */
     private Integer paymentType;
     
+    // 寄件人姓名
     private String consignmentName;
     
+    // 寄件人电话
     private String consignmentPhone;
     
+    // 寄件人地址
     private String consignmentAddress;
     
+    // 发送时间
     private Date sendTime;
     
+    // 收货价格
     private String receivedPrice;
     
+    // 批次
     private String batch;
     
+	// 是否有效描述
 	private String isUsefulDesc;
 
-    /**
+    // 是否赠送
-     * 0-非赠送，1-赠送
-     */
     private Integer isGift;
 
-    /**
+    // 是否赠送描述
-     *
-     */
     private String isGiftDesc;
-    /**
+
-     *
+    // 备注
-     */
     private String notes;
-    /**
+
-     * 活动id
+    // 活动ID
-     */
     private int cdActivityId;
     
+	// 关联商品列表
 	private List<CouponRelationItem> relationItemList;
 
 }

src/main/java/com/xmomen/module/base/model/CouponQuery.java

@@ -5,25 +5,38 @@ import java.util.Date;
 
 import lombok.Data;
 
-/**
+
- * Created by Jeng on 2016/3/30.
- */
 public @Data 
 class CouponQuery implements Serializable {
 
+    // 关键字
     private String keyword;
+    // 优惠券编号
     private String couponNumber;
+    // 密码
     private String password;
+    // 优惠券类型
     private Integer couponType;
+    // 优惠券分类ID
     private Integer couponCategoryId;
+    // 分类类型
     private Integer categoryType;
+    // 是否发送
     private Integer isSend;
+    // CD公司ID
     private Integer cdCompanyId;
+    // 客户经理ID
     private Integer customerMangerId;
+    // 是否有效
     private Integer isUseful;
+    // 是否过期
     private Integer isOver;
+    // 管理员ID
     private Integer managerId;
+    // 批次
     private String batch;
+    // 审核日期开始
     private String auditDateStart;
+    // 审核日期结束
     private String auditDateEnd;
 }

src/main/java/com/xmomen/module/base/model/CouponRelationItem.java

@@ -3,25 +3,29 @@ package com.xmomen.module.base.model;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-/**
+
- * Created by Jeng on 2016/5/16.
- */
 public class CouponRelationItem implements Serializable{
+    // 优惠券关联项ID
     private Integer itemId;
+    // 优惠券关联项数量
     private BigDecimal itemNumber;
 
+    // 获取优惠券关联项ID
     public Integer getItemId() {
         return itemId;
     }
 
+    // 设置优惠券关联项ID
     public void setItemId(Integer itemId) {
         this.itemId = itemId;
     }
 
+    // 获取优惠券关联项数量
     public BigDecimal getItemNumber() {
         return itemNumber;
     }
 
+    // 设置优惠券关联项数量
     public void setItemNumber(BigDecimal itemNumber) {
         this.itemNumber = itemNumber;
     }

src/main/java/com/xmomen/module/base/model/CouponReportModel.java

@@ -9,46 +9,35 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 
 import lombok.Data;
 
-/**
+
- */
 public class CouponReportModel implements Serializable {
 
-    /**
+	// 卡劵类型，1为卡，2为劵
-     * 卡或者劵,1-卡，2-劵
-     */
 	@Excel(name="卡劵",replace={"卡_1","劵_2"})
     private Integer couponType;
 	
+	// 类型
 	@Excel(name="类型")
     private String categoryName;
 	private Integer couponCategoryId;
-    /**
+
-     * 卡描述
+	// 卡描述
-     */
 	@Excel(name="卡描述")
     private String couponDesc;
 
-    /**
+	// 卡号
-     * 卡号
-     */
 	@Excel(name="卡号")
     private String couponNumber;
 
-    /**
+	// 初始金额
-     * 卡值：初始金额,初始次数
-     */
 	@Excel(name="初始金额")
     private BigDecimal couponValue;
-    
+
-    /**
+	// 密码
-     * 密码
-     */
 	@Excel(name="密码")
     private String couponPassword;
 
-    /**
+	// 是否预付款，1为预付款，2为后付款
-     * 是否预付款 1-预付款,2-后付款
-     */
 	@Excel(name="是否预付款",replace={"预付款_1","后付款_2"})
     private Integer paymentType;
 

src/main/java/com/xmomen/module/base/model/CreateActivity.java

@@ -6,45 +6,35 @@ import java.util.Date;
 import java.util.List;
 
 public class CreateActivity implements Serializable {
-	/**
+
-     * 活动名称
+    // 活动名称
-     */
     private String activityName;
 
-    /**
+    // 活动开始时间
-     * 活动开始时间
-     */
     private Date activityBeginTime;
 
-    /**
+    // 活动结束时间
-     * 活动结束时间
-     */
     private Date activityEndTime;
 
-    /**
+    // 活动描述
-     * 活动介绍
-     */
     private String activityDescribe;
 
-    /**
+    // 活动类型
-     * 参与活动的卡类型
-     */
     private Integer activityType;
     
+    // 最低价格
     private BigDecimal lowestPrice;
     
+    // 优惠券类别
     private Integer couponCategory;
-    
+
-    /**
+    // 活动天数
-     * 活动下单时间
-     */
     private Integer activityDay;
 
-    /**
+    // 可用状态
-     * 是否启用（0-不启用，1-启用）
-     */
     private Integer available;
     
+    // 活动关联列表
     private List<ActivityRefModel> activityRefList;
 
 	public String getActivityName() {

src/main/java/com/xmomen/module/base/model/CreateCompany.java

@@ -8,79 +8,83 @@ import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.NotBlank;
 
 public class CreateCompany implements Serializable{
-    /**
+
-     * 单位编号
+    // 公司代码
-     */
     private String companyCode;
 
-    /**
+	// 公司名称，不能为空
-     * 单位名称
-     */
 	@NotBlank
 	@NotNull
     private String companyName;
 
-    /**
+    // 公司地址
-     * 单位地址
-     */
     private String companyAddress;
 
-    /**
+    // 公司负责人
-     * 单位联系人
-     */
     private String companyLeader;
 
-    /**
+    // 公司负责人电话
-     * 联系人电话
-     */
     private String companyLeaderTel;
     
+    // 客户经理ID列表
     private List<Integer> customerManagerIds;
 
+	// 获取公司代码
 	public String getCompanyCode() {
 		return companyCode;
 	}
 
+	// 设置公司代码
 	public void setCompanyCode(String companyCode) {
 		this.companyCode = companyCode;
 	}
 
+	// 获取公司名称
 	public String getCompanyName() {
 		return companyName;
 	}
 
+	// 设置公司名称
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
 	}
 
+	// 获取公司地址
 	public String getCompanyAddress() {
 		return companyAddress;
 	}
 
+	// 设置公司地址
 	public void setCompanyAddress(String companyAddress) {
 		this.companyAddress = companyAddress;
 	}
 
+	// 获取公司负责人
 	public String getCompanyLeader() {
 		return companyLeader;
 	}
 
+	// 设置公司负责人
 	public void setCompanyLeader(String companyLeader) {
 		this.companyLeader = companyLeader;
 	}
 
+	// 获取公司负责人电话
 	public String getCompanyLeaderTel() {
 		return companyLeaderTel;
 	}
 
+	// 设置公司负责人电话
 	public void setCompanyLeaderTel(String companyLeaderTel) {
 		this.companyLeaderTel = companyLeaderTel;
 	}
 
+	// 获取客户经理ID列表
 	public List<Integer> getCustomerManagerIds() {
 		return customerManagerIds;
 	}
 
+	// 设置客户经理ID列表
 	public void setCustomerManagerIds(List<Integer> customerManagerIds) {
 		this.customerManagerIds = customerManagerIds;
 	}

src/main/java/com/xmomen/module/base/model/CreateContract.java

@@ -8,53 +8,35 @@ import java.util.List;
 import lombok.Data;
 
 public @Data class CreateContract implements Serializable {
-	/**
+
-     * 合同名称
+    // 合同名称
-     */
     private String contractName;
-	/**
+
-     * 合同编号
+    // 合同编号
-     */
     private String contractCode;
-	/**
+
-     * 合同价的客户
+    // 成员ID
-     */
     private Integer cdMemberId;
 
-    /**
+    // 公司ID
-     * 合同价的单位
-     */
     private Integer cdCompanyId;
 
-    /**
+    // 范围
-     * 1-部分产品，2-全部产品
-     */
     private Integer scope;
 
-    /**
+    // 合同价格
-     * 仅当适用范围为全部产品时适用
-     */
     private BigDecimal contractPrice;
 
-    /**
+    // 开始时间
-     * 合同开始时间
-     */
     private Date beginTime;
 
-    /**
+    // 结束时间
-     * 合同结束时间
-     */
     private Date endTime;
 
-    /**
+    // 是否审核
-     * 0-未审核，1-审核
-     */
     private Integer isAuditor;
-    
 
-    /**
+    // 合同条目列表
-     * 合同明细
-     */
     private List<CreateContractItem> contractItemList;
 
 }

src/main/java/com/xmomen/module/base/model/CreateContractItem.java

@@ -9,28 +9,15 @@ public @Data class CreateContractItem implements Serializable{
 	private Integer addType;//添加方式
     private Integer cdCategoryId;
     private String itemCode;
-    /**
+
-     * 1-固定价格，2-固定金额
-     */
     private Integer contractType;
 
-    /**
-     * 产品合同
-     */
     private Integer cdContractId;
 
-    /**
-     * 当合同适用范围为1的时候，每种产品要设定对应的合同价
-     */
     private Integer cdItemId;
-    
+
-    /**
-     * 合同折扣
-     */
     private BigDecimal discount;
-    /**
+
-     * 合同价格
-     */
     private BigDecimal contractValue;
 
 }

src/main/java/com/xmomen/module/base/model/CreateCoupon.java

@@ -8,25 +8,37 @@ import javax.validation.constraints.NotNull;
 
 import lombok.Data;
 
-/**
+
- * Created by Jeng on 2016/3/30.
- */
 public @Data class CreateCoupon implements Serializable {
 
+    // 优惠券类型
     @NotNull
     private Integer couponType;
+    // 优惠券描述
     private String couponDesc;
+    // 优惠券分类
     @NotNull
     private Integer couponCategory;
+    // 优惠券号码
     private String couponNumber;
+    // 优惠券密码
     private String couponPassword;
+    // 开始时间
     private Date beginTime;
+    // 结束时间
     private Date endTime;
+    // 优惠券价值
     private BigDecimal couponValue;
+    // 是否已使用
     private Integer isUsed;
+    // 是否有效
     private Integer isUseful;
+    // 是否为礼品
     private Integer isGift;
+    // 备注
     private String notes;
+    // 支付类型
     private Integer paymentType;
+    // 用户价格
     private BigDecimal userPrice;
 }

src/main/java/com/xmomen/module/base/model/CreateCouponCategory.java

@@ -12,12 +12,15 @@ import org.hibernate.validator.constraints.NotBlank;
  */
 public class CreateCouponCategory implements Serializable {
 
+    // 优惠券分类名称
     @NotNull
     @NotBlank
     private String categoryName;
+    // 优惠券分类类型
     @NotNull
     private Integer categoryType;
    
+    // 优惠券分类关联模型列表
     private List<CouponCategoryRefModel> categoryRefs;
 
 	public String getCategoryName() {

src/main/java/com/xmomen/module/base/model/CreateItem.java

@@ -5,339 +5,344 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+// 创建商品模型类
 public class CreateItem implements Serializable {
-	/**
+
-     * 产品编号
+    // 商品编码
-     */
     private String itemCode;
 
-    /**
+    // 商品分类ID
-     * 产品归属的类别
-     */
     private Integer cdCategoryId;
 
-    /**
+    // 商品名称
-     * 产品名称
-     */
     private String itemName;
 
-    /**
+    // 商品描述
-     * 产品描述
-     */
     private String itemDescribe;
 
-    /**
+    // 商品类型
-     * 产品类型
-     */
     private Integer itemType;
 
-    /**
+    // 产量
-     * 生产地
-     */
     private String yieldly;
 
-    /**
+    // 规格
-     * 产品规格
-     */
     private String spec;
 
-    /**
+    // 基础价格
-     * 基础价格
-     */
     private BigDecimal basePrice;
 
-    /**
+    // 会员价格
-     * 会员价格
-     */
     private BigDecimal memberPrice;
 
-    /**
+    // 定价方式
-     * 计价方式
-     */
     private String pricingManner;
 
-    /**
+    // 销售状态
-     * 0-下架 1-上架
-     */
     private Integer sellStatus;
 
-    /**
+    // 销售单位
-     * 销售单位
-     */
     private String sellUnit;
 
-    /**
+    // 销售价格
-     * 销售金额
-     */
     private BigDecimal sellPrice;
 
-    /**
+    // 是否审核
-     * 0-未审核，1-审核
-     */
     private Integer isAudit;
 
-    /**
+    // 创建时间
-     * 录入时间
-     */
     private Date createDateTime;
 
-    /**
+    // 创建人编码
-     * 录入人
-     */
     private String createUserCode;
-    
+
-    /**
+    // 财务人员
-     * 采摘人
-     */
     private String caizaiUser;
 
-    /**
+    // 检测人员
-     * 检测人
-     */
     private String jianceUser;
-    
+
-    /**
+    // 农残率
-     * 农残率
-     */
     private String nongCanLv;
 
-	/**
+	// 养殖成分
-	 * 营养成分
-	 */
 	private String yiYangChenFen;
 
-	/**
+	// 保质期
-	 * 保质期
-	 */
 	private Integer baoZhiQi;
 
-	/**
+	// 十亿人群
-	 * 适应人群
-	 */
 	private String shiYiRenQun;
 
-	/**
+	// 限时抢购
-	 * 限时抢购
-	 */
 	private Integer xianShiQiangGou;
 
-	/**
+	// 新品常鲜
-	 * 新品尝鲜
-	 */
 	private Integer xinPinChangXian;
 
-	/**
+	// 重新推荐
-	 * 热卖推荐
-	 */
 	private Integer reMaiTuiJian;
     
+    // 子商品列表
     private List<ItemChildModel> childItems;
 
+	// 获取商品编码
 	public String getItemCode() {
 		return itemCode;
 	}
 
+	// 设置商品编码
 	public void setItemCode(String itemCode) {
 		this.itemCode = itemCode;
 	}
 
+	// 获取商品分类ID
 	public Integer getCdCategoryId() {
 		return cdCategoryId;
 	}
 
+	// 设置商品分类ID
 	public void setCdCategoryId(Integer cdCategoryId) {
 		this.cdCategoryId = cdCategoryId;
 	}
 
+	// 获取商品名称
 	public String getItemName() {
 		return itemName;
 	}
 
+	// 设置商品名称
 	public void setItemName(String itemName) {
 		this.itemName = itemName;
 	}
 
+	// 获取商品描述
 	public String getItemDescribe() {
 		return itemDescribe;
 	}
 
+	// 设置商品描述
 	public void setItemDescribe(String itemDescribe) {
 		this.itemDescribe = itemDescribe;
 	}
 
+	// 获取商品类型
 	public Integer getItemType() {
 		return itemType;
 	}
 
+	// 设置商品类型
 	public void setItemType(Integer itemType) {
 		this.itemType = itemType;
 	}
 
+	// 获取产量
 	public String getYieldly() {
 		return yieldly;
 	}
 
+	// 设置产量
 	public void setYieldly(String yieldly) {
 		this.yieldly = yieldly;
 	}
 
+	// 获取规格
 	public String getSpec() {
 		return spec;
 	}
 
+	// 设置规格
 	public void setSpec(String spec) {
 		this.spec = spec;
 	}
 
+	// 获取基础价格
 	public BigDecimal getBasePrice() {
 		return basePrice;
 	}
 
+	// 设置基础价格
 	public void setBasePrice(BigDecimal basePrice) {
 		this.basePrice = basePrice;
 	}
 
+	// 获取会员价格
 	public BigDecimal getMemberPrice() {
 		return memberPrice;
 	}
 
+	// 设置会员价格
 	public void setMemberPrice(BigDecimal memberPrice) {
 		this.memberPrice = memberPrice;
 	}
 
+	// 获取定价方式
 	public String getPricingManner() {
 		return pricingManner;
 	}
 
+	// 设置定价方式
 	public void setPricingManner(String pricingManner) {
 		this.pricingManner = pricingManner;
 	}
 
+	// 获取销售状态
 	public Integer getSellStatus() {
 		return sellStatus;
 	}
 
+	// 设置销售状态
 	public void setSellStatus(Integer sellStatus) {
 		this.sellStatus = sellStatus;
 	}
 
+	// 获取销售单位
 	public String getSellUnit() {
 		return sellUnit;
 	}
 
+	// 设置销售单位
 	public void setSellUnit(String sellUnit) {
 		this.sellUnit = sellUnit;
 	}
 
+	// 获取销售价格
 	public BigDecimal getSellPrice() {
 		return sellPrice;
 	}
 
+	// 设置销售价格
 	public void setSellPrice(BigDecimal sellPrice) {
 		this.sellPrice = sellPrice;
 	}
 
 
+	// 获取是否审核
 	public Integer getIsAudit() {
 		return isAudit;
 	}
 
+	// 设置是否审核
 	public void setIsAudit(Integer isAudit) {
 		this.isAudit = isAudit;
 	}
 
+	// 获取创建时间
 	public Date getCreateDateTime() {
 		return createDateTime;
 	}
 
+	// 设置创建时间
 	public void setCreateDateTime(Date createDateTime) {
 		this.createDateTime = createDateTime;
 	}
 
+	// 获取创建人编码
 	public String getCreateUserCode() {
 		return createUserCode;
 	}
 
+	// 设置创建人编码
 	public void setCreateUserCode(String createUserCode) {
 		this.createUserCode = createUserCode;
 	}
 
+	// 获取子商品列表
 	public List<ItemChildModel> getChildItems() {
 		return childItems;
 	}
 
+	// 设置子商品列表
 	public void setChildItems(List<ItemChildModel> childItems) {
 		this.childItems = childItems;
 	}
 
+	// 获取财务人员
 	public String getCaizaiUser() {
 		return caizaiUser;
 	}
 
+	// 设置财务人员
 	public void setCaizaiUser(String caizaiUser) {
 		this.caizaiUser = caizaiUser;
 	}
 
+	// 获取检测人员
 	public String getJianceUser() {
 		return jianceUser;
 	}
 
+	// 设置检测人员
 	public void setJianceUser(String jianceUser) {
 		this.jianceUser = jianceUser;
 	}
 
+	// 获取农残率
 	public String getNongCanLv() {
 		return nongCanLv;
 	}
 
+	// 设置农残率
 	public void setNongCanLv(String nongCanLv) {
 		this.nongCanLv = nongCanLv;
 	}
 
+	// 获取养殖成分
 	public String getYiYangChenFen() {
 		return yiYangChenFen;
 	}
 
+	// 设置养殖成分
 	public void setYiYangChenFen(String yiYangChenFen) {
 		this.yiYangChenFen = yiYangChenFen;
 	}
 
+	// 获取保质期
 	public Integer getBaoZhiQi() {
 		return baoZhiQi;
 	}
 
+	// 设置保质期
 	public void setBaoZhiQi(Integer baoZhiQi) {
 		this.baoZhiQi = baoZhiQi;
 	}
 
+	// 获取十亿人群
 	public String getShiYiRenQun() {
 		return shiYiRenQun;
 	}
 
+	// 设置十亿人群
 	public void setShiYiRenQun(String shiYiRenQun) {
 		this.shiYiRenQun = shiYiRenQun;
 	}
 
+	// 获取限时抢购
 	public Integer getXianShiQiangGou() {
 		return xianShiQiangGou;
 	}
 
+	// 设置限时抢购
 	public void setXianShiQiangGou(Integer xianShiQiangGou) {
 		this.xianShiQiangGou = xianShiQiangGou;
 	}
 
+	// 获取新品常鲜
 	public Integer getXinPinChangXian() {
 		return xinPinChangXian;
 	}
 
+	// 设置新品常鲜
 	public void setXinPinChangXian(Integer xinPinChangXian) {
 		this.xinPinChangXian = xinPinChangXian;
 	}
 
+	// 获取重新推荐
 	public Integer getReMaiTuiJian() {
 		return reMaiTuiJian;
 	}
 
+	// 设置重新推荐
 	public void setReMaiTuiJian(Integer reMaiTuiJian) {
 		this.reMaiTuiJian = reMaiTuiJian;
 	}

src/main/java/com/xmomen/module/base/model/CreateItemCategory.java

@@ -10,23 +10,29 @@ import java.io.Serializable;
  */
 public class CreateItemCategory implements Serializable {
 
+    // 名称
     @NotNull
     @NotBlank
     private String name;
+    // 父级ID
     private Integer parentId;
 
+    // 获取名称
     public String getName() {
         return name;
     }
 
+    // 设置名称
     public void setName(String name) {
         this.name = name;
     }
 
+    // 获取父级ID
     public Integer getParentId() {
         return parentId;
     }
 
+    // 设置父级ID
     public void setParentId(Integer parentId) {
         this.parentId = parentId;
     }

src/main/java/com/xmomen/module/base/model/CreateItemDetail.java

@@ -6,18 +6,15 @@ import lombok.Data;
 import javax.persistence.*;
 
 public @Data class CreateItemDetail extends BaseMybatisModel {
-    /**
+
-     * 主键
+    // 主键id
-     */
     private Integer id;
 
-    /**
+
-     * 商品ID
+    // cdItemId
-     */
     private Integer cdItemId;
 
-    /**
+
-     * 商品的详细内容
+    // itemDetailContent
-     */
     private String itemDetailContent;
 }

src/main/java/com/xmomen/module/base/model/CreateMember.java

@@ -10,58 +10,51 @@ import com.xmomen.module.member.model.MemberAddressModel;
 import org.hibernate.validator.constraints.NotBlank;
 
 public class CreateMember implements Serializable {
-    /**
+
-     * 会员编号
+    //会员编号
-     */
     private String memberCode;
 
-    /**
+
-     * 姓名
+    //姓名
-     */
     @NotNull
     @NotBlank
     private String name;
 
-    /**
+
-     * 手机号
+    //电话号码
-     */
     @NotNull
     @NotBlank
     private String phoneNumber;
 
-    /**
+
-     * 卡号
+    //优惠券编号
-     */
     private String couponNumber;
 
 
-    /**
+
-     * 家庭固话
+    //电话号码
-     */
     private String telNumber;
 
-    /**
+
-     * 办公室电话
+    //办公电话
-     */
     private String officeTel;
 
-    /**
+
-     * 1-潜在客户，2-普通客户，3-优质客户
+    //会员类型
-     */
     private Integer memberType;
 
-    /**
+
-     * 所属单位
+    //公司ID
-     */
     private Integer cdCompanyId;
 
-    /**
+
-     * 所属客服经理
+    //用户ID
-     */
     private Integer cdUserId;
     
+    //密码
     private String password;
     
+    //邮箱
     private String email;
 
     //地址集合

src/main/java/com/xmomen/module/base/model/CreatePlan.java

@@ -12,65 +12,57 @@ import lombok.Data;
 import org.hibernate.validator.constraints.NotBlank;
 
 public @Data class CreatePlan implements Serializable {
-	/**
+
-     * 主键
+    // 计划id
-     */
     private Integer id;
 
-    /**
+
-     * 计划名称
+    // 计划名称
-     */
     @NotBlank
     private String planName;
 
-    /**
+
-     * 计划创建人
+    // 创建用户
-     */
-    
     private String createUser;
 
-    /**
+
-     * 计划创建时间
+    // 创建时间
-     */
     private Date createTime;
 
-    /**
+
-     * 配送频率
+    // 配送类型
-     */
     @NotNull
     private Integer deliveryType;
 
-    /**
+
-     * 配送时间(一周的星期几）
+    // 配送时间
-     */
     private String deliveryTime;
 
-    /**
+
-     * 配送的次数
+    // 配送数量
-     */
     @NotNull
     private Integer deliverCount;
 
+    // 价格
     @NotNull
     private BigDecimal price;
 
-    /**
+
-     * 是否随机
+    // 是否随机
-     */
     private Integer isRandom;
 
-    /**
+
-     * 产品归属的类别
+    // cd分类id
-     */
     private Integer cdCategoryId;
 
-    /**
+
-     * 随机数
+    // 随机数
-     */
     private Integer randomNum;
     
+    // 开始时间
     private Date beginTime;
     
+    // 计划项
     private List<PlanItemModel> planItems;
 
 }

src/main/java/com/xmomen/module/base/model/ExpressMemberModel.java

@@ -5,25 +5,22 @@ import java.io.Serializable;
 import lombok.Data;
 
 public @Data class ExpressMemberModel implements Serializable{
-	/**
+
-     * 主键
+    // 快递员ID
-     */
     private Integer id;
 
-    /**
+
-     * 快递商id
+    // 快递公司ID
-     */
     private Integer cdExpressId;
 
-    /**
+
-     * 快递员姓名
+    // 快递员姓名
-     */
     private String memberName;
 
-    /**
+
-     * 电话号码
+    // 快递员电话
-     */
     private String phone;
 
+    // 快递公司名称
     private String expressName;
 }

src/main/java/com/xmomen/module/base/model/ExpressTask.java

@@ -7,20 +7,17 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
-/**
+
- */
 public @Data
 class ExpressTask implements Serializable {
 
-    /**
+
-     * 订单号集合
+    // 订单号列表，不能为空
-     */
     @NotNull
     @NotEmpty
     private List<String> orderNos;
-    /**
+
-     * 快递商ID
+    // 快递ID，不能为空
-     */
     @NotNull
     private Integer expressId;
 

src/main/java/com/xmomen/module/base/model/ItemCategoryModel.java

@@ -3,52 +3,65 @@ package com.xmomen.module.base.model;
 import java.io.Serializable;
 import java.util.List;
 
-/**
+
- * Created by Jeng on 16/3/25.
- */
 public class ItemCategoryModel implements Serializable {
 
+    // 类别ID
     private Integer id;
+    // 类别名称
     private String name;
+    // 父类别ID
     private Integer parentId;
+    // 父类别名称
     private String parentName;
+    // 子类别列表
     private List<ItemCategoryModel> nodes;
 
+    // 获取类别ID
     public Integer getId() {
         return id;
     }
 
+    // 设置类别ID
     public void setId(Integer id) {
         this.id = id;
     }
 
+    // 获取类别名称
     public String getName() {
         return name;
     }
 
+    // 设置类别名称
     public void setName(String name) {
         this.name = name;
     }
+    // 获取父类别ID
     public Integer getParentId() {
         return parentId;
     }
 
+    // 设置父类别ID
     public void setParentId(Integer parentId) {
         this.parentId = parentId;
     }
 
+    // 获取父类别名称
     public String getParentName() {
         return parentName;
     }
 
+    // 设置父类别名称
     public void setParentName(String parentName) {
         this.parentName = parentName;
     }
 
+    // 获取子类别列表
     public List<ItemCategoryModel> getNodes() {
         return nodes;
     }
 
+    // 设置子类别列表
     public void setNodes(List<ItemCategoryModel> nodes) {
         this.nodes = nodes;
     }

src/main/java/com/xmomen/module/base/model/ItemChildModel.java

@@ -6,10 +6,15 @@ import lombok.Data;
 
 public @Data class ItemChildModel implements Serializable{
 	
+	//商品id
 	private Integer id;
+	//商品名称
 	private String itemName;
+	//商品编码
 	private String itemCode;
+	//商品分类名称
 	private String categoryName;
+	//商品数量
 	private Integer count;
 	private Integer sellStatus;//状态0-下架 1-上架
 	

src/main/java/com/xmomen/module/base/model/ItemDetailModel.java

@@ -4,18 +4,15 @@ import com.xmomen.framework.mybatis.model.BaseMybatisModel;
 import lombok.Data;
 
 public @Data class ItemDetailModel extends BaseMybatisModel {
-    /**
+
-     * 主键
+    // 商品详情ID
-     */
     private Integer id;
 
-    /**
+
-     * 商品ID
+    // 商品ID
-     */
     private Integer cdItemId;
 
-    /**
+
-     * 商品的详细内容
+    // 商品详情内容
-     */
     private String itemDetailContent;
 }

src/main/java/com/xmomen/module/base/model/ItemDetailQuery.java

@@ -4,18 +4,15 @@ import com.xmomen.framework.mybatis.model.BaseMybatisModel;
 import lombok.Data;
 
 public @Data class ItemDetailQuery extends BaseMybatisModel {
-    /**
+
-     * 主键
+    // 商品详情ID
-     */
     private Integer id;
 
-    /**
+
-     * 商品ID
+    // 商品ID
-     */
     private Integer cdItemId;
 
-    /**
+
-     * 商品的详细内容
+    // 商品详情内容
-     */
     private String itemDetailContent;
 }

src/main/java/com/xmomen/module/base/model/ItemModel.java

@@ -5,141 +5,118 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class ItemModel implements Serializable {
+    //商品ID
     private Integer id;
-    /**
+
-     * 产品编号
+    //商品编码
-     */
     private String itemCode;
 
-    /**
+
-     * 产品归属的类别
+    //商品分类ID
-     */
     private Integer cdCategoryId;
 
+    //商品分类名称
     private String categoryName;
 
-    /**
+
-     * 产品名称
+    //商品名称
-     */
     private String itemName;
 
-    /**
+
-     * 产品描述
+    //商品描述
-     */
     private String itemDescribe;
 
-    /**
+
-     * 产品类型
+    //商品类型
-     */
     private Integer itemType;
 
-    /**
+
-     * 生产地
+    //产量
-     */
     private String yieldly;
 
-    /**
+
-     * 产品规格
+    //规格
-     */
     private String spec;
 
-    /**
+
-     * 基础价格
+    //基础价格
-     */
     private BigDecimal basePrice;
 
-    /**
+
-     * 会员价格
+    //会员价格
-     */
     private BigDecimal memberPrice;
 
-    /**
+
-     * 计价方式
+    //定价方式
-     */
     private String pricingManner;
 
-    /**
+
-     * 0-下架 1-上架
+    //销售状态
-     */
     private Integer sellStatus;
 
-    /**
+    //销售单位
-     * 销售单位
-     */
     private String sellUnit;
 
-    /**
+
-     * 销售金额
+    //销售价格
-     */
     private BigDecimal sellPrice;
 
-    /**
+
-     * 折扣价格
+    //折扣价格
-     */
     private BigDecimal discountPrice;
 
 
-    /**
+
-     * 0-未审核，1-审核
+    //是否审核
-     */
     private Integer isAudit;
 
-    /**
+
-     * 录入时间
+    //创建时间
-     */
     private Date createDateTime;
 
-    /**
+
-     * 录入人
+    //创建人编码
-     */
     private String createUserCode;
 
-    /**
+
-     * 采摘人
+    //采摘人
-     */
     private String caizaiUser;
 
-    /**
+
-     * 检测人
+    //检测人
-     */
     private String jianceUser;
 
-    /**
+
-     * 农残率
+    //农残率
-     */
     private String nongCanLv;
 
-    /**
+
-     * 营养成分
+    //营养成分
-     */
     private String yiYangChenFen;
 
-    /**
+
-     * 保质期
+    //保质期
-     */
     private Integer baoZhiQi;
 
-    /**
+
-     * 适应人群
+    //适宜人群
-     */
     private String shiYiRenQun;
 
-    /**
+
-     * 限时抢购
+    //限时抢购
-     */
     private Integer xianShiQiangGou;
 
-    /**
+
-     * 新品尝鲜
+    //新品上市
-     */
     private Integer xinPinChangXian;
 
-    /**
+
-     * 热卖推荐
+    //热卖推荐
-     */
     private Integer reMaiTuiJian;
 
+    //商品详情ID
     private Integer itemDetailId;
+    //商品详情内容
     private String itemDetailContent;
 
     //库存

src/main/java/com/xmomen/module/base/model/ItemQuery.java

@@ -4,20 +4,28 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-/**
+
- * Created by Jeng on 2016/5/13.
- */
 public @Data
 class ItemQuery implements Serializable{
 
+    // 商品ID
     private Integer id;
+    // 关键字
     private String keyword;
+    // 销售状态
     private Integer sellStatus;
+    // 公司ID
     private Integer companyId;
+    // 商品类型
     private Integer itemType;
+    // 商品编码
     private String[] itemCodes;
+    // 销售单位
     private String sellUnit;
+    // ID数组
     private Integer[] ids;
+    // 排除ID数组
     private Integer[] excludeIds;
+    // 排除库存
     private Integer excludeStock;
 }

src/main/java/com/xmomen/module/base/model/MemberCouponModel.java

@@ -4,17 +4,23 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 public class MemberCouponModel implements Serializable{
+	// 优惠券编号
 	private String couponNumber;
+	// 用户价格
 	private BigDecimal userPrice;
+	// 获取优惠券编号
 	public String getCouponNumber() {
 		return couponNumber;
 	}
+	// 设置优惠券编号
 	public void setCouponNumber(String couponNumber) {
 		this.couponNumber = couponNumber;
 	}
+	// 获取用户价格
 	public BigDecimal getUserPrice() {
 		return userPrice;
 	}
+	// 设置用户价格
 	public void setUserPrice(BigDecimal userPrice) {
 		this.userPrice = userPrice;
 	}

src/main/java/com/xmomen/module/base/model/MemberModel.java

@@ -4,85 +4,68 @@ import java.io.Serializable;
 import java.util.List;
 
 public class MemberModel implements Serializable{
-	/**
+
-     * 
+    // 会员ID
-     */
     private Integer id;
-	/**
+
-     * 会员编号
+    // 会员编码
-     */
     private String memberCode;
 
-    /**
+
-     * 姓名
+    // 会员姓名
-     */
     private String name;
 
-    /**
+
-     * 手机号
+    // 会员电话
-     */
     private String phoneNumber;
     
+    // 备用姓名
     private String spareName;
     
+    // 备用姓名2
     private String spareName2;
-    /**
+
-     * 备用手机号1
+    // 备用电话
-     */
     private String spareTel;
 
-    /**
+
-     * 备用手机号2
+    // 备用电话2
-     */
     private String spareTel2;
 
-    /**
+
-     * 家庭固话
+    // 固定电话
-     */
     private String telNumber;
 
-    /**
+
-     * 办公室电话
+    // 办公电话
-     */
     private String officeTel;
 
-    /**
+
-     * 收货地址
+    // 地址
-     */
     private String address;
 
-    /**
+    // 备用地址
-     * 备用地址1
-     */
     private String spareAddress;
 
-    /**
+    // 备用地址2
-     * 备用地址2
-     */
     private String spareAddress2;
 
-    /**
+    // 会员类型
-     * 1-潜在客户，2-普通客户，3-优质客户
-     */
     private Integer memberType;
 
-    /**
+    // 公司ID
-     * 所属单位
-     */
     private Integer cdCompanyId;
-    /**
+
-     * 单位
+    // 公司名称
-     */
     private String companyName;
-    /**
+
-     * 所属客服经理
+    // 用户ID
-     */
     private Integer cdUserId;
-    /**
+
-     * 所属客服经理
+    // 管理员姓名
-     */
     private String managerName;
     
+    // 优惠券列表
     private List<MemberCouponModel> couponNumbers;
     
 	public String getMemberCode() {

src/main/java/com/xmomen/module/base/model/PlanItemModel.java

@@ -3,38 +3,53 @@ package com.xmomen.module.base.model;
 import java.io.Serializable;
 
 public class PlanItemModel implements Serializable{
+	// 计划项ID
 	private Integer cdItemId;
+	// 计划项名称
 	private String itemName;
+	// 计划项编码
 	private String itemCode;
+	// 计划项类别名称
 	private String categoryName;
+	// 计划项数量
 	private Integer count;
+	// 获取计划项ID
 	public Integer getCdItemId() {
 		return cdItemId;
 	}
+	// 设置计划项ID
 	public void setCdItemId(Integer cdItemId) {
 		this.cdItemId = cdItemId;
 	}
+	// 获取计划项名称
 	public String getItemName() {
 		return itemName;
 	}
+	// 设置计划项名称
 	public void setItemName(String itemName) {
 		this.itemName = itemName;
 	}
+	// 获取计划项编码
 	public String getItemCode() {
 		return itemCode;
 	}
+	// 设置计划项编码
 	public void setItemCode(String itemCode) {
 		this.itemCode = itemCode;
 	}
+	// 获取计划项类别名称
 	public String getCategoryName() {
 		return categoryName;
 	}
+	// 设置计划项类别名称
 	public void setCategoryName(String categoryName) {
 		this.categoryName = categoryName;
 	}
+	// 获取计划项数量
 	public Integer getCount() {
 		return count;
 	}
+	// 设置计划项数量
 	public void setCount(Integer count) {
 		this.count = count;
 	}

src/main/java/com/xmomen/module/base/model/PlanModel.java

@@ -8,65 +8,47 @@ import java.util.List;
 import lombok.Data;
 
 public @Data class PlanModel implements Serializable{
-	/**
+
-     * 主键
+    // 计划ID
-     */
     private Integer id;
 
-    /**
+    // 计划名称
-     * 计划名称
-     */
     private String planName;
 
-    /**
+    // 创建人
-     * 计划创建人
-     */
     private String createUser;
 
-    /**
+    // 创建时间
-     * 计划创建时间
-     */
     private Date createTime;
 
-    /**
+    // 配送类型
-     * 配送频率
-     */
     private Integer deliveryType;
 
-    /**
+    // 配送时间
-     * 配送时间(一周的星期几）
-     */
     private String deliveryTime;
 
-    /**
+    // 配送数量
-     * 配送的次数
-     */
     private Integer deliverCount;
-    
+
-    /**
+    // 价格
-     * 价格
-     */
     private BigDecimal price;
 
-    /**
+    // 是否随机
-     * 是否随机
-     */
     private Integer isRandom;
 
-    /**
+    // CD分类ID
-     * 产品归属的类别
-     */
     private Integer cdCategoryId;
     
+    // 分类名称
     private String categoryName;
 
-    /**
+    // 随机数量
-     * 随机数
-     */
     private Integer randomNum;
 
+    // 开始时间
     private Date beginTime;
     
+    // 计划项列表
     private List<PlanItemModel> planItems;
     
 }

src/main/java/com/xmomen/module/base/model/ReadCardVo.java

@@ -3,38 +3,53 @@ package com.xmomen.module.base.model;
 import java.math.BigDecimal;
 
 public class ReadCardVo {
+	// 优惠券编号
 	private String couponNo;
+	// 优惠券价格
 	private BigDecimal couponPrice;
+	// 用户名
 	private String userName;
+	// 电话号码
 	private String phoneNumber;
+	// 优惠券密码
 	private String couponPassword;
+	// 获取优惠券编号
 	public String getCouponNo() {
 		return couponNo;
 	}
+	// 设置优惠券编号
 	public void setCouponNo(String couponNo) {
 		this.couponNo = couponNo;
 	}
+	// 获取优惠券价格
 	public BigDecimal getCouponPrice() {
 		return couponPrice;
 	}
+	// 设置优惠券价格
 	public void setCouponPrice(BigDecimal couponPrice) {
 		this.couponPrice = couponPrice;
 	}
+	// 获取用户名
 	public String getUserName() {
 		return userName;
 	}
+	// 设置用户名
 	public void setUserName(String userName) {
 		this.userName = userName;
 	}
+	// 获取电话号码
 	public String getPhoneNumber() {
 		return phoneNumber;
 	}
+	// 设置电话号码
 	public void setPhoneNumber(String phoneNumber) {
 		this.phoneNumber = phoneNumber;
 	}
+	// 获取优惠券密码
 	public String getCouponPassword() {
 		return couponPassword;
 	}
+	// 设置优惠券密码
 	public void setCouponPassword(String couponPassword) {
 		this.couponPassword = couponPassword;
 	}

src/main/java/com/xmomen/module/base/model/UpdateActivity.java

@@ -6,45 +6,35 @@ import java.util.Date;
 import java.util.List;
 
 public class UpdateActivity implements Serializable {
-	/**
+
-     * 活动名称
+    // 活动名称
-     */
     private String activityName;
 
-    /**
+    // 活动开始时间
-     * 活动开始时间
-     */
     private Date activityBeginTime;
 
-    /**
+    // 活动结束时间
-     * 活动结束时间
-     */
     private Date activityEndTime;
 
-    /**
+    // 活动描述
-     * 活动介绍
-     */
     private String activityDescribe;
 
-    /**
+    // 活动类型
-     * 参与活动的卡类型
-     */
     private Integer activityType;
 
-    /**
+    // 活动天数
-     * 活动下单时间
-     */
     private Integer activityDay;
 
-    /**
+    // 是否可用
-     * 是否启用（0-不启用，1-启用）
-     */
     private Integer available;
 
+    // 最低价格
     private BigDecimal lowestPrice;
     
+    // 优惠券类别
     private Integer couponCategory;
     
+    // 活动关联列表
     private List<ActivityRefModel> activityRefList;
     
 	public String getActivityName() {

src/main/java/com/xmomen/module/base/model/UpdateCompany.java

@@ -8,32 +8,24 @@ import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.NotBlank;
 
 public class UpdateCompany implements Serializable{
-    /**
+
-     * 单位编号
+    // 公司代码
-     */
     private String companyCode;
 
-    /**
+	// 公司名称，不能为空
-     * 单位名称
-     */
 	@NotBlank
 	@NotNull
     private String companyName;
 
-    /**
+    // 公司地址
-     * 单位地址
-     */
     private String companyAddress;
 
-    /**
+    // 公司负责人
-     * 单位联系人
-     */
     private String companyLeader;
 
-    /**
+    // 公司负责人电话
-     * 联系人电话
-     */
     private String companyLeaderTel;
+    // 客户经理ID列表
     private List<Integer> customerManagerIds;
 	public String getCompanyCode() {
 		return companyCode;

src/main/java/com/xmomen/module/base/model/UpdateContract.java

@@ -8,51 +8,35 @@ import java.util.List;
 import lombok.Data;
 
 public @Data class UpdateContract implements Serializable {
-	/**
+
-     * 合同名称
+    // 合同名称
-     */
     private String contractName;
-	/**
+
-     * 合同编号
+    // 合同编号
-     */
     private String contractCode;
-	/**
+
-     * 合同价的客户
+    // 成员ID
-     */
     private Integer cdMemberId;
 
-    /**
+    // 公司ID
-     * 合同价的单位
-     */
     private Integer cdCompanyId;
 
-    /**
+    // 范围
-     * 1-部分产品，2-全部产品
-     */
     private Integer scope;
 
-    /**
+    // 合同价格
-     * 仅当适用范围为全部产品时适用
-     */
     private BigDecimal contractPrice;
 
-    /**
+    // 开始时间
-     * 合同开始时间
-     */
     private Date beginTime;
 
-	/**
+    // 结束时间
-     * 合同结束时间
-     */
     private Date endTime;
 
-    /**
+    // 是否审核
-     * 0-未审核，1-审核
-     */
     private Integer isAuditor;
-    /**
+
-     * 合同明细
+    // 合同项目列表
-     */
     private List<CreateContractItem> contractItemList;
 
 }

src/main/java/com/xmomen/module/base/model/UpdateContractItem.java

@@ -16,24 +16,13 @@ public class UpdateContractItem implements Serializable{
 	private Integer addType;//添加方式
 	 private Integer cdCategoryId;
 	    private String itemCode;
-    /**
+
-     * 1-固定价格，2-固定金额
-     */
     private Integer contractType;
 
-    /**
-     * 产品合同
-     */
     private Integer cdContractId;
 
-    /**
-     * 当合同适用范围为1的时候，每种产品要设定对应的合同价
-     */
     private Integer cdItemId;
 
-    /**
-     * 合同价格
-     */
     private BigDecimal contractValue;
 
 	public Integer getContractType() {

src/main/java/com/xmomen/module/base/model/UpdateCoupon.java

@@ -8,26 +8,39 @@ import javax.validation.constraints.NotNull;
 
 import lombok.Data;
 
-/**
+
- * Created by Jeng on 2016/3/30.
- */
 public @Data class UpdateCoupon implements Serializable {
 
+    // 优惠券ID
     @NotNull
     private Integer id;
+    // 优惠券类型
     @NotNull
     private Integer couponType;
+    // 优惠券分类
     private Integer couponCategory;
+    // 优惠券描述
     private String couponDesc;
+    // 优惠券号码
     private String couponNumber;
+    // 优惠券密码
     private String couponPassword;
+    // 开始时间
     private Date beginTime;
+    // 结束时间
     private Date endTime;
+    // 优惠券价值
     private BigDecimal couponValue;
+    // 用户价格
     private BigDecimal userPrice;
+    // 是否已使用
     private Integer isUsed;
+    // 是否有效
     private Integer isUseful;
+    // 是否为礼品
     private Integer isGift;
+    // 备注
     private String notes;
+    // 支付类型
     private Integer paymentType;
 }

src/main/java/com/xmomen/module/base/model/UpdateCouponCategory.java

@@ -7,17 +7,18 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
-/**
+
- * Created by Jeng on 16/3/26.
- */
 public class UpdateCouponCategory implements Serializable {
 
+    // 优惠券分类名称
     @NotNull
     @NotBlank
     private String categoryName;
+    // 优惠券分类类型
     @NotNull
     private Integer categoryType;
    
+    // 优惠券分类关联模型列表
     private List<CouponCategoryRefModel> categoryRefs;
 
 	public String getCategoryName() {

src/main/java/com/xmomen/module/base/model/UpdateItem.java

@@ -6,130 +6,83 @@ import java.util.Date;
 import java.util.List;
 
 public class UpdateItem implements Serializable {
-	/**
+
-     * 产品编号
+    // 商品编码
-     */
     private String itemCode;
 
-    /**
+    // 商品分类ID
-     * 产品归属的类别
-     */
     private Integer cdCategoryId;
 
-    /**
+    // 商品名称
-     * 产品名称
-     */
     private String itemName;
 
-    /**
+    // 商品描述
-     * 产品描述
-     */
     private String itemDescribe;
 
-    /**
+    // 商品类型
-     * 产品类型
-     */
     private Integer itemType;
 
-    /**
+    // 产量
-     * 生产地
-     */
     private String yieldly;
 
-    /**
+    // 规格
-     * 产品规格
-     */
     private String spec;
 
-    /**
+    // 基础价格
-     * 基础价格
-     */
     private BigDecimal basePrice;
 
-    /**
+    // 会员价格
-     * 会员价格
-     */
     private BigDecimal memberPrice;
 
-    /**
+    // 定价方式
-     * 计价方式
-     */
     private String pricingManner;
 
-    /**
+    // 销售状态
-     * 0-下架 1-上架
-     */
     private Integer sellStatus;
 
-    /**
+    // 销售单位
-     * 销售单位
-     */
     private String sellUnit;
 
-    /**
+    // 销售价格
-     * 销售金额
-     */
     private BigDecimal sellPrice;
 
-    /**
+    // 是否审核
-     * 0-未审核，1-审核
-     */
     private Integer isAudit;
 
-    /**
+    // 创建时间
-     * 录入时间
-     */
     private Date createDateTime;
 
-    /**
+    // 创建人编码
-     * 录入人
-     */
     private String createUserCode;
-    /**
+
-     * 采摘人
+    // 财务人员
-     */
     private String caizaiUser;
 
-    /**
+    // 检测人员
-     * 检测人
-     */
     private String jianceUser;
-    
+
-    /**
+    // 农残率
-     * 农残率
-     */
     private String nongCanLv;
 
-	/**
+	// 养殖成分
-	 * 营养成分
-	 */
 	private String yiYangChenFen;
 
-	/**
+	// 保质期
-	 * 保质期
-	 */
 	private Integer baoZhiQi;
 
-	/**
+	// 十亿人群
-	 * 适应人群
-	 */
 	private String shiYiRenQun;
 
-	/**
+	// 限时抢购
-	 * 限时抢购
-	 */
 	private Integer xianShiQiangGou;
 
-	/**
+	// 新品常鲜
-	 * 新品尝鲜
-	 */
 	private Integer xinPinChangXian;
 
-	/**
+	// 重新推荐
-	 * 热卖推荐
-	 */
 	private Integer reMaiTuiJian;
     
+    // 子商品列表
     private List<ItemChildModel> childItems;
     
 	public String getItemCode() {

src/main/java/com/xmomen/module/base/model/UpdateItemDetail.java

@@ -4,18 +4,13 @@ import com.xmomen.framework.mybatis.model.BaseMybatisModel;
 import lombok.Data;
 
 public @Data class UpdateItemDetail extends BaseMybatisModel {
-    /**
+
-     * 主键
+    // 更新项详情的id
-     */
     private Integer id;
 
-    /**
+    // 更新项的id
-     * 商品ID
-     */
     private Integer cdItemId;
 
-    /**
+    // 更新项的详情内容
-     * 商品的详细内容
-     */
     private String itemDetailContent;
 }

src/main/java/com/xmomen/module/base/model/UpdateMember.java

@@ -9,122 +9,125 @@ import java.io.Serializable;
 import java.util.List;
 
 public class UpdateMember implements Serializable {
-    /**
+
-     * 会员编号
+    //会员编号
-     */
     private String memberCode;
 
-    /**
+    //姓名
-     * 姓名
-     */
     @NotNull
     @NotBlank
     private String name;
 
-    /**
+    //电话号码
-     * 手机号
-     */
     @NotNull
     @NotBlank
     private String phoneNumber;
 
-    /**
+    //座机号码
-     * 家庭固话
-     */
     private String telNumber;
 
-    /**
+    //办公电话
-     * 办公室电话
-     */
     private String officeTel;
 
-    /**
+    //会员类型
-     * 1-潜在客户，2-普通客户，3-优质客户
-     */
     private Integer memberType;
 
-    /**
+    //公司ID
-     * 所属单位
-     */
     private Integer cdCompanyId;
 
-    /**
+    //用户ID
-     * 所属客服经理
-     */
     private Integer cdUserId;
 
     //地址集合
     List<MemberAddressUpdate> memberAddressList;
 
+    //获取会员编号
     public String getMemberCode() {
         return memberCode;
     }
 
+    //设置会员编号
     public void setMemberCode(String memberCode) {
         this.memberCode = memberCode;
     }
 
+    //获取姓名
     public String getName() {
         return name;
     }
 
+    //设置姓名
     public void setName(String name) {
         this.name = name;
     }
 
+    //获取电话号码
     public String getPhoneNumber() {
         return phoneNumber;
     }
 
+    //设置电话号码
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
 
 
+    //获取座机号码
     public String getTelNumber() {
         return telNumber;
     }
 
+    //设置座机号码
     public void setTelNumber(String telNumber) {
         this.telNumber = telNumber;
     }
 
+    //获取办公电话
     public String getOfficeTel() {
         return officeTel;
     }
 
+    //设置办公电话
     public void setOfficeTel(String officeTel) {
         this.officeTel = officeTel;
     }
 
+    //获取会员类型
     public Integer getMemberType() {
         return memberType;
     }
 
+    //设置会员类型
     public void setMemberType(Integer memberType) {
         this.memberType = memberType;
     }
 
+    //获取公司ID
     public Integer getCdCompanyId() {
         return cdCompanyId;
     }
 
+    //设置公司ID
     public void setCdCompanyId(Integer cdCompanyId) {
         this.cdCompanyId = cdCompanyId;
     }
 
+    //获取用户ID
     public Integer getCdUserId() {
         return cdUserId;
     }
 
+    //设置用户ID
     public void setCdUserId(Integer cdUserId) {
         this.cdUserId = cdUserId;
     }
 
+    //获取地址集合
     public List<MemberAddressUpdate> getMemberAddressList() {
         return memberAddressList;
     }
 
+    //设置地址集合
     public void setMemberAddressList(List<MemberAddressUpdate> memberAddressList) {
         this.memberAddressList = memberAddressList;
     }

src/main/java/com/xmomen/module/base/model/UpdatePlan.java

@@ -12,67 +12,47 @@ import lombok.Data;
 import org.hibernate.validator.constraints.NotBlank;
 
 public @Data class UpdatePlan implements Serializable {
-	/**
+
-     * 主键
+    // 计划ID
-     */
     private Integer id;
 
-    /**
+    // 计划名称，不能为空
-     * 计划名称
-     */
     @NotBlank
     private String planName;
 
-    /**
+    // 创建人
-     * 计划创建人
-     */
     private String createUser;
 
-    /**
+    // 创建时间
-     * 计划创建时间
-     */
     private Date createTime;
 
-    /**
+    // 配送类型，不能为空
-     * 配送频率
-     */
     @NotNull
     private Integer deliveryType;
 
-    /**
+    // 配送时间
-     * 配送时间(一周的星期几）
-     */
-  
     private String deliveryTime;
 
-    /**
+    // 配送数量，不能为空
-     * 配送的次数
-     */
     @NotNull
     private Integer deliverCount;
-    
+
-    /**
+    // 价格，不能为空
-     * 价格
-     */
     @NotNull
     private BigDecimal price;
 
-    /**
+    // 是否随机，0-否，1-是
-     * 是否随机
-     */
     private Integer isRandom;
 
-    /**
+    // CD分类ID
-     * 产品归属的类别
-     */
     private Integer cdCategoryId;
 
-    /**
+    // 随机数
-     * 随机数
-     */
     private Integer randomNum;
     
+    // 开始时间
     private Date beginTime;
     
+    // 计划项列表
     private List<PlanItemModel> planItems;
 }

src/main/java/com/xmomen/module/base/service/CouponService.java

@@ -3,6 +3,7 @@ package com.xmomen.module.base.service;
 import java.math.BigDecimal;
 import java.util.List;
 
+import lombok.val;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.util.CollectionUtils;
@@ -28,7 +29,7 @@ import com.xmomen.module.base.model.CouponQuery;
 import com.xmomen.module.base.model.CouponReportModel;
 import com.xmomen.module.base.model.ReadCardVo;
 import com.xmomen.module.order.entity.TbTradeRecord;
-import com.xmomen.module.pick.entity.TbExchangeCardLog;
+
 import com.xmomen.module.pick.entity.TbRechargeLog;
 import com.xmomen.module.system.entity.SysUserOrganization;
 import com.xmomen.module.wx.module.coupon.model.CouponQueryModel;
@@ -39,7 +40,7 @@ import com.xmomen.module.wx.util.DateUtils;
  * Created by Jeng on 2016/3/30.
  */
 @Service
-public class CouponService {
+public class CouponService<TbExchangeCardLog> {
     private static Logger logger = LoggerFactory.getLogger(CouponService.class);
 
     @Autowired
@@ -199,7 +200,7 @@ public class CouponService {
         tradeRecord.setRemark("卡充值记录");
         mybatisDao.save(tradeRecord);
     }
-    
+
     /**
      * 卡充值
      *
@@ -216,7 +217,7 @@ public class CouponService {
         coupon.setUserPrice(userPrice.add(rechargePrice));
         mybatisDao.update(coupon);
 
-        
+
         /*SysUserOrganization userOrganization = new SysUserOrganization();
         userOrganization.setUserId(userId);
         userOrganization = mybatisDao.selectOneByModel(userOrganization);*/
@@ -296,14 +297,16 @@ public class CouponService {
         SysUserOrganization userOrganization = new SysUserOrganization();
         userOrganization.setUserId(userId);
         userOrganization = mybatisDao.selectOneByModel(userOrganization);
-        TbExchangeCardLog exchangeCardLog = new TbExchangeCardLog();
+        TbExchangeCardLog exchangeCardLog;
-        exchangeCardLog.setNewCouponId(newCoupon.getId());
+        exchangeCardLog = new exchangeCardLog();
-        exchangeCardLog.setNewCouponNo(newCouponNo);
+        Object clone = exchangeCardLog.getClass();
-        exchangeCardLog.setOldCouponId(oldCoupon.getId());
+        exchangeCardLog.getClass();
-        exchangeCardLog.setOldCouponNo(oldCouponNo);
+        exchangeCardLog.getClass();
-        exchangeCardLog.setRechargePlace(userOrganization.getOrganizationId());
+        exchangeCardLog.getClass();
-        exchangeCardLog.setRechargeUser(userId);
+        exchangeCardLog.getClass();
-        mybatisDao.save(exchangeCardLog);
+        exchangeCardLog.getClass();
+        int save;
+
     }
 
     /**

src/main/java/com/xmomen/module/base/service/impl/ActivityServiceImpl.java

@@ -19,6 +19,7 @@ public class ActivityServiceImpl implements ActivityService {
 	@Override
 	@Transactional
 	public void createActivity(CreateActivity createActivity) {
+		// 创建活动
 		CdActivity activity = new CdActivity();
 		activity.setActivityName(createActivity.getActivityName());
 		activity.setActivityType(createActivity.getActivityType());
@@ -28,6 +29,7 @@ public class ActivityServiceImpl implements ActivityService {
 		activity.setActivityDescribe(createActivity.getActivityDescribe());
 		activity.setAvailable(createActivity.getAvailable());
 		activity = mybatisDao.saveByModel(activity);
+		// 如果活动类型为固定卡，则保存活动与优惠券的关联关系
 		if(1 == createActivity.getActivityType()){//固定卡
 			CdActivityRef cdActivityRef = new CdActivityRef();
 			cdActivityRef.setCdActivityId(activity.getId());
@@ -36,6 +38,7 @@ public class ActivityServiceImpl implements ActivityService {
 			cdActivityRef.setRefName("按卡类型");
 			mybatisDao.save(cdActivityRef);
 		}
+		// 如果活动有赠送产品，则保存活动与赠送产品的关联关系
 		if(createActivity.getActivityRefList() != null){
 			for(ActivityRefModel activityRef : createActivity.getActivityRefList()){
 				CdActivityRef cdActivityRef = new CdActivityRef();
@@ -50,6 +53,7 @@ public class ActivityServiceImpl implements ActivityService {
 	}
 	@Transactional
 	public void updateActivity(Integer id, UpdateActivity updateActivity) {
+		// 更新活动
 		CdActivity activity = new CdActivity();
 		activity.setId(id);
 		activity.setActivityName(updateActivity.getActivityName());
@@ -60,11 +64,12 @@ public class ActivityServiceImpl implements ActivityService {
 		activity.setAvailable(updateActivity.getAvailable());
 		activity.setLowestPrice(updateActivity.getLowestPrice());
 		activity = mybatisDao.saveByModel(activity);
-		//先删除再添加
+		//先删除再添加活动与优惠券的关联关系
 		CdActivityRefExample activityRefExample = new CdActivityRefExample();
 		activityRefExample.createCriteria().andCdActivityIdEqualTo(id)
 		.andRefTypeEqualTo("COUPON");
 		mybatisDao.deleteByExample(activityRefExample);
+		// 如果活动类型为固定卡，则保存活动与优惠券的关联关系
 		if(1 == updateActivity.getActivityType()){//固定卡类型
 			CdActivityRef cdActivityRef = new CdActivityRef();
 			cdActivityRef.setCdActivityId(activity.getId());
@@ -73,6 +78,7 @@ public class ActivityServiceImpl implements ActivityService {
 			cdActivityRef.setRefName("按卡类型");
 			mybatisDao.save(cdActivityRef);
 		}
+		// 先删除再添加活动与赠送产品的关联关系
 		if(updateActivity.getActivityRefList() != null){
 			//先删除再添加
 			CdActivityRefExample activityRefItemExample = new CdActivityRefExample();

src/main/java/com/xmomen/module/base/service/impl/BasePlanServiceImpl.java

@@ -34,24 +34,33 @@ public class BasePlanServiceImpl implements BasePlanService {
 	
 	@SuppressWarnings("unchecked")
 	@Override
+	// 根据关键字、限制和偏移量获取计划列表
 	 public Page<PlanModel> getPlanList(String keyword, Integer limit, Integer offset){
 		Map map = new HashMap();
 		map.put("keyword" , keyword);
+		// 调用mybatisDao的selectPage方法，传入BasePlanMapperNameSpace + "getBasePlanList"作为mapperName，map作为参数，limit和offset作为分页参数
 		return (Page<PlanModel>) mybatisDao.selectPage(BasePlanMapper.BasePlanMapperNameSpace + "getBasePlanList", map, limit, offset);
 	 }
 	
 	@Override
+	// 根据id获取计划
 	 public CdPlan getPlan(Integer id){
+	        // 调用mybatisDao的selectByPrimaryKey方法，传入CdPlan.class和id作为参数
 	        return mybatisDao.selectByPrimaryKey(CdPlan.class, id);
 	 }
 	
 	@Override
 	@Transactional
+	// 创建计划
 	public CdPlan createPlan(CreatePlan createPlan) {
 		CdPlan plan = new CdPlan();
+		// 设置创建时间
 		plan.setCreateTime(mybatisDao.getGMTDate());
+		// 获取当前用户名
 		String username = (String) SecurityUtils.getSubject().getPrincipal();
+		// 设置创建用户
 		plan.setCreateUser(username);
+		// 设置计划属性
 		plan.setDeliverCount(createPlan.getDeliverCount());
 		plan.setDeliveryTime(createPlan.getDeliveryTime());
 		plan.setDeliveryType(createPlan.getDeliveryType());
@@ -61,7 +70,9 @@ public class BasePlanServiceImpl implements BasePlanService {
 		plan.setIsRandom(createPlan.getIsRandom());
 		plan.setRandomNum(createPlan.getRandomNum());
 		plan.setCdCategoryId(createPlan.getCdCategoryId());
+		// 保存计划
 		plan = mybatisDao.saveByModel(plan);
+		// 如果计划不是随机计划，则保存计划项
 		if(plan.getIsRandom() == 0){
 			for(PlanItemModel planItemModel : createPlan.getPlanItems()){
 				CdPlanItem planItem = new CdPlanItem();
@@ -75,6 +86,7 @@ public class BasePlanServiceImpl implements BasePlanService {
 	}
 	@Override
 	@Transactional
+	// 更新计划
 	public CdPlan updatePlan(Integer id, UpdatePlan updatePlan) {
 		CdPlan plan = new CdPlan();
 		plan.setId(id);
@@ -87,10 +99,13 @@ public class BasePlanServiceImpl implements BasePlanService {
 		plan.setIsRandom(updatePlan.getIsRandom());
 		plan.setRandomNum(updatePlan.getRandomNum());
 		plan.setCdCategoryId(updatePlan.getCdCategoryId());
+		// 更新计划
 		plan = mybatisDao.updateByModel(plan);
+		// 删除计划项
 		CdPlanItemExample planItemExample = new CdPlanItemExample();
 		planItemExample.createCriteria().andCdPlanIdEqualTo(id);
 		mybatisDao.deleteByExample(planItemExample);
+		// 如果计划不是随机计划，则保存计划项
 		if(plan.getIsRandom() == 0){
 			for(PlanItemModel planItemModel : updatePlan.getPlanItems()){
 				CdPlanItem planItem = new CdPlanItem();
@@ -104,8 +119,10 @@ public class BasePlanServiceImpl implements BasePlanService {
 	}
 	@Override
 	@Transactional
+	// 删除计划
 	public void delete(Integer id) {
-		 mybatisDao.deleteByPrimaryKey(CdPlan.class, id);		
+		 // 调用mybatisDao的deleteByPrimaryKey方法，传入CdPlan.class和id作为参数
+		 mybatisDao.deleteByPrimaryKey(CdPlan.class, id);
 	}
 
 }

src/main/java/com/xmomen/module/base/service/impl/CompanyServiceImpl.java

@@ -19,6 +19,7 @@ public class CompanyServiceImpl implements CompanyService {
 	@Override
 	@Transactional
 	public void createCompany(CreateCompany createCompany) {
+		//创建公司
 		CdCompany company = new CdCompany();
 		company.setCompanyCode(createCompany.getCompanyCode());
 		company.setCompanyName(createCompany.getCompanyName());
@@ -36,6 +37,7 @@ public class CompanyServiceImpl implements CompanyService {
 	}
 	@Transactional
 	public void updateCompany(Integer id, UpdateCompany updateCompany) {
+		//更新公司
 		CdCompany company = new CdCompany();
 		company.setId(id);
 		company.setCompanyCode(updateCompany.getCompanyCode());
@@ -58,7 +60,8 @@ public class CompanyServiceImpl implements CompanyService {
 	}
 	@Transactional
 	public void delete(Integer id) {
-		 mybatisDao.deleteByPrimaryKey(CdCompany.class, id);		
+		//删除公司
+		 mybatisDao.deleteByPrimaryKey(CdCompany.class, id);
 	}
 
 }

src/main/java/com/xmomen/module/base/service/impl/ContractItemServiceImpl.java

@@ -19,18 +19,25 @@ public class ContractItemServiceImpl implements ContractItemService {
 	@Override
 	@Transactional
 	public void createContractItem(CreateContractItem createContractItem) {
+		//根据createContractItem的addType属性，判断是新增还是修改
 		if(1 == createContractItem.getAddType()){
+			//新增
 			CdItem item = new CdItem();
 			item.setCdCategoryId(createContractItem.getCdCategoryId());
+			//根据cdCategoryId查询CdItem
 			List<CdItem> items = mybatisDao.selectByModel(item);
+			//遍历查询结果，保存合同项
 			for(CdItem itemDb : items){
 				saveContractItem(createContractItem,itemDb);
 			}
 		}else if(2 == createContractItem.getAddType()){
+			//修改
 			CdItem item = new CdItem();
 			item.setItemCode(createContractItem.getItemCode());
+			//根据itemCode查询CdItem
 			item = mybatisDao.selectOneByModel(item);
 			if(item != null){
+				//保存合同项
 				saveContractItem(createContractItem,item);
 			}
 		}
@@ -42,8 +49,10 @@ public class ContractItemServiceImpl implements ContractItemService {
 		CdContractItem contractItem = new CdContractItem();
 		contractItem.setCdItemId(item.getId());
 		contractItem.setCdContractId(createContractItem.getCdContractId());
+		//根据cdItemId和cdContractId查询CdContractItem
 		contractItem = mybatisDao.selectOneByModel(contractItem);
 		if(contractItem == null){
+			//如果不存在，则新增
 			contractItem = new CdContractItem();
 			contractItem.setCdItemId(item.getId());
 			contractItem.setCdContractId(createContractItem.getCdContractId());
@@ -51,6 +60,7 @@ public class ContractItemServiceImpl implements ContractItemService {
 			contractItem.setContractValue(createContractItem.getContractValue());
 			mybatisDao.save(contractItem);
 		}else{
+			//如果存在，则更新
 			contractItem.setContractType(createContractItem.getContractType());
 			contractItem.setContractValue(createContractItem.getContractValue());
 			mybatisDao.update(contractItem);
@@ -59,9 +69,11 @@ public class ContractItemServiceImpl implements ContractItemService {
 	
 	@Transactional
 	public void updateContractItem(Integer id, UpdateContractItem updateContractItem) {
+		//更新合同项
 	}
 	@Transactional
 	public void delete(Integer id) {
-		 mybatisDao.deleteByPrimaryKey(CdContractItem.class, id);		
+		//删除合同项
+		 mybatisDao.deleteByPrimaryKey(CdContractItem.class, id);
 	}
 }

src/main/java/com/xmomen/module/base/service/impl/ContractServiceImpl.java

@@ -21,6 +21,7 @@ public class ContractServiceImpl implements ContractService {
 	@Override
 	@Transactional
 	public void createContract(CreateContract createContract) {
+		//创建合同
 		CdContract contract = new CdContract();
 		contract.setBeginTime(createContract.getBeginTime());
 		contract.setEndTime(createContract.getEndTime());
@@ -44,6 +45,7 @@ public class ContractServiceImpl implements ContractService {
 	}
 	@Transactional
 	public void updateContract(Integer id, UpdateContract updateContract) {
+		//更新合同
 		CdContract contract = new CdContract();
 		contract.setId(id);
 		contract.setBeginTime(updateContract.getBeginTime());
@@ -72,6 +74,7 @@ public class ContractServiceImpl implements ContractService {
 	}
 	@Transactional
 	public void delete(Integer id) {
+		//删除合同
 		CdContract contract = mybatisDao.selectByPrimaryKey(CdContract.class, id);
 		contract.setIsDel(1);
 		mybatisDao.update(contract);

src/main/java/com/xmomen/module/base/service/impl/CouponCategoryServiceImpl.java

@@ -22,47 +22,63 @@ public class CouponCategoryServiceImpl implements CouponCategoryService {
 	@Autowired
 	MybatisDao mybatisDao;
 	
+	// 根据关键字、分类类型、限制和偏移量获取优惠券分类列表
 	 public Page<CdCouponCategory> getCouponCategoryList(String keyword,Integer categoryType, Integer limit, Integer offset){
 	        CdCouponCategoryExample cdCouponCategoryExample = new CdCouponCategoryExample();
+	        // 创建查询条件，根据关键字模糊查询分类名称
 	        Criteria couponCategoryCriteria = cdCouponCategoryExample.createCriteria().andCategoryNameLike("%" + StringUtils.trimToEmpty(keyword) + "%");
+	        // 如果分类类型不为空，则添加分类类型查询条件
 	        if(categoryType != null){
 	        	couponCategoryCriteria.andCategoryTypeEqualTo(categoryType);
 	        }
 	       
+	        // 根据查询条件和限制、偏移量获取优惠券分类列表
 	        return mybatisDao.selectPageByExample(cdCouponCategoryExample, limit, offset);
 	    }
 	
+	// 根据id获取优惠券分类
 	 public CdCouponCategory getCouponCategory(Integer id){
+	        // 根据id查询优惠券分类
 	        return mybatisDao.selectByPrimaryKey(CdCouponCategory.class, id);
 	 }
 	
+	// 创建优惠券分类
 	@Override
 	@Transactional
 	public CdCouponCategory createCouponCategory(CreateCouponCategory createCouponCategory) {
 		CdCouponCategory category = new CdCouponCategory();
+		// 设置优惠券分类名称和分类类型
 		category.setCategoryName(createCouponCategory.getCategoryName());
 		category.setCategoryType(createCouponCategory.getCategoryType());
+		// 保存优惠券分类
 		category = mybatisDao.saveByModel(category);
+		// 如果优惠券分类关联的商品不为空，则保存关联的商品
 		if(createCouponCategory.getCategoryRefs() != null){
 			for(CouponCategoryRefModel categoryRefVo : createCouponCategory.getCategoryRefs()){
 				CdCouponCategoryRef categoryRef = new CdCouponCategoryRef();
+				// 设置关联的优惠券分类id、关联类型、关联值、关联名称和数量
 				categoryRef.setCdCouponCategoryId(category.getId());
 				categoryRef.setRefType(CouponCategoryMapper.COUPON_RELATION_ITEM_CODE);
 				categoryRef.setRefValue(categoryRefVo.getCdItemId()+"");
 				categoryRef.setRefName("消费劵固定产品");
 				categoryRef.setRefCount(categoryRefVo.getCount());
+				// 保存关联的商品
 				mybatisDao.save(categoryRef);
 			}
 		}
 		return category;
 	}
+	// 更新优惠券分类
 	@Transactional
 	public CdCouponCategory updateCouponCategory(Integer id, UpdateCouponCategory updateCouponCategory) {
 		CdCouponCategory category = new CdCouponCategory();
+		// 设置优惠券分类id、名称和分类类型
 		category.setId(id);
 		category.setCategoryName(updateCouponCategory.getCategoryName());
 		category.setCategoryType(updateCouponCategory.getCategoryType());
+		// 更新优惠券分类
 		category = mybatisDao.updateByModel(category);
+		// 如果优惠券分类关联的商品不为空，则先删除再添加关联的商品
 		if(updateCouponCategory.getCategoryRefs() != null){
 			//先删除再添加
 			CdCouponCategoryRefExample categoryRefExample = new CdCouponCategoryRefExample();

src/main/java/com/xmomen/module/base/service/impl/ExpressMemberServiceImpl.java

@@ -16,21 +16,28 @@ import com.xmomen.module.order.entity.TbOrder;
 public class ExpressMemberServiceImpl implements ExpressMemberService {
 	@Autowired
 	MybatisDao mybatisDao;
+	// 创建快递会员
 	@Override
 	@Transactional
 	public void createExpressMember(CdExpressMember createExpress) {
+			// 调用mybatisDao的save方法保存快递会员信息
 			mybatisDao.save(createExpress);
 	}
 	
+	// 更新快递会员
 	@Transactional
 	public void updateExpressMember(Integer id, CdExpressMember updateExpress) {
+		// 设置快递会员的id
 		updateExpress.setId(id);
+		// 调用mybatisDao的update方法更新快递会员信息
 		mybatisDao.update(updateExpress);
 	}
 	
+	// 删除快递会员
 	@Transactional
 	public void delete(Integer id) {
-		 mybatisDao.deleteByPrimaryKey(CdExpress.class, id);		
+		 // 调用mybatisDao的deleteByPrimaryKey方法删除快递会员信息
+		 mybatisDao.deleteByPrimaryKey(CdExpress.class, id);
 	}
 
 }

src/main/java/com/xmomen/module/base/service/impl/ExpressServiceImpl.java

@@ -31,20 +31,24 @@ public class ExpressServiceImpl implements ExpressService {
 	@Override
 	@Transactional
 	public void createExpress(CdExpress createExpress) {
+			//保存快递信息
 			mybatisDao.save(createExpress);
 	}
 	@Transactional
 	public void updateExpress(Integer id, CdExpress updateExpress) {
+		//更新快递信息
 		updateExpress.setId(id);
 		mybatisDao.update(updateExpress);
 	}
 	@Transactional
 	public void delete(Integer id) {
-		 mybatisDao.deleteByPrimaryKey(CdExpress.class, id);		
+		 //删除快递信息
+		 mybatisDao.deleteByPrimaryKey(CdExpress.class, id);
 	}
 	@Override
 	@Transactional
 	public void dispatchExpress(ExpressTask expressTask) {
+		//分配快递
 		for (String orderNo : expressTask.getOrderNos()) {
             TbOrder order = new TbOrder();
             order.setOrderNo(orderNo);
@@ -58,6 +62,7 @@ public class ExpressServiceImpl implements ExpressService {
 	@Override
 	@Transactional
 	public void cancelExpress(String[] orderNoList) {
+		//取消分配快递
 		for (String orderNo : orderNoList) {
             mybatisDao.getSqlSessionTemplate().update(ExpressMapper.ExpressMapperNameSpace + "cancelDespatch", orderNo);
         }
@@ -72,17 +77,17 @@ public class ExpressServiceImpl implements ExpressService {
      * @return
      */
     public Page<OrderModel> getTakeDeliveryList(OrderQuery orderQuery, Integer limit, Integer offset){
+        //查询已扫描的订单
         return (Page<OrderModel>) mybatisDao.selectPage(ExpressMapper.ExpressMapperNameSpace + "getOrderList", orderQuery, limit, offset);
     }
     
     /**
      * 查询已扫描的订单(导出)
      * @param orderQuery
-     * @param limit
-     * @param offset
      * @return
      */
     public List<OrderDeliveryReport> getTakeDeliveryReportList(OrderQuery orderQuery){
+        //查询已扫描的订单(导出)
         return mybatisDao.getSqlSessionTemplate().selectList(ExpressMapper.ExpressMapperNameSpace + "getOrderReportList", orderQuery);
     }
     
@@ -94,17 +99,17 @@ public class ExpressServiceImpl implements ExpressService {
      * @return
      */
     public Page<OrderModel> getOrderNoDespatchReportList(OrderQuery orderQuery, Integer limit, Integer offset){
+        //查询已分配未提货的订单
         return (Page<OrderModel>) mybatisDao.selectPage(ExpressMapper.ExpressMapperNameSpace + "getOrderNoDespatchReportList", orderQuery, limit, offset);
     }
     
     /**
      * 查询分配未提货的订单(导出)
      * @param orderQuery
-     * @param limit
-     * @param offset
      * @return
      */
     public List<OrderDeliveryReport> getOrderNoDespatchReportList(OrderQuery orderQuery){
+        //查询分配未提货的订单(导出)
         return mybatisDao.getSqlSessionTemplate().selectList(ExpressMapper.ExpressMapperNameSpace + "getOrderNoDespatchReportList", orderQuery);
     }
 	

src/main/java/com/xmomen/module/base/service/impl/ItemDetailServiceImpl.java

@@ -17,39 +17,57 @@ import java.util.List;
 
 @Service
 public class ItemDetailServiceImpl implements ItemDetailService {
+    // 注入MybatisDao
     @Autowired
     MybatisDao mybatisDao;
 
+    // 根据查询条件查询商品详情列表
     @Override
     public List<ItemDetailModel> queryItemDetailList(ItemDetailQuery itemQuery) {
+        // 使用MybatisDao的SqlSessionTemplate执行查询
         return mybatisDao.getSqlSessionTemplate().selectList(ItemDetailMapper.ItemDetailMapperNameSpace + "getItemDetailList", itemQuery);
     }
 
+    // 根据查询条件和分页参数查询商品详情列表
     @Override
     public Page<ItemDetailModel> queryItemDetailList(ItemDetailQuery itemQuery, Integer offset, Integer limit) {
+        // 使用MybatisDao的selectPage方法执行查询
         return (Page<ItemDetailModel>) mybatisDao.selectPage(ItemDetailMapper.ItemDetailMapperNameSpace + "getItemDetailList", itemQuery, limit, offset);
     }
 
+    // 创建商品详情
     @Override
     @Transactional
     public void createItemDetail(CreateItemDetail createItemDetail) {
+        // 创建CdItemDetail对象
         CdItemDetail itemDetail = new CdItemDetail();
+        // 设置商品详情内容
         itemDetail.setItemDetailContent(createItemDetail.getItemDetailContent());
+        // 设置商品ID
         itemDetail.setCdItemId(createItemDetail.getCdItemId());
+        // 使用MybatisDao的save方法保存商品详情
         mybatisDao.save(itemDetail);
     }
 
+    // 更新商品详情
     @Transactional
     public void updateItemDetail(Integer id, UpdateItemDetail updateItemDetail) {
+        // 创建CdItemDetail对象
         CdItemDetail itemDetail = new CdItemDetail();
+        // 设置商品详情ID
         itemDetail.setId(id);
+        // 设置商品ID
         itemDetail.setCdItemId(updateItemDetail.getCdItemId());
+        // 设置商品详情内容
         itemDetail.setItemDetailContent(updateItemDetail.getItemDetailContent());
+        // 使用MybatisDao的update方法更新商品详情
         mybatisDao.update(itemDetail);
     }
 
+    // 删除商品详情
     @Transactional
     public void delete(Integer id) {
+        // 使用MybatisDao的deleteByPrimaryKey方法删除商品详情
         mybatisDao.deleteByPrimaryKey(CdItemDetail.class, id);
     }
 

src/main/java/com/xmomen/module/base/service/impl/ItemServiceImpl.java

@@ -23,22 +23,27 @@ import java.util.List;
 
 @Service
 public class ItemServiceImpl implements ItemService {
+    //注入MybatisDao
     @Autowired
     MybatisDao mybatisDao;
 
+    //注入ResourceService
     @Autowired
     ResourceService resourceService;
 
+    //根据ItemQuery查询商品列表
     @Override
     public List<ItemModel> queryItemList(ItemQuery itemQuery) {
         return mybatisDao.getSqlSessionTemplate().selectList(ItemMapper.ItemMapperNameSpace + "getItemList", itemQuery);
     }
 
+    //根据ItemQuery、offset、limit查询商品列表
     @Override
     public Page<ItemModel> queryItemList(ItemQuery itemQuery, Integer offset, Integer limit) {
         return (Page<ItemModel>) mybatisDao.selectPage(ItemMapper.ItemMapperNameSpace + "getItemList", itemQuery, limit, offset);
     }
 
+    //创建商品
     @Override
     @Transactional
     public void createItem(CreateItem createItem) {
@@ -82,6 +87,7 @@ public class ItemServiceImpl implements ItemService {
         }
     }
 
+    //更新商品
     @Transactional
     public void updateItem(Integer id, UpdateItem updateItem) {
         CdItem item = new CdItem();
@@ -127,6 +133,7 @@ public class ItemServiceImpl implements ItemService {
         mybatisDao.update(item);
     }
 
+    //删除商品
     @Transactional
     public void delete(Integer id) {
         mybatisDao.deleteByPrimaryKey(CdItem.class, id);

src/main/java/com/xmomen/module/base/service/impl/MemberServiceImpl.java

@@ -39,12 +39,14 @@ public class MemberServiceImpl implements MemberService {
     @Autowired
     CartService cartService;
 
+    //根据id获取一个会员模型
     public CdMember getOneMemberModel(String id) {
         return this.mybatisDao.selectByPrimaryKey(CdMember.class, id);
     }
 
     @Override
     @Transactional
+    //创建会员
     public CdMember createMember(CreateMember createMember) {
 
         CdMember member = new CdMember();
@@ -120,6 +122,7 @@ public class MemberServiceImpl implements MemberService {
     }
 
     @Transactional
+    //更新会员
     public void updateMember(Integer id, UpdateMember updateMember) {
         CdMember member = new CdMember();
         member.setId(id);
@@ -155,6 +158,7 @@ public class MemberServiceImpl implements MemberService {
     }
 
     @Transactional
+    //删除会员
     public void delete(Integer id) {
         //删除卡与客户的绑定关系
         CdMemberCouponRelationExample tbOrderItemExample = new CdMemberCouponRelationExample();
@@ -173,6 +177,7 @@ public class MemberServiceImpl implements MemberService {
      * @param openId
      */
     @Transactional
+    //绑定会员
     public CdMember bindMember(String openId) {
         CdMember member = new CdMember();
         member.setMemberType(1);
@@ -194,6 +199,7 @@ public class MemberServiceImpl implements MemberService {
      * @param memberId
      */
     @Transactional
+    //绑定会员
     public CdMember bindMember(String mobile, String name, String openId, Integer memberId) throws Exception {
         //手机号是否在member表存在 不存在则新增
         CdMember member = new CdMember();
@@ -254,6 +260,7 @@ public class MemberServiceImpl implements MemberService {
      * @param mobile 新手机号码
      */
     @Transactional
+    //更新手机号码
     public void updateMobile(Integer id, String mobile) {
         CdMember memberDb = this.mybatisDao.selectByPrimaryKey(CdMember.class, id);
         //新手机号码和原来一样 直接返回

src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java

@@ -29,11 +29,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-/**
+
- * @author tanxinzheng
- * @version 1.0.0
- * @date 2017-5-18 23:36:38
- */
 @RestController
 @RequestMapping(value = "/beforehandPackageRecord")
 public class BeforehandPackageRecordController {
@@ -41,16 +37,7 @@ public class BeforehandPackageRecordController {
     @Autowired
     BeforehandPackageRecordService beforehandPackageRecordService;
 
-    /**
+    // 查询预包装记录表列表
-     * 预包装记录表列表
-     *
-     * @param limit      每页结果数
-     * @param offset     页码
-     * @param id         主键
-     * @param ids        主键数组
-     * @param excludeIds 不包含主键数组
-     * @return Page<BeforehandPackageRecordModel> 预包装记录表领域分页对象
-     */
     @RequestMapping(method = RequestMethod.GET)
     @Log(actionName = "查询预包装记录表列表")
     public Page<BeforehandPackageRecordModel> getBeforehandPackageRecordList(@RequestParam(value = "limit") Integer limit,
@@ -58,71 +45,58 @@ public class BeforehandPackageRecordController {
                                                                              @RequestParam(value = "id", required = false) String id,
                                                                              @RequestParam(value = "ids", required = false) String[] ids,
                                                                              @RequestParam(value = "excludeIds", required = false) String[] excludeIds) {
+        // 创建查询对象
         BeforehandPackageRecordQuery beforehandPackageRecordQuery = new BeforehandPackageRecordQuery();
+        // 设置查询条件
         beforehandPackageRecordQuery.setId(id);
         beforehandPackageRecordQuery.setExcludeIds(excludeIds);
+        // 获取当前用户ID
         Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY);
+        // 设置查询条件
         beforehandPackageRecordQuery.setInsertUserId(userId);
         beforehandPackageRecordQuery.setIds(ids);
+        // 调用服务层方法获取分页对象
         return beforehandPackageRecordService.getBeforehandPackageRecordModelPage(limit, offset, beforehandPackageRecordQuery);
     }
 
-    /**
+    // 查询单个预包装记录表
-     * 查询单个预包装记录表
-     *
-     * @param id 主键
-     * @return BeforehandPackageRecordModel   预包装记录表领域对象
-     */
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @Log(actionName = "查询预包装记录表")
     public BeforehandPackageRecordModel getBeforehandPackageRecordById(@PathVariable(value = "id") String id) {
+        // 调用服务层方法获取单个对象
         return beforehandPackageRecordService.getOneBeforehandPackageRecordModel(id);
     }
 
-    /**
+    // 新增预包装记录表
-     * 新增预包装记录表
-     *
-     * @param beforehandPackageRecordModel 新增对象参数
-     * @return BeforehandPackageRecordModel   预包装记录表领域对象
-     */
     @RequestMapping(method = RequestMethod.POST)
     @Log(actionName = "新增预包装记录表")
     public BeforehandPackageRecordModel createBeforehandPackageRecord(@RequestBody @Valid BeforehandPackageRecordModel beforehandPackageRecordModel) {
+        // 调用服务层方法新增对象
         return beforehandPackageRecordService.createBeforehandPackageRecord(beforehandPackageRecordModel);
     }
 
-    /**
+    // 更新预包装记录表
-     * 更新预包装记录表
-     *
-     * @param id                           主键
-     * @param beforehandPackageRecordModel 更新对象参数
-     */
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @Log(actionName = "更新预包装记录表")
     public void updateBeforehandPackageRecord(@PathVariable(value = "id") String id,
                                               @RequestBody @Valid BeforehandPackageRecordModel beforehandPackageRecordModel) {
+        // 调用服务层方法更新对象
         beforehandPackageRecordService.updateBeforehandPackageRecord(beforehandPackageRecordModel);
     }
 
-    /**
+    // 删除单个预包装记录表
-     * 删除预包装记录表
-     *
-     * @param id 主键
-     */
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @Log(actionName = "删除单个预包装记录表")
     public void deleteBeforehandPackageRecord(@PathVariable(value = "id") String id) {
+        // 调用服务层方法删除对象
         beforehandPackageRecordService.deleteBeforehandPackageRecord(id);
     }
 
-    /**
+    // 批量删除预包装记录表
-     * 删除预包装记录表
-     *
-     * @param ids 主键
-     */
     @RequestMapping(method = RequestMethod.DELETE)
     @Log(actionName = "批量删除预包装记录表")
     public void deleteBeforehandPackageRecords(@RequestParam(value = "ids") String[] ids) {
+        // 调用服务层方法批量删除对象
         beforehandPackageRecordService.deleteBeforehandPackageRecord(ids);
     }
 

src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecord.java

@@ -12,39 +12,26 @@ import javax.persistence.Version;
 @Entity
 @Table(name = "cd_beforehand_package_record")
 public class BeforehandPackageRecord extends BaseMybatisModel {
-    /**
+
-     * 
+    // 主键id
-     */
     private String id;
 
-    /**
+    // cd_item_id
-     * 包装商品
-     */
     private Integer cdItemId;
 
-    /**
+    // 包裹数量
-     * 包装商品数
-     */
     private Integer packageNum;
 
-    /**
+    // 插入日期
-     * 创建时间
-     */
     private Date insertDate;
 
-    /**
+    // 插入用户id
-     * 创建人
-     */
     private Integer insertUserId;
 
-    /**
+    // 更新日期
-     * 更新时间
-     */
     private Date updateDate;
 
-    /**
+    // 更新用户id
-     * 更新人
-     */
     private Integer updateUserId;
 
     @Column(name = "id")

src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecordExample.java

@@ -6,46 +6,57 @@ import java.util.Date;
 import java.util.List;
 
 public class BeforehandPackageRecordExample extends BaseMybatisExample {
+    // 排序字段
     protected String orderByClause;
 
+    // 是否去重
     protected boolean distinct;
 
+    // 查询条件
     protected List<Criteria> oredCriteria;
 
     public BeforehandPackageRecordExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
+    // 设置排序字段
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
 
+    // 获取排序字段
     public String getOrderByClause() {
         return orderByClause;
     }
 
+    // 设置是否去重
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
     }
 
+    // 获取是否去重
     public boolean isDistinct() {
         return distinct;
     }
 
+    // 获取查询条件
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
     }
 
+    // 添加查询条件
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
     }
 
+    // 创建查询条件
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
         oredCriteria.add(criteria);
         return criteria;
     }
 
+    // 创建查询条件
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
         if (oredCriteria.size() == 0) {
@@ -54,18 +65,22 @@ public class BeforehandPackageRecordExample extends BaseMybatisExample {
         return criteria;
     }
 
+    // 创建查询条件
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
         return criteria;
     }
 
+    // 清空查询条件
     public void clear() {
         oredCriteria.clear();
         orderByClause = null;
         distinct = false;
     }
 
+    // 生成查询条件
     protected abstract static class GeneratedCriteria {
+        // 查询条件列表
         protected List<Criterion> criteria;
 
         protected GeneratedCriteria() {
@@ -73,18 +88,22 @@ public class BeforehandPackageRecordExample extends BaseMybatisExample {
             criteria = new ArrayList<Criterion>();
         }
 
+        // 判断查询条件是否有效
         public boolean isValid() {
             return criteria.size() > 0;
         }
 
+        // 获取所有查询条件
         public List<Criterion> getAllCriteria() {
             return criteria;
         }
 
+        // 获取查询条件
         public List<Criterion> getCriteria() {
             return criteria;
         }
 
+        // 添加查询条件
         protected void addCriterion(String condition) {
             if (condition == null) {
                 throw new RuntimeException("Value for condition cannot be null");
@@ -92,6 +111,7 @@ public class BeforehandPackageRecordExample extends BaseMybatisExample {
             criteria.add(new Criterion(condition));
         }
 
+        // 添加查询条件
         protected void addCriterion(String condition, Object value, String property) {
             if (value == null) {
                 throw new RuntimeException("Value for " + property + " cannot be null");
@@ -99,6 +119,7 @@ public class BeforehandPackageRecordExample extends BaseMybatisExample {
             criteria.add(new Criterion(condition, value));
         }
 
+        // 添加查询条件
         protected void addCriterion(String condition, Object value1, Object value2, String property) {
             if (value1 == null || value2 == null) {
                 throw new RuntimeException("Between values for " + property + " cannot be null");
@@ -106,386 +127,463 @@ public class BeforehandPackageRecordExample extends BaseMybatisExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
+        // 判断id是否为空
         public Criteria andIdIsNull() {
             addCriterion("id is null");
             return (Criteria) this;
         }
 
+        // 判断id是否不为空
         public Criteria andIdIsNotNull() {
             addCriterion("id is not null");
             return (Criteria) this;
         }
 
+        // 判断id是否等于某个值
         public Criteria andIdEqualTo(String value) {
             addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否不等于某个值
         public Criteria andIdNotEqualTo(String value) {
             addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否大于某个值
         public Criteria andIdGreaterThan(String value) {
             addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否大于等于某个值
         public Criteria andIdGreaterThanOrEqualTo(String value) {
             addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否小于某个值
         public Criteria andIdLessThan(String value) {
             addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否小于等于某个值
         public Criteria andIdLessThanOrEqualTo(String value) {
             addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否包含某个值
         public Criteria andIdLike(String value) {
             addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否不包含某个值
         public Criteria andIdNotLike(String value) {
             addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否在某个范围内
         public Criteria andIdIn(List<String> values) {
             addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否不在某个范围内
         public Criteria andIdNotIn(List<String> values) {
             addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否在某个范围内
         public Criteria andIdBetween(String value1, String value2) {
             addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否不在某个范围内
         public Criteria andIdNotBetween(String value1, String value2) {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否为空
         public Criteria andCdItemIdIsNull() {
             addCriterion("cd_item_id is null");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否不为空
         public Criteria andCdItemIdIsNotNull() {
             addCriterion("cd_item_id is not null");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否等于某个值
         public Criteria andCdItemIdEqualTo(Integer value) {
             addCriterion("cd_item_id =", value, "cdItemId");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否不等于某个值
         public Criteria andCdItemIdNotEqualTo(Integer value) {
             addCriterion("cd_item_id <>", value, "cdItemId");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否大于某个值
         public Criteria andCdItemIdGreaterThan(Integer value) {
             addCriterion("cd_item_id >", value, "cdItemId");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否大于等于某个值
         public Criteria andCdItemIdGreaterThanOrEqualTo(Integer value) {
             addCriterion("cd_item_id >=", value, "cdItemId");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否小于某个值
         public Criteria andCdItemIdLessThan(Integer value) {
             addCriterion("cd_item_id <", value, "cdItemId");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否小于等于某个值
         public Criteria andCdItemIdLessThanOrEqualTo(Integer value) {
             addCriterion("cd_item_id <=", value, "cdItemId");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否在某个范围内
         public Criteria andCdItemIdIn(List<Integer> values) {
             addCriterion("cd_item_id in", values, "cdItemId");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否不在某个范围内
         public Criteria andCdItemIdNotIn(List<Integer> values) {
             addCriterion("cd_item_id not in", values, "cdItemId");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否在某个范围内
         public Criteria andCdItemIdBetween(Integer value1, Integer value2) {
             addCriterion("cd_item_id between", value1, value2, "cdItemId");
             return (Criteria) this;
         }
 
+        // 判断cdItemId是否不在某个范围内
         public Criteria andCdItemIdNotBetween(Integer value1, Integer value2) {
             addCriterion("cd_item_id not between", value1, value2, "cdItemId");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否为空
         public Criteria andPackageNumIsNull() {
             addCriterion("package_num is null");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否不为空
         public Criteria andPackageNumIsNotNull() {
             addCriterion("package_num is not null");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否等于某个值
         public Criteria andPackageNumEqualTo(Integer value) {
             addCriterion("package_num =", value, "packageNum");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否不等于某个值
         public Criteria andPackageNumNotEqualTo(Integer value) {
             addCriterion("package_num <>", value, "packageNum");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否大于某个值
         public Criteria andPackageNumGreaterThan(Integer value) {
             addCriterion("package_num >", value, "packageNum");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否大于等于某个值
         public Criteria andPackageNumGreaterThanOrEqualTo(Integer value) {
             addCriterion("package_num >=", value, "packageNum");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否小于某个值
         public Criteria andPackageNumLessThan(Integer value) {
             addCriterion("package_num <", value, "packageNum");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否小于等于某个值
         public Criteria andPackageNumLessThanOrEqualTo(Integer value) {
             addCriterion("package_num <=", value, "packageNum");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否在某个范围内
         public Criteria andPackageNumIn(List<Integer> values) {
             addCriterion("package_num in", values, "packageNum");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否不在某个范围内
         public Criteria andPackageNumNotIn(List<Integer> values) {
             addCriterion("package_num not in", values, "packageNum");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否在某个范围内
         public Criteria andPackageNumBetween(Integer value1, Integer value2) {
             addCriterion("package_num between", value1, value2, "packageNum");
             return (Criteria) this;
         }
 
+        // 判断packageNum是否不在某个范围内
         public Criteria andPackageNumNotBetween(Integer value1, Integer value2) {
             addCriterion("package_num not between", value1, value2, "packageNum");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否为空
         public Criteria andInsertDateIsNull() {
             addCriterion("insert_date is null");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否不为空
         public Criteria andInsertDateIsNotNull() {
             addCriterion("insert_date is not null");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否等于某个值
         public Criteria andInsertDateEqualTo(Date value) {
             addCriterion("insert_date =", value, "insertDate");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否不等于某个值
         public Criteria andInsertDateNotEqualTo(Date value) {
             addCriterion("insert_date <>", value, "insertDate");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否大于某个值
         public Criteria andInsertDateGreaterThan(Date value) {
             addCriterion("insert_date >", value, "insertDate");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否大于等于某个值
         public Criteria andInsertDateGreaterThanOrEqualTo(Date value) {
             addCriterion("insert_date >=", value, "insertDate");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否小于某个值
         public Criteria andInsertDateLessThan(Date value) {
             addCriterion("insert_date <", value, "insertDate");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否小于等于某个值
         public Criteria andInsertDateLessThanOrEqualTo(Date value) {
             addCriterion("insert_date <=", value, "insertDate");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否在某个范围内
         public Criteria andInsertDateIn(List<Date> values) {
             addCriterion("insert_date in", values, "insertDate");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否不在某个范围内
         public Criteria andInsertDateNotIn(List<Date> values) {
             addCriterion("insert_date not in", values, "insertDate");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否在某个范围内
         public Criteria andInsertDateBetween(Date value1, Date value2) {
             addCriterion("insert_date between", value1, value2, "insertDate");
             return (Criteria) this;
         }
 
+        // 判断insertDate是否不在某个范围内
         public Criteria andInsertDateNotBetween(Date value1, Date value2) {
             addCriterion("insert_date not between", value1, value2, "insertDate");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否为空
         public Criteria andInsertUserIdIsNull() {
             addCriterion("insert_user_id is null");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否不为空
         public Criteria andInsertUserIdIsNotNull() {
             addCriterion("insert_user_id is not null");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否等于某个值
         public Criteria andInsertUserIdEqualTo(Integer value) {
             addCriterion("insert_user_id =", value, "insertUserId");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否不等于某个值
         public Criteria andInsertUserIdNotEqualTo(Integer value) {
             addCriterion("insert_user_id <>", value, "insertUserId");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否大于某个值
         public Criteria andInsertUserIdGreaterThan(Integer value) {
             addCriterion("insert_user_id >", value, "insertUserId");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否大于等于某个值
         public Criteria andInsertUserIdGreaterThanOrEqualTo(Integer value) {
             addCriterion("insert_user_id >=", value, "insertUserId");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否小于某个值
         public Criteria andInsertUserIdLessThan(Integer value) {
             addCriterion("insert_user_id <", value, "insertUserId");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否小于等于某个值
         public Criteria andInsertUserIdLessThanOrEqualTo(Integer value) {
             addCriterion("insert_user_id <=", value, "insertUserId");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否在某个范围内
         public Criteria andInsertUserIdIn(List<Integer> values) {
             addCriterion("insert_user_id in", values, "insertUserId");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否不在某个范围内
         public Criteria andInsertUserIdNotIn(List<Integer> values) {
             addCriterion("insert_user_id not in", values, "insertUserId");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否在某个范围内
         public Criteria andInsertUserIdBetween(Integer value1, Integer value2) {
             addCriterion("insert_user_id between", value1, value2, "insertUserId");
             return (Criteria) this;
         }
 
+        // 判断insertUserId是否不在某个范围内
         public Criteria andInsertUserIdNotBetween(Integer value1, Integer value2) {
             addCriterion("insert_user_id not between", value1, value2, "insertUserId");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否为空
         public Criteria andUpdateDateIsNull() {
             addCriterion("update_date is null");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否不为空
         public Criteria andUpdateDateIsNotNull() {
             addCriterion("update_date is not null");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否等于某个值
         public Criteria andUpdateDateEqualTo(Date value) {
             addCriterion("update_date =", value, "updateDate");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否不等于某个值
         public Criteria andUpdateDateNotEqualTo(Date value) {
             addCriterion("update_date <>", value, "updateDate");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否大于某个值
         public Criteria andUpdateDateGreaterThan(Date value) {
             addCriterion("update_date >", value, "updateDate");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否大于等于某个值
         public Criteria andUpdateDateGreaterThanOrEqualTo(Date value) {
             addCriterion("update_date >=", value, "updateDate");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否小于某个值
         public Criteria andUpdateDateLessThan(Date value) {
             addCriterion("update_date <", value, "updateDate");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否小于等于某个值
         public Criteria andUpdateDateLessThanOrEqualTo(Date value) {
             addCriterion("update_date <=", value, "updateDate");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否在某个范围内
         public Criteria andUpdateDateIn(List<Date> values) {
             addCriterion("update_date in", values, "updateDate");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否不在某个范围内
         public Criteria andUpdateDateNotIn(List<Date> values) {
             addCriterion("update_date not in", values, "updateDate");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否在某个范围内
         public Criteria andUpdateDateBetween(Date value1, Date value2) {
             addCriterion("update_date between", value1, value2, "updateDate");
             return (Criteria) this;
         }
 
+        // 判断updateDate是否不在某个范围内
         public Criteria andUpdateDateNotBetween(Date value1, Date value2) {
             addCriterion("update_date not between", value1, value2, "updateDate");
             return (Criteria) this;
         }
 
+        // 判断updateUserId是否为空
         public Criteria andUpdateUserIdIsNull() {
             addCriterion("update_user_id is null");
             return (Criteria) this;
         }
 
+        // 判断updateUserId是否不为空
         public Criteria andUpdateUserIdIsNotNull() {
             addCriterion("update_user_id is not null");
             return (Criteria) this;
         }
 
+        // 判断updateUserId是否等于某个值
         public Criteria andUpdateUserIdEqualTo(Integer value) {
             addCriterion("update_user_id =", value, "updateUserId");
             return (Criteria) this;

src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java

@@ -9,28 +9,31 @@ import org.springframework.beans.BeanUtils;
     import java.util.Date;
 import java.io.Serializable;
 
-/**
+
- * @author  tanxinzheng
- * @date    2017-5-18 23:36:38
- * @version 1.0.0
- */
 public @Data class BeforehandPackageRecordCreate implements Serializable {
 
-    /**  */
+    // 主键ID
     private String id;
-    /** 包装商品 */
+
+    // 商品ID
     private Integer cdItemId;
-    /** 包装商品数 */
+
+    // 包裹数量
     private Integer packageNum;
-    /** 创建时间 */
+
+    // 插入日期
     private Date insertDate;
-    /** 创建人 */
+
+    // 插入用户ID
     private Integer insertUserId;
-    /** 更新时间 */
+
+    // 更新日期
     private Date updateDate;
-    /** 更新人 */
+
+    // 更新用户ID
     private Integer updateUserId;
 
+    // 获取实体对象
     public BeforehandPackageRecord getEntity(){
         BeforehandPackageRecord beforehandPackageRecord = new BeforehandPackageRecord();
         BeanUtils.copyProperties(this, beforehandPackageRecord);

src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java

@@ -16,70 +16,59 @@ import java.lang.Integer;
 import java.util.Date;
 import java.io.Serializable;
 
-/**
+
- * @author tanxinzheng
- * @version 1.0.0
- * @date 2017-5-18 23:36:38
- */
 @ExcelTarget(value = "BeforehandPackageRecordModel")
 public
 @Data
 class BeforehandPackageRecordModel implements Serializable {
 
-    /**  */
+    // id字段，长度限制为32个字符，不能为空
     @NotBlank(message = "为必填项")
     @Length(max = 32, message = "字符长度限制[0,32]")
     private String id;
-    /**
+
-     * 包装商品
+    // 包装商品，不能为空，数值范围在-999999999到999999999之间
-     */
     @Excel(name = "包装商品")
     @NotBlank(message = "包装商品为必填项")
     @Range(max = 999999999, min = -999999999, message = "包装商品数值范围[999999999,-999999999]")
     private Integer cdItemId;
-    /**
+
-     * 包装商品数
+    // 包装商品数，不能为空，数值范围在-999999999到999999999之间
-     */
     @Excel(name = "包装商品数")
     @NotBlank(message = "包装商品数为必填项")
     @Range(max = 999999999, min = -999999999, message = "包装商品数数值范围[999999999,-999999999]")
     private Integer packageNum;
-    /**
+
-     * 创建时间
+    // 创建时间，不能为空
-     */
     @Excel(name = "创建时间")
     @NotBlank(message = "创建时间为必填项")
     private Date insertDate;
-    /**
+
-     * 创建人
+    // 创建人，不能为空，数值范围在-999999999到999999999之间
-     */
     @Excel(name = "创建人")
     @NotBlank(message = "创建人为必填项")
     @Range(max = 999999999, min = -999999999, message = "创建人数值范围[999999999,-999999999]")
     private Integer insertUserId;
-    /**
+
-     * 更新时间
+    // 更新时间
-     */
     @Excel(name = "更新时间")
     private Date updateDate;
-    /**
+
-     * 更新人
+    // 更新人，数值范围在-999999999到999999999之间
-     */
     @Excel(name = "更新人")
     @Range(max = 999999999, min = -999999999, message = "更新人数值范围[999999999,-999999999]")
     private Integer updateUserId;
 
+    // 商品编码
     private String itemCode;
 
+    // 商品名称
     private String itemName;
 
+    // 包装人
     private String packageUserName;
 
-    /**
+    // 将BeforehandPackageRecordModel对象转换为BeforehandPackageRecord对象
-     * Get BeforehandPackageRecord Entity Object
-     *
-     * @return
-     */
     @JsonIgnore
     public BeforehandPackageRecord getEntity() {
         BeforehandPackageRecord beforehandPackageRecord = new BeforehandPackageRecord();

src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordQuery.java

@@ -4,27 +4,20 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-/**
- * @author tanxinzheng
- * @version 1.0.0
- * @date 2017-5-18 23:36:38
- */
 public
 @Data
 class BeforehandPackageRecordQuery implements Serializable {
-    /**
+
-     * 主键
+    // 包记录查询的id
-     */
     private String id;
-    /**
+
-     * 包含主键集
+    // 包记录查询的id数组
-     */
     private String[] ids;
-    /**
+
-     * 排除主键集
+    // 排除的id数组
-     */
     private String[] excludeIds;
 
+    // 插入用户id
     private Integer insertUserId;
 
 }

src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordUpdate.java

@@ -9,29 +9,32 @@ import org.springframework.beans.BeanUtils;
     import java.util.Date;
 import java.io.Serializable;
 
-/**
+
- * @author  tanxinzheng
- * @date    2017-5-18 23:36:38
- * @version 1.0.0
- */
 public @Data class BeforehandPackageRecordUpdate implements Serializable {
 
-    /**  */
+    // 记录ID
     private String id;
-    /** 包装商品 */
+
+    // CD项ID
     private Integer cdItemId;
-    /** 包装商品数 */
+
+    // 包数量
     private Integer packageNum;
-    /** 创建时间 */
+
+    // 插入日期
     private Date insertDate;
-    /** 创建人 */
+
+    // 插入用户ID
     private Integer insertUserId;
-    /** 更新时间 */
+
+    // 更新日期
     private Date updateDate;
-    /** 更新人 */
+
+    // 更新用户ID
     private Integer updateUserId;
 
 
+    // 将BeforehandPackageRecordUpdate对象转换为BeforehandPackageRecord对象
     public BeforehandPackageRecord getEntity(){
         BeforehandPackageRecord beforehandPackageRecord = new BeforehandPackageRecord();
         BeanUtils.copyProperties(this, beforehandPackageRecord);

src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java

@@ -20,57 +20,43 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-/**
+
- * @author  tanxinzheng
- * @date    2017-5-18 23:36:38
- * @version 1.0.0
- */
 @Service
 public class BeforehandPackageRecordServiceImpl implements BeforehandPackageRecordService {
 
     @Autowired
     MybatisDao mybatisDao;
 
-    /**
-     * 新增预包装记录表
-     *
-     * @param beforehandPackageRecordModel 新增预包装记录表对象参数
-     * @return BeforehandPackageRecordModel    预包装记录表领域对象
-     */
     @Override
     @Transactional
     public BeforehandPackageRecordModel createBeforehandPackageRecord(BeforehandPackageRecordModel beforehandPackageRecordModel) {
+        // 调用新增预包装记录表实体对象方法
         BeforehandPackageRecord beforehandPackageRecord = createBeforehandPackageRecord(beforehandPackageRecordModel.getEntity());
+        // 如果新增成功，则返回预包装记录表领域对象
         if(beforehandPackageRecord != null){
             return getOneBeforehandPackageRecordModel(beforehandPackageRecord.getId());
         }
+        // 否则返回null
         return null;
     }
 
-    /**
-     * 新增预包装记录表实体对象
-     *
-     * @param beforehandPackageRecord 新增预包装记录表实体对象参数
-     * @return BeforehandPackageRecord 预包装记录表实体对象
-     */
     @Override
     @Transactional
     public BeforehandPackageRecord createBeforehandPackageRecord(BeforehandPackageRecord beforehandPackageRecord) {
+        // 调用mybatisDao的insertByModel方法，新增预包装记录表实体对象
         return mybatisDao.insertByModel(beforehandPackageRecord);
     }
 
-    /**
-    * 批量新增预包装记录表
-    *
-    * @param beforehandPackageRecordModels 新增预包装记录表对象集合参数
-    * @return List<BeforehandPackageRecordModel>    预包装记录表领域对象集合
-    */
     @Override
     @Transactional
     public List<BeforehandPackageRecordModel> createBeforehandPackageRecords(List<BeforehandPackageRecordModel> beforehandPackageRecordModels) {
+        // 定义预包装记录表领域对象集合
         List<BeforehandPackageRecordModel> beforehandPackageRecordModelList = null;
+        // 遍历预包装记录表对象集合
         for (BeforehandPackageRecordModel beforehandPackageRecordModel : beforehandPackageRecordModels) {
+            // 调用新增预包装记录表方法
             beforehandPackageRecordModel = createBeforehandPackageRecord(beforehandPackageRecordModel);
+            // 如果新增成功，则将预包装记录表领域对象添加到集合中
             if(beforehandPackageRecordModel != null){
                 if(beforehandPackageRecordModelList == null){
                     beforehandPackageRecordModelList = new ArrayList<>();
@@ -78,134 +64,88 @@ public class BeforehandPackageRecordServiceImpl implements BeforehandPackageReco
                 beforehandPackageRecordModelList.add(beforehandPackageRecordModel);
             }
         }
+        // 返回预包装记录表领域对象集合
         return beforehandPackageRecordModelList;
     }
 
-    /**
+
-     * 更新预包装记录表
-     *
-     * @param beforehandPackageRecordModel 更新预包装记录表对象参数
-     */
     @Override
     @Transactional
     public void updateBeforehandPackageRecord(BeforehandPackageRecordModel beforehandPackageRecordModel) {
+        // 调用mybatisDao的update方法，更新预包装记录表
         mybatisDao.update(beforehandPackageRecordModel.getEntity());
     }
 
-    /**
-     * 更新预包装记录表实体对象
-     *
-     * @param beforehandPackageRecord 新增预包装记录表实体对象参数
-     * @return BeforehandPackageRecord 预包装记录表实体对象
-     */
     @Override
     @Transactional
     public void updateBeforehandPackageRecord(BeforehandPackageRecord beforehandPackageRecord) {
+        // 调用mybatisDao的update方法，更新预包装记录表实体对象
         mybatisDao.update(beforehandPackageRecord);
     }
 
-    /**
-     * 删除预包装记录表
-     *
-     * @param ids 主键数组
-     */
     @Override
     @Transactional
     public void deleteBeforehandPackageRecord(String[] ids) {
+        // 创建预包装记录表查询对象
         BeforehandPackageRecordExample beforehandPackageRecordExample = new BeforehandPackageRecordExample();
+        // 设置查询条件
         beforehandPackageRecordExample.createCriteria().andIdIn(Arrays.<String>asList((String[]) ids));
+        // 调用mybatisDao的deleteByExample方法，删除预包装记录表
         mybatisDao.deleteByExample(beforehandPackageRecordExample);
     }
 
-    /**
+
-    * 删除预包装记录表
-    *
-    * @param id 主键
-    */
     @Override
     @Transactional
     public void deleteBeforehandPackageRecord(String id) {
+        // 调用mybatisDao的deleteByPrimaryKey方法，删除预包装记录表
         mybatisDao.deleteByPrimaryKey(BeforehandPackageRecord.class, id);
     }
 
-    /**
-     * 查询预包装记录表领域分页对象（带参数条件）
-     *
-     * @param limit     每页最大数
-     * @param offset    页码
-     * @param beforehandPackageRecordQuery 查询参数
-     * @return Page<BeforehandPackageRecordModel>   预包装记录表参数对象
-     */
     @Override
     public Page<BeforehandPackageRecordModel> getBeforehandPackageRecordModelPage(int limit, int offset, BeforehandPackageRecordQuery beforehandPackageRecordQuery) {
+        // 调用mybatisDao的selectPage方法，查询预包装记录表领域分页对象
         return (Page<BeforehandPackageRecordModel>) mybatisDao.selectPage(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery, limit, offset);
     }
 
-    /**
+
-     * 查询预包装记录表领域分页对象（无参数条件）
-     *
-     * @param limit  每页最大数
-     * @param offset 页码
-     * @return Page<BeforehandPackageRecordModel> 预包装记录表领域对象
-     */
     @Override
     public Page<BeforehandPackageRecordModel> getBeforehandPackageRecordModelPage(int limit, int offset) {
+        // 调用mybatisDao的selectPage方法，查询预包装记录表领域分页对象
         return (Page<BeforehandPackageRecordModel>) mybatisDao.selectPage(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", null, limit, offset);
     }
 
-    /**
-     * 查询预包装记录表领域集合对象（带参数条件）
-     *
-     * @param beforehandPackageRecordQuery 查询参数对象
-     * @return List<BeforehandPackageRecordModel> 预包装记录表领域集合对象
-     */
     @Override
     public List<BeforehandPackageRecordModel> getBeforehandPackageRecordModelList(BeforehandPackageRecordQuery beforehandPackageRecordQuery) {
+        // 调用mybatisDao的getSqlSessionTemplate的selectList方法，查询预包装记录表领域集合对象
         return mybatisDao.getSqlSessionTemplate().selectList(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery);
     }
 
-    /**
-     * 查询预包装记录表领域集合对象（无参数条件）
-     *
-     * @return List<BeforehandPackageRecordModel> 预包装记录表领域集合对象
-     */
     @Override
     public List<BeforehandPackageRecordModel> getBeforehandPackageRecordModelList() {
+        // 调用mybatisDao的getSqlSessionTemplate的selectList方法，查询预包装记录表领域集合对象
         return mybatisDao.getSqlSessionTemplate().selectList(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel");
     }
 
-    /**
-     * 查询预包装记录表实体对象
-     *
-     * @param id 主键
-     * @return BeforehandPackageRecord 预包装记录表实体对象
-     */
     @Override
     public BeforehandPackageRecord getOneBeforehandPackageRecord(String id) {
+        // 调用mybatisDao的selectByPrimaryKey方法，查询预包装记录表实体对象
         return mybatisDao.selectByPrimaryKey(BeforehandPackageRecord.class, id);
     }
 
-    /**
-     * 根据主键查询单个对象
-     *
-     * @param id 主键
-     * @return BeforehandPackageRecordModel 预包装记录表领域对象
-     */
     @Override
     public BeforehandPackageRecordModel getOneBeforehandPackageRecordModel(String id) {
+        // 创建预包装记录表查询对象
         BeforehandPackageRecordQuery beforehandPackageRecordQuery = new BeforehandPackageRecordQuery();
+        // 设置查询条件
         beforehandPackageRecordQuery.setId(id);
+        // 调用mybatisDao的getSqlSessionTemplate的selectOne方法，根据主键查询单个对象
         return mybatisDao.getSqlSessionTemplate().selectOne(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery);
     }
 
-    /**
-     * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错）
-     *
-     * @param beforehandPackageRecordQuery 预包装记录表查询参数对象
-     * @return BeforehandPackageRecordModel 预包装记录表领域对象
-     */
     @Override
     public BeforehandPackageRecordModel getOneBeforehandPackageRecordModel(BeforehandPackageRecordQuery beforehandPackageRecordQuery) throws TooManyResultsException {
+        // 调用mybatisDao的getSqlSessionTemplate的selectOne方法，根据查询参数查询单个对象
         return mybatisDao.getSqlSessionTemplate().selectOne(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery);
     }
 }

src/main/java/com/xmomen/module/common/SysConstant.java

@@ -1,10 +1,7 @@
 package com.xmomen.module.common;
 
-/**
+
- * 系统常量
- * @author Administrator
- *
- */
 public class SysConstant {
 	
+	// 定义一个系统常量类
 }

src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java

@@ -12,42 +12,24 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 import java.util.HashMap;
 import java.util.Map;
 
-/**
+
- * Created by Jeng on 2016/1/21.
- */
 @Order(1)
 @ControllerAdvice
 public class JSONResponseBodyAdvice implements ResponseBodyAdvice {
-    /**
+
-     * Whether this component supports the given controller method return type
-     * and the selected {@code HttpMessageConverter} type.
-     *
-     * @param returnType    the return type
-     * @param converterType the selected converter type
-     * @return {@code true} if {@link #beforeBodyWrite} should be invoked, {@code false} otherwise
-     */
     @Override
     public boolean supports(MethodParameter returnType, Class converterType) {
+        // 判断返回类型是否为Page类型
         return returnType.getMethod().getReturnType().isAssignableFrom(Page.class);
     }
 
-    /**
-     * Invoked after an {@code HttpMessageConverter} is selected and just before
-     * its write method is invoked.
-     *
-     * @param body                  the body to be written
-     * @param returnType            the return type of the controller method
-     * @param selectedContentType   the content type selected through content negotiation
-     * @param selectedConverterType the converter type selected to write to the response
-     * @param request               the current request
-     * @param response              the current response
-     * @return the body that was passed in or a modified, possibly new instance
-     */
     @Override
     public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
+        // 判断返回类型是否为Page类型
         if(body instanceof Page){
             Page page = (Page) body;
             Map map = new HashMap();
+            // 将Page对象中的分页信息和数据放入map中
             map.put("pageInfo", page.getPageInfo());
             map.put("data", page.getResult());
             return map;

src/main/java/com/xmomen/module/core/web/WebCommonUtils.java

@@ -3,13 +3,14 @@ package com.xmomen.module.core.web;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
-/**
+
- * Created by Jeng on 2016/3/1.
- */
 public class WebCommonUtils {
 
+    // 判断请求是否为JSON格式
     public static boolean isJSON(ServletRequest request){
+        // 判断请求头中是否包含"X-Requested-With"字段，且值为"XMLHttpRequest"
         if("XMLHttpRequest".equalsIgnoreCase(((HttpServletRequest) request).getHeader("X-Requested-With"))
+                // 判断请求头中是否包含"Content-Type"字段，且值为"application/json"
                 || "application/json".equalsIgnoreCase(request.getContentType())){
             return true;
         }

src/main/java/com/xmomen/module/core/web/authenticator/MultiLoginAuthenticator.java

@@ -15,6 +15,7 @@ import com.xmomen.module.core.web.token.SysUserToken;
 public class MultiLoginAuthenticator extends ModularRealmAuthenticator {
 
 	
+	// 重写父类的方法，实现多Realm认证
 	@Override
 	protected AuthenticationInfo doAuthenticate(AuthenticationToken authenticationToken)
 			throws AuthenticationException {
@@ -36,6 +37,7 @@ public class MultiLoginAuthenticator extends ModularRealmAuthenticator {
         }
 	}
 
+	// 根据realmName查找对应的Realm
 	protected Realm lookupRealm(String realmName) throws AuthenticationException {
 		Collection<Realm> realms = getRealms();
 		for(Realm realm: realms) {

src/main/java/com/xmomen/module/core/web/controller/AccountController.java

@@ -12,41 +12,44 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
+
- * Created by Jeng on 2016/1/5.
- */
 @RestController
 public class AccountController {
 
+    // 注入UserService
     @Autowired
     UserService userService;
 
-    /**
+    // 获取账户设置
-     * 用户设置
-     * @return
-     */
     @RequestMapping(value = "/account/setting", method = RequestMethod.GET)
     public AccountSettingDto accountSetting(){
+        // 创建AccountSettingDto对象
         AccountSettingDto accountSettingDto = new AccountSettingDto();
+        // 获取当前用户
         Subject subject = SecurityUtils.getSubject();
+        // 如果当前用户为空，则返回null
         if(subject == null){
             return null;
         }
+        // 获取当前用户的用户名
         String username = subject.getPrincipal().toString();
+        // 将用户名设置到AccountSettingDto对象中
         accountSettingDto.setUsername(username);
+        // 获取当前用户的角色
         Set<String> roles = userService.findRoles(username);
+        // 返回AccountSettingDto对象
         return accountSettingDto;
     }
 
-    /**
+    // 重置密码
-     * 用户修改密码
-     * @return
-     */
     @RequestMapping(value = "/account/resetPassword", method = RequestMethod.POST)
     public void resetPassword(@RequestParam(value = "current_password") String currentPassword,
                               @RequestParam(value = "password") String password){
+        // 获取当前用户
         Subject subject = SecurityUtils.getSubject();
+        // 获取当前用户的用户名
         String username = subject.getPrincipal().toString();
+        // 调用UserService的changePassword方法，修改密码
         userService.changePassword(username, currentPassword, password);
     }
 

src/main/java/com/xmomen/module/core/web/controller/CoreController.java

@@ -21,26 +21,29 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.xmomen.module.core.web.controller.dto.RegisterDto;
 
-/**
+
- * Created by Jeng on 2016/1/5.
- */
 @Controller
 public class CoreController {
 
+    // 定义一个日志对象
     private static Logger logger = LoggerFactory.getLogger(CoreController.class);
 
+    // 定义一个请求映射，当访问根路径时，重定向到index.html页面
     @RequestMapping(value = "/")
     public String index(){
         return "redirect:/index.html";
     }
 
+    // 定义一个请求映射，当访问/login路径时，判断用户是否已经认证，如果已经认证，则重定向到根路径，否则返回登录页面
     @RequestMapping(value = "/login")
     public String login(HttpServletRequest request, Model model){
         if(SecurityUtils.getSubject().isAuthenticated()){
             return "redirect:/";
         }
+        // 获取登录失败的异常类名
         String exceptionClassName = (String)request.getAttribute("shiroLoginFailure");
         String error = null;
+        // 根据异常类名判断错误信息
         if(UnknownAccountException.class.getName().equals(exceptionClassName)) {
             error = "用户名/密码错误";
         } else if(IncorrectCredentialsException.class.getName().equals(exceptionClassName)) {
@@ -48,34 +51,44 @@ public class CoreController {
         } else if(exceptionClassName != null) {
             error = "其他错误：" + exceptionClassName;
         }
+        // 将错误信息添加到模型中
         model.addAttribute("error", error);
         return "login";
     }
 
+    // 自动注入UserService对象
     @Autowired
     UserService userService;
 
+    // 定义一个请求映射，当访问/register路径时，判断请求方法是否为POST，如果不是，则返回注册页面，如果是，则进行注册操作
     @RequestMapping(value = "/register")
     public String register(@ModelAttribute @Valid RegisterDto registerDto,
                            BindingResult bindingResult,
                            HttpServletRequest request,
                            Model model) {
+        // 判断请求方法是否为POST
         if (!WebUtils.toHttp(request).getMethod().equalsIgnoreCase("POST")){
             return "register";
         }
+        // 判断表单验证结果是否有错误
         if(!bindingResult.hasErrors()){
+            // 创建一个CreateUser对象，并将表单数据赋值给该对象
             CreateUser user = new CreateUser();
             user.setUsername(registerDto.getUsername());
             user.setPassword(registerDto.getPassword());
+            // 调用UserService的createUser方法进行注册操作
             SysUsers sysUsers = userService.createUser(user);
+            // 判断注册结果是否成功
             if(sysUsers.getId() != null && sysUsers.getId() > 0 ){
                 return "login";
             }else{
+                // 如果注册失败，则记录错误日志，并将错误信息添加到模型中
                 logger.error("注册成功后返回的主键为空（或主键等于或小于0）");
                 model.addAttribute("error", "注册用户失败");
                 return "register";
             }
         }else{
+            // 如果表单验证有错误，则将错误信息添加到模型中
             model.addAttribute("error", bindingResult.getFieldError().getDefaultMessage());
             return "register";
         }

src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java

@@ -4,14 +4,15 @@ import com.xmomen.module.base.constant.AppConstants;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
+
- * Created by tanxinzheng on 17/5/13.
- */
 @RestController
 public class DmsBaseController {
 
+    // 获取当前用户ID
     protected Integer getCurrentUserId(){
+        // 从SecurityUtils中获取当前用户的Session
         Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY);
+        // 返回当前用户ID
         return userId;
     }
 }

src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java

@@ -3,98 +3,126 @@ package com.xmomen.module.core.web.controller.dto;
 import java.io.Serializable;
 import java.util.List;
 
-/**
+
- * Created by Jeng on 16/1/7.
- */
 public class AccountSettingDto implements Serializable {
 
+    // 用户名
     private String username;
 //    private String
+    // 导航项列表
     private List<NavItem> navItems;
+    // 角色列表
     private List<Role> roles;
 
+    // 获取用户名
     public String getUsername() {
         return username;
     }
 
+    // 设置用户名
     public void setUsername(String username) {
         this.username = username;
     }
 
+    // 获取导航项列表
     public List<NavItem> getNavItems() {
         return navItems;
     }
 
+    // 设置导航项列表
     public void setNavItems(List<NavItem> navItems) {
         this.navItems = navItems;
     }
 
+    // 获取角色列表
     public List<Role> getRoles() {
         return roles;
     }
 
+    // 设置角色列表
     public void setRoles(List<Role> roles) {
         this.roles = roles;
     }
 
+    // 导航项类
     public class NavItem {
+        // 导航项的URL
         private String url;
+        // 导航项的名称
         private String name;
+        // 导航项的标题
         private String title;
 
+        // 获取导航项的URL
         public String getUrl() {
             return url;
         }
 
+        // 设置导航项的URL
         public void setUrl(String url) {
             this.url = url;
         }
 
+        // 获取导航项的名称
         public String getName() {
             return name;
         }
 
+        // 设置导航项的名称
         public void setName(String name) {
             this.name = name;
         }
 
+        // 获取导航项的标题
         public String getTitle() {
             return title;
         }
 
+        // 设置导航项的标题
         public void setTitle(String title) {
             this.title = title;
         }
     }
 
+    // 角色类
     public class Role {
+        // 角色名称
         private String role;
+        // 角色描述
         private String description;
+        // 角色是否可用
         private Boolean available;
 
+        // 无参构造函数
         public Role() {
         }
 
+        // 获取角色名称
         public String getRole() {
             return role;
         }
 
+        // 设置角色名称
         public void setRole(String role) {
             this.role = role;
         }
 
+        // 获取角色描述
         public String getDescription() {
             return description;
         }
 
+        // 设置角色描述
         public void setDescription(String description) {
             this.description = description;
         }
 
+        // 获取角色是否可用
         public Boolean isAvailable() {
             return available;
         }
 
+        // 设置角色是否可用
         public void setAvailable(Boolean available) {
             this.available = available;
         }

src/main/java/com/xmomen/module/core/web/controller/dto/RegisterDto.java

@@ -5,38 +5,45 @@ import org.hibernate.validator.constraints.NotBlank;
 
 import java.io.Serializable;
 
-/**
+
- * Created by Jeng on 2016/1/6.
- */
 public class RegisterDto implements Serializable {
 
+    // 用户名
     @NotBlank
     private String username;
+    // 邮箱
     @Email
     private String email;
+    // 密码
     @NotBlank
     private String password;
 
+    // 获取用户名
     public String getUsername() {
         return username;
     }
 
+    // 设置用户名
     public void setUsername(String username) {
         this.username = username;
     }
 
+    // 获取邮箱
     public String getEmail() {
         return email;
     }
 
+    // 设置邮箱
     public void setEmail(String email) {
         this.email = email;
     }
 
+    // 获取密码
     public String getPassword() {
         return password;
     }
 
+    // 设置密码
     public void setPassword(String password) {
         this.password = password;
     }

src/main/java/com/xmomen/module/core/web/exception/DefaultExceptionHandler.java

@@ -8,37 +8,35 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.servlet.ModelAndView;
 
-/**
+
- * <p>User: Zhang Kaitao
- * <p>Date: 14-2-12
- * <p>Version: 1.0
- */
 @ControllerAdvice
 public class DefaultExceptionHandler {
-    /**
+
-     * 没有权限 异常
+    // 处理未授权异常
-     * <p/>
-     * 后续根据不同的需求定制即可
-     */
     @ExceptionHandler({UnauthorizedException.class})
     @ResponseStatus(HttpStatus.UNAUTHORIZED)
     public ModelAndView processUnauthenticatedException(NativeWebRequest request, UnauthorizedException e) {
+        // 创建一个ModelAndView对象
         ModelAndView mv = new ModelAndView();
+        // 将异常对象添加到ModelAndView中
         mv.addObject("exception", e);
+        // 设置视图名为"unauthorized"
         mv.setViewName("unauthorized");
+        // 返回ModelAndView对象
         return mv;
     }
 
-    /**
+
-     * 没有权限 异常
+    // 处理500内部服务器错误
-     * <p/>
-     * 后续根据不同的需求定制即可
-     */
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     public ModelAndView internalServerError500Exception(NativeWebRequest request, UnauthorizedException e) {
+        // 创建一个ModelAndView对象
         ModelAndView mv = new ModelAndView();
+        // 将异常对象添加到ModelAndView中
         mv.addObject("exception", e);
+        // 设置视图名为"unauthorized"
         mv.setViewName("unauthorized");
+        // 返回ModelAndView对象
         return mv;
     }
 

src/main/java/com/xmomen/module/core/web/exception/GlobalMappingExceptionResolver.java

@@ -13,40 +13,51 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-/**
+
- * Created by Jeng on 2016/1/11.
- */
 public class GlobalMappingExceptionResolver extends SimpleMappingExceptionResolver {
 
     @Override
     protected ModelAndView doResolveException(HttpServletRequest request,
                                               HttpServletResponse response, Object handler, Exception ex) {
+        // 判断是否是ajax请求
         if (!WebCommonUtils.isJSON(request)) {// 不是ajax请求
+            // 调用父类的方法处理异常
             return super.doResolveException(request, response, handler, ex);
         }
+        // 创建ModelAndView对象
         ModelAndView mv = new ModelAndView();
         //设置ContentType
         response.setContentType(MediaType.APPLICATION_JSON_VALUE);
         //避免乱码
         response.setCharacterEncoding("UTF-8");
+        // 创建RestError对象
         RestError restError = new RestError(ex, request);
         //设置状态码
         int status = HttpStatus.INTERNAL_SERVER_ERROR.value();
         String message = "";
+        // 判断异常类型
         if(ex instanceof IllegalArgumentException || ex instanceof BusinessException){
+            // 如果是IllegalArgumentException或BusinessException，设置状态码为400
             status = HttpStatus.BAD_REQUEST.value();
+            // 设置错误信息为异常信息
             message = ex.getMessage();
         }else{
+            // 否则，设置错误信息为“系统异常，请联系管理员”
             message = "系统异常，请联系管理员";
         }
+        // 设置响应状态码
         response.setStatus(status);
+        // 设置RestError对象的状态码
         restError.setStatus(status);
+        // 设置RestError对象的错误信息
         restError.setMessage(message);
         try {
+            // 将RestError对象转换为JSON字符串，并写入响应
             response.getWriter().write(JSONObject.toJSONString(restError));
         } catch (IOException e) {
             e.printStackTrace();
         }
+        // 记录异常信息
         logger.error(ex.getMessage(), ex);
         return mv;
     }

src/main/java/com/xmomen/module/core/web/filter/FormAuthenticationFilterExt.java

@@ -28,9 +28,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-/**
+
- * Created by Jeng on 2016/1/7.
- */
 public class FormAuthenticationFilterExt extends FormAuthenticationFilter {
 
     @Autowired
@@ -38,11 +36,13 @@ public class FormAuthenticationFilterExt extends FormAuthenticationFilter {
 
     private static Logger logger = LoggerFactory.getLogger(FormAuthenticationFilterExt.class);
 
+    // 初始化用户上下文
     private void initUserContext(String username, Subject subject){
         SysUsers sysUsers = userService.findByUsername(username);
         subject.getSession().setAttribute("user_id", sysUsers.getId());
     }
 
+    // 构建JSON消息
     private void buildJSONMessage(String message, ServletRequest request, ServletResponse response){
         try {
             Map map = new HashMap<String, Object>();
@@ -64,7 +64,9 @@ public class FormAuthenticationFilterExt extends FormAuthenticationFilter {
 
     @Override
     protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
+        // 判断是否为登录请求
         if (isLoginRequest(request, response)) {
+            // 判断是否为登录提交
             if (isLoginSubmission(request, response)) {
                 if (logger.isTraceEnabled()) {
                     logger.trace("Login submission detected.  Attempting to execute login.");
@@ -74,6 +76,7 @@ public class FormAuthenticationFilterExt extends FormAuthenticationFilter {
                 if (logger.isTraceEnabled()) {
                     logger.trace("Login page view.");
                 }
+                // 判断是否为ajax请求
                 if (!WebCommonUtils.isJSON(request)) {// 不是ajax请求
                     //allow them to see the login page ;)
                     return true;
@@ -87,6 +90,7 @@ public class FormAuthenticationFilterExt extends FormAuthenticationFilter {
                 logger.trace("Attempting to access a path which requires authentication.  Forwarding to the " +
                         "Authentication url [" + getLoginUrl() + "]");
             }
+            // 判断是否为ajax请求
             if (!WebCommonUtils.isJSON(request)) {// 不是ajax请求
                 saveRequestAndRedirectToLogin(request, response);
             } else {
@@ -112,6 +116,7 @@ public class FormAuthenticationFilterExt extends FormAuthenticationFilter {
         HttpServletResponse httpServletResponse = (HttpServletResponse) response;
         String username = (String) subject.getPrincipal();
         initUserContext(username, subject);
+        // 判断是否为ajax请求
         if (!WebCommonUtils.isJSON(request)) {// 不是ajax请求
             issueSuccessRedirect(request, response);
         } else {
@@ -135,6 +140,7 @@ public class FormAuthenticationFilterExt extends FormAuthenticationFilter {
     @Override
     protected boolean onLoginFailure(AuthenticationToken token, AuthenticationException e,
                                      ServletRequest request, ServletResponse response) {
+        // 判断是否为ajax请求
         if (!WebCommonUtils.isJSON(request)) {// 不是ajax请求
             setFailureAttribute(request, e);
             return true;

src/main/java/com/xmomen/module/core/web/filter/PcFormAuthenticationFilter.java

@@ -35,11 +35,13 @@ public class PcFormAuthenticationFilter extends FormAuthenticationFilter {
 
 	private static Logger logger = LoggerFactory.getLogger(PcFormAuthenticationFilter.class);
 
+    // 默认的错误异常键属性名称
     public static final String DEFAULT_ERROR_EXCEPTION_KEY_ATTRIBUTE_NAME = "shiroLoginFailureException";
 
 	@Autowired
 	private MemberService memberService;
 	
+	// 初始化用户上下文
 	private void initUserContext(String phoneNumber, Subject subject){
         CdMember query = new CdMember();
         query.setPhoneNumber(phoneNumber);
@@ -50,6 +52,7 @@ public class PcFormAuthenticationFilter extends FormAuthenticationFilter {
         subject.getSession().setAttribute(AppConstants.SESSION_USER_ID_KEY, member.getId());
     }
 	
+	// 构建JSON消息
 	private void buildJSONMessage(String message, ServletRequest request, ServletResponse response){
         try {
             Map<String, Object> map = new HashMap<String, Object>();
@@ -69,6 +72,7 @@ public class PcFormAuthenticationFilter extends FormAuthenticationFilter {
         }
     }
 
+    // 访问拒绝处理
     @Override
     protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
         if (isLoginRequest(request, response)) {

src/main/java/com/xmomen/module/core/web/mgt/WebSecurityManagerExt.java

@@ -13,9 +13,7 @@ import org.apache.shiro.subject.SubjectContext;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.springframework.beans.factory.annotation.Autowired;
 
-/**
+
- * Created by tanxinzheng on 16/7/3.
- */
 public class WebSecurityManagerExt extends DefaultWebSecurityManager {
 
     @Autowired
@@ -24,31 +22,45 @@ public class WebSecurityManagerExt extends DefaultWebSecurityManager {
     @Autowired
     MemberService memberService;
 
+    //重写doCreateSubject方法，用于创建Subject对象
     protected Subject doCreateSubject(SubjectContext context) {
+    	//创建Subject对象
     	Subject subject = this.getSubjectFactory().createSubject(context);
+        //获取Subject对象中的用户名
         String username = (String) subject.getPrincipal();
+        //如果用户名不为空
         if(username != null){
         	//后端用户数据源
             SysUsers sysUsers = userService.findByUsername(username);
+            //如果后端用户数据源不为空
             if(sysUsers !=null && sysUsers.getId() != null){
+                //将后端用户ID存入Session中
                 subject.getSession().setAttribute(AppConstants.SESSION_USER_ID_KEY, sysUsers.getId());
             } else {
+            	//前端用户数据源
             	CdMember memberQuery = new CdMember();
             	memberQuery.setPhoneNumber(username);
             	//前端用户数据源
             	CdMember member = memberService.findMember(memberQuery);
+            	//如果前端用户数据源不为空
             	if(member != null && member.getId() != null) {
+            		//将前端用户ID存入Session中
             		subject.getSession().setAttribute(AppConstants.SESSION_USER_ID_KEY, member.getId());
             	}
             }
         }
+        //返回Subject对象
         return subject;
     }
 
+    //重写setAuthenticator方法，用于设置Authenticator
     @Override
 	public void setAuthenticator(Authenticator authenticator) throws IllegalArgumentException {
+		//调用父类方法
 		super.setAuthenticator(authenticator);
+		//如果Authenticator是ModularRealmAuthenticator类型
 		if (authenticator instanceof ModularRealmAuthenticator) {
+            //设置Realms
             ((ModularRealmAuthenticator) authenticator).setRealms(getRealms());
         }
 	}

src/main/java/com/xmomen/module/core/web/token/MemberUserToken.java

@@ -4,15 +4,20 @@ import org.apache.shiro.authc.UsernamePasswordToken;
 
 public class MemberUserToken extends UsernamePasswordToken {
 
+	// 定义序列化版本号
 	private static final long serialVersionUID = 1L;
 
+    // 定义领域键
     private final String realmKey = "MemberRealm";
 	
+	// 构造函数，传入用户名、密码、是否记住我、主机
 	public MemberUserToken(final String username, final String password,
             final boolean rememberMe, final String host) {
+		// 调用父类构造函数，传入用户名、密码、是否记住我、主机
 		super(username, password != null ? password.toCharArray() : null, rememberMe, host);
 	}
 	
+	// 获取领域键
 	public String getRealmKey() {
 		return this.realmKey;
 	}

src/main/java/com/xmomen/module/core/web/token/SysUserToken.java

@@ -4,15 +4,20 @@ import org.apache.shiro.authc.UsernamePasswordToken;
 
 public class SysUserToken extends UsernamePasswordToken {
 
+	// 定义序列化版本号
 	private static final long serialVersionUID = 1L;
 
+	// 定义领域键
 	private final String realmKey = "UserRealm";
 	
+	// 构造函数，传入用户名、密码、是否记住我、主机
 	public SysUserToken(final String username, final String password,
             final boolean rememberMe, final String host) {
+		// 调用父类构造函数，传入用户名、密码、是否记住我、主机
 		super(username, password != null ? password.toCharArray() : null, rememberMe, host);
 	}
 	
+	// 获取领域键
 	public String getRealmKey() {
 		return this.realmKey;
 	}

src/main/java/com/xmomen/module/export/controller/ExportController.java

@@ -38,36 +38,28 @@ public class ExportController {
     @Autowired
     PurchaseService purchaseService;
 
-    /**
-     * 导出未采购的采购物料
-     *
-     * @param request
-     * @param response
-     * @throws IOException
-     */
     @RequestMapping(value = "/export/exportPurchaseExcel")
     public String exportPurchaseExcel(HttpServletRequest request,
                                       HttpServletResponse response, ModelMap modelMap) throws IOException {
+        // 创建一个Map对象，用于存放查询参数
         Map param = new HashMap();
+        // 设置查询参数，查询未采购的采购物料
         param.put("purchaseStatus", 0);
+        // 调用purchaseService的getPurchaseList方法，根据查询参数获取未采购的采购物料列表
         List<PurchaseModel> purchaseModels = purchaseService
                 .getPurchaseList(param);
+        // 将文件名放入modelMap中
         modelMap.put(NormalExcelConstants.FILE_NAME, "未采购商品信息");
+        // 将导出参数放入modelMap中
         modelMap.put(NormalExcelConstants.PARAMS, new ExportParams());
+        // 将导出类放入modelMap中
         modelMap.put(NormalExcelConstants.CLASS, PurchaseModel.class);
+        // 将导出数据放入modelMap中
         modelMap.put(NormalExcelConstants.DATA_LIST, purchaseModels);
+        // 返回导出视图
         return NormalExcelConstants.JEECG_EXCEL_VIEW;
     }
 
-    /**
-     * 快递商导出订单信息
-     *
-     * @param request
-     * @param response
-     * @param startTime
-     * @param endTime
-     * @throws IOException
-     */
     @RequestMapping(value = "/export/exportTakeDeliveryExcel")
     public String exportTakeDeliveryExcel(
             HttpServletRequest request,
@@ -76,11 +68,14 @@ public class ExportController {
             @RequestParam(value = "endTime", required = false) String endTime,
             @RequestParam(value = "type") int type, ModelMap modelMap)
             throws IOException {
+        // 创建一个OrderQuery对象，用于存放查询参数
         OrderQuery orderQuery = new OrderQuery();
+        // 如果startTime不为空且不为undefined，则将startTime的前10位作为订单创建时间的开始时间
         if (StringUtilsExt.isNotBlank(startTime)
                 && !"undefined".equals(startTime)) {
             orderQuery.setOrderCreateTimeStart(startTime.substring(0, 10));
         }
+        // 如果endTime不为空且不为undefined，则将endTime的前10位作为订单创建时间的结束时间
         if (StringUtilsExt.isNotBlank(endTime) && !"undefined".equals(endTime)) {
             orderQuery.setOrderCreateTimeEnd(endTime.substring(0, 10));
         }

src/main/java/com/xmomen/module/export/model/UploadFileVo.java

@@ -6,12 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 
-/**
+
- * 上传下载模型类
- * 
- * @author 张代浩
- * 
- */
 public class UploadFileVo {
 	private String byteField = "attachmentcontent";// 二进制文件内容保存到数据库的对应实体类字段
 	private String titleField = "attachmenttitle";// 文件名(标题)保存到数据库的对应实体类字段
@@ -29,173 +24,179 @@ public class UploadFileVo {
 	private HttpServletRequest request;
 	private HttpServletResponse response;
 
-	/**
-	 * @param response
-	 *            the response to set
-	 */
 	public void setResponse(HttpServletResponse response) {
 		this.response = response;
 	}
 
+	// 构造函数，传入HttpServletRequest和Object对象
 	public UploadFileVo(HttpServletRequest request, Object object) {
 			this.multipartRequest = (MultipartHttpServletRequest) request;
 			this.object = object;
 	}
 
+	// 构造函数，传入HttpServletRequest对象
 	public UploadFileVo(HttpServletRequest request) {
 		this.multipartRequest = (MultipartHttpServletRequest) request;
 
 	}
 
+	// 构造函数，传入HttpServletRequest和HttpServletResponse对象
 	public UploadFileVo(HttpServletRequest request, HttpServletResponse response) {
 		this.request = request;
 		this.response = response;
 	}
 
+	// 无参构造函数
 	public UploadFileVo() {
 
 	}
 
+	// 获取swfpath
 	public String getSwfpath() {
 		return swfpath;
 	}
 
+	// 设置swfpath
 	public void setSwfpath(String swfpath) {
 		this.swfpath = swfpath;
 	}
 
-	/**
+	// 获取realPath
-	 * @return the realPath
-	 */
 	public String getRealPath() {
 		return realPath;
 	}
 
-	/**
+	// 设置realPath
-	 * @param realPath
-	 *            the realPath to set
-	 */
 	public void setRealPath(String realPath) {
 		this.realPath = realPath;
 	}
 
-	/**
+	// 获取response
-	 * @return the response
-	 */
 	public HttpServletResponse getResponse() {
 		return response;
 	}
 
-	/**
+	// 获取request
-	 * @return the request
-	 */
 	public HttpServletRequest getRequest() {
 		return request;
 	}
 
-	/**
+	// 设置request
-	 * @param request
-	 *            the request to set
-	 */
 	public void setRequest(HttpServletRequest request) {
 		this.request = request;
 	}
 
-	/**
+	// 获取multipartRequest
-	 * @return the multipartRequest
-	 */
 	public MultipartHttpServletRequest getMultipartRequest() {
 		return multipartRequest;
 	}
 
+	// 获取参数
 	public String get(String name) {
 		return getMultipartRequest().getParameter(name);
 
 	}
 
-	/**
+	// 设置multipartRequest
-	 * @param multipartRequest
-	 *            the multipartRequest to set
-	 */
 	public void setMultipartRequest(MultipartHttpServletRequest multipartRequest) {
 		this.multipartRequest = multipartRequest;
 	}
 
+	// 获取object
 	public Object getObject() {
 		return object;
 	}
 
+	// 获取basePath
 	public String getBasePath() {
 		return basePath;
 	}
 
+	// 设置basePath
 	public void setBasePath(String basePath) {
 		this.basePath = basePath;
 	}
 
+	// 设置object
 	public void setObject(Object object) {
 		this.object = object;
 	}
 
+	// 获取byteField
 	public String getByteField() {
 		return byteField;
 	}
 
+	// 设置byteField
 	public void setByteField(String byteField) {
 		this.byteField = byteField;
 	}
 
+	// 获取titleField
 	public String getTitleField() {
 		return titleField;
 	}
 
+	// 设置titleField
 	public void setTitleField(String titleField) {
 		this.titleField = titleField;
 	}
 
+	// 获取cusPath
 	public String getCusPath() {
 		return cusPath;
 	}
 
+	// 设置cusPath
 	public void setCusPath(String cusPath) {
 		this.cusPath = cusPath;
 	}
 
+	// 获取extend
 	public String getExtend() {
 		return extend;
 	}
 
+	// 设置extend
 	public void setExtend(String extend) {
 		this.extend = extend;
 	}
 
+	// 获取view
 	public boolean isView() {
 		return view;
 	}
 
+	// 设置view
 	public void setView(boolean view) {
 		this.view = view;
 	}
 
+	// 获取content
 	public byte[] getContent() {
 		return content;
 	}
 
+	// 设置content
 	public void setContent(byte[] content) {
 		this.content = content;
 	}
 
+	// 获取fileKey
 	public String getFileKey() {
 		return fileKey;
 	}
 
+	// 设置fileKey
 	public void setFileKey(String fileKey) {
 		this.fileKey = fileKey;
 	}
+	// 获取rename
 	public boolean isRename() {
 		return rename;
 	}
 
+	// 设置rename
 	public void setRename(boolean rename) {
 		this.rename = rename;
 	}

src/main/java/com/xmomen/module/export/service/ExportService.java

@@ -28,28 +28,36 @@ public class ExportService {
 	PurchaseService purchaseService;
 	@Autowired
 	ExpressService expressService;
-	/**
+
-	 * 采购单导出
+	// 导出采购单Excel
-	 * @param templatePath
-	 * @return
-	 */
 	public XSSFWorkbook exportPurchaseExcel(String templatePath){
 		XSSFWorkbook workbook = new XSSFWorkbook();
         ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream();     
 		try {
+			// 读取模板文件
 			workbook = new XSSFWorkbook(new FileInputStream(templatePath));
+			// 获取第一个sheet
 			XSSFSheet sheet = workbook.getSheet("Sheet1");
 			 Map param = new HashMap();
 	         param.put("purchaseStatus", 0);
+			// 获取采购单列表
 			List<PurchaseModel> purchaseModels  = purchaseService.getPurchaseList(param);
+			// 遍历采购单列表
 			for(int i=0,size=purchaseModels.size();i<size;i++){
 				PurchaseModel purchaseModel =purchaseModels.get(i);
+				// 创建新行
 				XSSFRow row = sheet.createRow(i+1);
+				// 创建采购单号单元格
 				XSSFCell purchaseNoCell = row.createCell(0);
+				// 设置采购单号
 				purchaseNoCell.setCellValue(purchaseModel.getPurchaseCode());
+				// 创建商品名称单元格
 				XSSFCell itemNameCell = row.createCell(1);;
+				// 设置商品名称
 				itemNameCell.setCellValue(purchaseModel.getItemName());
+				// 创建商品数量单元格
 				XSSFCell totalItemQtyCell = row.createCell(2);;
+				// 设置商品数量
 				totalItemQtyCell.setCellValue(purchaseModel.getTotalItemQty()+"");
 			}
 		} catch (IOException e) {
@@ -65,36 +73,51 @@ public class ExportService {
 	
 		return workbook;
 	}
-	/**
+
-	 * 快速商导出订单
+	// 导出取货单Excel
-	 * @param templatePath
-	 * @param query
-	 * @return
-	 */
 	public XSSFWorkbook exportTakeDeliveryExcel(String templatePath,OrderQuery query){
 		XSSFWorkbook workbook = new XSSFWorkbook();
         ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream();     
 		try {
+			// 读取模板文件
 			workbook = new XSSFWorkbook(new FileInputStream(templatePath));
+			// 获取第一个sheet
 			XSSFSheet sheet = workbook.getSheet("Sheet1");
+			// 获取订单列表
 			List<OrderModel> takeDeliverys  =  expressService.getTakeDeliveryList(query);
+			// 遍历订单列表
 			for(int i=0,size=takeDeliverys.size();i<size;i++){
 				OrderModel orderModel =takeDeliverys.get(i);
+				// 创建新行
 				XSSFRow row = sheet.createRow(i+1);
+				// 创建订单号单元格
 				XSSFCell orderNoCell = row.createCell(0);
+				// 设置订单号
 				orderNoCell.setCellValue(orderModel.getOrderNo());
+				// 创建快递名称单元格
 				XSSFCell expressNameCell = row.createCell(1);
+				// 设置快递名称
 				expressNameCell.setCellValue(orderModel.getExpressName());
+				// 创建收货人姓名单元格
 				XSSFCell consigneeNameCell = row.createCell(2);
+				// 设置收货人姓名
 				consigneeNameCell.setCellValue(orderModel.getConsigneeName());
+				// 创建收货人电话单元格
 				XSSFCell consigneePhoneCell = row.createCell(3);
+				// 设置收货人电话
 				consigneePhoneCell.setCellValue(orderModel.getConsigneePhone());
+				// 创建收货人地址单元格
 				XSSFCell consigneeAddressCell = row.createCell(4);
+				// 设置收货人地址
 				consigneeAddressCell.setCellValue(orderModel.getConsigneeAddress());
+				// 创建预约时间单元格
 				XSSFCell appointmentTimeCell = row.createCell(5);
+				// 设置预约时间
 				SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd");
 				appointmentTimeCell.setCellValue(sFormat.format(orderModel.getAppointmentTime()));
+				// 创建备注单元格
 				XSSFCell remarkCell = row.createCell(6);
+				// 设置备注
 				remarkCell.setCellValue(orderModel.getRemark());
 			}
 		} catch (IOException e) {

src/main/java/com/xmomen/module/export/util/PrintUtils.java

@@ -20,60 +20,92 @@ import com.xmomen.module.export.model.UploadFileVo;
 
 
 public class PrintUtils {
-	
+
+	// 导出Excel文件
 	public static void excelResponseOutput(HttpServletResponse response, HSSFWorkbook workbook, String outPutFileName) {
 		try{
+			// 重置response
 			response.reset();
-			response.addHeader("Content-Disposition", "attachment;filename=" + outPutFileName);    
+			// 设置文件下载头
+			response.addHeader("Content-Disposition", "attachment;filename=" + outPutFileName);
+			// 设置文件类型
 			response.setContentType("application/msexcel-print-Surface;charset=UTF-8");
+			// 获取输出流
 			OutputStream out = response.getOutputStream();
+			// 写入文件
 			workbook.write(out);
+			// 刷新输出流
 			out.flush();
+			// 释放资源
 			workbook = null;
 			out.close();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
-	
+
+	// 导出Excel文件
 	public static void excelResponseOutput(HttpServletResponse response, XSSFWorkbook workbook, String outPutFileName) {
 		try{
+			// 重置response
 			response.reset();
-			response.addHeader("Content-Disposition", "attachment;filename=" + outPutFileName);    
+			// 设置文件下载头
+			response.addHeader("Content-Disposition", "attachment;filename=" + outPutFileName);
+			// 设置文件类型
 			response.setContentType("application/msexcel-print-Surface;charset=UTF-8");
+			// 获取输出流
 			OutputStream out = response.getOutputStream();
+			// 写入文件
 			workbook.write(out);
+			// 刷新输出流
 			out.flush();
+			// 释放资源
 			workbook = null;
 			out.close();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
-	
+
+	// 导出标签文件
 	public static void labelResponseOutput(HttpServletResponse response, HSSFWorkbook workbook, String outPutFileName) {
 		try{
+			// 重置response
 			response.reset();
-			response.addHeader("Content-Disposition", "attachment;filename=" + outPutFileName);    
+			// 设置文件下载头
+			response.addHeader("Content-Disposition", "attachment;filename=" + outPutFileName);
+			// 设置文件类型
 			response.setContentType("application/msexcel-print-Consignment;charset=UTF-8");
+			// 获取输出流
 			OutputStream out = response.getOutputStream();
+			// 写入文件
 			workbook.write(out);
+			// 刷新输出流
 			out.flush();
+			// 释放资源
 			workbook = null;
 			out.close();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
-	
+
+	// 导出标签文件
 	public static void labelResponseOutput(HttpServletResponse response, XSSFWorkbook workbook, String outPutFileName) {
 		try{
+			// 重置response
 			response.reset();
-			response.addHeader("Content-Disposition", "attachment;filename=" + outPutFileName);    
+			// 设置文件下载头
+			response.addHeader("Content-Disposition", "attachment;filename=" + outPutFileName);
+			// 设置文件类型
 			response.setContentType("application/msexcel-print-Consignment;charset=UTF-8");
+			// 获取输出流
 			OutputStream out = response.getOutputStream();
+			// 写入文件
 			workbook.write(out);
+			// 刷新输出流
 			out.flush();
+			// 释放资源
 			workbook = null;
 			out.close();
 		} catch (Exception e) {
@@ -82,39 +114,50 @@ public class PrintUtils {
 	}
 	
 	
-	/**
+
-	 * 文件下载
-	 * 
-	 * @param request
-	 * @throws Exception
-	 * @throws Exception
-	 */
 	@SuppressWarnings("unchecked")
 	public static HttpServletResponse viewOrDownloadFile(UploadFileVo uploadFile) {
+		// 设置response的编码
 		uploadFile.getResponse().setContentType("UTF-8");
 		uploadFile.getResponse().setCharacterEncoding("UTF-8");
+		// 获取输入流
 		InputStream bis = null;
+		// 获取输出流
 		BufferedOutputStream bos = null;
+		// 获取response
 		HttpServletResponse response = uploadFile.getResponse();
+		// 获取request
 		HttpServletRequest request = uploadFile.getRequest();
+		// 获取项目根路径
 		String ctxPath = request.getSession().getServletContext().getRealPath("/");
+		// 下载路径
 		String downLoadPath = "";
+		// 文件长度
 		long fileLength = 0;
+		// 如果有真实路径
 		if (uploadFile.getRealPath() != null&&uploadFile.getContent() == null) {
+			// 设置下载路径
 			downLoadPath = ctxPath + uploadFile.getRealPath();
+			// 获取文件长度
 			fileLength = new File(downLoadPath).length();
 			try {
+				// 获取输入流
 				bis = new BufferedInputStream(new FileInputStream(downLoadPath));
 			} catch (FileNotFoundException e) {
 				e.printStackTrace();
 			}
 		} else {
+			// 如果有文件内容
 			if (uploadFile.getContent() != null)
+				// 获取输入流
 				bis = new ByteArrayInputStream(uploadFile.getContent());
+			// 获取文件长度
 			fileLength = uploadFile.getContent().length;
 		}
 		try {
+			// 如果不是预览，并且有扩展名
 			if (!uploadFile.isView() && uploadFile.getExtend() != null) {
+				// 根据扩展名设置文件类型
 				if (uploadFile.getExtend().equals("text")) {
 					response.setContentType("text/plain;");
 				} else if (uploadFile.getExtend().equals("doc")) {
@@ -128,22 +171,31 @@ public class PrintUtils {
 				} else {
 					response.setContentType("application/x-msdownload;");
 				}
+				// 设置文件下载头
 				response.setHeader("Content-disposition", "attachment; filename=" + new String((uploadFile.getTitleField() + "." + uploadFile.getExtend()).getBytes("GBK"), "ISO8859-1"));
+				// 设置文件长度
 				response.setHeader("Content-Length", String.valueOf(fileLength));
 			}
+			// 获取输出流
 			bos = new BufferedOutputStream(response.getOutputStream());
+			// 定义缓冲区
 			byte[] buff = new byte[2048];
+			// 定义读取的字节数
 			int bytesRead;
+			// 循环读取文件内容
 			while (-1 != (bytesRead = bis.read(buff, 0, buff.length))) {
+				// 写入输出流
 				bos.write(buff, 0, bytesRead);
 			}
 		} catch (IOException e) {
 			e.printStackTrace();
 		} finally {
 			try {
+				// 关闭输入流
 				if (bis != null) {
 					bis.close();
 				}
+				// 关闭输出流
 				if (bos != null) {
 					bos.close();
 				}

src/main/java/com/xmomen/module/job/controller/JobOperationLogController.java

@@ -26,8 +26,7 @@ import com.xmomen.module.job.model.JobOperationLogModel;
 import com.xmomen.module.job.service.JobOperationLogService;
 import com.xmomen.module.logger.Log;
 
-/**
+
- */
 @RestController
 public class JobOperationLogController {
 	
@@ -37,13 +36,8 @@ public class JobOperationLogController {
     @Autowired
     MybatisDao mybatisDao;
 
-    /**
+
-     * 查看包装操作记录
+    // 根据参数查询包装操作记录
-     * @param limit
-     * @param offset
-     * @param keyword
-     * @return
-     */
     @RequestMapping(value = "/jobOperationLog", method = RequestMethod.GET)
     @Log(actionName = "查看包装操作记录")
     public Page<JobOperationLogModel> getUserList(@RequestParam(value = "limit") Integer limit,
@@ -58,10 +52,7 @@ public class JobOperationLogController {
         return  (Page<JobOperationLogModel>) mybatisDao.selectPage(JobOperationLogMapper.JobOperationLogMapperNameSpace + "getJobOperationLogList", param, limit, offset);
     }
 
-    /**
+    // 根据id删除包装操作记录
-     *  删除包装操作记录
-     * @param id
-     */
     @RequestMapping(value = "/jobOperationLog/{id}", method = RequestMethod.DELETE)
     @Log(actionName = "包装操作记录")
     public void deletePlan(@PathVariable(value = "id") Integer id){

src/main/java/com/xmomen/module/job/controller/PackageTaskController.java

@@ -27,8 +27,7 @@ import com.xmomen.module.job.model.PackageTaskModel;
 import com.xmomen.module.job.service.PackageTaskService;
 import com.xmomen.module.logger.Log;
 
-/**
+
- */
 @RestController
 public class PackageTaskController {
 	
@@ -38,13 +37,7 @@ public class PackageTaskController {
     @Autowired
     MybatisDao mybatisDao;
 
-    /**
+
-     * 包装任务
-     * @param limit
-     * @param offset
-     * @param keyword
-     * @return
-     */
     @RequestMapping(value = "/packageTask", method = RequestMethod.GET)
     @Log(actionName = "查询包装任务")
     public Page<PackageTaskModel> getUserList(@RequestParam(value = "limit") Integer limit,
@@ -79,13 +72,9 @@ public class PackageTaskController {
         return  packageTasks;
     }
 
-    /**
+
-     * 新增包装任务
-     * @param createPurchase
-     * @param bindingResult
-     * @return
-     */
     @RequestMapping(value = "/packageTask", method = RequestMethod.POST)
+    // 新增包装任务
     @Log(actionName = "新增包装任务")
     public void packageTask(@RequestBody @Valid CreatePackageTask createPackageTask, BindingResult bindingResult) throws ArgumentValidException {
         if(bindingResult != null && bindingResult.hasErrors()){

src/main/java/com/xmomen/module/job/entity/TbJob.java

@@ -12,69 +12,44 @@ import javax.persistence.Version;
 @Entity
 @Table(name = "tb_job")
 public class TbJob extends BaseMybatisModel {
-    /**
+
-     * 
+    // 任务ID
-     */
     private Integer id;
 
-    /**
+    // 采购单号
-     * 采购编号
-     */
     private String purchaseCode;
 
-    /**
+    // 采购ID
-     * 采购明细ID
-     */
     private Integer purchaseId;
 
-    /**
+    // 任务类型
-     * 1-包装任务，2-装箱任务
-     */
     private Integer jobType;
 
-    /**
+    // 任务状态
-     * 0-未开始，1-包装中，2-包装完成
-     */
     private Integer jobStatus;
 
-    /**
+    // 任务用户
-     * 
-     */
     private Integer jobUser;
 
-    /**
+    // 任务创建时间
-     * 任务创建时间
-     */
     private Date jobCreateTime;
 
-    /**
+    // CD项ID
-     * 包装的产品
-     */
     private Integer cdItemId;
 
-    /**
+    // 计数值
-     * 需要包装的份数
-     */
     private Integer countValue;
 
-    /**
+    // 任务开始时间
-     * 任务开始时间
-     */
     private Date jobBeginTime;
 
-    /**
+    // 完成值
-     * 包装完成的份数
-     */
     private Integer finishValue;
 
-    /**
+    // 完成时间
-     * 
-     */
     private Date finishTime;
 
-    /**
+    // 任务创建用户
-     * 任务创建人
-     */
     private Integer jobCreateUser;
 
     @Column(name = "id")

src/main/java/com/xmomen/module/job/entity/TbJobExample.java

@@ -6,46 +6,57 @@ import java.util.Date;
 import java.util.List;
 
 public class TbJobExample extends BaseMybatisExample {
+    // 排序字段
     protected String orderByClause;
 
+    // 是否去重
     protected boolean distinct;
 
+    // 查询条件
     protected List<Criteria> oredCriteria;
 
     public TbJobExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
+    // 设置排序字段
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
 
+    // 获取排序字段
     public String getOrderByClause() {
         return orderByClause;
     }
 
+    // 设置是否去重
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
     }
 
+    // 获取是否去重
     public boolean isDistinct() {
         return distinct;
     }
 
+    // 获取查询条件
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
     }
 
+    // 添加查询条件
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
     }
 
+    // 创建查询条件
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
         oredCriteria.add(criteria);
         return criteria;
     }
 
+    // 创建查询条件
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
         if (oredCriteria.size() == 0) {
@@ -54,18 +65,22 @@ public class TbJobExample extends BaseMybatisExample {
         return criteria;
     }
 
+    // 创建查询条件
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
         return criteria;
     }
 
+    // 清空查询条件
     public void clear() {
         oredCriteria.clear();
         orderByClause = null;
         distinct = false;
     }
 
+    // 生成查询条件
     protected abstract static class GeneratedCriteria {
+        // 查询条件
         protected List<Criterion> criteria;
 
         protected GeneratedCriteria() {
@@ -73,18 +88,22 @@ public class TbJobExample extends BaseMybatisExample {
             criteria = new ArrayList<Criterion>();
         }
 
+        // 判断查询条件是否有效
         public boolean isValid() {
             return criteria.size() > 0;
         }
 
+        // 获取所有查询条件
         public List<Criterion> getAllCriteria() {
             return criteria;
         }
 
+        // 获取查询条件
         public List<Criterion> getCriteria() {
             return criteria;
         }
 
+        // 添加查询条件
         protected void addCriterion(String condition) {
             if (condition == null) {
                 throw new RuntimeException("Value for condition cannot be null");
@@ -92,6 +111,7 @@ public class TbJobExample extends BaseMybatisExample {
             criteria.add(new Criterion(condition));
         }
 
+        // 添加查询条件
         protected void addCriterion(String condition, Object value, String property) {
             if (value == null) {
                 throw new RuntimeException("Value for " + property + " cannot be null");
@@ -99,6 +119,7 @@ public class TbJobExample extends BaseMybatisExample {
             criteria.add(new Criterion(condition, value));
         }
 
+        // 添加查询条件
         protected void addCriterion(String condition, Object value1, Object value2, String property) {
             if (value1 == null || value2 == null) {
                 throw new RuntimeException("Between values for " + property + " cannot be null");
@@ -106,381 +127,457 @@ public class TbJobExample extends BaseMybatisExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
+        // 判断id是否为空
         public Criteria andIdIsNull() {
             addCriterion("id is null");
             return (Criteria) this;
         }
 
+        // 判断id是否不为空
         public Criteria andIdIsNotNull() {
             addCriterion("id is not null");
             return (Criteria) this;
         }
 
+        // 判断id是否等于某个值
         public Criteria andIdEqualTo(Integer value) {
             addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否不等于某个值
         public Criteria andIdNotEqualTo(Integer value) {
             addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否大于某个值
         public Criteria andIdGreaterThan(Integer value) {
             addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否大于等于某个值
         public Criteria andIdGreaterThanOrEqualTo(Integer value) {
             addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否小于某个值
         public Criteria andIdLessThan(Integer value) {
             addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否小于等于某个值
         public Criteria andIdLessThanOrEqualTo(Integer value) {
             addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否在某个范围内
         public Criteria andIdIn(List<Integer> values) {
             addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否不在某个范围内
         public Criteria andIdNotIn(List<Integer> values) {
             addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否在某个范围内
         public Criteria andIdBetween(Integer value1, Integer value2) {
             addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
+        // 判断id是否不在某个范围内
         public Criteria andIdNotBetween(Integer value1, Integer value2) {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否为空
         public Criteria andPurchaseCodeIsNull() {
             addCriterion("PURCHASE_CODE is null");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否不为空
         public Criteria andPurchaseCodeIsNotNull() {
             addCriterion("PURCHASE_CODE is not null");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否等于某个值
         public Criteria andPurchaseCodeEqualTo(String value) {
             addCriterion("PURCHASE_CODE =", value, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否不等于某个值
         public Criteria andPurchaseCodeNotEqualTo(String value) {
             addCriterion("PURCHASE_CODE <>", value, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否大于某个值
         public Criteria andPurchaseCodeGreaterThan(String value) {
             addCriterion("PURCHASE_CODE >", value, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否大于等于某个值
         public Criteria andPurchaseCodeGreaterThanOrEqualTo(String value) {
             addCriterion("PURCHASE_CODE >=", value, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否小于某个值
         public Criteria andPurchaseCodeLessThan(String value) {
             addCriterion("PURCHASE_CODE <", value, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否小于等于某个值
         public Criteria andPurchaseCodeLessThanOrEqualTo(String value) {
             addCriterion("PURCHASE_CODE <=", value, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否包含某个值
         public Criteria andPurchaseCodeLike(String value) {
             addCriterion("PURCHASE_CODE like", value, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否不包含某个值
         public Criteria andPurchaseCodeNotLike(String value) {
             addCriterion("PURCHASE_CODE not like", value, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否在某个范围内
         public Criteria andPurchaseCodeIn(List<String> values) {
             addCriterion("PURCHASE_CODE in", values, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否不在某个范围内
         public Criteria andPurchaseCodeNotIn(List<String> values) {
             addCriterion("PURCHASE_CODE not in", values, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否在某个范围内
         public Criteria andPurchaseCodeBetween(String value1, String value2) {
             addCriterion("PURCHASE_CODE between", value1, value2, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_CODE是否不在某个范围内
         public Criteria andPurchaseCodeNotBetween(String value1, String value2) {
             addCriterion("PURCHASE_CODE not between", value1, value2, "purchaseCode");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否为空
         public Criteria andPurchaseIdIsNull() {
             addCriterion("PURCHASE_ID is null");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否不为空
         public Criteria andPurchaseIdIsNotNull() {
             addCriterion("PURCHASE_ID is not null");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否等于某个值
         public Criteria andPurchaseIdEqualTo(Integer value) {
             addCriterion("PURCHASE_ID =", value, "purchaseId");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否不等于某个值
         public Criteria andPurchaseIdNotEqualTo(Integer value) {
             addCriterion("PURCHASE_ID <>", value, "purchaseId");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否大于某个值
         public Criteria andPurchaseIdGreaterThan(Integer value) {
             addCriterion("PURCHASE_ID >", value, "purchaseId");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否大于等于某个值
         public Criteria andPurchaseIdGreaterThanOrEqualTo(Integer value) {
             addCriterion("PURCHASE_ID >=", value, "purchaseId");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否小于某个值
         public Criteria andPurchaseIdLessThan(Integer value) {
             addCriterion("PURCHASE_ID <", value, "purchaseId");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否小于等于某个值
         public Criteria andPurchaseIdLessThanOrEqualTo(Integer value) {
             addCriterion("PURCHASE_ID <=", value, "purchaseId");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否在某个范围内
         public Criteria andPurchaseIdIn(List<Integer> values) {
             addCriterion("PURCHASE_ID in", values, "purchaseId");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否不在某个范围内
         public Criteria andPurchaseIdNotIn(List<Integer> values) {
             addCriterion("PURCHASE_ID not in", values, "purchaseId");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否在某个范围内
         public Criteria andPurchaseIdBetween(Integer value1, Integer value2) {
             addCriterion("PURCHASE_ID between", value1, value2, "purchaseId");
             return (Criteria) this;
         }
 
+        // 判断PURCHASE_ID是否不在某个范围内
         public Criteria andPurchaseIdNotBetween(Integer value1, Integer value2) {
             addCriterion("PURCHASE_ID not between", value1, value2, "purchaseId");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否为空
         public Criteria andJobTypeIsNull() {
             addCriterion("JOB_TYPE is null");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否不为空
         public Criteria andJobTypeIsNotNull() {
             addCriterion("JOB_TYPE is not null");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否等于某个值
         public Criteria andJobTypeEqualTo(Integer value) {
             addCriterion("JOB_TYPE =", value, "jobType");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否不等于某个值
         public Criteria andJobTypeNotEqualTo(Integer value) {
             addCriterion("JOB_TYPE <>", value, "jobType");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否大于某个值
         public Criteria andJobTypeGreaterThan(Integer value) {
             addCriterion("JOB_TYPE >", value, "jobType");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否大于等于某个值
         public Criteria andJobTypeGreaterThanOrEqualTo(Integer value) {
             addCriterion("JOB_TYPE >=", value, "jobType");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否小于某个值
         public Criteria andJobTypeLessThan(Integer value) {
             addCriterion("JOB_TYPE <", value, "jobType");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否小于等于某个值
         public Criteria andJobTypeLessThanOrEqualTo(Integer value) {
             addCriterion("JOB_TYPE <=", value, "jobType");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否在某个范围内
         public Criteria andJobTypeIn(List<Integer> values) {
             addCriterion("JOB_TYPE in", values, "jobType");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否不在某个范围内
         public Criteria andJobTypeNotIn(List<Integer> values) {
             addCriterion("JOB_TYPE not in", values, "jobType");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否在某个范围内
         public Criteria andJobTypeBetween(Integer value1, Integer value2) {
             addCriterion("JOB_TYPE between", value1, value2, "jobType");
             return (Criteria) this;
         }
 
+        // 判断JOB_TYPE是否不在某个范围内
         public Criteria andJobTypeNotBetween(Integer value1, Integer value2) {
             addCriterion("JOB_TYPE not between", value1, value2, "jobType");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否为空
         public Criteria andJobStatusIsNull() {
             addCriterion("JOB_STATUS is null");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否不为空
         public Criteria andJobStatusIsNotNull() {
             addCriterion("JOB_STATUS is not null");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否等于某个值
         public Criteria andJobStatusEqualTo(Integer value) {
             addCriterion("JOB_STATUS =", value, "jobStatus");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否不等于某个值
         public Criteria andJobStatusNotEqualTo(Integer value) {
             addCriterion("JOB_STATUS <>", value, "jobStatus");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否大于某个值
         public Criteria andJobStatusGreaterThan(Integer value) {
             addCriterion("JOB_STATUS >", value, "jobStatus");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否大于等于某个值
         public Criteria andJobStatusGreaterThanOrEqualTo(Integer value) {
             addCriterion("JOB_STATUS >=", value, "jobStatus");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否小于某个值
         public Criteria andJobStatusLessThan(Integer value) {
             addCriterion("JOB_STATUS <", value, "jobStatus");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否小于等于某个值
         public Criteria andJobStatusLessThanOrEqualTo(Integer value) {
             addCriterion("JOB_STATUS <=", value, "jobStatus");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否在某个范围内
         public Criteria andJobStatusIn(List<Integer> values) {
             addCriterion("JOB_STATUS in", values, "jobStatus");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否不在某个范围内
         public Criteria andJobStatusNotIn(List<Integer> values) {
             addCriterion("JOB_STATUS not in", values, "jobStatus");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否在某个范围内
         public Criteria andJobStatusBetween(Integer value1, Integer value2) {
             addCriterion("JOB_STATUS between", value1, value2, "jobStatus");
             return (Criteria) this;
         }
 
+        // 判断JOB_STATUS是否不在某个范围内
         public Criteria andJobStatusNotBetween(Integer value1, Integer value2) {
             addCriterion("JOB_STATUS not between", value1, value2, "jobStatus");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否为空
         public Criteria andJobUserIsNull() {
             addCriterion("JOB_USER is null");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否不为空
         public Criteria andJobUserIsNotNull() {
             addCriterion("JOB_USER is not null");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否等于某个值
         public Criteria andJobUserEqualTo(Integer value) {
             addCriterion("JOB_USER =", value, "jobUser");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否不等于某个值
         public Criteria andJobUserNotEqualTo(Integer value) {
             addCriterion("JOB_USER <>", value, "jobUser");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否大于某个值
         public Criteria andJobUserGreaterThan(Integer value) {
             addCriterion("JOB_USER >", value, "jobUser");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否大于等于某个值
         public Criteria andJobUserGreaterThanOrEqualTo(Integer value) {
             addCriterion("JOB_USER >=", value, "jobUser");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否小于某个值
         public Criteria andJobUserLessThan(Integer value) {
             addCriterion("JOB_USER <", value, "jobUser");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否小于等于某个值
         public Criteria andJobUserLessThanOrEqualTo(Integer value) {
             addCriterion("JOB_USER <=", value, "jobUser");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否在某个范围内
         public Criteria andJobUserIn(List<Integer> values) {
             addCriterion("JOB_USER in", values, "jobUser");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否不在某个范围内
         public Criteria andJobUserNotIn(List<Integer> values) {
             addCriterion("JOB_USER not in", values, "jobUser");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否在某个范围内
         public Criteria andJobUserBetween(Integer value1, Integer value2) {
             addCriterion("JOB_USER between", value1, value2, "jobUser");
             return (Criteria) this;
         }
 
+        // 判断JOB_USER是否不在某个范围内
         public Criteria andJobUserNotBetween(Integer value1, Integer value2) {
             addCriterion("JOB_USER not between", value1, value2, "jobUser");
             return (Criteria) this;
         }
 
+        // 判断JOB_CREATE_TIME是否为空
         public Criteria andJobCreateTimeIsNull() {
             addCriterion("JOB_CREATE_TIME is null");
             return (Criteria) this;
         }
 
+        // 判断JOB_CREATE_TIME是否不为空
         public Criteria andJobCreateTimeIsNotNull() {
             addCriterion("JOB_CREATE_TIME is not null");
             return (Criteria) this;

src/main/java/com/xmomen/module/job/entity/TbJobOperationLog.java

@@ -12,34 +12,23 @@ import javax.persistence.Version;
 @Entity
 @Table(name = "tb_job_operation_log")
 public class TbJobOperationLog extends BaseMybatisModel {
-    /**
+
-     * 主键
+    // 主键id
-     */
     private Integer id;
 
-    /**
+    // 任务id
-     * 工作ID
-     */
     private Integer jobId;
 
-    /**
+    // 任务用户
-     * 操作人
-     */
     private Integer jobUser;
 
-    /**
+    // 任务时间
-     * 操作时间
-     */
     private Date jobTime;
 
-    /**
+    // 条形码
-     * 操作的条码
-     */
     private String barCode;
 
-    /**
+    // 商品编码
-     * 操作的商品条码
-     */
     private String itemCode;
 
     @Column(name = "id")