realmNames = principals.getRealmNames();
for(String realmName: realmNames) {
- if(realmName.contains("UserRealm")) {
- roles.add("user");
- }
+ if(realmName.contains("UserRealm")) {
+ 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) {
- if(token instanceof SysUserToken) {
- return super.supports(token);
- }
- return false;
- }
-
- // 获取用户的认证信息
- @Override
+ public boolean supports(AuthenticationToken token) {
+ if(token instanceof SysUserToken) {
+ return super.supports(token);
+ }
+ return false;
+ }
+
+ // 获取用户的认证信息
+ @Override
protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
// 获取用户名
diff --git a/src/main/java/com/xmomen/module/account/service/PasswordHelper.java b/src/main/java/com/xmomen/module/account/service/PasswordHelper.java
index 259f5cc..4e6b0fd 100644
--- a/src/main/java/com/xmomen/module/account/service/PasswordHelper.java
+++ b/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;
-/**
- * User: Zhang Kaitao
- *
Date: 14-1-28
- *
Version: 1.0
- */
public class PasswordHelper {
// 随机数生成器
diff --git a/src/main/java/com/xmomen/module/account/service/PermissionServiceImpl.java b/src/main/java/com/xmomen/module/account/service/PermissionServiceImpl.java
index 575760c..b7f780a 100644
--- a/src/main/java/com/xmomen/module/account/service/PermissionServiceImpl.java
+++ b/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;
-/**
- *
User: Zhang Kaitao
- *
Date: 14-1-28
- *
Version: 1.0
- */
@Service
public class PermissionServiceImpl implements PermissionService {
- @Autowired
- private MybatisDao mybatisDao;
+ @Autowired
+ 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删除权限信息
- mybatisDao.deleteByPrimaryKey(SysPermissions.class, permissionId);
+ // 根据权限ID删除权限信息
+ mybatisDao.deleteByPrimaryKey(SysPermissions.class, permissionId);
}
}
diff --git a/src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java b/src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java
index 5662241..09d1db6 100644
--- a/src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java
+++ b/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;
-/**
- *
User: Zhang Kaitao
- *
Date: 14-1-28
- *
Version: 1.0
- */
+
@Service
public class RoleServiceImpl implements RoleService {
diff --git a/src/main/java/com/xmomen/module/account/service/UserServiceImpl.java b/src/main/java/com/xmomen/module/account/service/UserServiceImpl.java
index 2d3cdfc..5564b75 100644
--- a/src/main/java/com/xmomen/module/account/service/UserServiceImpl.java
+++ b/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;
-/**
- *
User: Zhang Kaitao
- *
Date: 14-1-28
- *
Version: 1.0
- */
+
@Service
public class UserServiceImpl implements UserService {
diff --git a/src/main/java/com/xmomen/module/base/entity/CdCouponRefExample.java b/src/main/java/com/xmomen/module/base/entity/CdCouponRefExample.java
index 43c9837..b66db67 100644
--- a/src/main/java/com/xmomen/module/base/entity/CdCouponRefExample.java
+++ b/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 oredCriteria;
+ // 构造函数，初始化oredCriteria变量
public CdCouponRefExample() {
oredCriteria = new ArrayList();
}
+ // 设置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 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 criteria;
+ // 构造函数，初始化criteria变量
protected GeneratedCriteria() {
super();
criteria = new ArrayList();
}
+ // 判断是否有查询条件
public boolean isValid() {
return criteria.size() > 0;
}
+ // 获取所有的查询条件
public List getAllCriteria() {
return criteria;
}
+ // 获取查询条件
public List 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 values) {
addCriterion("ID in", values, "id");
return (Criteria) this;
}
+ // 判断ID是否不在某个范围内
public Criteria andIdNotIn(List 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 values) {
addCriterion("CD_COUPON_ID in", values, "cdCouponId");
return (Criteria) this;
}
+ // 判断CD_COUPON_ID是否不在某个范围内
public Criteria andCdCouponIdNotIn(List 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 values) {
addCriterion("COUPON_NUMBER in", values, "couponNumber");
return (Criteria) this;
}
+ // 判断COUPON_NUMBER是否不在某个范围内
public Criteria andCouponNumberNotIn(List 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 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 values) {
addCriterion("REF_NAME in", values, "refName");
return (Criteria) this;
+ // 判断REF_NAME是否在某个范围内
}
public Criteria andRefNameNotIn(List 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) {
diff --git a/src/main/java/com/xmomen/module/base/entity/CdExpress.java b/src/main/java/com/xmomen/module/base/entity/CdExpress.java
index 2c13b9f..9513385 100644
--- a/src/main/java/com/xmomen/module/base/entity/CdExpress.java
+++ b/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");
- return;
+ removeValidField("id");
+ 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");
- return;
+ removeValidField("expressCode");
+ 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");
- return;
+ removeValidField("expressName");
+ return;
}
addValidField("expressName");
}
diff --git a/src/main/java/com/xmomen/module/base/model/ActivityModel.java b/src/main/java/com/xmomen/module/base/model/ActivityModel.java
index bb62398..86dcd9e 100644
--- a/src/main/java/com/xmomen/module/base/model/ActivityModel.java
+++ b/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() {
diff --git a/src/main/java/com/xmomen/module/base/model/ActivityRefModel.java b/src/main/java/com/xmomen/module/base/model/ActivityRefModel.java
index 1319b89..8a2ba36 100644
--- a/src/main/java/com/xmomen/module/base/model/ActivityRefModel.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CompanyCustomerManager.java b/src/main/java/com/xmomen/module/base/model/CompanyCustomerManager.java
index 1a69b59..1594802 100644
--- a/src/main/java/com/xmomen/module/base/model/CompanyCustomerManager.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CompanyModel.java b/src/main/java/com/xmomen/module/base/model/CompanyModel.java
index 55684e4..0607844 100644
--- a/src/main/java/com/xmomen/module/base/model/CompanyModel.java
+++ b/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 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 getCompanyCustomerManagers() {
return companyCustomerManagers;
}
+ // 设置单位客户经理列表
public void setCompanyCustomerManagers(
List companyCustomerManagers) {
this.companyCustomerManagers = companyCustomerManagers;
diff --git a/src/main/java/com/xmomen/module/base/model/ContractItemModel.java b/src/main/java/com/xmomen/module/base/model/ContractItemModel.java
index 0dfa597..f03b0fc 100644
--- a/src/main/java/com/xmomen/module/base/model/ContractItemModel.java
+++ b/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;
- /**
- * 当合同适用范围为1的时候，每种产品要设定对应的合同价
- */
+ // 产品ID
private Integer cdItemId;
- /**
- * 合同价格
- */
+ // 合同价格
private BigDecimal contractValue;
- /**
- * 合同折扣
- */
+
+ // 合同折扣
private BigDecimal discount;
}
diff --git a/src/main/java/com/xmomen/module/base/model/ContractModel.java b/src/main/java/com/xmomen/module/base/model/ContractModel.java
index 55b4051..2d79f7d 100644
--- a/src/main/java/com/xmomen/module/base/model/ContractModel.java
+++ b/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 contractItemList;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CouponActivityAddress.java b/src/main/java/com/xmomen/module/base/model/CouponActivityAddress.java
index b6a912e..d364474 100644
--- a/src/main/java/com/xmomen/module/base/model/CouponActivityAddress.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CouponActivityAddressHead.java b/src/main/java/com/xmomen/module/base/model/CouponActivityAddressHead.java
index 472e512..a4d5c90 100644
--- a/src/main/java/com/xmomen/module/base/model/CouponActivityAddressHead.java
+++ b/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 couponActivityAddressList;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CouponCategoryModel.java b/src/main/java/com/xmomen/module/base/model/CouponCategoryModel.java
index 710f484..e2bbd5c 100644
--- a/src/main/java/com/xmomen/module/base/model/CouponCategoryModel.java
+++ b/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 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 getNodes() {
return nodes;
}
+ // 设置子分类列表
public void setNodes(List nodes) {
this.nodes = nodes;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CouponCategoryRefModel.java b/src/main/java/com/xmomen/module/base/model/CouponCategoryRefModel.java
index f5197fe..fd66936 100644
--- a/src/main/java/com/xmomen/module/base/model/CouponCategoryRefModel.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CouponModel.java b/src/main/java/com/xmomen/module/base/model/CouponModel.java
index 2981c57..c3ef137 100644
--- a/src/main/java/com/xmomen/module/base/model/CouponModel.java
+++ b/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 relationItemList;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CouponQuery.java b/src/main/java/com/xmomen/module/base/model/CouponQuery.java
index 068f962..ddce6a4 100644
--- a/src/main/java/com/xmomen/module/base/model/CouponQuery.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CouponRelationItem.java b/src/main/java/com/xmomen/module/base/model/CouponRelationItem.java
index c26e660..d28d062 100644
--- a/src/main/java/com/xmomen/module/base/model/CouponRelationItem.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CouponReportModel.java b/src/main/java/com/xmomen/module/base/model/CouponReportModel.java
index 3cf7524..c7967c5 100644
--- a/src/main/java/com/xmomen/module/base/model/CouponReportModel.java
+++ b/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;
diff --git a/src/main/java/com/xmomen/module/base/model/CreateActivity.java b/src/main/java/com/xmomen/module/base/model/CreateActivity.java
index 14e3a47..4fc20de 100644
--- a/src/main/java/com/xmomen/module/base/model/CreateActivity.java
+++ b/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 activityRefList;
public String getActivityName() {
diff --git a/src/main/java/com/xmomen/module/base/model/CreateCompany.java b/src/main/java/com/xmomen/module/base/model/CreateCompany.java
index 42c135a..b9a1059 100644
--- a/src/main/java/com/xmomen/module/base/model/CreateCompany.java
+++ b/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 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 getCustomerManagerIds() {
return customerManagerIds;
}
+ // 设置客户经理ID列表
public void setCustomerManagerIds(List customerManagerIds) {
this.customerManagerIds = customerManagerIds;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CreateContract.java b/src/main/java/com/xmomen/module/base/model/CreateContract.java
index dddc305..57527ec 100644
--- a/src/main/java/com/xmomen/module/base/model/CreateContract.java
+++ b/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 contractItemList;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CreateContractItem.java b/src/main/java/com/xmomen/module/base/model/CreateContractItem.java
index d685ca5..54c2a14 100644
--- a/src/main/java/com/xmomen/module/base/model/CreateContractItem.java
+++ b/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;
}
\ No newline at end of file
diff --git a/src/main/java/com/xmomen/module/base/model/CreateCoupon.java b/src/main/java/com/xmomen/module/base/model/CreateCoupon.java
index 6fc9493..ad18f6f 100644
--- a/src/main/java/com/xmomen/module/base/model/CreateCoupon.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CreateCouponCategory.java b/src/main/java/com/xmomen/module/base/model/CreateCouponCategory.java
index 311566a..eabe607 100644
--- a/src/main/java/com/xmomen/module/base/model/CreateCouponCategory.java
+++ b/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 categoryRefs;
public String getCategoryName() {
diff --git a/src/main/java/com/xmomen/module/base/model/CreateItem.java b/src/main/java/com/xmomen/module/base/model/CreateItem.java
index ce58549..95cffb5 100644
--- a/src/main/java/com/xmomen/module/base/model/CreateItem.java
+++ b/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 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 getChildItems() {
return childItems;
}
+ // 设置子商品列表
public void setChildItems(List 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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CreateItemCategory.java b/src/main/java/com/xmomen/module/base/model/CreateItemCategory.java
index d40588c..705b183 100644
--- a/src/main/java/com/xmomen/module/base/model/CreateItemCategory.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/CreateItemDetail.java b/src/main/java/com/xmomen/module/base/model/CreateItemDetail.java
index 9f5df0e..8f6abbc 100644
--- a/src/main/java/com/xmomen/module/base/model/CreateItemDetail.java
+++ b/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;
}
\ No newline at end of file
diff --git a/src/main/java/com/xmomen/module/base/model/CreateMember.java b/src/main/java/com/xmomen/module/base/model/CreateMember.java
index f4b4661..31a5757 100644
--- a/src/main/java/com/xmomen/module/base/model/CreateMember.java
+++ b/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;
//地址集合
diff --git a/src/main/java/com/xmomen/module/base/model/CreatePlan.java b/src/main/java/com/xmomen/module/base/model/CreatePlan.java
index b4d39e1..bc71491 100644
--- a/src/main/java/com/xmomen/module/base/model/CreatePlan.java
+++ b/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 planItems;
}
diff --git a/src/main/java/com/xmomen/module/base/model/ExpressMemberModel.java b/src/main/java/com/xmomen/module/base/model/ExpressMemberModel.java
index 2eec3a9..76f1a36 100644
--- a/src/main/java/com/xmomen/module/base/model/ExpressMemberModel.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/ExpressTask.java b/src/main/java/com/xmomen/module/base/model/ExpressTask.java
index 97e0ce0..7413390 100644
--- a/src/main/java/com/xmomen/module/base/model/ExpressTask.java
+++ b/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 orderNos;
- /**
- * 快递商ID
- */
+
+ // 快递ID，不能为空
@NotNull
private Integer expressId;
diff --git a/src/main/java/com/xmomen/module/base/model/ItemCategoryModel.java b/src/main/java/com/xmomen/module/base/model/ItemCategoryModel.java
index e866411..dcfbe0f 100644
--- a/src/main/java/com/xmomen/module/base/model/ItemCategoryModel.java
+++ b/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 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 getNodes() {
return nodes;
}
+ // 设置子类别列表
public void setNodes(List nodes) {
this.nodes = nodes;
}
diff --git a/src/main/java/com/xmomen/module/base/model/ItemChildModel.java b/src/main/java/com/xmomen/module/base/model/ItemChildModel.java
index c75c3f3..f65174f 100644
--- a/src/main/java/com/xmomen/module/base/model/ItemChildModel.java
+++ b/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-上架
diff --git a/src/main/java/com/xmomen/module/base/model/ItemDetailModel.java b/src/main/java/com/xmomen/module/base/model/ItemDetailModel.java
index 130ed17..6766e6e 100644
--- a/src/main/java/com/xmomen/module/base/model/ItemDetailModel.java
+++ b/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;
}
\ No newline at end of file
diff --git a/src/main/java/com/xmomen/module/base/model/ItemDetailQuery.java b/src/main/java/com/xmomen/module/base/model/ItemDetailQuery.java
index a537675..ac297ac 100644
--- a/src/main/java/com/xmomen/module/base/model/ItemDetailQuery.java
+++ b/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;
}
\ No newline at end of file
diff --git a/src/main/java/com/xmomen/module/base/model/ItemModel.java b/src/main/java/com/xmomen/module/base/model/ItemModel.java
index 922fd30..b715f46 100644
--- a/src/main/java/com/xmomen/module/base/model/ItemModel.java
+++ b/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;
//库存
diff --git a/src/main/java/com/xmomen/module/base/model/ItemQuery.java b/src/main/java/com/xmomen/module/base/model/ItemQuery.java
index 5928c57..df36410 100644
--- a/src/main/java/com/xmomen/module/base/model/ItemQuery.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/MemberCouponModel.java b/src/main/java/com/xmomen/module/base/model/MemberCouponModel.java
index e78927a..5dff6d2 100644
--- a/src/main/java/com/xmomen/module/base/model/MemberCouponModel.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/MemberModel.java b/src/main/java/com/xmomen/module/base/model/MemberModel.java
index 618dcb9..30b8cc2 100644
--- a/src/main/java/com/xmomen/module/base/model/MemberModel.java
+++ b/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 couponNumbers;
public String getMemberCode() {
diff --git a/src/main/java/com/xmomen/module/base/model/PlanItemModel.java b/src/main/java/com/xmomen/module/base/model/PlanItemModel.java
index 9ec623c..b788cef 100644
--- a/src/main/java/com/xmomen/module/base/model/PlanItemModel.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/PlanModel.java b/src/main/java/com/xmomen/module/base/model/PlanModel.java
index cc1bc33..c1a9df1 100644
--- a/src/main/java/com/xmomen/module/base/model/PlanModel.java
+++ b/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 planItems;
}
diff --git a/src/main/java/com/xmomen/module/base/model/ReadCardVo.java b/src/main/java/com/xmomen/module/base/model/ReadCardVo.java
index 354749c..8a7edb9 100644
--- a/src/main/java/com/xmomen/module/base/model/ReadCardVo.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/UpdateActivity.java b/src/main/java/com/xmomen/module/base/model/UpdateActivity.java
index acb4211..504eeaf 100644
--- a/src/main/java/com/xmomen/module/base/model/UpdateActivity.java
+++ b/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 activityRefList;
public String getActivityName() {
diff --git a/src/main/java/com/xmomen/module/base/model/UpdateCompany.java b/src/main/java/com/xmomen/module/base/model/UpdateCompany.java
index e1c2d07..d0f23c5 100644
--- a/src/main/java/com/xmomen/module/base/model/UpdateCompany.java
+++ b/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 customerManagerIds;
public String getCompanyCode() {
return companyCode;
diff --git a/src/main/java/com/xmomen/module/base/model/UpdateContract.java b/src/main/java/com/xmomen/module/base/model/UpdateContract.java
index f48ba89..76c0343 100644
--- a/src/main/java/com/xmomen/module/base/model/UpdateContract.java
+++ b/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 contractItemList;
}
diff --git a/src/main/java/com/xmomen/module/base/model/UpdateContractItem.java b/src/main/java/com/xmomen/module/base/model/UpdateContractItem.java
index 47a9960..1be61b5 100644
--- a/src/main/java/com/xmomen/module/base/model/UpdateContractItem.java
+++ b/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() {
diff --git a/src/main/java/com/xmomen/module/base/model/UpdateCoupon.java b/src/main/java/com/xmomen/module/base/model/UpdateCoupon.java
index bbe7365..ab75555 100644
--- a/src/main/java/com/xmomen/module/base/model/UpdateCoupon.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/base/model/UpdateCouponCategory.java b/src/main/java/com/xmomen/module/base/model/UpdateCouponCategory.java
index 8887ebf..f022240 100644
--- a/src/main/java/com/xmomen/module/base/model/UpdateCouponCategory.java
+++ b/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 categoryRefs;
public String getCategoryName() {
diff --git a/src/main/java/com/xmomen/module/base/model/UpdateItem.java b/src/main/java/com/xmomen/module/base/model/UpdateItem.java
index 3ed2042..43e8634 100644
--- a/src/main/java/com/xmomen/module/base/model/UpdateItem.java
+++ b/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 childItems;
public String getItemCode() {
diff --git a/src/main/java/com/xmomen/module/base/model/UpdateItemDetail.java b/src/main/java/com/xmomen/module/base/model/UpdateItemDetail.java
index d58a3fc..9ca3c3a 100644
--- a/src/main/java/com/xmomen/module/base/model/UpdateItemDetail.java
+++ b/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;
}
\ No newline at end of file
diff --git a/src/main/java/com/xmomen/module/base/model/UpdateMember.java b/src/main/java/com/xmomen/module/base/model/UpdateMember.java
index 93d5809..2a8ce0a 100644
--- a/src/main/java/com/xmomen/module/base/model/UpdateMember.java
+++ b/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 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 getMemberAddressList() {
return memberAddressList;
}
+ //设置地址集合
public void setMemberAddressList(List memberAddressList) {
this.memberAddressList = memberAddressList;
}
diff --git a/src/main/java/com/xmomen/module/base/model/UpdatePlan.java b/src/main/java/com/xmomen/module/base/model/UpdatePlan.java
index 1f21280..bf012fa 100644
--- a/src/main/java/com/xmomen/module/base/model/UpdatePlan.java
+++ b/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 planItems;
}
diff --git a/src/main/java/com/xmomen/module/base/service/CouponService.java b/src/main/java/com/xmomen/module/base/service/CouponService.java
index 46a4f52..7480406 100644
--- a/src/main/java/com/xmomen/module/base/service/CouponService.java
+++ b/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 {
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();
- exchangeCardLog.setNewCouponId(newCoupon.getId());
- exchangeCardLog.setNewCouponNo(newCouponNo);
- exchangeCardLog.setOldCouponId(oldCoupon.getId());
- exchangeCardLog.setOldCouponNo(oldCouponNo);
- exchangeCardLog.setRechargePlace(userOrganization.getOrganizationId());
- exchangeCardLog.setRechargeUser(userId);
- mybatisDao.save(exchangeCardLog);
+ TbExchangeCardLog exchangeCardLog;
+ exchangeCardLog = new exchangeCardLog();
+ Object clone = exchangeCardLog.getClass();
+ exchangeCardLog.getClass();
+ exchangeCardLog.getClass();
+ exchangeCardLog.getClass();
+ exchangeCardLog.getClass();
+ exchangeCardLog.getClass();
+ int save;
+
}
/**
diff --git a/src/main/java/com/xmomen/module/base/service/impl/ActivityServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ActivityServiceImpl.java
index 3290bad..b76a06a 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/ActivityServiceImpl.java
+++ b/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();
diff --git a/src/main/java/com/xmomen/module/base/service/impl/BasePlanServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/BasePlanServiceImpl.java
index 3fc4bf2..bc65941 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/BasePlanServiceImpl.java
+++ b/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 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) 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);
}
}
diff --git a/src/main/java/com/xmomen/module/base/service/impl/CompanyServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/CompanyServiceImpl.java
index bfc273d..4a56a51 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/CompanyServiceImpl.java
+++ b/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);
}
}
diff --git a/src/main/java/com/xmomen/module/base/service/impl/ContractItemServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ContractItemServiceImpl.java
index dd0f1f3..24bb4a7 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/ContractItemServiceImpl.java
+++ b/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 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);
}
}
diff --git a/src/main/java/com/xmomen/module/base/service/impl/ContractServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ContractServiceImpl.java
index 275e52f..4543718 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/ContractServiceImpl.java
+++ b/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);
diff --git a/src/main/java/com/xmomen/module/base/service/impl/CouponCategoryServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/CouponCategoryServiceImpl.java
index 3097327..b2f1839 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/CouponCategoryServiceImpl.java
+++ b/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 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();
diff --git a/src/main/java/com/xmomen/module/base/service/impl/ExpressMemberServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ExpressMemberServiceImpl.java
index 4583b06..8432cc1 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/ExpressMemberServiceImpl.java
+++ b/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);
}
}
diff --git a/src/main/java/com/xmomen/module/base/service/impl/ExpressServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ExpressServiceImpl.java
index 512e1c8..0ff681d 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/ExpressServiceImpl.java
+++ b/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 getTakeDeliveryList(OrderQuery orderQuery, Integer limit, Integer offset){
+ //查询已扫描的订单
return (Page) mybatisDao.selectPage(ExpressMapper.ExpressMapperNameSpace + "getOrderList", orderQuery, limit, offset);
}
/**
* 查询已扫描的订单(导出)
* @param orderQuery
- * @param limit
- * @param offset
* @return
*/
public List getTakeDeliveryReportList(OrderQuery orderQuery){
+ //查询已扫描的订单(导出)
return mybatisDao.getSqlSessionTemplate().selectList(ExpressMapper.ExpressMapperNameSpace + "getOrderReportList", orderQuery);
}
@@ -94,17 +99,17 @@ public class ExpressServiceImpl implements ExpressService {
* @return
*/
public Page getOrderNoDespatchReportList(OrderQuery orderQuery, Integer limit, Integer offset){
+ //查询已分配未提货的订单
return (Page) mybatisDao.selectPage(ExpressMapper.ExpressMapperNameSpace + "getOrderNoDespatchReportList", orderQuery, limit, offset);
}
/**
* 查询分配未提货的订单(导出)
* @param orderQuery
- * @param limit
- * @param offset
* @return
*/
public List getOrderNoDespatchReportList(OrderQuery orderQuery){
+ //查询分配未提货的订单(导出)
return mybatisDao.getSqlSessionTemplate().selectList(ExpressMapper.ExpressMapperNameSpace + "getOrderNoDespatchReportList", orderQuery);
}
diff --git a/src/main/java/com/xmomen/module/base/service/impl/ItemDetailServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ItemDetailServiceImpl.java
index beaafbc..6d12265 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/ItemDetailServiceImpl.java
+++ b/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 queryItemDetailList(ItemDetailQuery itemQuery) {
+ // 使用MybatisDao的SqlSessionTemplate执行查询
return mybatisDao.getSqlSessionTemplate().selectList(ItemDetailMapper.ItemDetailMapperNameSpace + "getItemDetailList", itemQuery);
}
+ // 根据查询条件和分页参数查询商品详情列表
@Override
public Page queryItemDetailList(ItemDetailQuery itemQuery, Integer offset, Integer limit) {
+ // 使用MybatisDao的selectPage方法执行查询
return (Page) 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);
}
diff --git a/src/main/java/com/xmomen/module/base/service/impl/ItemServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ItemServiceImpl.java
index ea9c31a..d0dbb96 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/ItemServiceImpl.java
+++ b/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 queryItemList(ItemQuery itemQuery) {
return mybatisDao.getSqlSessionTemplate().selectList(ItemMapper.ItemMapperNameSpace + "getItemList", itemQuery);
}
+ //根据ItemQuery、offset、limit查询商品列表
@Override
public Page queryItemList(ItemQuery itemQuery, Integer offset, Integer limit) {
return (Page) 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);
diff --git a/src/main/java/com/xmomen/module/base/service/impl/MemberServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/MemberServiceImpl.java
index e15c921..1e1730b 100644
--- a/src/main/java/com/xmomen/module/base/service/impl/MemberServiceImpl.java
+++ b/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);
//新手机号码和原来一样 直接返回
diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java
index 53a5b2d..5fd9983 100644
--- a/src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java
+++ b/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 预包装记录表领域分页对象
- */
+ // 查询预包装记录表列表
@RequestMapping(method = RequestMethod.GET)
@Log(actionName = "查询预包装记录表列表")
public Page 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);
}
diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecord.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecord.java
index 4c122e5..95f4354 100644
--- a/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecord.java
+++ b/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")
diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecordExample.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecordExample.java
index 50acfde..3d747cb 100644
--- a/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecordExample.java
+++ b/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 oredCriteria;
public BeforehandPackageRecordExample() {
oredCriteria = new ArrayList();
}
+ // 设置排序字段
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 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 criteria;
protected GeneratedCriteria() {
@@ -73,18 +88,22 @@ public class BeforehandPackageRecordExample extends BaseMybatisExample {
criteria = new ArrayList();
}
+ // 判断查询条件是否有效
public boolean isValid() {
return criteria.size() > 0;
}
+ // 获取所有查询条件
public List getAllCriteria() {
return criteria;
}
+ // 获取查询条件
public List 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 values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
+ // 判断id是否不在某个范围内
public Criteria andIdNotIn(List 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 values) {
addCriterion("cd_item_id in", values, "cdItemId");
return (Criteria) this;
}
+ // 判断cdItemId是否不在某个范围内
public Criteria andCdItemIdNotIn(List 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 values) {
addCriterion("package_num in", values, "packageNum");
return (Criteria) this;
}
+ // 判断packageNum是否不在某个范围内
public Criteria andPackageNumNotIn(List 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 values) {
addCriterion("insert_date in", values, "insertDate");
return (Criteria) this;
}
+ // 判断insertDate是否不在某个范围内
public Criteria andInsertDateNotIn(List 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 values) {
addCriterion("insert_user_id in", values, "insertUserId");
return (Criteria) this;
}
+ // 判断insertUserId是否不在某个范围内
public Criteria andInsertUserIdNotIn(List 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 values) {
addCriterion("update_date in", values, "updateDate");
return (Criteria) this;
}
+ // 判断updateDate是否不在某个范围内
public Criteria andUpdateDateNotIn(List 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;
diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java
index 3725aed..2a82dd4 100644
--- a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java
+++ b/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);
diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java
index aaac5b5..0955c7d 100644
--- a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java
+++ b/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;
- /**
- * Get BeforehandPackageRecord Entity Object
- *
- * @return
- */
+ // 将BeforehandPackageRecordModel对象转换为BeforehandPackageRecord对象
@JsonIgnore
public BeforehandPackageRecord getEntity() {
BeforehandPackageRecord beforehandPackageRecord = new BeforehandPackageRecord();
diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordQuery.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordQuery.java
index a8abfc8..7c72c7b 100644
--- a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordQuery.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordUpdate.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordUpdate.java
index 330fb0e..4157c4e 100644
--- a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordUpdate.java
+++ b/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);
diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java
index 24ec927..ef78140 100644
--- a/src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java
+++ b/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 预包装记录表领域对象集合
- */
@Override
@Transactional
public List createBeforehandPackageRecords(List beforehandPackageRecordModels) {
+ // 定义预包装记录表领域对象集合
List 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.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 预包装记录表参数对象
- */
@Override
public Page getBeforehandPackageRecordModelPage(int limit, int offset, BeforehandPackageRecordQuery beforehandPackageRecordQuery) {
+ // 调用mybatisDao的selectPage方法，查询预包装记录表领域分页对象
return (Page) mybatisDao.selectPage(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery, limit, offset);
}
- /**
- * 查询预包装记录表领域分页对象（无参数条件）
- *
- * @param limit 每页最大数
- * @param offset 页码
- * @return Page 预包装记录表领域对象
- */
+
@Override
public Page getBeforehandPackageRecordModelPage(int limit, int offset) {
+ // 调用mybatisDao的selectPage方法，查询预包装记录表领域分页对象
return (Page) mybatisDao.selectPage(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", null, limit, offset);
}
- /**
- * 查询预包装记录表领域集合对象（带参数条件）
- *
- * @param beforehandPackageRecordQuery 查询参数对象
- * @return List 预包装记录表领域集合对象
- */
@Override
public List getBeforehandPackageRecordModelList(BeforehandPackageRecordQuery beforehandPackageRecordQuery) {
+ // 调用mybatisDao的getSqlSessionTemplate的selectList方法，查询预包装记录表领域集合对象
return mybatisDao.getSqlSessionTemplate().selectList(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery);
}
- /**
- * 查询预包装记录表领域集合对象（无参数条件）
- *
- * @return List 预包装记录表领域集合对象
- */
@Override
public List 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);
}
}
diff --git a/src/main/java/com/xmomen/module/common/SysConstant.java b/src/main/java/com/xmomen/module/common/SysConstant.java
index 4a04f69..8602179 100644
--- a/src/main/java/com/xmomen/module/common/SysConstant.java
+++ b/src/main/java/com/xmomen/module/common/SysConstant.java
@@ -1,10 +1,7 @@
package com.xmomen.module.common;
-/**
- * 系统常量
- * @author Administrator
- *
- */
+
public class SysConstant {
+ // 定义一个系统常量类
}
diff --git a/src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java b/src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java
index 771f119..b047ef6 100644
--- a/src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java
+++ b/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;
diff --git a/src/main/java/com/xmomen/module/core/web/WebCommonUtils.java b/src/main/java/com/xmomen/module/core/web/WebCommonUtils.java
index 71b7b45..3757144 100644
--- a/src/main/java/com/xmomen/module/core/web/WebCommonUtils.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/core/web/authenticator/MultiLoginAuthenticator.java b/src/main/java/com/xmomen/module/core/web/authenticator/MultiLoginAuthenticator.java
index c1bb2ef..196cc80 100644
--- a/src/main/java/com/xmomen/module/core/web/authenticator/MultiLoginAuthenticator.java
+++ b/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 realms = getRealms();
for(Realm realm: realms) {
diff --git a/src/main/java/com/xmomen/module/core/web/controller/AccountController.java b/src/main/java/com/xmomen/module/core/web/controller/AccountController.java
index 3259aa3..e4222a5 100644
--- a/src/main/java/com/xmomen/module/core/web/controller/AccountController.java
+++ b/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 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);
}
diff --git a/src/main/java/com/xmomen/module/core/web/controller/CoreController.java b/src/main/java/com/xmomen/module/core/web/controller/CoreController.java
index 8cec06f..cad56b2 100644
--- a/src/main/java/com/xmomen/module/core/web/controller/CoreController.java
+++ b/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";
}
diff --git a/src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java b/src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java
index cb59e94..d331320 100644
--- a/src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java
+++ b/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;
}
}
diff --git a/src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java b/src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java
index b6213e8..b39ed6a 100644
--- a/src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java
+++ b/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 navItems;
+ // 角色列表
private List roles;
+ // 获取用户名
public String getUsername() {
return username;
}
+ // 设置用户名
public void setUsername(String username) {
this.username = username;
}
+ // 获取导航项列表
public List getNavItems() {
return navItems;
}
+ // 设置导航项列表
public void setNavItems(List navItems) {
this.navItems = navItems;
}
+ // 获取角色列表
public List getRoles() {
return roles;
}
+ // 设置角色列表
public void setRoles(List 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;
}
diff --git a/src/main/java/com/xmomen/module/core/web/controller/dto/RegisterDto.java b/src/main/java/com/xmomen/module/core/web/controller/dto/RegisterDto.java
index 49db7ca..c87048f 100644
--- a/src/main/java/com/xmomen/module/core/web/controller/dto/RegisterDto.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/core/web/exception/DefaultExceptionHandler.java b/src/main/java/com/xmomen/module/core/web/exception/DefaultExceptionHandler.java
index ad6f1d9..14fca76 100644
--- a/src/main/java/com/xmomen/module/core/web/exception/DefaultExceptionHandler.java
+++ b/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;
-/**
- * User: Zhang Kaitao
- *
Date: 14-2-12
- *
Version: 1.0
- */
+
@ControllerAdvice
public class DefaultExceptionHandler {
- /**
- * 没有权限 异常
- *
- * 后续根据不同的需求定制即可
- */
+
+ // 处理未授权异常
@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内部服务器错误
@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;
}
diff --git a/src/main/java/com/xmomen/module/core/web/exception/GlobalMappingExceptionResolver.java b/src/main/java/com/xmomen/module/core/web/exception/GlobalMappingExceptionResolver.java
index 2ac5c1f..14f6c53 100644
--- a/src/main/java/com/xmomen/module/core/web/exception/GlobalMappingExceptionResolver.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/core/web/filter/FormAuthenticationFilterExt.java b/src/main/java/com/xmomen/module/core/web/filter/FormAuthenticationFilterExt.java
index 7f1559c..6ff6303 100644
--- a/src/main/java/com/xmomen/module/core/web/filter/FormAuthenticationFilterExt.java
+++ b/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();
@@ -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;
diff --git a/src/main/java/com/xmomen/module/core/web/filter/PcFormAuthenticationFilter.java b/src/main/java/com/xmomen/module/core/web/filter/PcFormAuthenticationFilter.java
index 25ab08c..eb40edc 100644
--- a/src/main/java/com/xmomen/module/core/web/filter/PcFormAuthenticationFilter.java
+++ b/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 map = new HashMap();
@@ -69,6 +72,7 @@ public class PcFormAuthenticationFilter extends FormAuthenticationFilter {
}
}
+ // 访问拒绝处理
@Override
protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
if (isLoginRequest(request, response)) {
diff --git a/src/main/java/com/xmomen/module/core/web/mgt/WebSecurityManagerExt.java b/src/main/java/com/xmomen/module/core/web/mgt/WebSecurityManagerExt.java
index 77fe423..86b9d3e 100644
--- a/src/main/java/com/xmomen/module/core/web/mgt/WebSecurityManagerExt.java
+++ b/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());
}
}
diff --git a/src/main/java/com/xmomen/module/core/web/token/MemberUserToken.java b/src/main/java/com/xmomen/module/core/web/token/MemberUserToken.java
index e527133..fda4a47 100644
--- a/src/main/java/com/xmomen/module/core/web/token/MemberUserToken.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/core/web/token/SysUserToken.java b/src/main/java/com/xmomen/module/core/web/token/SysUserToken.java
index b372262..5c31e5d 100644
--- a/src/main/java/com/xmomen/module/core/web/token/SysUserToken.java
+++ b/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;
}
diff --git a/src/main/java/com/xmomen/module/export/controller/ExportController.java b/src/main/java/com/xmomen/module/export/controller/ExportController.java
index f817a1a..ab2d3ff 100644
--- a/src/main/java/com/xmomen/module/export/controller/ExportController.java
+++ b/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 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));
}
diff --git a/src/main/java/com/xmomen/module/export/model/UploadFileVo.java b/src/main/java/com/xmomen/module/export/model/UploadFileVo.java
index e6d473a..cab7abb 100644
--- a/src/main/java/com/xmomen/module/export/model/UploadFileVo.java
+++ b/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;
}
- /**
- * @return the realPath
- */
+ // 获取realPath
public String getRealPath() {
return realPath;
}
- /**
- * @param realPath
- * the realPath to set
- */
+ // 设置realPath
public void setRealPath(String realPath) {
this.realPath = realPath;
}
- /**
- * @return the response
- */
+ // 获取response
public HttpServletResponse getResponse() {
return response;
}
- /**
- * @return the request
- */
+ // 获取request
public HttpServletRequest getRequest() {
return request;
}
- /**
- * @param request
- * the request to set
- */
+ // 设置request
public void setRequest(HttpServletRequest request) {
this.request = request;
}
- /**
- * @return the multipartRequest
- */
+ // 获取multipartRequest
public MultipartHttpServletRequest getMultipartRequest() {
return multipartRequest;
}
+ // 获取参数
public String get(String name) {
return getMultipartRequest().getParameter(name);
}
- /**
- * @param multipartRequest
- * the multipartRequest to set
- */
+ // 设置multipartRequest
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;
}
diff --git a/src/main/java/com/xmomen/module/export/service/ExportService.java b/src/main/java/com/xmomen/module/export/service/ExportService.java
index 768d652..2ce438f 100644
--- a/src/main/java/com/xmomen/module/export/service/ExportService.java
+++ b/src/main/java/com/xmomen/module/export/service/ExportService.java
@@ -28,28 +28,36 @@ public class ExportService {
PurchaseService purchaseService;
@Autowired
ExpressService expressService;
- /**
- * 采购单导出
- * @param templatePath
- * @return
- */
+
+ // 导出采购单Excel
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 purchaseModels = purchaseService.getPurchaseList(param);
+ // 遍历采购单列表
for(int i=0,size=purchaseModels.size();i takeDeliverys = expressService.getTakeDeliveryList(query);
+ // 遍历订单列表
for(int i=0,size=takeDeliverys.size();i getUserList(@RequestParam(value = "limit") Integer limit,
@@ -58,10 +52,7 @@ public class JobOperationLogController {
return (Page) mybatisDao.selectPage(JobOperationLogMapper.JobOperationLogMapperNameSpace + "getJobOperationLogList", param, limit, offset);
}
- /**
- * 删除包装操作记录
- * @param id
- */
+ // 根据id删除包装操作记录
@RequestMapping(value = "/jobOperationLog/{id}", method = RequestMethod.DELETE)
@Log(actionName = "包装操作记录")
public void deletePlan(@PathVariable(value = "id") Integer id){
diff --git a/src/main/java/com/xmomen/module/job/controller/PackageTaskController.java b/src/main/java/com/xmomen/module/job/controller/PackageTaskController.java
index ef08165..0f557ac 100644
--- a/src/main/java/com/xmomen/module/job/controller/PackageTaskController.java
+++ b/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 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()){
diff --git a/src/main/java/com/xmomen/module/job/entity/TbJob.java b/src/main/java/com/xmomen/module/job/entity/TbJob.java
index 0eebd6f..922f2dd 100644
--- a/src/main/java/com/xmomen/module/job/entity/TbJob.java
+++ b/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")
diff --git a/src/main/java/com/xmomen/module/job/entity/TbJobExample.java b/src/main/java/com/xmomen/module/job/entity/TbJobExample.java
index ad8cdb0..bd8ceac 100644
--- a/src/main/java/com/xmomen/module/job/entity/TbJobExample.java
+++ b/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 oredCriteria;
public TbJobExample() {
oredCriteria = new ArrayList();
}
+ // 设置排序字段
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 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 criteria;
protected GeneratedCriteria() {
@@ -73,18 +88,22 @@ public class TbJobExample extends BaseMybatisExample {
criteria = new ArrayList();
}
+ // 判断查询条件是否有效
public boolean isValid() {
return criteria.size() > 0;
}
+ // 获取所有查询条件
public List getAllCriteria() {
return criteria;
}
+ // 获取查询条件
public List 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 values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
+ // 判断id是否不在某个范围内
public Criteria andIdNotIn(List 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 values) {
addCriterion("PURCHASE_CODE in", values, "purchaseCode");
return (Criteria) this;
}
+ // 判断PURCHASE_CODE是否不在某个范围内
public Criteria andPurchaseCodeNotIn(List 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 values) {
addCriterion("PURCHASE_ID in", values, "purchaseId");
return (Criteria) this;
}
+ // 判断PURCHASE_ID是否不在某个范围内
public Criteria andPurchaseIdNotIn(List 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 values) {
addCriterion("JOB_TYPE in", values, "jobType");
return (Criteria) this;
}
+ // 判断JOB_TYPE是否不在某个范围内
public Criteria andJobTypeNotIn(List 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 values) {
addCriterion("JOB_STATUS in", values, "jobStatus");
return (Criteria) this;
}
+ // 判断JOB_STATUS是否不在某个范围内
public Criteria andJobStatusNotIn(List 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 values) {
addCriterion("JOB_USER in", values, "jobUser");
return (Criteria) this;
}
+ // 判断JOB_USER是否不在某个范围内
public Criteria andJobUserNotIn(List 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;
diff --git a/src/main/java/com/xmomen/module/job/entity/TbJobOperationLog.java b/src/main/java/com/xmomen/module/job/entity/TbJobOperationLog.java
index 4f82d05..c414b21 100644
--- a/src/main/java/com/xmomen/module/job/entity/TbJobOperationLog.java
+++ b/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")
diff --git a/src/main/java/com/xmomen/module/job/entity/TbJobOperationLogExample.java b/src/main/java/com/xmomen/module/job/entity/TbJobOperationLogExample.java
index 784c63d..6cdd4c3 100644
--- a/src/main/java/com/xmomen/module/job/entity/TbJobOperationLogExample.java
+++ b/src/main/java/com/xmomen/module/job/entity/TbJobOperationLogExample.java
@@ -6,46 +6,57 @@ import java.util.Date;
import java.util.List;
public class TbJobOperationLogExample extends BaseMybatisExample {
+ // 排序字段
protected String orderByClause;
+ // 是否去重
protected boolean distinct;
+ // 查询条件
protected List oredCriteria;
public TbJobOperationLogExample() {
oredCriteria = new ArrayList();
}
+ // 设置排序字段
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 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,17 +65,20 @@ public class TbJobOperationLogExample 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 criteria;
@@ -73,18 +87,22 @@ public class TbJobOperationLogExample extends BaseMybatisExample {
criteria = new ArrayList();
}
+ // 判断查询条件是否有效
public boolean isValid() {
return criteria.size() > 0;
}
+ // 获取所有查询条件
public List getAllCriteria() {
return criteria;
}
+ // 获取查询条件
public List getCriteria() {
return criteria;
}
+ // 添加查询条件
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
@@ -92,6 +110,7 @@ public class TbJobOperationLogExample 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 +118,7 @@ public class TbJobOperationLogExample 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,387 +126,464 @@ public class TbJobOperationLogExample 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 values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
+ // 添加id查询条件
public Criteria andIdNotIn(List 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;
}
+ // 添加jobId查询条件
public Criteria andJobIdIsNull() {
addCriterion("job_id is null");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdIsNotNull() {
addCriterion("job_id is not null");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdEqualTo(Integer value) {
addCriterion("job_id =", value, "jobId");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdNotEqualTo(Integer value) {
addCriterion("job_id <>", value, "jobId");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdGreaterThan(Integer value) {
addCriterion("job_id >", value, "jobId");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdGreaterThanOrEqualTo(Integer value) {
addCriterion("job_id >=", value, "jobId");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdLessThan(Integer value) {
addCriterion("job_id <", value, "jobId");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdLessThanOrEqualTo(Integer value) {
addCriterion("job_id <=", value, "jobId");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdIn(List values) {
addCriterion("job_id in", values, "jobId");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdNotIn(List values) {
addCriterion("job_id not in", values, "jobId");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdBetween(Integer value1, Integer value2) {
addCriterion("job_id between", value1, value2, "jobId");
return (Criteria) this;
}
+ // 添加jobId查询条件
public Criteria andJobIdNotBetween(Integer value1, Integer value2) {
addCriterion("job_id not between", value1, value2, "jobId");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserIsNull() {
addCriterion("job_user is null");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserIsNotNull() {
addCriterion("job_user is not null");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserEqualTo(Integer value) {
addCriterion("job_user =", value, "jobUser");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserNotEqualTo(Integer value) {
addCriterion("job_user <>", value, "jobUser");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserGreaterThan(Integer value) {
addCriterion("job_user >", value, "jobUser");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserGreaterThanOrEqualTo(Integer value) {
addCriterion("job_user >=", value, "jobUser");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserLessThan(Integer value) {
addCriterion("job_user <", value, "jobUser");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserLessThanOrEqualTo(Integer value) {
addCriterion("job_user <=", value, "jobUser");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserIn(List values) {
addCriterion("job_user in", values, "jobUser");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserNotIn(List values) {
addCriterion("job_user not in", values, "jobUser");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserBetween(Integer value1, Integer value2) {
addCriterion("job_user between", value1, value2, "jobUser");
return (Criteria) this;
}
+ // 添加jobUser查询条件
public Criteria andJobUserNotBetween(Integer value1, Integer value2) {
addCriterion("job_user not between", value1, value2, "jobUser");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeIsNull() {
addCriterion("job_time is null");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeIsNotNull() {
addCriterion("job_time is not null");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeEqualTo(Date value) {
addCriterion("job_time =", value, "jobTime");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeNotEqualTo(Date value) {
addCriterion("job_time <>", value, "jobTime");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeGreaterThan(Date value) {
addCriterion("job_time >", value, "jobTime");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeGreaterThanOrEqualTo(Date value) {
addCriterion("job_time >=", value, "jobTime");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeLessThan(Date value) {
addCriterion("job_time <", value, "jobTime");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeLessThanOrEqualTo(Date value) {
addCriterion("job_time <=", value, "jobTime");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeIn(List values) {
addCriterion("job_time in", values, "jobTime");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeNotIn(List values) {
addCriterion("job_time not in", values, "jobTime");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeBetween(Date value1, Date value2) {
addCriterion("job_time between", value1, value2, "jobTime");
return (Criteria) this;
}
+ // 添加jobTime查询条件
public Criteria andJobTimeNotBetween(Date value1, Date value2) {
addCriterion("job_time not between", value1, value2, "jobTime");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeIsNull() {
addCriterion("bar_code is null");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeIsNotNull() {
addCriterion("bar_code is not null");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeEqualTo(String value) {
addCriterion("bar_code =", value, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeNotEqualTo(String value) {
addCriterion("bar_code <>", value, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeGreaterThan(String value) {
addCriterion("bar_code >", value, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeGreaterThanOrEqualTo(String value) {
addCriterion("bar_code >=", value, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeLessThan(String value) {
addCriterion("bar_code <", value, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeLessThanOrEqualTo(String value) {
addCriterion("bar_code <=", value, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeLike(String value) {
addCriterion("bar_code like", value, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeNotLike(String value) {
addCriterion("bar_code not like", value, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeIn(List values) {
addCriterion("bar_code in", values, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeNotIn(List values) {
addCriterion("bar_code not in", values, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeBetween(String value1, String value2) {
addCriterion("bar_code between", value1, value2, "barCode");
return (Criteria) this;
}
+ // 添加barCode查询条件
public Criteria andBarCodeNotBetween(String value1, String value2) {
addCriterion("bar_code not between", value1, value2, "barCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeIsNull() {
addCriterion("item_code is null");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeIsNotNull() {
addCriterion("item_code is not null");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeEqualTo(String value) {
addCriterion("item_code =", value, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeNotEqualTo(String value) {
addCriterion("item_code <>", value, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeGreaterThan(String value) {
addCriterion("item_code >", value, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeGreaterThanOrEqualTo(String value) {
addCriterion("item_code >=", value, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeLessThan(String value) {
addCriterion("item_code <", value, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeLessThanOrEqualTo(String value) {
addCriterion("item_code <=", value, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeLike(String value) {
addCriterion("item_code like", value, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeNotLike(String value) {
addCriterion("item_code not like", value, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeIn(List values) {
addCriterion("item_code in", values, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeNotIn(List values) {
addCriterion("item_code not in", values, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeBetween(String value1, String value2) {
addCriterion("item_code between", value1, value2, "itemCode");
return (Criteria) this;
}
+ // 添加itemCode查询条件
public Criteria andItemCodeNotBetween(String value1, String value2) {
addCriterion("item_code not between", value1, value2, "itemCode");
return (Criteria) this;
}
}
+ // 生成查询条件
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
@@ -494,6 +591,7 @@ public class TbJobOperationLogExample extends BaseMybatisExample {
}
}
+ // 生成查询条件
public static class Criterion {
private String condition;
@@ -511,22 +609,27 @@ public class TbJobOperationLogExample extends BaseMybatisExample {
private String typeHandler;
+ // 获取查询条件
public String getCondition() {
return condition;
}
+ // 获取查询条件
public Object getValue() {
return value;
}
+ // 获取查询条件
public Object getSecondValue() {
return secondValue;
}
+ // 判断查询条件是否为空
public boolean isNoValue() {
return noValue;
}
+ // 判断查询条件是否为单个值
public boolean isSingleValue() {
return singleValue;
}
diff --git a/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java b/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java
index ee1f99d..97f5d77 100644
--- a/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java
+++ b/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java
@@ -6,13 +6,11 @@ import java.util.Date;
import lombok.Data;
public @Data class CreateJobOperationLog implements Serializable{
- /**
- * 操作的条码
- */
+
+ // 条形码
private String barCode;
- /**
- * 操作的商品条码
- */
+
+ // 物品编码
private String itemCode;
}
diff --git a/src/main/java/com/xmomen/module/job/model/CreatePackageTask.java b/src/main/java/com/xmomen/module/job/model/CreatePackageTask.java
index 6d41d1d..893b841 100644
--- a/src/main/java/com/xmomen/module/job/model/CreatePackageTask.java
+++ b/src/main/java/com/xmomen/module/job/model/CreatePackageTask.java
@@ -5,59 +5,37 @@ import java.util.Date;
public class CreatePackageTask implements Serializable{
- /**
- * 采购编号
- */
+ // 购买代码
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 Integer finishValue;
- /**
- *
- */
+ // 完成时间
private Date finishTime;
- /**
- * 任务创建人
- */
+ // 任务创建用户
private Integer jobCreateUser;
public String getPurchaseCode() {
diff --git a/src/main/java/com/xmomen/module/job/model/JobOperationLogModel.java b/src/main/java/com/xmomen/module/job/model/JobOperationLogModel.java
index 4fb48a4..e071392 100644
--- a/src/main/java/com/xmomen/module/job/model/JobOperationLogModel.java
+++ b/src/main/java/com/xmomen/module/job/model/JobOperationLogModel.java
@@ -6,37 +6,27 @@ import java.util.Date;
import lombok.Data;
public @Data class JobOperationLogModel implements Serializable{
+ // 操作日志ID
private Integer id;
- /**
- * 操作的条码
- */
+
+ // 条形码
private String barCode;
- /**
- * 操作的商品条码
- */
+
+ // 物料编码
private String itemCode;
+ // 物料名称
private String itemName;
-
- /**
- * 采摘人
- */
+
+ // 质检员
private String caizaiUser;
- /**
- * 检测人
- */
+ // 检测员
private String jianceUser;
-
-
- /**
- * 农残率
- */
- private String nongCanLv;
+ // 农残率
+ private String nongCanLv;
- /**
- * 生产地
- */
+ // 产量
private String yieldly;
}
diff --git a/src/main/java/com/xmomen/module/job/model/PackageTaskModel.java b/src/main/java/com/xmomen/module/job/model/PackageTaskModel.java
index 77a06ae..0675c99 100644
--- a/src/main/java/com/xmomen/module/job/model/PackageTaskModel.java
+++ b/src/main/java/com/xmomen/module/job/model/PackageTaskModel.java
@@ -4,287 +4,301 @@ import java.io.Serializable;
import java.util.Date;
public class PackageTaskModel implements Serializable {
- /**
- *
- */
+
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;
-
- /**
- * 任务开始时间
- */
+ // 任务开始时间
private Date jobBeginTime;
-
- /**
- * 包装的产品
- */
+ // 包装的产品
private Integer cdItemId;
- /**
- * 销售单位
- */
+ // 销售单位
private String sellUnit;
- /**
- * 需要包装的份数
- */
+ // 需要包装的份数
private Integer countValue;
- /**
- * 包装完成的份数
- */
+ // 包装完成的份数
private Integer finishValue;
+ // 未完成的份数
private Integer noFinishValue;
- /**
- *
- */
+
+ // 任务完成时间
private Date finishTime;
- /**
- * 任务创建人
- */
+ // 任务创建人
private Integer jobCreateUser;
+ // 商品编码
private String itemCode;
+ // 商品名称
private String itemName;
+ // 任务执行人名称
private String jobUserName;
+ // 商品规格
private String spec;
- /**
- * 采摘人
- */
+ // 采摘人
private String caizaiUser;
- /**
- * 检测人
- */
+ // 检测人
private String jianceUser;
- /**
- * 农残率
- */
+ // 农残率
private String nongCanLv;
- /**
- * 生产地
- */
+ // 生产地
private String yieldly;
+ // 获取商品编码
public String getItemCode() {
return itemCode;
}
+ // 设置商品编码
public void setItemCode(String itemCode) {
this.itemCode = itemCode;
}
+ // 获取商品名称
public String getItemName() {
return itemName;
}
+ // 设置商品名称
public void setItemName(String itemName) {
this.itemName = itemName;
}
+ // 获取任务执行人名称
public String getJobUserName() {
return jobUserName;
}
+ // 设置任务执行人名称
public void setJobUserName(String jobUserName) {
this.jobUserName = jobUserName;
}
+ // 获取任务ID
public Integer getId() {
return id;
}
+ // 设置任务ID
public void setId(Integer id) {
this.id = id;
}
+ // 获取采购编号
public String getPurchaseCode() {
return purchaseCode;
}
+ // 设置采购编号
public void setPurchaseCode(String purchaseCode) {
this.purchaseCode = purchaseCode;
}
+ // 获取采购明细ID
public Integer getPurchaseId() {
return purchaseId;
}
+ // 设置采购明细ID
public void setPurchaseId(Integer purchaseId) {
this.purchaseId = purchaseId;
}
+ // 获取任务类型
public Integer getJobType() {
return jobType;
}
+ // 设置任务类型
public void setJobType(Integer jobType) {
this.jobType = jobType;
}
+ // 获取任务状态
public Integer getJobStatus() {
return jobStatus;
}
+ // 设置任务状态
public void setJobStatus(Integer jobStatus) {
this.jobStatus = jobStatus;
}
+ // 获取任务执行人
public Integer getJobUser() {
return jobUser;
}
+ // 设置任务执行人
public void setJobUser(Integer jobUser) {
this.jobUser = jobUser;
}
+ // 获取任务创建时间
public Date getJobCreateTime() {
return jobCreateTime;
}
+ // 设置任务创建时间
public void setJobCreateTime(Date jobCreateTime) {
this.jobCreateTime = jobCreateTime;
}
+ // 获取包装的产品
public Integer getCdItemId() {
return cdItemId;
}
+ // 设置包装的产品
public void setCdItemId(Integer cdItemId) {
this.cdItemId = cdItemId;
}
+ // 获取需要包装的份数
public Integer getCountValue() {
return countValue;
}
+ // 设置需要包装的份数
public void setCountValue(Integer countValue) {
this.countValue = countValue;
}
+ // 获取包装完成的份数
public Integer getFinishValue() {
return finishValue;
}
+ // 设置包装完成的份数
public void setFinishValue(Integer finishValue) {
this.finishValue = finishValue;
}
+ // 获取任务完成时间
public Date getFinishTime() {
return finishTime;
}
+ // 设置任务完成时间
public void setFinishTime(Date finishTime) {
this.finishTime = finishTime;
}
+ // 获取任务创建人
public Integer getJobCreateUser() {
return jobCreateUser;
}
+ // 设置任务创建人
public void setJobCreateUser(Integer jobCreateUser) {
this.jobCreateUser = jobCreateUser;
}
+ // 获取任务开始时间
public Date getJobBeginTime() {
return jobBeginTime;
}
+ // 设置任务开始时间
public void setJobBeginTime(Date jobBeginTime) {
this.jobBeginTime = jobBeginTime;
}
+ // 获取未完成的份数
public Integer getNoFinishValue() {
return noFinishValue;
}
+ // 设置未完成的份数
public void setNoFinishValue(Integer noFinishValue) {
this.noFinishValue = noFinishValue;
}
+ // 获取商品规格
public String getSpec() {
return spec;
}
+ // 设置商品规格
public void setSpec(String spec) {
this.spec = spec;
}
+ // 获取采摘人
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 getSellUnit() {
return sellUnit;
}
+ // 设置销售单位
public void setSellUnit(String sellUnit) {
this.sellUnit = sellUnit;
}
+ // 获取农残率
public String getNongCanLv() {
return nongCanLv;
}
+ // 设置农残率
public void setNongCanLv(String nongCanLv) {
this.nongCanLv = nongCanLv;
}
+ // 获取生产地
public String getYieldly() {
return yieldly;
}
+ // 设置生产地
public void setYieldly(String yieldly) {
this.yieldly = yieldly;
}
diff --git a/src/main/java/com/xmomen/module/job/model/UpdateJobOperationLog.java b/src/main/java/com/xmomen/module/job/model/UpdateJobOperationLog.java
index ac38bb9..fc6a282 100644
--- a/src/main/java/com/xmomen/module/job/model/UpdateJobOperationLog.java
+++ b/src/main/java/com/xmomen/module/job/model/UpdateJobOperationLog.java
@@ -6,13 +6,11 @@ import java.util.Date;
import lombok.Data;
public @Data class UpdateJobOperationLog implements Serializable{
- /**
- * 操作的条码
- */
+
+ // 条形码
private String barCode;
- /**
- * 操作的商品条码
- */
+
+ // 商品编码
private String itemCode;
}
diff --git a/src/main/java/com/xmomen/module/job/model/UpdatePackageTask.java b/src/main/java/com/xmomen/module/job/model/UpdatePackageTask.java
index 0fa2e13..42ca6fe 100644
--- a/src/main/java/com/xmomen/module/job/model/UpdatePackageTask.java
+++ b/src/main/java/com/xmomen/module/job/model/UpdatePackageTask.java
@@ -4,59 +4,38 @@ import java.io.Serializable;
import java.util.Date;
public class UpdatePackageTask implements Serializable{
- /**
- * 采购编号
- */
+
+ // 购买代码
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 Integer finishValue;
- /**
- *
- */
+ // 完成时间
private Date finishTime;
- /**
- * 任务创建人
- */
+ // 任务创建用户
private Integer jobCreateUser;
public String getPurchaseCode() {
diff --git a/src/main/java/com/xmomen/module/job/service/impl/JobOperationLogServiceImpl.java b/src/main/java/com/xmomen/module/job/service/impl/JobOperationLogServiceImpl.java
index 1435209..5ee2d68 100644
--- a/src/main/java/com/xmomen/module/job/service/impl/JobOperationLogServiceImpl.java
+++ b/src/main/java/com/xmomen/module/job/service/impl/JobOperationLogServiceImpl.java
@@ -20,16 +20,23 @@ public class JobOperationLogServiceImpl implements JobOperationLogService {
@Override
public void delete(Integer id) {
+ //根据id查询操作日志
TbJobOperationLog jobOperationLog = mybatisDao.selectByPrimaryKey(TbJobOperationLog.class, id);
+ //根据操作日志中的任务id查询任务
TbJob job = mybatisDao.selectByPrimaryKey(TbJob.class, jobOperationLog.getJobId());
+ //删除操作日志
mybatisDao.delete(jobOperationLog);
+ //任务完成值减1
job.setFinishValue(job.getFinishValue() - 1);
+ //保存任务
mybatisDao.save(job);
//改变任务状态
if(job.getFinishValue() == 0){
+ //更新任务开始时间
mybatisDao.getSqlSessionTemplate().update(PackageTaskMapper.PackageTaskMapperNameSpace + "updateBeginTime",jobOperationLog.getJobId());
}
if(job.getJobStatus() == 2){
+ //更新任务完成时间
mybatisDao.getSqlSessionTemplate().update(PackageTaskMapper.PackageTaskMapperNameSpace + "updateFinishTime",jobOperationLog.getJobId());
}
}
diff --git a/src/main/java/com/xmomen/module/member/controller/MemberAddressController.java b/src/main/java/com/xmomen/module/member/controller/MemberAddressController.java
index 0cc6d86..30bab41 100644
--- a/src/main/java/com/xmomen/module/member/controller/MemberAddressController.java
+++ b/src/main/java/com/xmomen/module/member/controller/MemberAddressController.java
@@ -29,28 +29,16 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-/**
- * @author tanxinzheng
- * @version 1.0.0
- * @date 2017-3-29 0:27:52
- */
+
@RestController
@RequestMapping(value = "/memberAddress")
public class MemberAddressController {
+ // 自动注入MemberAddressService
@Autowired
MemberAddressService memberAddressService;
- /**
- * 客户地址列表
- *
- * @param limit 每页结果数
- * @param offset 页码
- * @param id 主键
- * @param ids 主键数组
- * @param excludeIds 不包含主键数组
- * @return Page 客户地址领域分页对象
- */
+ // 查询客户地址列表
@RequestMapping(method = RequestMethod.GET)
@Log(actionName = "查询客户地址列表")
public Page getMemberAddressList(@RequestParam(value = "limit") Integer limit,
@@ -59,72 +47,59 @@ public class MemberAddressController {
@RequestParam(value = "ids", required = false) String[] ids,
@RequestParam(value = "cdMemberId", required = false) String cdMemberId,
@RequestParam(value = "excludeIds", required = false) String[] excludeIds) {
+ // 创建MemberAddressQuery对象
MemberAddressQuery memberAddressQuery = new MemberAddressQuery();
+ // 设置查询条件
memberAddressQuery.setId(id);
memberAddressQuery.setExcludeIds(excludeIds);
memberAddressQuery.setIds(ids);
memberAddressQuery.setCdMemberId(cdMemberId);
+ // 调用MemberAddressService的getMemberAddressModelPage方法查询客户地址列表
return memberAddressService.getMemberAddressModelPage(limit, offset, memberAddressQuery);
}
- /**
- * 查询单个客户地址
- *
- * @param id 主键
- * @return MemberAddressModel 客户地址领域对象
- */
+ // 查询客户地址
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@Log(actionName = "查询客户地址")
public MemberAddressModel getMemberAddressById(@PathVariable(value = "id") String id) {
+ // 调用MemberAddressService的getOneMemberAddressModel方法查询客户地址
return memberAddressService.getOneMemberAddressModel(id);
}
- /**
- * 新增客户地址
- *
- * @param memberAddressModel 新增对象参数
- * @return MemberAddressModel 客户地址领域对象
- */
+ // 新增客户地址
@RequestMapping(method = RequestMethod.POST)
@Log(actionName = "新增客户地址")
public MemberAddressModel createMemberAddress(@RequestBody @Valid MemberAddressModel memberAddressModel) {
+ // 获取当前用户ID
Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY);
+ // 设置客户ID
memberAddressModel.setCdMemberId(userId);
+ // 调用MemberAddressService的createMemberAddress方法新增客户地址
return memberAddressService.createMemberAddress(memberAddressModel);
}
- /**
- * 更新客户地址
- *
- * @param id 主键
- * @param memberAddressModel 更新对象参数
- */
+ // 更新客户地址
@RequestMapping(value = "/{id}", method = RequestMethod.PUT)
@Log(actionName = "更新客户地址")
public void updateMemberAddress(@PathVariable(value = "id") String id,
@RequestBody @Valid MemberAddressModel memberAddressModel) {
+ // 调用MemberAddressService的updateMemberAddress方法更新客户地址
memberAddressService.updateMemberAddress(memberAddressModel);
}
- /**
- * 删除客户地址
- *
- * @param id 主键
- */
+ // 删除单个客户地址
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@Log(actionName = "删除单个客户地址")
public void deleteMemberAddress(@PathVariable(value = "id") String id) {
+ // 调用MemberAddressService的deleteMemberAddress方法删除客户地址
memberAddressService.deleteMemberAddress(id);
}
- /**
- * 删除客户地址
- *
- * @param ids 主键
- */
+ // 批量删除客户地址
@RequestMapping(method = RequestMethod.DELETE)
@Log(actionName = "批量删除客户地址")
public void deleteMemberAddresss(@RequestParam(value = "ids") String[] ids) {
+ // 调用MemberAddressService的deleteMemberAddress方法批量删除客户地址
memberAddressService.deleteMemberAddress(ids);
}
diff --git a/src/main/java/com/xmomen/module/member/entity/MemberAddress.java b/src/main/java/com/xmomen/module/member/entity/MemberAddress.java
index 26934c4..8813fe1 100644
--- a/src/main/java/com/xmomen/module/member/entity/MemberAddress.java
+++ b/src/main/java/com/xmomen/module/member/entity/MemberAddress.java
@@ -11,54 +11,35 @@ import javax.persistence.Version;
@Entity
@Table(name = "cd_member_address")
public class MemberAddress extends BaseMybatisModel {
- /**
- *
- */
+
+ // 主键id
private String id;
- /**
- * 客户ID
- */
+ // 会员id
private Integer cdMemberId;
- /**
- *
- */
+ // 省份
private Integer province;
- /**
- * 城市
- */
+ // 城市
private Integer city;
- /**
- * 区域
- */
+ // 区域
private Integer area;
- /**
- * 详细地址
- */
+ // 详细地址
private String address;
- /**
- * 完整地址
- */
+ // 完整地址
private String fullAddress;
- /**
- *
- */
+ // 姓名
private String name;
- /**
- *
- */
+ // 手机号
private String mobile;
- /**
- * 是否默认地址
- */
+ // 是否默认地址
private Boolean isDefault;
@Column(name = "id")
diff --git a/src/main/java/com/xmomen/module/member/entity/MemberAddressExample.java b/src/main/java/com/xmomen/module/member/entity/MemberAddressExample.java
index 12f7209..0577f4d 100644
--- a/src/main/java/com/xmomen/module/member/entity/MemberAddressExample.java
+++ b/src/main/java/com/xmomen/module/member/entity/MemberAddressExample.java
@@ -5,46 +5,57 @@ import java.util.ArrayList;
import java.util.List;
public class MemberAddressExample extends BaseMybatisExample {
+ // 排序字段
protected String orderByClause;
+ // 是否去重
protected boolean distinct;
+ // 查询条件
protected List oredCriteria;
public MemberAddressExample() {
oredCriteria = new ArrayList();
}
+ // 设置排序字段
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 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,17 +64,20 @@ public class MemberAddressExample 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 criteria;
@@ -72,18 +86,22 @@ public class MemberAddressExample extends BaseMybatisExample {
criteria = new ArrayList();
}
+ // 判断查询条件是否有效
public boolean isValid() {
return criteria.size() > 0;
}
+ // 获取所有查询条件
public List getAllCriteria() {
return criteria;
}
+ // 获取查询条件
public List getCriteria() {
return criteria;
}
+ // 添加查询条件
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
@@ -91,6 +109,7 @@ public class MemberAddressExample 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 +117,7 @@ public class MemberAddressExample 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,413 +125,496 @@ public class MemberAddressExample 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 values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
+ // 判断id是否不在某个范围内
public Criteria andIdNotIn(List 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;
}
+ // 判断cdMemberId是否为空
public Criteria andCdMemberIdIsNull() {
addCriterion("cd_member_id is null");
return (Criteria) this;
}
+ // 判断cdMemberId是否不为空
public Criteria andCdMemberIdIsNotNull() {
addCriterion("cd_member_id is not null");
return (Criteria) this;
}
+ // 判断cdMemberId是否等于某个值
public Criteria andCdMemberIdEqualTo(Integer value) {
addCriterion("cd_member_id =", value, "cdMemberId");
return (Criteria) this;
}
+ // 判断cdMemberId是否不等于某个值
public Criteria andCdMemberIdNotEqualTo(Integer value) {
addCriterion("cd_member_id <>", value, "cdMemberId");
return (Criteria) this;
}
+ // 判断cdMemberId是否大于某个值
public Criteria andCdMemberIdGreaterThan(Integer value) {
addCriterion("cd_member_id >", value, "cdMemberId");
return (Criteria) this;
}
+ // 判断cdMemberId是否大于等于某个值
public Criteria andCdMemberIdGreaterThanOrEqualTo(Integer value) {
addCriterion("cd_member_id >=", value, "cdMemberId");
return (Criteria) this;
}
+ // 判断cdMemberId是否小于某个值
public Criteria andCdMemberIdLessThan(Integer value) {
addCriterion("cd_member_id <", value, "cdMemberId");
return (Criteria) this;
}
+ // 判断cdMemberId是否小于等于某个值
public Criteria andCdMemberIdLessThanOrEqualTo(Integer value) {
addCriterion("cd_member_id <=", value, "cdMemberId");
return (Criteria) this;
}
+ // 判断cdMemberId是否在某个范围内
public Criteria andCdMemberIdIn(List values) {
addCriterion("cd_member_id in", values, "cdMemberId");
return (Criteria) this;
}
+ // 判断cdMemberId是否不在某个范围内
public Criteria andCdMemberIdNotIn(List values) {
addCriterion("cd_member_id not in", values, "cdMemberId");
return (Criteria) this;
}
+ // 判断cdMemberId是否在某个范围内
public Criteria andCdMemberIdBetween(Integer value1, Integer value2) {
addCriterion("cd_member_id between", value1, value2, "cdMemberId");
return (Criteria) this;
}
+ // 判断cdMemberId是否不在某个范围内
public Criteria andCdMemberIdNotBetween(Integer value1, Integer value2) {
addCriterion("cd_member_id not between", value1, value2, "cdMemberId");
return (Criteria) this;
}
+ // 判断province是否为空
public Criteria andProvinceIsNull() {
addCriterion("province is null");
return (Criteria) this;
}
+ // 判断province是否不为空
public Criteria andProvinceIsNotNull() {
addCriterion("province is not null");
return (Criteria) this;
}
+ // 判断province是否等于某个值
public Criteria andProvinceEqualTo(Integer value) {
addCriterion("province =", value, "province");
return (Criteria) this;
}
+ // 判断province是否不等于某个值
public Criteria andProvinceNotEqualTo(Integer value) {
addCriterion("province <>", value, "province");
return (Criteria) this;
}
+ // 判断province是否大于某个值
public Criteria andProvinceGreaterThan(Integer value) {
addCriterion("province >", value, "province");
return (Criteria) this;
}
+ // 判断province是否大于等于某个值
public Criteria andProvinceGreaterThanOrEqualTo(Integer value) {
addCriterion("province >=", value, "province");
return (Criteria) this;
}
+ // 判断province是否小于某个值
public Criteria andProvinceLessThan(Integer value) {
addCriterion("province <", value, "province");
return (Criteria) this;
}
+ // 判断province是否小于等于某个值
public Criteria andProvinceLessThanOrEqualTo(Integer value) {
addCriterion("province <=", value, "province");
return (Criteria) this;
}
+ // 判断province是否在某个范围内
public Criteria andProvinceIn(List values) {
addCriterion("province in", values, "province");
return (Criteria) this;
}
+ // 判断province是否不在某个范围内
public Criteria andProvinceNotIn(List values) {
addCriterion("province not in", values, "province");
return (Criteria) this;
}
+ // 判断province是否在某个范围内
public Criteria andProvinceBetween(Integer value1, Integer value2) {
addCriterion("province between", value1, value2, "province");
return (Criteria) this;
}
+ // 判断province是否不在某个范围内
public Criteria andProvinceNotBetween(Integer value1, Integer value2) {
addCriterion("province not between", value1, value2, "province");
return (Criteria) this;
}
+ // 判断city是否为空
public Criteria andCityIsNull() {
addCriterion("city is null");
return (Criteria) this;
}
+ // 判断city是否不为空
public Criteria andCityIsNotNull() {
addCriterion("city is not null");
return (Criteria) this;
}
+ // 判断city是否等于某个值
public Criteria andCityEqualTo(Integer value) {
addCriterion("city =", value, "city");
return (Criteria) this;
}
+ // 判断city是否不等于某个值
public Criteria andCityNotEqualTo(Integer value) {
addCriterion("city <>", value, "city");
return (Criteria) this;
}
+ // 判断city是否大于某个值
public Criteria andCityGreaterThan(Integer value) {
addCriterion("city >", value, "city");
return (Criteria) this;
}
+ // 判断city是否大于等于某个值
public Criteria andCityGreaterThanOrEqualTo(Integer value) {
addCriterion("city >=", value, "city");
return (Criteria) this;
}
+ // 判断city是否小于某个值
public Criteria andCityLessThan(Integer value) {
addCriterion("city <", value, "city");
return (Criteria) this;
}
+ // 判断city是否小于等于某个值
public Criteria andCityLessThanOrEqualTo(Integer value) {
addCriterion("city <=", value, "city");
return (Criteria) this;
}
+ // 判断city是否在某个范围内
public Criteria andCityIn(List values) {
addCriterion("city in", values, "city");
return (Criteria) this;
}
+ // 判断city是否不在某个范围内
public Criteria andCityNotIn(List values) {
addCriterion("city not in", values, "city");
return (Criteria) this;
}
+ // 判断city是否在某个范围内
public Criteria andCityBetween(Integer value1, Integer value2) {
addCriterion("city between", value1, value2, "city");
return (Criteria) this;
}
+ // 判断city是否不在某个范围内
public Criteria andCityNotBetween(Integer value1, Integer value2) {
addCriterion("city not between", value1, value2, "city");
return (Criteria) this;
}
+ // 判断area是否为空
public Criteria andAreaIsNull() {
addCriterion("area is null");
return (Criteria) this;
}
+ // 判断area是否不为空
public Criteria andAreaIsNotNull() {
addCriterion("area is not null");
return (Criteria) this;
}
+ // 判断area是否等于某个值
public Criteria andAreaEqualTo(Integer value) {
addCriterion("area =", value, "area");
return (Criteria) this;
}
+ // 判断area是否不等于某个值
public Criteria andAreaNotEqualTo(Integer value) {
addCriterion("area <>", value, "area");
return (Criteria) this;
}
+ // 判断area是否大于某个值
public Criteria andAreaGreaterThan(Integer value) {
addCriterion("area >", value, "area");
return (Criteria) this;
}
+ // 判断area是否大于等于某个值
public Criteria andAreaGreaterThanOrEqualTo(Integer value) {
addCriterion("area >=", value, "area");
return (Criteria) this;
}
+ // 判断area是否小于某个值
public Criteria andAreaLessThan(Integer value) {
addCriterion("area <", value, "area");
return (Criteria) this;
}
+ // 判断area是否小于等于某个值
public Criteria andAreaLessThanOrEqualTo(Integer value) {
addCriterion("area <=", value, "area");
return (Criteria) this;
}
+ // 判断area是否在某个范围内
public Criteria andAreaIn(List values) {
addCriterion("area in", values, "area");
return (Criteria) this;
}
+ // 判断area是否不在某个范围内
public Criteria andAreaNotIn(List values) {
addCriterion("area not in", values, "area");
return (Criteria) this;
}
+ // 判断area是否在某个范围内
public Criteria andAreaBetween(Integer value1, Integer value2) {
addCriterion("area between", value1, value2, "area");
return (Criteria) this;
}
+ // 判断area是否不在某个范围内
public Criteria andAreaNotBetween(Integer value1, Integer value2) {
addCriterion("area not between", value1, value2, "area");
return (Criteria) this;
}
+ // 判断address是否为空
public Criteria andAddressIsNull() {
addCriterion("address is null");
return (Criteria) this;
}
+ // 判断address是否不为空
public Criteria andAddressIsNotNull() {
addCriterion("address is not null");
return (Criteria) this;
}
+ // 判断address是否等于某个值
public Criteria andAddressEqualTo(String value) {
addCriterion("address =", value, "address");
return (Criteria) this;
}
+ // 判断address是否不等于某个值
public Criteria andAddressNotEqualTo(String value) {
addCriterion("address <>", value, "address");
return (Criteria) this;
}
+ // 判断address是否大于某个值
public Criteria andAddressGreaterThan(String value) {
addCriterion("address >", value, "address");
return (Criteria) this;
}
+ // 判断address是否大于等于某个值
public Criteria andAddressGreaterThanOrEqualTo(String value) {
addCriterion("address >=", value, "address");
return (Criteria) this;
}
+ // 判断address是否小于某个值
public Criteria andAddressLessThan(String value) {
addCriterion("address <", value, "address");
return (Criteria) this;
}
+ // 判断address是否小于等于某个值
public Criteria andAddressLessThanOrEqualTo(String value) {
addCriterion("address <=", value, "address");
return (Criteria) this;
}
+ // 判断address是否包含某个值
public Criteria andAddressLike(String value) {
addCriterion("address like", value, "address");
return (Criteria) this;
}
+ // 判断address是否不包含某个值
public Criteria andAddressNotLike(String value) {
addCriterion("address not like", value, "address");
return (Criteria) this;
}
+ // 判断address是否在某个范围内
public Criteria andAddressIn(List values) {
addCriterion("address in", values, "address");
return (Criteria) this;
}
+ // 判断address是否不在某个范围内
public Criteria andAddressNotIn(List values) {
addCriterion("address not in", values, "address");
return (Criteria) this;
}
+ // 判断address是否在某个范围内
public Criteria andAddressBetween(String value1, String value2) {
addCriterion("address between", value1, value2, "address");
return (Criteria) this;
}
+ // 判断address是否不在某个范围内
public Criteria andAddressNotBetween(String value1, String value2) {
addCriterion("address not between", value1, value2, "address");
return (Criteria) this;
}
+ // 判断fullAddress是否为空
public Criteria andFullAddressIsNull() {
addCriterion("full_address is null");
return (Criteria) this;
}
+ // 判断fullAddress是否不为空
public Criteria andFullAddressIsNotNull() {
addCriterion("full_address is not null");
return (Criteria) this;
}
+ // 判断fullAddress是否等于某个值
public Criteria andFullAddressEqualTo(String value) {
addCriterion("full_address =", value, "fullAddress");
return (Criteria) this;
}
+ // 判断fullAddress是否不等于某个值
public Criteria andFullAddressNotEqualTo(String value) {
addCriterion("full_address <>", value, "fullAddress");
return (Criteria) this;
}
+ // 判断fullAddress是否大于某个值
public Criteria andFullAddressGreaterThan(String value) {
addCriterion("full_address >", value, "fullAddress");
return (Criteria) this;
}
public Criteria andFullAddressGreaterThanOrEqualTo(String value) {
+ // 添加查询条件，full_address字段大于等于value
addCriterion("full_address >=", value, "fullAddress");
+ // 返回当前Criteria对象
return (Criteria) this;
}
diff --git a/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java b/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java
index 09a8b1a..ba20533 100644
--- a/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java
+++ b/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java
@@ -9,34 +9,40 @@ import org.springframework.beans.BeanUtils;
import java.lang.Integer;
import java.io.Serializable;
-/**
- * @author tanxinzheng
- * @date 2017-4-10 23:05:38
- * @version 1.0.0
- */
+
public @Data class MemberAddressCreate implements Serializable {
- /** */
+ // 会员地址ID
private String id;
- /** 客户ID */
+
+ // 会员ID
private Integer cdMemberId;
- /** */
+
+ // 省份
private Integer province;
- /** 城市 */
+
+ // 城市
private Integer city;
- /** 区域 */
+
+ // 区域
private Integer area;
- /** 详细地址 */
+
+ // 详细地址
private String address;
- /** 完整地址 */
+
+ // 完整地址
private String fullAddress;
- /** */
+
+ // 姓名
private String name;
- /** */
+
+ // 手机号
private String mobile;
- /** 是否默认地址 */
+
+ // 是否默认地址
private boolean isDefault;
+ // 将MemberAddressCreate对象转换为MemberAddress对象
public MemberAddress getEntity(){
MemberAddress memberAddress = new MemberAddress();
BeanUtils.copyProperties(this, memberAddress);
diff --git a/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java b/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java
index b847c53..049b144 100644
--- a/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java
+++ b/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java
@@ -13,65 +13,56 @@ import java.lang.Integer;
import java.lang.String;
import java.io.Serializable;
-/**
- * @author tanxinzheng
- * @date 2017-3-28 12:53:37
- * @version 1.0.0
- */
+
@ExcelTarget(value = "MemberAddressModel")
public @Data class MemberAddressModel implements Serializable {
- /** */
// @NotBlank(message = "为必填项")
@Length(max = 32, message = "字符长度限制[0,32]")
private String id;
- /** 客户ID */
+
@Excel(name = "客户ID")
@NotNull(message = "客户ID为必填项")
@Range(max = 999999999, min = -999999999, message = "客户ID数值范围[999999999,-999999999]")
private Integer cdMemberId;
- /** */
+
@Excel(name = "")
@Range(max = 999999999, min = -999999999, message = "数值范围[999999999,-999999999]")
private Integer province;
- /** 城市 */
+
@Excel(name = "城市")
@Range(max = 999999999, min = -999999999, message = "城市数值范围[999999999,-999999999]")
private Integer city;
- /** 区域 */
+
@Excel(name = "区域")
@Range(max = 999999999, min = -999999999, message = "区域数值范围[999999999,-999999999]")
private Integer area;
- /** 详细地址 */
+
@Excel(name = "详细地址")
@NotBlank(message = "详细地址为必填项")
@Length(max = 256, message = "详细地址字符长度限制[0,256]")
private String address;
- /** 完整地址 */
+
@Excel(name = "完整地址")
@NotBlank(message = "完整地址为必填项")
@Length(max = 256, message = "完整地址字符长度限制[0,256]")
private String fullAddress;
- /** */
+
@Excel(name = "")
@NotBlank(message = "为必填项")
@Length(max = 32, message = "字符长度限制[0,32]")
private String name;
- /** */
+
@Excel(name = "")
@NotBlank(message = "为必填项")
@Length(max = 32, message = "字符长度限制[0,32]")
private String mobile;
- /** 是否默认地址 */
+
@Excel(name = "是否默认地址")
// @Range(max = 999999999, min = -999999999, message = "是否默认地址数值范围[999999999,-999999999]")
//@NotBlank(message = "是否默认地址为必填项")
private Boolean isDefault;
- /**
- * Get MemberAddress Entity Object
- * @return
- */
@JsonIgnore
public MemberAddress getEntity(){
MemberAddress memberAddress = new MemberAddress();
diff --git a/src/main/java/com/xmomen/module/member/model/MemberAddressQuery.java b/src/main/java/com/xmomen/module/member/model/MemberAddressQuery.java
index 826ee74..246ce03 100644
--- a/src/main/java/com/xmomen/module/member/model/MemberAddressQuery.java
+++ b/src/main/java/com/xmomen/module/member/model/MemberAddressQuery.java
@@ -4,27 +4,21 @@ import lombok.Data;
import java.io.Serializable;
-/**
- * @author tanxinzheng
- * @version 1.0.0
- * @date 2017-3-29 0:27:52
- */
+
public
@Data
class MemberAddressQuery implements Serializable {
- /**
- * 主键
- */
+
+ // 会员地址查询类
private String id;
- /**
- * 包含主键集
- */
+
+ // 会员地址查询类
private String[] ids;
- /**
- * 排除主键集
- */
+
+ // 会员地址查询类
private String[] excludeIds;
+ // 会员地址查询类
private String cdMemberId;
}
diff --git a/src/main/java/com/xmomen/module/member/model/MemberAddressUpdate.java b/src/main/java/com/xmomen/module/member/model/MemberAddressUpdate.java
index f9f6e17..c3191b7 100644
--- a/src/main/java/com/xmomen/module/member/model/MemberAddressUpdate.java
+++ b/src/main/java/com/xmomen/module/member/model/MemberAddressUpdate.java
@@ -9,35 +9,41 @@ import org.springframework.beans.BeanUtils;
import java.lang.Integer;
import java.io.Serializable;
-/**
- * @author tanxinzheng
- * @date 2017-4-10 23:05:39
- * @version 1.0.0
- */
+
public @Data class MemberAddressUpdate implements Serializable {
- /** */
+ // 会员地址ID
private String id;
- /** 客户ID */
+
+ // 会员ID
private Integer cdMemberId;
- /** */
+
+ // 省份
private Integer province;
- /** 城市 */
+
+ // 城市
private Integer city;
- /** 区域 */
+
+ // 区域
private Integer area;
- /** 详细地址 */
+
+ // 详细地址
private String address;
- /** 完整地址 */
+
+ // 完整地址
private String fullAddress;
- /** */
+
+ // 姓名
private String name;
- /** */
+
+ // 手机号
private String mobile;
- /** 是否默认地址 */
+
+ // 是否默认地址
private Boolean isDefault;
+ // 将MemberAddressUpdate对象转换为MemberAddress对象
public MemberAddress getEntity(){
MemberAddress memberAddress = new MemberAddress();
BeanUtils.copyProperties(this, memberAddress);
diff --git a/src/main/java/com/xmomen/module/member/service/impl/MemberAddressServiceImpl.java b/src/main/java/com/xmomen/module/member/service/impl/MemberAddressServiceImpl.java
index b9c8149..da3e90d 100644
--- a/src/main/java/com/xmomen/module/member/service/impl/MemberAddressServiceImpl.java
+++ b/src/main/java/com/xmomen/module/member/service/impl/MemberAddressServiceImpl.java
@@ -19,23 +19,15 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-/**
- * @author tanxinzheng
- * @version 1.0.0
- * @date 2017-3-29 0:27:52
- */
+
@Service
public class MemberAddressServiceImpl implements MemberAddressService {
+ //注入MybatisDao
@Autowired
MybatisDao mybatisDao;
- /**
- * 新增客户地址
- *
- * @param memberAddressModel 新增客户地址对象参数
- * @return MemberAddressModel 客户地址领域对象
- */
+ //创建会员地址
@Override
@Transactional
public MemberAddressModel createMemberAddress(MemberAddressModel memberAddressModel) {
@@ -46,27 +38,18 @@ public class MemberAddressServiceImpl implements MemberAddressService {
return null;
}
- /**
- * 新增客户地址实体对象
- *
- * @param memberAddress 新增客户地址实体对象参数
- * @return MemberAddress 客户地址实体对象
- */
+ //创建会员地址
@Override
@Transactional
public MemberAddress createMemberAddress(MemberAddress memberAddress) {
+ //如果地址id为空，则生成一个新的id
if (StringUtils.trimToNull(memberAddress.getId()) == null) {
memberAddress.setId(StringUtilsExt.getUUID(32));
}
return mybatisDao.insertByModel(memberAddress);
}
- /**
- * 批量新增客户地址
- *
- * @param memberAddressModels 新增客户地址对象集合参数
- * @return List 客户地址领域对象集合
- */
+ //批量创建会员地址
@Override
@Transactional
public List createMemberAddresss(List memberAddressModels) {
@@ -83,34 +66,21 @@ public class MemberAddressServiceImpl implements MemberAddressService {
return memberAddressModelList;
}
- /**
- * 更新客户地址
- *
- * @param memberAddressModel 更新客户地址对象参数
- */
+ //更新会员地址
@Override
@Transactional
public void updateMemberAddress(MemberAddressModel memberAddressModel) {
mybatisDao.update(memberAddressModel.getEntity());
}
- /**
- * 更新客户地址实体对象
- *
- * @param memberAddress 新增客户地址实体对象参数
- * @return MemberAddress 客户地址实体对象
- */
+ //更新会员地址
@Override
@Transactional
public void updateMemberAddress(MemberAddress memberAddress) {
mybatisDao.update(memberAddress);
}
- /**
- * 删除客户地址
- *
- * @param ids 主键数组
- */
+ //删除会员地址
@Override
@Transactional
public void deleteMemberAddress(String[] ids) {
@@ -119,80 +89,44 @@ public class MemberAddressServiceImpl implements MemberAddressService {
mybatisDao.deleteByExample(memberAddressExample);
}
- /**
- * 删除客户地址
- *
- * @param id 主键
- */
+ //删除会员地址
@Override
@Transactional
public void deleteMemberAddress(String id) {
mybatisDao.deleteByPrimaryKey(MemberAddress.class, id);
}
- /**
- * 查询客户地址领域分页对象（带参数条件）
- *
- * @param limit 每页最大数
- * @param offset 页码
- * @param memberAddressQuery 查询参数
- * @return Page 客户地址参数对象
- */
+ //分页查询会员地址
@Override
public Page getMemberAddressModelPage(int limit, int offset, MemberAddressQuery memberAddressQuery) {
return (Page) mybatisDao.selectPage(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", memberAddressQuery, limit, offset);
}
- /**
- * 查询客户地址领域分页对象（无参数条件）
- *
- * @param limit 每页最大数
- * @param offset 页码
- * @return Page 客户地址领域对象
- */
+ //分页查询会员地址
@Override
public Page getMemberAddressModelPage(int limit, int offset) {
return (Page) mybatisDao.selectPage(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", null, limit, offset);
}
- /**
- * 查询客户地址领域集合对象（带参数条件）
- *
- * @param memberAddressQuery 查询参数对象
- * @return List 客户地址领域集合对象
- */
+ //查询会员地址列表
@Override
public List getMemberAddressModelList(MemberAddressQuery memberAddressQuery) {
return mybatisDao.getSqlSessionTemplate().selectList(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", memberAddressQuery);
}
- /**
- * 查询客户地址领域集合对象（无参数条件）
- *
- * @return List 客户地址领域集合对象
- */
+ //查询会员地址列表
@Override
public List getMemberAddressModelList() {
return mybatisDao.getSqlSessionTemplate().selectList(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel");
}
- /**
- * 查询客户地址实体对象
- *
- * @param id 主键
- * @return MemberAddress 客户地址实体对象
- */
+ //根据id查询会员地址
@Override
public MemberAddress getOneMemberAddress(String id) {
return mybatisDao.selectByPrimaryKey(MemberAddress.class, id);
}
- /**
- * 根据主键查询单个对象
- *
- * @param id 主键
- * @return MemberAddressModel 客户地址领域对象
- */
+ //根据id查询会员地址
@Override
public MemberAddressModel getOneMemberAddressModel(String id) {
MemberAddressQuery memberAddressQuery = new MemberAddressQuery();
@@ -200,22 +134,13 @@ public class MemberAddressServiceImpl implements MemberAddressService {
return mybatisDao.getSqlSessionTemplate().selectOne(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", memberAddressQuery);
}
- /**
- * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错）
- *
- * @param memberAddressQuery 客户地址查询参数对象
- * @return MemberAddressModel 客户地址领域对象
- */
+ //根据查询条件查询会员地址
@Override
public MemberAddressModel getOneMemberAddressModel(MemberAddressQuery memberAddressQuery) throws TooManyResultsException {
return mybatisDao.getSqlSessionTemplate().selectOne(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", memberAddressQuery);
}
- /**
- * 设置默认收货地址
- *
- * @param addressId 收货地址
- */
+ //设置默认地址
public void defaultAddress(String addressId) {
MemberAddress memberAddress = this.getOneMemberAddress(addressId);
//将收货地址全部更新为非默认
@@ -224,6 +149,7 @@ public class MemberAddressServiceImpl implements MemberAddressService {
this.mybatisDao.updateByModel(memberAddress);
}
+ //根据查询条件查询会员地址列表
@Override
public List getMemberAddressModels(MemberAddressQuery memberAddressQuery) {
return mybatisDao.getSqlSessionTemplate().selectList(MemberAddressMapperExt.MemberAddressMapperNameSpace + "getMemberAddressModel", memberAddressQuery);
diff --git a/src/main/java/com/xmomen/module/order/controller/OrderController.java b/src/main/java/com/xmomen/module/order/controller/OrderController.java
index 6991b3f..e0b8757 100644
--- a/src/main/java/com/xmomen/module/order/controller/OrderController.java
+++ b/src/main/java/com/xmomen/module/order/controller/OrderController.java
@@ -29,9 +29,7 @@ import com.xmomen.module.order.model.UpdateOrder;
import com.xmomen.module.order.service.OrderService;
import com.xmomen.module.wx.model.AjaxResult;
-/**
- * Created by Jeng on 2016/3/30.
- */
+
@RestController
public class OrderController {
@@ -41,14 +39,7 @@ public class OrderController {
@Autowired
MybatisDao mybatisDao;
- /**
- * 订单列表
- *
- * @param limit
- * @param offset
- * @param keyword
- * @return
- */
+ // 查询订单列表
@RequestMapping(value = "/order", method = RequestMethod.GET)
@Log(actionName = "查询订单列表")
public Page getUserList(@RequestParam(value = "limit") Integer limit,
@@ -109,11 +100,8 @@ public class OrderController {
return orderService.getOrderList(orderQuery, limit, offset);
}
- /**
- * 订单明细
- *
- * @return
- */
+
+ // 查询订单详情
@RequestMapping(value = "/order/{id}", method = RequestMethod.GET)
@Log(actionName = "查询订单列表")
public OrderModel getOrderDetail(@PathVariable(value = "id") Integer id) {
@@ -126,13 +114,8 @@ public class OrderController {
return null;
}
- /**
- * 新增订单
- *
- * @param createOrder
- * @param bindingResult
- * @return
- */
+
+ // 新增订单
@RequestMapping(value = "/order", method = RequestMethod.POST)
@Log(actionName = "新增订单")
public TbOrder createOrder(@RequestBody @Valid CreateOrder createOrder, BindingResult bindingResult) throws ArgumentValidException {
@@ -144,13 +127,8 @@ public class OrderController {
return orderService.createOrder(createOrder);
}
- /**
- * 批量新增订单
- *
- * @param createOrder
- * @param bindingResult
- * @return
- */
+
+ // 批量新增订单
@RequestMapping(value = "/order/batch", method = RequestMethod.POST)
@Log(actionName = "批量新增订单")
public void batchCreateOrder(@RequestBody @Valid CreateOrder createOrder, BindingResult bindingResult) throws ArgumentValidException {
@@ -162,13 +140,8 @@ public class OrderController {
orderService.batchCreateOrder(createOrder);
}
- /**
- * 更新订单
- *
- * @param updateOrder
- * @param bindingResult
- * @return
- */
+
+ // 更新订单
@RequestMapping(value = "/order/{id}", method = RequestMethod.PUT)
@Log(actionName = "更新订单")
public TbOrder updateOrder(
@@ -182,14 +155,8 @@ public class OrderController {
return orderService.updateOrder(updateOrder);
}
- /**
- * 订单商品列表
- *
- * @param limit
- * @param offset
- * @param orderNo
- * @return
- */
+
+ // 查询订单商品列表
@RequestMapping(value = "/order/{id}/item", method = RequestMethod.GET)
@Log(actionName = "查询订单商品列表")
public Page getUserList(@RequestParam(value = "limit") Integer limit,
@@ -200,24 +167,16 @@ public class OrderController {
return mybatisDao.selectPageByModel(tbOrderItem, limit, offset);
}
- /**
- * 取消订单
- *
- * @param id
- */
+
+ // 取消订单
@RequestMapping(value = "/order/{id}", method = RequestMethod.DELETE)
@Log(actionName = "取消订单")
public void cancelOrder(@PathVariable(value = "id") Integer id) {
orderService.cancelOrder(id);
}
- /**
- * 更新订单装箱数
- *
- * @param createOrder
- * @param bindingResult
- * @return
- */
+
+ // 更新订单装箱数
@RequestMapping(value = "/order/updateTotalBox", method = RequestMethod.POST)
@Log(actionName = "更新订单装箱数")
public void updateTotalBox(@RequestParam(value = "orderNo") String orderNo,
@@ -225,11 +184,8 @@ public class OrderController {
orderService.updateTotalBox(orderNo, totalBox);
}
- /**
- * 二次配送审核
- *
- * @param id
- */
+
+ // 二次配送审核
@RequestMapping(value = "/order/{id}/twoSend", method = RequestMethod.POST)
@Log(actionName = "二次配送审核")
public AjaxResult twoSendOrder(@PathVariable(value = "id") Integer id, @RequestParam(value = "auditStatusCd") Integer auditStatusCd) {
diff --git a/src/main/java/com/xmomen/module/order/controller/PackingController.java b/src/main/java/com/xmomen/module/order/controller/PackingController.java
index bbf6796..2f9c787 100644
--- a/src/main/java/com/xmomen/module/order/controller/PackingController.java
+++ b/src/main/java/com/xmomen/module/order/controller/PackingController.java
@@ -21,28 +21,24 @@ import javax.validation.Valid;
import java.util.List;
-/**
- * Created by Jeng on 2016/3/30.
- */
+
@RestController
public class PackingController {
+ // 自动装配PackingService
@Autowired
PackingService packingService;
+ // 自动装配OrderService
@Autowired
OrderService orderService;
+ // 自动装配MybatisDao
@Autowired
MybatisDao mybatisDao;
- /**
- * 装箱记录列表
- * @param limit
- * @param offset
- * @param keyword
- * @return
- */
+
+ // 查询装箱记录列表
@RequestMapping(value = "/packing", method = RequestMethod.GET)
@Log(actionName = "查询装箱记录列表")
public Page getUserList(@RequestParam(value = "limit") Integer limit,
@@ -57,12 +53,8 @@ public class PackingController {
return packingService.getPackingList(packingQuery, limit, offset);
}
- /**
- * 新增装箱记录
- * @param createPacking
- * @param bindingResult
- * @return
- */
+
+ // 新增装箱记录
@RequestMapping(value = "/packing", method = RequestMethod.POST)
@Log(actionName = "新增装箱记录")
public TbPacking createPacking(@RequestBody @Valid CreatePacking createPacking, BindingResult bindingResult) throws ArgumentValidException {
@@ -72,13 +64,8 @@ public class PackingController {
return packingService.create(createPacking);
}
- /**
- * 装箱记录列表
- * @param limit
- * @param offset
- * @param keyword
- * @return
- */
+
+ // 查询装箱任务统计列表
@RequestMapping(value = "/packing/task", method = RequestMethod.GET)
@Log(actionName = "查询装箱任务统计列表")
public Page getPackingTaskList(@RequestParam(value = "limit") Integer limit,
@@ -89,12 +76,8 @@ public class PackingController {
return packingService.getPackingTaskCountList(null, limit, offset);
}
- /**
- * 分配装箱任务
- * @param packingTask
- * @param bindingResult
- * @return
- */
+
+ // 分配装箱任务
@RequestMapping(value = "/packing/task/bind", method = RequestMethod.PUT)
@Log(actionName = "分配装箱任务")
public void createPacking(@RequestBody @Valid PackingTask packingTask, BindingResult bindingResult) throws ArgumentValidException {
@@ -104,11 +87,8 @@ public class PackingController {
packingService.dispatchPackingTask(packingTask);
}
- /**
- * 分配装箱任务
- * @param orderNoList
- * @throws ArgumentValidException
- */
+
+ // 取消分配装箱任务
@RequestMapping(value = "/packing/task/unbind", method = RequestMethod.PUT)
@Log(actionName = "取消分配装箱任务")
public void unbind(@RequestParam(value = "orderNos", required = true)String[] orderNoList) throws ArgumentValidException {
@@ -118,6 +98,7 @@ public class PackingController {
packingService.cancelPackingTask(orderNoList);
}
+ // 装箱订单列表
@RequestMapping(value = "/packing/order", method = RequestMethod.GET)
@Log(actionName = "装箱订单列表")
public Page queryPackingOrder(@RequestParam(value = "limit") Integer limit,
@@ -171,24 +152,16 @@ public class PackingController {
return orderModePage;
}
- /**
- * 删除装箱记录
- * @param id
- */
+
+ // 删除装箱记录
@RequestMapping(value = "/packing/{id}", method = RequestMethod.DELETE)
@Log(actionName = "删除装箱记录")
public void deletePacking(@PathVariable(value = "id") Integer id){
packingService.delete(id);
}
- /**
- * 商品装箱汇总
- * @param packingId
- * @param orderId
- * @param limit
- * @param offset
- * @return
- */
+
+ // 查询装箱订单
@RequestMapping(value = "/packing/{id}/order")
public Page queryPackingOrder(@PathVariable(value = "id") Integer packingId,
@RequestParam(value = "orderId") Integer orderId,
@@ -203,11 +176,8 @@ public class PackingController {
return packingService.queryPackingOrder(packingOrderQuery, limit, offset);
}
- /**
- * 订单打印
- * @param orderId 订单ID
- * @return
- */
+
+ // 打印订单
@RequestMapping(value = "/packing/printOrder")
public OrderModel printOrder(@RequestParam(value = "orderId") Integer orderId){
OrderModel orderModel = null;
@@ -237,6 +207,7 @@ public class PackingController {
}
+ // 查询装箱订单项
@RequestMapping(value = "/packing/order/item")
public Page queryPackingOrderItem(@RequestParam(value = "orderNos", required = false) String[] orderNos,
@RequestParam(value = "limit") Integer limit,
@@ -246,16 +217,8 @@ public class PackingController {
return packingService.queryPackingOrderItem(packingOrderQuery, limit, offset);
}
- /**
- * 查询装箱记录
- *
- * @param packingId
- * @param orderItemId
- * @param keyword
- * @param limit
- * @param offset
- * @return
- */
+
+ // 查询装箱记录
@RequestMapping(value = "/packing/{id}/record", method = RequestMethod.GET)
public Page queryPackingRecord(@PathVariable(value = "id") Integer packingId,
@RequestParam(value = "orderItemId") Integer orderItemId,
@@ -269,14 +232,8 @@ public class PackingController {
return packingService.queryPackingRecord(packingRecordQuery, limit, offset);
}
- /**
- * 装箱扫码
- *
- * @param createPackingRecord
- * @param bindingResult
- * @return
- * @throws ArgumentValidException
- */
+
+ // 新增装箱记录
@RequestMapping(value = "/packing/record", method = RequestMethod.POST)
@Log(actionName = "新增装箱记录")
public ScanModel createPackingRecord(@RequestBody @Valid CreatePackingRecord createPackingRecord, BindingResult bindingResult) throws ArgumentValidException {
@@ -286,6 +243,7 @@ public class PackingController {
return packingService.createRecord(createPackingRecord);
}
+ // 删除装箱记录
@RequestMapping(value = "/packing/{id}/record/{recordId}", method = RequestMethod.DELETE)
@Log(actionName = "删除装箱记录")
public void createPackingRecord(@PathVariable(value = "id") Integer id,
@@ -293,6 +251,7 @@ public class PackingController {
packingService.deleteRecord(recordId);
}
+ // 订单自动装箱
@RequestMapping(value = "/packing/auto", method = RequestMethod.POST)
@Log(actionName = "订单自动装箱")
public List autoPacking(@RequestParam(value = "packingId") Integer packingId,
diff --git a/src/main/java/com/xmomen/module/order/controller/PurchaseController.java b/src/main/java/com/xmomen/module/order/controller/PurchaseController.java
index 2294f91..3212e9e 100644
--- a/src/main/java/com/xmomen/module/order/controller/PurchaseController.java
+++ b/src/main/java/com/xmomen/module/order/controller/PurchaseController.java
@@ -25,25 +25,19 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-/**
- * Created by Jeng on 2016/3/30.
- */
+
@RestController
public class PurchaseController {
+ // 注入PurchaseService
@Autowired
PurchaseService purchaseService;
+ // 注入MybatisDao
@Autowired
MybatisDao mybatisDao;
- /**
- * 采购单列表
- * @param limit
- * @param offset
- * @param keyword
- * @return
- */
+
@RequestMapping(value = "/purchase", method = RequestMethod.GET)
@Log(actionName = "查询采购单列表")
public Page getUserList(@RequestParam(value = "limit") Integer limit,
@@ -68,12 +62,7 @@ public class PurchaseController {
return purchaseService.getPurchaseList(param, limit, offset);
}
- /**
- * 新增采购单
- * @param createPurchase
- * @param bindingResult
- * @return
- */
+
@RequestMapping(value = "/purchase", method = RequestMethod.POST)
@Log(actionName = "新增采购单")
public void createPurchase(@RequestBody @Valid CreatePurchase createPurchase, BindingResult bindingResult) throws ArgumentValidException {
@@ -83,11 +72,7 @@ public class PurchaseController {
purchaseService.createPurchase(createPurchase);
}
- /**
- * 修改采购状态
- * @param id
- * @param purchaseStatus
- */
+
@RequestMapping(value = "/purchase/{id}", method = RequestMethod.PUT)
@Log(actionName = "修改采购状态")
public void createPurchase(@PathVariable(value = "id") Integer id,
@@ -97,10 +82,7 @@ public class PurchaseController {
- /**
- * 删除采购单
- * @param id
- */
+
@RequestMapping(value = "/purchase/{id}", method = RequestMethod.DELETE)
@Log(actionName = "删除采购单")
diff --git a/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java b/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java
index b637ddc..757e5c4 100644
--- a/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java
+++ b/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java
@@ -15,27 +15,26 @@ import com.xmomen.module.logger.Log;
import com.xmomen.module.order.mapper.TradeRecordMapper;
import com.xmomen.module.order.model.TradeRecordModel;
-/**
- */
+
@RestController
public class TradeRecordController {
+ // 注入MybatisDao
@Autowired
MybatisDao mybatisDao;
- /**
- * 查看交易记录
- * @param limit
- * @param offset
- * @param keyword
- * @return
- */
+
+ // 使用@RequestMapping注解指定请求路径和请求方法
@RequestMapping(value = "/tradeRecord", method = RequestMethod.GET)
+ // 使用@Log注解记录操作日志
@Log(actionName = " 查看交易记录")
public Page getUserList(@RequestParam(value = "limit") Integer limit,
@RequestParam(value = "offset") Integer offset,
@RequestParam(value = "keyword", required = false) String keyword){
+ // 创建一个Map对象，用于存放参数
Map param = new HashMap();
+ // 将keyword参数存入Map对象
param.put("keyword", keyword);
+ // 调用mybatisDao的selectPage方法，查询交易记录列表
return (Page) mybatisDao.selectPage(TradeRecordMapper.TradeRecordMapperNameSpace + "getTradeRecordList", param, limit, offset);
}
}
diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrder.java b/src/main/java/com/xmomen/module/order/entity/TbOrder.java
index 1536fe4..f976e85 100644
--- a/src/main/java/com/xmomen/module/order/entity/TbOrder.java
+++ b/src/main/java/com/xmomen/module/order/entity/TbOrder.java
@@ -13,184 +13,148 @@ import javax.persistence.Version;
@Entity
@Table(name = "tb_order")
public class TbOrder extends BaseMybatisModel {
- /**
- *
- */
+
+ // 订单ID
private Integer id;
- /**
- * 订单编号
- */
+
+ // 订单号
private String orderNo;
- /**
- * 1-卡，2-劵，3-常规，4-活动
- */
+
+ // 订单类型
private Integer orderType;
- /**
- * 1-微信订单，2-商城订单，3-客服下单，4-采摘订单
- */
+
+ // 订单来源
private Integer orderSource;
- /**
- * 付款方式
- */
+
+ // 支付方式
private Integer paymentMode;
- /**
- * 附加付款方式
- */
+
+ // 其他支付方式
private Integer otherPaymentMode;
- /**
- * 客户代码
- */
+
+ // 会员号
private String memberCode;
- /**
- * 订单状态
- */
+
+ // 订单状态
private String orderStatus;
- /**
- * 交易状态：0-待支付，1-已支付
- */
+
+ // 支付状态
private Integer payStatus;
- /**
- * 收货人手机
- */
+
+ // 收货人电话
private String consigneePhone;
- /**
- * 收货人姓名
- */
+
+ // 收货人姓名
private String consigneeName;
- /**
- * 收货人地址
- */
+
+ // 收货人地址
private String consigneeAddress;
- /**
- * 邮政编码
- */
+
+ // 邮编
private String postcode;
- /**
- * 运送方式 1-快递，2-自提
- */
+
+ // 运输方式
private Integer transportMode;
- /**
- * 订单备注
- */
+
+ // 备注
private String remark;
- /**
- * 折扣金额
- */
+
+ // 折扣价格
private BigDecimal discountPrice;
- /**
- * 订单总金额
- */
+
+ // 总金额
private BigDecimal totalAmount;
- /**
- * 订单创建时间
- */
+
+ // 创建时间
private Date createTime;
- /**
- * 预约时间
- */
+
+ // 预约时间
private Date appointmentTime;
- /**
- * 订单创建人ID
- */
+
+ // 创建人ID
private Integer createUserId;
- /**
- * 发运快递
- */
+
+ // 发货快递ID
private Integer despatchExpressId;
- /**
- * 快递员ID
- */
+
+ // 快递会员ID
private Integer expressMemberId;
- /**
- * 单位ID
- */
+
+ // 公司ID
private Integer companyId;
- /**
- * 客户经理ID
- */
+
+ // 管理员ID
private Integer managerId;
- /**
- * 批次号
- */
+
+ // 批次号
private String batchNo;
- /**
- * 装箱总箱数
- */
+
+ // 总箱数
private Integer totalBoxNum;
- /**
- * 快递商提货扫描箱数
- */
+
+ // 快递扫描箱数
private Integer expressScanBoxNum;
- /**
- * 0无下架商品，1有下架商品
- */
+
+ // 下架
private Integer xiajia;
- /**
- * 是否二次配送订单
- */
+
+ // 是否二次发货
private Integer isTwoSend;
- /**
- * 二次配送审核时间
- */
+
+ // 二次发货审核日期
private Date twoSendAuditDate;
- /**
- * 二次配送审核人
- */
+
+ // 二次发货审核人ID
private Integer twoSendAuditUserId;
- /**
- * 出库时间
- */
+
+ // 出库日期
private Date outDate;
- /**
- * 确认收货时间
- */
+
+ // 收货日期
private Date shouHuoDate;
- /**
- * 是否拒绝收货（0-不 1-是）
- */
+
+ // 是否驳回
private Integer isReject;
- /**
- * 更新时间
- */
+
+ // 更新日期
private Date updateDate;
- /**
- * 更新人
- */
+
+ // 更新人ID
private Integer updateUserId;
@Column(name = "ID")
diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderExample.java b/src/main/java/com/xmomen/module/order/entity/TbOrderExample.java
index 3bf4ad2..9b132d1 100644
--- a/src/main/java/com/xmomen/module/order/entity/TbOrderExample.java
+++ b/src/main/java/com/xmomen/module/order/entity/TbOrderExample.java
@@ -6,47 +6,60 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-public class TbOrderExample extends BaseMybatisExample {
+public class
+TbOrderExample extends BaseMybatisExample {
+ // 排序字段
protected String orderByClause;
+ // 是否去重
protected boolean distinct;
+ // 查询条件
protected List oredCriteria;
+ // 构造函数，初始化查询条件
public TbOrderExample() {
oredCriteria = new ArrayList();
}
+ // 设置排序字段
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 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) {
@@ -55,37 +68,46 @@ public class TbOrderExample extends BaseMybatisExample {
return criteria;
}
+ // 创建查询条件
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
+ // 清空查询条件
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
+ // GeneratedCriteria 类，用于生成查询条件
protected abstract static class GeneratedCriteria {
+ // 查询条件列表
protected List criteria;
+ // 构造函数，初始化查询条件列表
protected GeneratedCriteria() {
super();
criteria = new ArrayList();
}
+ // 判断查询条件是否有效
public boolean isValid() {
return criteria.size() > 0;
}
+ // 获取所有查询条件
public List getAllCriteria() {
return criteria;
}
+ // 获取查询条件
public List getCriteria() {
return criteria;
}
+ // 添加查询条件
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
@@ -93,6 +115,7 @@ public class TbOrderExample 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");
@@ -100,6 +123,7 @@ public class TbOrderExample 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");
@@ -107,747 +131,897 @@ public class TbOrderExample 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 values) {
addCriterion("ID in", values, "id");
return (Criteria) this;
}
+ // 添加查询条件，ID不在某个值列表中
public Criteria andIdNotIn(List 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;
}
+ // 添加查询条件，ORDER_NO为空
public Criteria andOrderNoIsNull() {
addCriterion("ORDER_NO is null");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO不为空
public Criteria andOrderNoIsNotNull() {
addCriterion("ORDER_NO is not null");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO等于某个值
public Criteria andOrderNoEqualTo(String value) {
addCriterion("ORDER_NO =", value, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO不等于某个值
public Criteria andOrderNoNotEqualTo(String value) {
addCriterion("ORDER_NO <>", value, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO大于某个值
public Criteria andOrderNoGreaterThan(String value) {
addCriterion("ORDER_NO >", value, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO大于等于某个值
public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
addCriterion("ORDER_NO >=", value, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO小于某个值
public Criteria andOrderNoLessThan(String value) {
addCriterion("ORDER_NO <", value, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO小于等于某个值
public Criteria andOrderNoLessThanOrEqualTo(String value) {
addCriterion("ORDER_NO <=", value, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO包含某个值
public Criteria andOrderNoLike(String value) {
addCriterion("ORDER_NO like", value, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO不包含某个值
public Criteria andOrderNoNotLike(String value) {
addCriterion("ORDER_NO not like", value, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO在某个值列表中
public Criteria andOrderNoIn(List values) {
addCriterion("ORDER_NO in", values, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO不在某个值列表中
public Criteria andOrderNoNotIn(List values) {
addCriterion("ORDER_NO not in", values, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO在某个值范围内
public Criteria andOrderNoBetween(String value1, String value2) {
addCriterion("ORDER_NO between", value1, value2, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_NO不在某个值范围内
public Criteria andOrderNoNotBetween(String value1, String value2) {
addCriterion("ORDER_NO not between", value1, value2, "orderNo");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE为空
public Criteria andOrderTypeIsNull() {
addCriterion("ORDER_TYPE is null");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE不为空
public Criteria andOrderTypeIsNotNull() {
addCriterion("ORDER_TYPE is not null");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE等于某个值
public Criteria andOrderTypeEqualTo(Integer value) {
addCriterion("ORDER_TYPE =", value, "orderType");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE不等于某个值
public Criteria andOrderTypeNotEqualTo(Integer value) {
addCriterion("ORDER_TYPE <>", value, "orderType");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE大于某个值
public Criteria andOrderTypeGreaterThan(Integer value) {
addCriterion("ORDER_TYPE >", value, "orderType");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE大于等于某个值
public Criteria andOrderTypeGreaterThanOrEqualTo(Integer value) {
addCriterion("ORDER_TYPE >=", value, "orderType");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE小于某个值
public Criteria andOrderTypeLessThan(Integer value) {
addCriterion("ORDER_TYPE <", value, "orderType");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE小于等于某个值
public Criteria andOrderTypeLessThanOrEqualTo(Integer value) {
addCriterion("ORDER_TYPE <=", value, "orderType");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE在某个值列表中
public Criteria andOrderTypeIn(List values) {
addCriterion("ORDER_TYPE in", values, "orderType");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE不在某个值列表中
public Criteria andOrderTypeNotIn(List values) {
addCriterion("ORDER_TYPE not in", values, "orderType");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE在某个值范围内
public Criteria andOrderTypeBetween(Integer value1, Integer value2) {
addCriterion("ORDER_TYPE between", value1, value2, "orderType");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_TYPE不在某个值范围内
public Criteria andOrderTypeNotBetween(Integer value1, Integer value2) {
addCriterion("ORDER_TYPE not between", value1, value2, "orderType");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE为空
public Criteria andOrderSourceIsNull() {
addCriterion("ORDER_SOURCE is null");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE不为空
public Criteria andOrderSourceIsNotNull() {
addCriterion("ORDER_SOURCE is not null");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE等于某个值
public Criteria andOrderSourceEqualTo(Integer value) {
addCriterion("ORDER_SOURCE =", value, "orderSource");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE不等于某个值
public Criteria andOrderSourceNotEqualTo(Integer value) {
addCriterion("ORDER_SOURCE <>", value, "orderSource");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE大于某个值
public Criteria andOrderSourceGreaterThan(Integer value) {
addCriterion("ORDER_SOURCE >", value, "orderSource");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE大于等于某个值
public Criteria andOrderSourceGreaterThanOrEqualTo(Integer value) {
addCriterion("ORDER_SOURCE >=", value, "orderSource");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE小于某个值
public Criteria andOrderSourceLessThan(Integer value) {
addCriterion("ORDER_SOURCE <", value, "orderSource");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE小于等于某个值
public Criteria andOrderSourceLessThanOrEqualTo(Integer value) {
addCriterion("ORDER_SOURCE <=", value, "orderSource");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE在某个值列表中
public Criteria andOrderSourceIn(List values) {
addCriterion("ORDER_SOURCE in", values, "orderSource");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE不在某个值列表中
public Criteria andOrderSourceNotIn(List values) {
addCriterion("ORDER_SOURCE not in", values, "orderSource");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE在某个值范围内
public Criteria andOrderSourceBetween(Integer value1, Integer value2) {
addCriterion("ORDER_SOURCE between", value1, value2, "orderSource");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_SOURCE不在某个值范围内
public Criteria andOrderSourceNotBetween(Integer value1, Integer value2) {
addCriterion("ORDER_SOURCE not between", value1, value2, "orderSource");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE为空
public Criteria andPaymentModeIsNull() {
addCriterion("PAYMENT_MODE is null");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE不为空
public Criteria andPaymentModeIsNotNull() {
addCriterion("PAYMENT_MODE is not null");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE等于某个值
public Criteria andPaymentModeEqualTo(Integer value) {
addCriterion("PAYMENT_MODE =", value, "paymentMode");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE不等于某个值
public Criteria andPaymentModeNotEqualTo(Integer value) {
addCriterion("PAYMENT_MODE <>", value, "paymentMode");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE大于某个值
public Criteria andPaymentModeGreaterThan(Integer value) {
addCriterion("PAYMENT_MODE >", value, "paymentMode");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE大于等于某个值
public Criteria andPaymentModeGreaterThanOrEqualTo(Integer value) {
addCriterion("PAYMENT_MODE >=", value, "paymentMode");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE小于某个值
public Criteria andPaymentModeLessThan(Integer value) {
addCriterion("PAYMENT_MODE <", value, "paymentMode");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE小于等于某个值
public Criteria andPaymentModeLessThanOrEqualTo(Integer value) {
addCriterion("PAYMENT_MODE <=", value, "paymentMode");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE在某个值列表中
public Criteria andPaymentModeIn(List values) {
addCriterion("PAYMENT_MODE in", values, "paymentMode");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE不在某个值列表中
public Criteria andPaymentModeNotIn(List values) {
addCriterion("PAYMENT_MODE not in", values, "paymentMode");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE在某个值范围内
public Criteria andPaymentModeBetween(Integer value1, Integer value2) {
addCriterion("PAYMENT_MODE between", value1, value2, "paymentMode");
return (Criteria) this;
}
+ // 添加查询条件，PAYMENT_MODE不在某个值范围内
public Criteria andPaymentModeNotBetween(Integer value1, Integer value2) {
addCriterion("PAYMENT_MODE not between", value1, value2, "paymentMode");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE为空
public Criteria andOtherPaymentModeIsNull() {
addCriterion("OTHER_PAYMENT_MODE is null");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE不为空
public Criteria andOtherPaymentModeIsNotNull() {
addCriterion("OTHER_PAYMENT_MODE is not null");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE等于某个值
public Criteria andOtherPaymentModeEqualTo(Integer value) {
addCriterion("OTHER_PAYMENT_MODE =", value, "otherPaymentMode");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE不等于某个值
public Criteria andOtherPaymentModeNotEqualTo(Integer value) {
addCriterion("OTHER_PAYMENT_MODE <>", value, "otherPaymentMode");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE大于某个值
public Criteria andOtherPaymentModeGreaterThan(Integer value) {
addCriterion("OTHER_PAYMENT_MODE >", value, "otherPaymentMode");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE大于等于某个值
public Criteria andOtherPaymentModeGreaterThanOrEqualTo(Integer value) {
addCriterion("OTHER_PAYMENT_MODE >=", value, "otherPaymentMode");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE小于某个值
public Criteria andOtherPaymentModeLessThan(Integer value) {
addCriterion("OTHER_PAYMENT_MODE <", value, "otherPaymentMode");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE小于等于某个值
public Criteria andOtherPaymentModeLessThanOrEqualTo(Integer value) {
addCriterion("OTHER_PAYMENT_MODE <=", value, "otherPaymentMode");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE在某个值列表中
public Criteria andOtherPaymentModeIn(List values) {
addCriterion("OTHER_PAYMENT_MODE in", values, "otherPaymentMode");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE不在某个值列表中
public Criteria andOtherPaymentModeNotIn(List values) {
addCriterion("OTHER_PAYMENT_MODE not in", values, "otherPaymentMode");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE在某个值范围内
public Criteria andOtherPaymentModeBetween(Integer value1, Integer value2) {
addCriterion("OTHER_PAYMENT_MODE between", value1, value2, "otherPaymentMode");
return (Criteria) this;
}
+ // 添加查询条件，OTHER_PAYMENT_MODE不在某个值范围内
public Criteria andOtherPaymentModeNotBetween(Integer value1, Integer value2) {
addCriterion("OTHER_PAYMENT_MODE not between", value1, value2, "otherPaymentMode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE为空
public Criteria andMemberCodeIsNull() {
addCriterion("MEMBER_CODE is null");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE不为空
public Criteria andMemberCodeIsNotNull() {
addCriterion("MEMBER_CODE is not null");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE等于某个值
public Criteria andMemberCodeEqualTo(String value) {
addCriterion("MEMBER_CODE =", value, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE不等于某个值
public Criteria andMemberCodeNotEqualTo(String value) {
addCriterion("MEMBER_CODE <>", value, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE大于某个值
public Criteria andMemberCodeGreaterThan(String value) {
addCriterion("MEMBER_CODE >", value, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE大于等于某个值
public Criteria andMemberCodeGreaterThanOrEqualTo(String value) {
addCriterion("MEMBER_CODE >=", value, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE小于某个值
public Criteria andMemberCodeLessThan(String value) {
addCriterion("MEMBER_CODE <", value, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE小于等于某个值
public Criteria andMemberCodeLessThanOrEqualTo(String value) {
addCriterion("MEMBER_CODE <=", value, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE包含某个值
public Criteria andMemberCodeLike(String value) {
addCriterion("MEMBER_CODE like", value, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE不包含某个值
public Criteria andMemberCodeNotLike(String value) {
addCriterion("MEMBER_CODE not like", value, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE在某个值列表中
public Criteria andMemberCodeIn(List values) {
addCriterion("MEMBER_CODE in", values, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE不在某个值列表中
public Criteria andMemberCodeNotIn(List values) {
addCriterion("MEMBER_CODE not in", values, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE在某个值范围内
public Criteria andMemberCodeBetween(String value1, String value2) {
addCriterion("MEMBER_CODE between", value1, value2, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，MEMBER_CODE不在某个值范围内
public Criteria andMemberCodeNotBetween(String value1, String value2) {
addCriterion("MEMBER_CODE not between", value1, value2, "memberCode");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS为空
public Criteria andOrderStatusIsNull() {
addCriterion("ORDER_STATUS is null");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS不为空
public Criteria andOrderStatusIsNotNull() {
addCriterion("ORDER_STATUS is not null");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS等于某个值
public Criteria andOrderStatusEqualTo(String value) {
addCriterion("ORDER_STATUS =", value, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS不等于某个值
public Criteria andOrderStatusNotEqualTo(String value) {
addCriterion("ORDER_STATUS <>", value, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS大于某个值
public Criteria andOrderStatusGreaterThan(String value) {
addCriterion("ORDER_STATUS >", value, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS大于等于某个值
public Criteria andOrderStatusGreaterThanOrEqualTo(String value) {
addCriterion("ORDER_STATUS >=", value, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS小于某个值
public Criteria andOrderStatusLessThan(String value) {
addCriterion("ORDER_STATUS <", value, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS小于等于某个值
public Criteria andOrderStatusLessThanOrEqualTo(String value) {
addCriterion("ORDER_STATUS <=", value, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS包含某个值
public Criteria andOrderStatusLike(String value) {
addCriterion("ORDER_STATUS like", value, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS不包含某个值
public Criteria andOrderStatusNotLike(String value) {
addCriterion("ORDER_STATUS not like", value, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS在某个值列表中
public Criteria andOrderStatusIn(List values) {
addCriterion("ORDER_STATUS in", values, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS不在某个值列表中
public Criteria andOrderStatusNotIn(List values) {
addCriterion("ORDER_STATUS not in", values, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS在某个值范围内
public Criteria andOrderStatusBetween(String value1, String value2) {
addCriterion("ORDER_STATUS between", value1, value2, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，ORDER_STATUS不在某个值范围内
public Criteria andOrderStatusNotBetween(String value1, String value2) {
addCriterion("ORDER_STATUS not between", value1, value2, "orderStatus");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS为空
public Criteria andPayStatusIsNull() {
addCriterion("PAY_STATUS is null");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS不为空
public Criteria andPayStatusIsNotNull() {
addCriterion("PAY_STATUS is not null");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS等于某个值
public Criteria andPayStatusEqualTo(Integer value) {
addCriterion("PAY_STATUS =", value, "payStatus");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS不等于某个值
public Criteria andPayStatusNotEqualTo(Integer value) {
addCriterion("PAY_STATUS <>", value, "payStatus");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS大于某个值
public Criteria andPayStatusGreaterThan(Integer value) {
addCriterion("PAY_STATUS >", value, "payStatus");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS大于等于某个值
public Criteria andPayStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("PAY_STATUS >=", value, "payStatus");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS小于某个值
public Criteria andPayStatusLessThan(Integer value) {
addCriterion("PAY_STATUS <", value, "payStatus");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS小于等于某个值
public Criteria andPayStatusLessThanOrEqualTo(Integer value) {
addCriterion("PAY_STATUS <=", value, "payStatus");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS在某个值列表中
public Criteria andPayStatusIn(List values) {
addCriterion("PAY_STATUS in", values, "payStatus");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS不在某个值列表中
public Criteria andPayStatusNotIn(List values) {
addCriterion("PAY_STATUS not in", values, "payStatus");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS在某个值范围内
public Criteria andPayStatusBetween(Integer value1, Integer value2) {
addCriterion("PAY_STATUS between", value1, value2, "payStatus");
return (Criteria) this;
}
+ // 添加查询条件，PAY_STATUS不在某个值范围内
public Criteria andPayStatusNotBetween(Integer value1, Integer value2) {
addCriterion("PAY_STATUS not between", value1, value2, "payStatus");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE为空
public Criteria andConsigneePhoneIsNull() {
addCriterion("CONSIGNEE_PHONE is null");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE不为空
public Criteria andConsigneePhoneIsNotNull() {
addCriterion("CONSIGNEE_PHONE is not null");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE等于某个值
public Criteria andConsigneePhoneEqualTo(String value) {
addCriterion("CONSIGNEE_PHONE =", value, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE不等于某个值
public Criteria andConsigneePhoneNotEqualTo(String value) {
addCriterion("CONSIGNEE_PHONE <>", value, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE大于某个值
public Criteria andConsigneePhoneGreaterThan(String value) {
addCriterion("CONSIGNEE_PHONE >", value, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE大于等于某个值
public Criteria andConsigneePhoneGreaterThanOrEqualTo(String value) {
addCriterion("CONSIGNEE_PHONE >=", value, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE小于某个值
public Criteria andConsigneePhoneLessThan(String value) {
addCriterion("CONSIGNEE_PHONE <", value, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE小于等于某个值
public Criteria andConsigneePhoneLessThanOrEqualTo(String value) {
addCriterion("CONSIGNEE_PHONE <=", value, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE包含某个值
public Criteria andConsigneePhoneLike(String value) {
addCriterion("CONSIGNEE_PHONE like", value, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE不包含某个值
public Criteria andConsigneePhoneNotLike(String value) {
addCriterion("CONSIGNEE_PHONE not like", value, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE在某个值列表中
public Criteria andConsigneePhoneIn(List values) {
addCriterion("CONSIGNEE_PHONE in", values, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE不在某个值列表中
public Criteria andConsigneePhoneNotIn(List values) {
addCriterion("CONSIGNEE_PHONE not in", values, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE在某个值范围内
public Criteria andConsigneePhoneBetween(String value1, String value2) {
addCriterion("CONSIGNEE_PHONE between", value1, value2, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_PHONE不在某个值范围内
public Criteria andConsigneePhoneNotBetween(String value1, String value2) {
addCriterion("CONSIGNEE_PHONE not between", value1, value2, "consigneePhone");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME为空
public Criteria andConsigneeNameIsNull() {
addCriterion("CONSIGNEE_NAME is null");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME不为空
public Criteria andConsigneeNameIsNotNull() {
addCriterion("CONSIGNEE_NAME is not null");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME等于某个值
public Criteria andConsigneeNameEqualTo(String value) {
addCriterion("CONSIGNEE_NAME =", value, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME不等于某个值
public Criteria andConsigneeNameNotEqualTo(String value) {
addCriterion("CONSIGNEE_NAME <>", value, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME大于某个值
public Criteria andConsigneeNameGreaterThan(String value) {
addCriterion("CONSIGNEE_NAME >", value, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME大于等于某个值
public Criteria andConsigneeNameGreaterThanOrEqualTo(String value) {
addCriterion("CONSIGNEE_NAME >=", value, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME小于某个值
public Criteria andConsigneeNameLessThan(String value) {
addCriterion("CONSIGNEE_NAME <", value, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME小于等于某个值
public Criteria andConsigneeNameLessThanOrEqualTo(String value) {
addCriterion("CONSIGNEE_NAME <=", value, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME包含某个值
public Criteria andConsigneeNameLike(String value) {
addCriterion("CONSIGNEE_NAME like", value, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME不包含某个值
public Criteria andConsigneeNameNotLike(String value) {
addCriterion("CONSIGNEE_NAME not like", value, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME在某个值列表中
public Criteria andConsigneeNameIn(List values) {
addCriterion("CONSIGNEE_NAME in", values, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME不在某个值列表中
public Criteria andConsigneeNameNotIn(List values) {
addCriterion("CONSIGNEE_NAME not in", values, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME在某个值范围内
public Criteria andConsigneeNameBetween(String value1, String value2) {
addCriterion("CONSIGNEE_NAME between", value1, value2, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_NAME不在某个值范围内
public Criteria andConsigneeNameNotBetween(String value1, String value2) {
addCriterion("CONSIGNEE_NAME not between", value1, value2, "consigneeName");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_ADDRESS为空
public Criteria andConsigneeAddressIsNull() {
addCriterion("CONSIGNEE_ADDRESS is null");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_ADDRESS不为空
public Criteria andConsigneeAddressIsNotNull() {
addCriterion("CONSIGNEE_ADDRESS is not null");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_ADDRESS等于某个值
public Criteria andConsigneeAddressEqualTo(String value) {
addCriterion("CONSIGNEE_ADDRESS =", value, "consigneeAddress");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_ADDRESS不等于某个值
public Criteria andConsigneeAddressNotEqualTo(String value) {
addCriterion("CONSIGNEE_ADDRESS <>", value, "consigneeAddress");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_ADDRESS大于某个值
public Criteria andConsigneeAddressGreaterThan(String value) {
addCriterion("CONSIGNEE_ADDRESS >", value, "consigneeAddress");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_ADDRESS大于等于某个值
public Criteria andConsigneeAddressGreaterThanOrEqualTo(String value) {
addCriterion("CONSIGNEE_ADDRESS >=", value, "consigneeAddress");
return (Criteria) this;
}
+ // 添加查询条件，CONSIGNEE_ADDRESS小于某个值
public Criteria andConsigneeAddressLessThan(String value) {
+ // 添加查询条件，CONSIGNEE_ADDRESS小于value
addCriterion("CONSIGNEE_ADDRESS <", value, "consigneeAddress");
return (Criteria) this;
}
diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderItem.java b/src/main/java/com/xmomen/module/order/entity/TbOrderItem.java
index f309900..e2a1890 100644
--- a/src/main/java/com/xmomen/module/order/entity/TbOrderItem.java
+++ b/src/main/java/com/xmomen/module/order/entity/TbOrderItem.java
@@ -13,64 +13,52 @@ import javax.persistence.Version;
@Entity
@Table(name = "tb_order_item")
public class TbOrderItem extends BaseMybatisModel {
- /**
- *
- */
+
+ // 订单项ID
private Integer id;
- /**
- * 订单编号
- */
+
+ // 订单号
private String orderNo;
- /**
- *
- */
+
+ // 商品ID
private Integer itemId;
- /**
- * 商品编码
- */
+
+ // 商品编码
private String itemCode;
- /**
- * 商品名称
- */
+
+ // 商品名称
private String itemName;
- /**
- * 商品单价
- */
+
+ // 商品价格
private BigDecimal itemPrice;
- /**
- * 商品数量
- */
+
+ // 商品数量
private BigDecimal itemQty;
- /**
- * 商品单位
- */
+
+ // 商品单位
private String itemUnit;
- /**
- * 创建时间
- */
+
+ // 创建日期
private Date createDate;
- /**
- * 创建人
- */
+
+ // 创建用户ID
private Integer createUserId;
- /**
- * 更新时间
- */
+
+ // 更新日期
private Date updateDate;
- /**
- * 更新人
- */
+
+ // 更新用户ID
private Integer updateUserId;
@Column(name = "ID")
diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderItemExample.java b/src/main/java/com/xmomen/module/order/entity/TbOrderItemExample.java
index 68a1963..8b75ed2 100644
--- a/src/main/java/com/xmomen/module/order/entity/TbOrderItemExample.java
+++ b/src/main/java/com/xmomen/module/order/entity/TbOrderItemExample.java
@@ -6,47 +6,60 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+// 订单项示例类
public class TbOrderItemExample extends BaseMybatisExample {
+ // 排序字段
protected String orderByClause;
+ // 是否去重
protected boolean distinct;
+ // 查询条件
protected List oredCriteria;
+ // 构造函数
public TbOrderItemExample() {
oredCriteria = new ArrayList();
}
+ // 设置排序字段
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 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) {
@@ -55,37 +68,46 @@ public class TbOrderItemExample 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 criteria;
+ // 构造函数
protected GeneratedCriteria() {
super();
criteria = new ArrayList();
}
+ // 判断查询条件是否有效
public boolean isValid() {
return criteria.size() > 0;
}
+ // 获取所有查询条件
public List getAllCriteria() {
return criteria;
}
+ // 获取查询条件
public List getCriteria() {
return criteria;
}
+ // 添加查询条件
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
@@ -93,6 +115,7 @@ public class TbOrderItemExample 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");
@@ -100,6 +123,7 @@ public class TbOrderItemExample 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");
@@ -107,371 +131,445 @@ public class TbOrderItemExample 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 values) {
addCriterion("ID in", values, "id");
return (Criteria) this;
}
+ // 添加ID不在指定值列表中的查询条件
public Criteria andIdNotIn(List 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;
}
+ // 添加订单号为空的查询条件
public Criteria andOrderNoIsNull() {
addCriterion("ORDER_NO is null");
return (Criteria) this;
}
+ // 添加订单号不为空的查询条件
public Criteria andOrderNoIsNotNull() {
addCriterion("ORDER_NO is not null");
return (Criteria) this;
}
+ // 添加订单号等于指定值的查询条件
public Criteria andOrderNoEqualTo(String value) {
addCriterion("ORDER_NO =", value, "orderNo");
return (Criteria) this;
}
+ // 添加订单号不等于指定值的查询条件
public Criteria andOrderNoNotEqualTo(String value) {
addCriterion("ORDER_NO <>", value, "orderNo");
return (Criteria) this;
}
+ // 添加订单号大于指定值的查询条件
public Criteria andOrderNoGreaterThan(String value) {
addCriterion("ORDER_NO >", value, "orderNo");
return (Criteria) this;
}
+ // 添加订单号大于等于指定值的查询条件
public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
addCriterion("ORDER_NO >=", value, "orderNo");
return (Criteria) this;
}
+ // 添加订单号小于指定值的查询条件
public Criteria andOrderNoLessThan(String value) {
addCriterion("ORDER_NO <", value, "orderNo");
return (Criteria) this;
}
+ // 添加订单号小于等于指定值的查询条件
public Criteria andOrderNoLessThanOrEqualTo(String value) {
addCriterion("ORDER_NO <=", value, "orderNo");
return (Criteria) this;
}
+ // 添加订单号包含指定值的查询条件
public Criteria andOrderNoLike(String value) {
addCriterion("ORDER_NO like", value, "orderNo");
return (Criteria) this;
}
+ // 添加订单号不包含指定值的查询条件
public Criteria andOrderNoNotLike(String value) {
addCriterion("ORDER_NO not like", value, "orderNo");
return (Criteria) this;
}
+ // 添加订单号在指定值列表中的查询条件
public Criteria andOrderNoIn(List values) {
addCriterion("ORDER_NO in", values, "orderNo");
return (Criteria) this;
}
+ // 添加订单号不在指定值列表中的查询条件
public Criteria andOrderNoNotIn(List values) {
addCriterion("ORDER_NO not in", values, "orderNo");
return (Criteria) this;
}
+ // 添加订单号在指定值之间的查询条件
public Criteria andOrderNoBetween(String value1, String value2) {
addCriterion("ORDER_NO between", value1, value2, "orderNo");
return (Criteria) this;
}
+ // 添加订单号不在指定值之间的查询条件
public Criteria andOrderNoNotBetween(String value1, String value2) {
addCriterion("ORDER_NO not between", value1, value2, "orderNo");
return (Criteria) this;
}
+ // 添加商品ID为空的查询条件
public Criteria andItemIdIsNull() {
addCriterion("ITEM_ID is null");
return (Criteria) this;
}
+ // 添加商品ID不为空的查询条件
public Criteria andItemIdIsNotNull() {
addCriterion("ITEM_ID is not null");
return (Criteria) this;
}
+ // 添加商品ID等于指定值的查询条件
public Criteria andItemIdEqualTo(Integer value) {
addCriterion("ITEM_ID =", value, "itemId");
return (Criteria) this;
}
+ // 添加商品ID不等于指定值的查询条件
public Criteria andItemIdNotEqualTo(Integer value) {
addCriterion("ITEM_ID <>", value, "itemId");
return (Criteria) this;
}
+ // 添加商品ID大于指定值的查询条件
public Criteria andItemIdGreaterThan(Integer value) {
addCriterion("ITEM_ID >", value, "itemId");
return (Criteria) this;
}
+ // 添加商品ID大于等于指定值的查询条件
public Criteria andItemIdGreaterThanOrEqualTo(Integer value) {
addCriterion("ITEM_ID >=", value, "itemId");
return (Criteria) this;
}
+ // 添加商品ID小于指定值的查询条件
public Criteria andItemIdLessThan(Integer value) {
addCriterion("ITEM_ID <", value, "itemId");
return (Criteria) this;
}
+ // 添加商品ID小于等于指定值的查询条件
public Criteria andItemIdLessThanOrEqualTo(Integer value) {
addCriterion("ITEM_ID <=", value, "itemId");
return (Criteria) this;
}
+ // 添加商品ID在指定值列表中的查询条件
public Criteria andItemIdIn(List values) {
addCriterion("ITEM_ID in", values, "itemId");
return (Criteria) this;
}
+ // 添加商品ID不在指定值列表中的查询条件
public Criteria andItemIdNotIn(List values) {
addCriterion("ITEM_ID not in", values, "itemId");
return (Criteria) this;
}
+ // 添加商品ID在指定值之间的查询条件
public Criteria andItemIdBetween(Integer value1, Integer value2) {
addCriterion("ITEM_ID between", value1, value2, "itemId");
return (Criteria) this;
}
+ // 添加商品ID不在指定值之间的查询条件
public Criteria andItemIdNotBetween(Integer value1, Integer value2) {
addCriterion("ITEM_ID not between", value1, value2, "itemId");
return (Criteria) this;
}
+ // 添加商品编码为空的查询条件
public Criteria andItemCodeIsNull() {
addCriterion("ITEM_CODE is null");
return (Criteria) this;
}
+ // 添加商品编码不为空的查询条件
public Criteria andItemCodeIsNotNull() {
addCriterion("ITEM_CODE is not null");
return (Criteria) this;
}
+ // 添加商品编码等于指定值的查询条件
public Criteria andItemCodeEqualTo(String value) {
addCriterion("ITEM_CODE =", value, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码不等于指定值的查询条件
public Criteria andItemCodeNotEqualTo(String value) {
addCriterion("ITEM_CODE <>", value, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码大于指定值的查询条件
public Criteria andItemCodeGreaterThan(String value) {
addCriterion("ITEM_CODE >", value, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码大于等于指定值的查询条件
public Criteria andItemCodeGreaterThanOrEqualTo(String value) {
addCriterion("ITEM_CODE >=", value, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码小于指定值的查询条件
public Criteria andItemCodeLessThan(String value) {
addCriterion("ITEM_CODE <", value, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码小于等于指定值的查询条件
public Criteria andItemCodeLessThanOrEqualTo(String value) {
addCriterion("ITEM_CODE <=", value, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码包含指定值的查询条件
public Criteria andItemCodeLike(String value) {
addCriterion("ITEM_CODE like", value, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码不包含指定值的查询条件
public Criteria andItemCodeNotLike(String value) {
addCriterion("ITEM_CODE not like", value, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码在指定值列表中的查询条件
public Criteria andItemCodeIn(List values) {
addCriterion("ITEM_CODE in", values, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码不在指定值列表中的查询条件
public Criteria andItemCodeNotIn(List values) {
addCriterion("ITEM_CODE not in", values, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码在指定值之间的查询条件
public Criteria andItemCodeBetween(String value1, String value2) {
addCriterion("ITEM_CODE between", value1, value2, "itemCode");
return (Criteria) this;
}
+ // 添加商品编码不在指定值之间的查询条件
public Criteria andItemCodeNotBetween(String value1, String value2) {
addCriterion("ITEM_CODE not between", value1, value2, "itemCode");
return (Criteria) this;
}
+ // 添加商品名称为空的查询条件
public Criteria andItemNameIsNull() {
addCriterion("ITEM_NAME is null");
return (Criteria) this;
}
+ // 添加商品名称不为空的查询条件
public Criteria andItemNameIsNotNull() {
addCriterion("ITEM_NAME is not null");
return (Criteria) this;
}
+ // 添加商品名称等于指定值的查询条件
public Criteria andItemNameEqualTo(String value) {
addCriterion("ITEM_NAME =", value, "itemName");
return (Criteria) this;
}
+ // 添加商品名称不等于指定值的查询条件
public Criteria andItemNameNotEqualTo(String value) {
addCriterion("ITEM_NAME <>", value, "itemName");
return (Criteria) this;
}
+ // 添加商品名称大于指定值的查询条件
public Criteria andItemNameGreaterThan(String value) {
addCriterion("ITEM_NAME >", value, "itemName");
return (Criteria) this;
}
+ // 添加商品名称大于等于指定值的查询条件
public Criteria andItemNameGreaterThanOrEqualTo(String value) {
addCriterion("ITEM_NAME >=", value, "itemName");
return (Criteria) this;
}
+ // 添加商品名称小于指定值的查询条件
public Criteria andItemNameLessThan(String value) {
addCriterion("ITEM_NAME <", value, "itemName");
return (Criteria) this;
}
+ // 添加商品名称小于等于指定值的查询条件
public Criteria andItemNameLessThanOrEqualTo(String value) {
addCriterion("ITEM_NAME <=", value, "itemName");
return (Criteria) this;
}
+ // 添加商品名称包含指定值的查询条件
public Criteria andItemNameLike(String value) {
addCriterion("ITEM_NAME like", value, "itemName");
return (Criteria) this;
}
+ // 添加商品名称不包含指定值的查询条件
public Criteria andItemNameNotLike(String value) {
addCriterion("ITEM_NAME not like", value, "itemName");
return (Criteria) this;
}
+ // 添加商品名称在指定值列表中的查询条件
public Criteria andItemNameIn(List values) {
addCriterion("ITEM_NAME in", values, "itemName");
return (Criteria) this;
}
+ // 添加商品名称不在指定值列表中的查询条件
public Criteria andItemNameNotIn(List values) {
addCriterion("ITEM_NAME not in", values, "itemName");
return (Criteria) this;
}
+ // 添加商品名称在指定值之间的查询条件
public Criteria andItemNameBetween(String value1, String value2) {
addCriterion("ITEM_NAME between", value1, value2, "itemName");
return (Criteria) this;
}
+ // 添加商品名称不在指定值之间的查询条件
public Criteria andItemNameNotBetween(String value1, String value2) {
addCriterion("ITEM_NAME not between", value1, value2, "itemName");
return (Criteria) this;
}
+ // 添加商品价格为空的查询条件
public Criteria andItemPriceIsNull() {
addCriterion("ITEM_PRICE is null");
return (Criteria) this;
}
+ // 添加商品价格不为空的查询条件
public Criteria andItemPriceIsNotNull() {
addCriterion("ITEM_PRICE is not null");
return (Criteria) this;
}
+ // 添加商品价格等于指定值的查询条件
public Criteria andItemPriceEqualTo(BigDecimal value) {
addCriterion("ITEM_PRICE =", value, "itemPrice");
return (Criteria) this;
}
+ // 添加商品价格不等于指定值的查询条件
public Criteria andItemPriceNotEqualTo(BigDecimal value) {
addCriterion("ITEM_PRICE <>", value, "itemPrice");
return (Criteria) this;
}
+ // 添加商品价格大于指定值的查询条件
public Criteria andItemPriceGreaterThan(BigDecimal value) {
addCriterion("ITEM_PRICE >", value, "itemPrice");
return (Criteria) this;
}
+ // 添加商品价格大于等于指定值的查询条件
public Criteria andItemPriceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("ITEM_PRICE >=", value, "itemPrice");
return (Criteria) this;
}
+ // 添加商品价格小于指定值的查询条件
public Criteria andItemPriceLessThan(BigDecimal value) {
addCriterion("ITEM_PRICE <", value, "itemPrice");
return (Criteria) this;
}
+ // 添加商品价格小于等于指定值的查询条件
public Criteria andItemPriceLessThanOrEqualTo(BigDecimal value) {
addCriterion("ITEM_PRICE <=", value, "itemPrice");
return (Criteria) this;
diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderRef.java b/src/main/java/com/xmomen/module/order/entity/TbOrderRef.java
index fd073eb..524ac5b 100644
--- a/src/main/java/com/xmomen/module/order/entity/TbOrderRef.java
+++ b/src/main/java/com/xmomen/module/order/entity/TbOrderRef.java
@@ -11,24 +11,20 @@ import javax.persistence.Version;
@Entity
@Table(name = "tb_order_ref")
public class TbOrderRef extends BaseMybatisModel {
- /**
- * 物理主键
- */
+
+ // 订单引用ID
private Integer id;
- /**
- * 扩展类型
- */
+
+ // 引用类型
private String refType;
- /**
- * 扩展值
- */
+
+ // 引用值
private String refValue;
- /**
- * 订单编号
- */
+
+ // 订单号
private String orderNo;
@Column(name = "ID")
diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderRefExample.java b/src/main/java/com/xmomen/module/order/entity/TbOrderRefExample.java
index e851fe7..5586ecd 100644
--- a/src/main/java/com/xmomen/module/order/entity/TbOrderRefExample.java
+++ b/src/main/java/com/xmomen/module/order/entity/TbOrderRefExample.java
@@ -4,47 +4,60 @@ import com.xmomen.framework.mybatis.model.BaseMybatisExample;
import java.util.ArrayList;
import java.util.List;
+// 定义一个TbOrderRefExample类，继承自BaseMybatisExample类
public class TbOrderRefExample extends BaseMybatisExample {
+ // 定义一个orderByClause变量，用于存储排序的子句
protected String orderByClause;
+ // 定义一个distinct变量，用于存储是否去重的标志
protected boolean distinct;
+ // 定义一个oredCriteria变量，用于存储查询条件的列表
protected List