122

src/main/java/com/xmomen/framework/web/exceptions/ArgumentValidException.java

@@ -0,0 +1,34 @@
+package com.xmomen.framework.web.exceptions;
+
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+
+import java.util.Iterator;
+
+/**
+ * Created by tanxinzheng on 17/5/14.
+ */
+@Deprecated
+public class ArgumentValidException extends Exception{
+    private final BindingResult bindingResult;
+
+    public ArgumentValidException(BindingResult bindingResult) {
+        this.bindingResult = bindingResult;
+    }
+
+    public BindingResult getBindingResult() {
+        return this.bindingResult;
+    }
+
+    public String getMessage() {
+        StringBuilder sb = (new StringBuilder("Validation failed for argument at index ")).append(", with ").append(this.bindingResult.getErrorCount()).append(" error(s): ");
+        Iterator var2 = this.bindingResult.getAllErrors().iterator();
+
+        while(var2.hasNext()) {
+            ObjectError error = (ObjectError)var2.next();
+            sb.append("[").append(error).append("] ");
+        }
+
+        return sb.toString();
+    }
+}

src/main/java/com/xmomen/framework/web/interceptor/CrossInterceptor.java

@@ -0,0 +1,28 @@
+package com.xmomen.framework.web.interceptor;
+
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+
+/**
+ * Created by tanxinzheng on 17/5/24.
+ */
+public class CrossInterceptor extends OncePerRequestFilter {
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+        if (request.getHeader("Access-Control-Request-Method") != null && "OPTIONS".equals(request.getMethod())) {
+            // CORS "pre-flight" request
+            response.addHeader("Access-Control-Allow-Origin", "*");
+            response.addHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE");
+            response.addHeader("Access-Control-Allow-Headers", "X-Requested-With,Content-Type");
+            response.addHeader("Access-Control-Max-Age", "1800");//30 min
+        }
+        filterChain.doFilter(request, response);
+    }
+}

src/main/java/com/xmomen/module/account/model/CreateUser.java

@@ -0,0 +1,52 @@
+package com.xmomen.module.account.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * <p>User: Zhang Kaitao
+ * <p>Date: 14-1-28
+ * <p>Version: 1.0
+ */
+public @Data class CreateUser implements Serializable {
+	
+    private String username;
+    private String email;
+    private String password;
+    /**
+     * 真实姓名
+     */
+    private String realname;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+    /**
+     * 1-男，2女
+     */
+    private Integer sex;
+
+    /**
+     * QQ
+     */
+    private String qq;
+
+    /**
+     * 手机号
+     */
+    private String phoneNumber;
+
+    /**
+     * 办公室电话
+     */
+    private String officeTel;
+
+    private Boolean locked = Boolean.FALSE;
+    
+    private Integer organizationId;
+    
+    private List<Integer> userGroupIds;
+}

src/main/java/com/xmomen/module/account/model/User.java

@@ -0,0 +1,25 @@
+package com.xmomen.module.account.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * Created by Jeng on 2016/1/28.
+ */
+public @Data class User implements Serializable {
+    private Integer id;
+    private String username;
+    private String realName;
+    private String phoneNumber;
+    private String sex;
+    private Integer age;
+    private String qq;
+    private String officeTel;
+    private Integer locked;
+    private String email;
+    private String organization;//组织
+    private Integer organizationId;
+    private List<UserGroup> userGroups;
+}

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

@@ -0,0 +1,112 @@
+package com.xmomen.module.account.realm;
+
+import com.xmomen.module.account.service.UserService;
+import com.xmomen.module.core.web.token.SysUserToken;
+import com.xmomen.module.user.entity.SysUsers;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.LockedAccountException;
+import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authc.UnknownAccountException;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.authz.SimpleAuthorizationInfo;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.apache.shiro.util.ByteSource;
+
+import java.util.Set;
+
+
+/**
+ * <p>User: Zhang Kaitao
+ * <p>Date: 14-1-28
+ * <p>Version: 1.0
+ */
+public class UserRealm extends AuthorizingRealm {
+
+    private UserService userService;
+
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
+
+    @Override
+    protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
+        String username = (String)principals.getPrimaryPrincipal();
+        Set<String> roles = userService.findRoles(username);
+        Set<String> realmNames = principals.getRealmNames();
+        for(String realmName: realmNames) {
+        	if(realmName.contains("UserRealm")) {
+        		roles.add("user");
+        	}
+        }
+        SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo();
+        authorizationInfo.setRoles(roles);
+        authorizationInfo.setStringPermissions(userService.findPermissions(username));
+        return authorizationInfo;
+    }
+
+    
+    @Override
+	public boolean supports(AuthenticationToken token) {
+		if(token instanceof SysUserToken) {
+			return super.supports(token);
+		}
+		return false;
+	}
+
+	@Override
+    protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
+
+        String username = (String)token.getPrincipal();
+
+        SysUsers user = userService.findByUsername(username);
+
+        if(user == null) {
+            throw new UnknownAccountException();//没找到帐号
+        }
+
+        if(Boolean.TRUE.equals(user.getLocked())) {
+            throw new LockedAccountException(); //帐号锁定
+        }
+
+        //交给AuthenticatingRealm使用CredentialsMatcher进行密码匹配，如果觉得人家的不好可以自定义实现
+        SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo(
+                username, //用户名
+                user.getPassword(), //密码
+                ByteSource.Util.bytes(user.getSalt()),//salt=salt
+                getName()  //realm name
+        );
+        return authenticationInfo;
+    }
+
+    @Override
+    public void clearCachedAuthorizationInfo(PrincipalCollection principals) {
+        super.clearCachedAuthorizationInfo(principals);
+    }
+
+    @Override
+    public void clearCachedAuthenticationInfo(PrincipalCollection principals) {
+        super.clearCachedAuthenticationInfo(principals);
+    }
+
+    @Override
+    public void clearCache(PrincipalCollection principals) {
+        super.clearCache(principals);
+    }
+
+    public void clearAllCachedAuthorizationInfo() {
+        getAuthorizationCache().clear();
+    }
+
+    public void clearAllCachedAuthenticationInfo() {
+        getAuthenticationCache().clear();
+    }
+
+    public void clearAllCache() {
+        clearAllCachedAuthenticationInfo();
+        clearAllCachedAuthorizationInfo();
+    }
+
+}

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

@@ -0,0 +1,43 @@
+package com.xmomen.module.account.service;
+
+import org.apache.shiro.crypto.RandomNumberGenerator;
+import org.apache.shiro.crypto.SecureRandomNumberGenerator;
+import org.apache.shiro.crypto.hash.SimpleHash;
+import org.apache.shiro.util.ByteSource;
+
+/**
+ * <p>User: Zhang Kaitao
+ * <p>Date: 14-1-28
+ * <p>Version: 1.0
+ */
+public class PasswordHelper {
+
+    private RandomNumberGenerator randomNumberGenerator = new SecureRandomNumberGenerator();
+    private String algorithmName = "md5";
+    private int hashIterations = 2;
+
+    public void setRandomNumberGenerator(RandomNumberGenerator randomNumberGenerator) {
+        this.randomNumberGenerator = randomNumberGenerator;
+    }
+
+    public void setAlgorithmName(String algorithmName) {
+        this.algorithmName = algorithmName;
+    }
+
+    public void setHashIterations(int hashIterations) {
+        this.hashIterations = hashIterations;
+    }
+
+    public String getSalt(){
+        return randomNumberGenerator.nextBytes().toHex();
+    }
+
+    public String encryptPassword(String password, String salt) {
+        return new SimpleHash(
+                algorithmName,
+                password,
+                ByteSource.Util.bytes(salt),
+                hashIterations).toHex();
+
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.xmomen.module.account.service;
+
+import com.xmomen.module.user.entity.SysPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.xmomen.framework.mybatis.dao.MybatisDao;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>User: Zhang Kaitao
+ * <p>Date: 14-1-28
+ * <p>Version: 1.0
+ */
+@Service
+public class PermissionServiceImpl implements PermissionService {
+
+	@Autowired
+	private MybatisDao mybatisDao;
+
+    @Override
+    @Transactional
+    public SysPermissions createPermission(SysPermissions permission) {
+    	permission = mybatisDao.saveByModel(permission);
+        return permission;
+    }
+
+    @Override
+    @Transactional
+    public void deletePermission(Long permissionId) {
+    	mybatisDao.deleteByPrimaryKey(SysPermissions.class, permissionId);
+    }
+}

src/main/java/com/xmomen/module/account/web/controller/PermissionController.java

@@ -0,0 +1,114 @@
+package com.xmomen.module.account.web.controller;
+
+import com.xmomen.module.account.service.PermissionService;
+import com.xmomen.module.account.service.RoleService;
+import com.xmomen.module.account.service.UserService;
+import com.xmomen.module.account.web.controller.vo.CreatePermissionVo;
+import com.xmomen.module.user.entity.SysPermissions;
+import com.xmomen.module.user.entity.SysPermissionsExample;
+import com.xmomen.framework.mybatis.dao.MybatisDao;
+import com.xmomen.framework.mybatis.page.Page;
+import com.xmomen.framework.web.exceptions.ArgumentValidException;
+import com.xmomen.module.logger.Log;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.*;
+
+/**
+ * Created by Jeng on 2016/1/5.
+ */
+@RestController
+public class PermissionController {
+
+    @Autowired
+    UserService userService;
+
+    @Autowired
+    PermissionService permissionService;
+
+    @Autowired
+    RoleService roleService;
+
+    @Autowired
+    MybatisDao mybatisDao;
+
+    /**
+     * 权限权限
+     * @return
+     */
+    @RequestMapping(value = "/user/permissions", method = RequestMethod.GET)
+    public Map getPermission(){
+        String username = (String) SecurityUtils.getSubject().getPrincipal();
+        Set<String> roles = userService.findRoles(username);
+        Set<String> permissions = userService.findPermissions(username);
+        Map rolesMap = new HashMap();
+        rolesMap.put("roles", roles);
+        rolesMap.put("permissions", permissions);
+        return rolesMap;
+    }
+
+    /**
+     * 权限列表
+     * @param limit
+     * @param offset
+     * @param keyword
+     * @return
+     */
+    @RequestMapping(value = "/permission", method = RequestMethod.GET)
+    @Log(actionName = "查看权限列表")
+    public Page<SysPermissions> getPermissionList(@RequestParam(value = "limit") Integer limit,
+                                        @RequestParam(value = "offset") Integer offset,
+                                        @RequestParam(value = "keyword", required = false) String keyword){
+        SysPermissionsExample sysPermissionsExample = new SysPermissionsExample();
+        sysPermissionsExample.createCriteria()
+                .andPermissionLike("%" + StringUtils.trimToEmpty(keyword) + "%");
+        sysPermissionsExample.or()
+                .andDescriptionLike("%" + StringUtils.trimToEmpty(keyword) + "%");
+        return mybatisDao.selectPageByExample(sysPermissionsExample, limit, offset);
+    }
+
+    /**
+     *  权限资源
+     * @param id
+     */
+    @RequestMapping(value = "/permission/{id}", method = RequestMethod.GET)
+    @Log(actionName = "查询单个权限")
+    public SysPermissions getPermission(@PathVariable(value = "id") Integer id){
+        return mybatisDao.selectByPrimaryKey(SysPermissions.class, id);
+    }
+
+    /**
+     * 新增权限
+     * @param createPermissionVo
+     * @param bindingResult
+     * @return
+     */
+    @RequestMapping(value = "/permission", method = RequestMethod.POST)
+    @Log(actionName = "新增权限资源")
+    public SysPermissions createPermission(@RequestBody @Valid CreatePermissionVo createPermissionVo, BindingResult bindingResult) throws ArgumentValidException {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            throw new ArgumentValidException(bindingResult);
+        }
+        SysPermissions sysPermissions = new SysPermissions();
+        sysPermissions.setDescription(createPermissionVo.getDescription());
+        sysPermissions.setPermission(createPermissionVo.getPermissionCode().toUpperCase());
+        sysPermissions.setAvailable(createPermissionVo.getAvailable() != null && createPermissionVo.getAvailable() ? 1 : 0);
+        return permissionService.createPermission(sysPermissions);
+    }
+
+    /**
+     *  删除权限
+     * @param id
+     */
+    @RequestMapping(value = "/permission/{id}", method = RequestMethod.DELETE)
+    @Log(actionName = "删除权限资源")
+    public void deletePermission(@PathVariable(value = "id") Long id){
+        mybatisDao.deleteByPrimaryKey(SysPermissions.class, id);
+    }
+
+}

src/main/java/com/xmomen/module/account/web/controller/UserController.java

@@ -0,0 +1,147 @@
+package com.xmomen.module.account.web.controller;
+
+import javax.validation.Valid;
+
+import com.xmomen.module.account.model.CreateUser;
+import com.xmomen.module.account.mapper.UserMapper;
+import com.xmomen.module.account.model.User;
+import com.xmomen.module.account.service.UserService;
+import com.xmomen.module.account.web.controller.vo.CreateUserVo;
+import com.xmomen.module.account.web.controller.vo.UpdateUserVo;
+import com.xmomen.module.user.entity.SysUsers;
+import com.xmomen.framework.mybatis.page.Page;
+import com.xmomen.framework.web.exceptions.ArgumentValidException;
+import com.xmomen.module.logger.Log;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import com.xmomen.framework.mybatis.dao.MybatisDao;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by Jeng on 2016/1/5.
+ */
+@RestController
+public class UserController {
+
+    @Autowired
+    UserService userService;
+
+    @Autowired
+    UserMapper userMapper;
+
+    @Autowired
+    MybatisDao mybatisDao;
+
+    /**
+     *  用户列表
+     * @param id
+     */
+    @RequestMapping(value = "/user", method = RequestMethod.GET)
+    @Log(actionName = "查询用户列表")
+    public Page<User> getUserList(@RequestParam(value = "limit") Integer limit,
+                                  @RequestParam(value = "offset") Integer offset,
+                                  @RequestParam(value = "id", required = false) Integer id,
+                                  @RequestParam(value = "keyword", required = false) String keyword,
+                                  @RequestParam(value = "organizationId",required = false) Integer organizationId){
+        Map<String, Object> map = new HashMap<String,Object>();
+        map.put("id", id);
+        map.put("keyword", keyword);
+        map.put("organizationId", organizationId);
+        return (Page<User>) mybatisDao.selectPage(UserMapper.UserMapperNameSpace + "getUsers", map, limit, offset);
+    }
+
+    /**
+     *  用户列表
+     * @param id
+     */
+    @RequestMapping(value = "/user/{id}", method = RequestMethod.GET)
+    @Log(actionName = "查询用户")
+    public SysUsers getUserList(@PathVariable(value = "id") Integer id){
+        return mybatisDao.selectByPrimaryKey(SysUsers.class, id);
+    }
+
+    /**
+     * 新增用户
+     * @param createUser
+     * @param bindingResult
+     * @return
+     */
+    @RequestMapping(value = "/user", method = RequestMethod.POST)
+    @Log(actionName = "新增用户")
+    public SysUsers createUser(@RequestBody @Valid CreateUserVo createUser, BindingResult bindingResult) throws ArgumentValidException {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            throw new ArgumentValidException(bindingResult);
+        }
+        CreateUser user = new CreateUser();
+        user.setAge(createUser.getAge());
+        user.setOfficeTel(createUser.getOfficeTel());
+        user.setPhoneNumber(createUser.getPhoneNumber());
+        user.setQq(createUser.getQq());
+        user.setRealname(createUser.getRealName());
+        user.setSex(createUser.getSex());
+        user.setUsername(createUser.getUsername());
+        user.setPassword(createUser.getPassword());
+        user.setEmail(createUser.getEmail());
+        user.setLocked(createUser.getLocked() != null && createUser.getLocked() == true ? true : false);
+        user.setOrganizationId(createUser.getOrganizationId());
+        user.setUserGroupIds(createUser.getUserGroupIds());
+        return userService.createUser(user);
+    }
+
+    /**
+     * 更新用户
+     * @param id
+     * @param updateUserVo
+     * @param bindingResult
+     * @throws ArgumentValidException
+     */
+    @RequestMapping(value = "/user/{id}", method = RequestMethod.PUT)
+    @Log(actionName = "更新用户")
+    public void updateUser(@PathVariable(value = "id") Integer id,
+                           @RequestBody @Valid UpdateUserVo updateUserVo, BindingResult bindingResult) throws ArgumentValidException {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            throw new ArgumentValidException(bindingResult);
+        }
+        userService.updateUser(updateUserVo);
+    }
+
+    /**
+     *  删除用户
+     * @param id
+     */
+    @RequestMapping(value = "/user/{id}", method = RequestMethod.DELETE)
+    @Log(actionName = "删除用户")
+    public void deleteUser(@PathVariable(value = "id") Long id){
+        mybatisDao.deleteByPrimaryKey(SysUsers.class, id);
+    }
+
+    /**
+     *  锁定用户
+     * @param id
+     */
+    @RequestMapping(value = "/user/{id}/locked", method = RequestMethod.PUT)
+    @Log(actionName = "修改用户信息")
+    public void lockedUser(@PathVariable(value = "id") Integer id,
+                           @RequestParam(value = "locked") Boolean locked){
+        SysUsers sysUsers = new SysUsers();
+        sysUsers.setLocked(locked ? 1 : 0);
+        sysUsers.setId(id);
+        mybatisDao.update(sysUsers);
+    }
+    
+    /**
+     *  重置密码
+     * @param id
+     */
+    @RequestMapping(value = "/user/{id}/resetPassword", method = RequestMethod.PUT)
+    @Log(actionName = "重置密码")
+    public void resetPassword(@PathVariable(value = "id") Integer id){
+        userService.changePassword(id, "123456");
+    }
+
+}

src/main/java/com/xmomen/module/account/web/controller/vo/CreateUserVo.java

@@ -0,0 +1,37 @@
+package com.xmomen.module.account.web.controller.vo;
+
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+
+import org.hibernate.validator.constraints.NotBlank;
+
+/**
+ * Created by Jeng on 2016/1/7.
+ */
+public @Data class CreateUserVo implements Serializable {
+
+    @NotBlank
+    private String username;
+    @NotBlank
+    private String password;
+    private String email;
+    @NotBlank
+    private String realName;
+    @NotBlank
+    private String phoneNumber;
+    private Integer age;
+    private String qq;
+    private String officeTel;
+    private Boolean locked;
+    /**
+     * 1-男，2女
+     */
+    private Integer sex;
+    
+    private Integer organizationId;
+    
+    private List<Integer> userGroupIds;
+    
+}

src/main/java/com/xmomen/module/account/web/controller/vo/UpdateUserVo.java

@@ -0,0 +1,39 @@
+package com.xmomen.module.account.web.controller.vo;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Data;
+
+import org.hibernate.validator.constraints.NotBlank;
+
+/**
+ * Created by Jeng on 2016/1/7.
+ */
+public @Data class UpdateUserVo implements Serializable {
+
+    @NotNull
+    private Integer id;
+    @NotBlank
+    private String username;
+    private String email;
+    @NotBlank
+    private String realName;
+    @NotNull
+    private String phoneNumber;
+    private Integer age;
+    private String qq;
+    private String officeTel;
+    private Boolean locked;
+    /**
+     * 1-男，2女
+     */
+    private Integer sex;
+    
+    private Integer organizationId;
+    
+    private List<Integer> userGroupIds;
+
+}

src/main/java/com/xmomen/module/advice/entity/Advice.java

@@ -0,0 +1,149 @@
+package com.xmomen.module.advice.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_advice")
+public class Advice extends BaseMybatisModel {
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 创建时间
+     */
+    private Date insertDate;
+
+    /**
+     * 创建人
+     */
+    private Integer insertUserId;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUserId;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    @Column(name = "id")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "title")
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+        if(title == null){
+              removeValidField("title");
+              return;
+        }
+        addValidField("title");
+    }
+
+    @Column(name = "insert_date")
+    public Date getInsertDate() {
+        return insertDate;
+    }
+
+    public void setInsertDate(Date insertDate) {
+        this.insertDate = insertDate;
+        if(insertDate == null){
+              removeValidField("insertDate");
+              return;
+        }
+        addValidField("insertDate");
+    }
+
+    @Column(name = "insert_user_id")
+    public Integer getInsertUserId() {
+        return insertUserId;
+    }
+
+    public void setInsertUserId(Integer insertUserId) {
+        this.insertUserId = insertUserId;
+        if(insertUserId == null){
+              removeValidField("insertUserId");
+              return;
+        }
+        addValidField("insertUserId");
+    }
+
+    @Column(name = "update_date")
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+        if(updateDate == null){
+              removeValidField("updateDate");
+              return;
+        }
+        addValidField("updateDate");
+    }
+
+    @Column(name = "update_user_id")
+    public Integer getUpdateUserId() {
+        return updateUserId;
+    }
+
+    public void setUpdateUserId(Integer updateUserId) {
+        this.updateUserId = updateUserId;
+        if(updateUserId == null){
+              removeValidField("updateUserId");
+              return;
+        }
+        addValidField("updateUserId");
+    }
+
+    @Column(name = "content")
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+        if(content == null){
+              removeValidField("content");
+              return;
+        }
+        addValidField("content");
+    }
+}

src/main/java/com/xmomen/module/advice/entity/mapper/AdviceMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.advice.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.advice.entity.Advice;
+import com.xmomen.module.advice.entity.AdviceExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface AdviceMapper extends MybatisMapper {
+    int countByExample(AdviceExample example);
+
+    int deleteByExample(AdviceExample example);
+
+    int insertSelective(Advice record);
+
+    int updateByExampleSelective(@Param("record") Advice record, @Param("example") AdviceExample example);
+}

src/main/java/com/xmomen/module/advice/mapper/AdviceMapperExt.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xmomen.module.advice.mapper.AdviceMapperExt">
+
+    <!--    查询消息    -->
+    <select id="getAdviceModel"
+            resultType="com.xmomen.module.advice.model.AdviceModel"
+            parameterType="com.xmomen.module.advice.model.AdviceQuery">
+        SELECT
+        t.*,
+        inser_user.username insert_user,
+        update_user.username update_user
+        FROM cd_advice t
+        LEFT JOIN sys_users inser_user ON t.insert_user_id = inser_user.id
+        LEFT JOIN sys_users update_user ON t.insert_user_id = update_user.id
+        <where>
+            <if test="id">
+                AND t.ID = #{id}
+            </if>
+            <if test="ids">
+                AND t.ID IN
+                <foreach collection="ids" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="excludeIds">
+                AND t.ID NOT IN
+                <foreach collection="excludeIds" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        ORDER BY t.insert_date desc
+    </select>
+
+</mapper>

src/main/java/com/xmomen/module/advice/model/AdviceModel.java

@@ -0,0 +1,87 @@
+package com.xmomen.module.advice.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.xmomen.module.advice.entity.Advice;
+import lombok.Data;
+import org.hibernate.validator.constraints.*;
+
+import javax.validation.constraints.*;
+
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelTarget;
+import org.springframework.beans.BeanUtils;
+
+import java.lang.String;
+import java.lang.Integer;
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * @author tanxinzheng
+ * @version 1.0.0
+ * @date 2017-5-14 20:05:05
+ */
+@ExcelTarget(value = "AdviceModel")
+public
+@Data
+class AdviceModel implements Serializable {
+
+    /**
+     * 主键
+     */
+    @Length(max = 32, message = "主键字符长度限制[0,32]")
+    private String id;
+    /**
+     * 标题
+     */
+    @Excel(name = "标题")
+    @NotBlank(message = "标题为必填项")
+    @Length(max = 128, message = "标题字符长度限制[0,128]")
+    private String title;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间")
+    private Date insertDate;
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人")
+    @Range(max = 999999999, min = -999999999, message = "创建人数值范围[999999999,-999999999]")
+    private Integer insertUserId;
+
+    private String insertUser;
+    /**
+     * 更新时间
+     */
+    @Excel(name = "更新时间")
+    private Date updateDate;
+    /**
+     * 更新人
+     */
+    @Excel(name = "更新人")
+    @Range(max = 999999999, min = -999999999, message = "更新人数值范围[999999999,-999999999]")
+    private Integer updateUserId;
+
+    private String updateUser;
+    /**
+     * 内容
+     */
+    @Excel(name = "内容")
+    @Length(max = 65535, message = "内容字符长度限制[0,65,535]")
+    private String content;
+
+    /**
+     * Get Advice Entity Object
+     *
+     * @return
+     */
+    @JsonIgnore
+    public Advice getEntity() {
+        Advice advice = new Advice();
+        BeanUtils.copyProperties(this, advice);
+        return advice;
+    }
+
+
+}

src/main/java/com/xmomen/module/advice/service/impl/AdviceServiceImpl.java

@@ -0,0 +1,222 @@
+package com.xmomen.module.advice.service.impl;
+
+import com.xmomen.module.advice.entity.Advice;
+import com.xmomen.module.advice.entity.AdviceExample;
+import com.xmomen.module.advice.mapper.AdviceMapperExt;
+import com.xmomen.module.advice.model.AdviceCreate;
+import com.xmomen.module.advice.model.AdviceQuery;
+import com.xmomen.module.advice.model.AdviceUpdate;
+import com.xmomen.module.advice.model.AdviceModel;
+import com.xmomen.module.advice.service.AdviceService;
+import com.xmomen.framework.mybatis.dao.MybatisDao;
+import com.xmomen.framework.mybatis.page.Page;
+import com.xmomen.module.base.constant.AppConstants;
+import com.xmomen.module.wx.util.DateUtils;
+import org.apache.ibatis.exceptions.TooManyResultsException;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author  tanxinzheng
+ * @date    2017-5-14 20:05:05
+ * @version 1.0.0
+ */
+@Service
+public class AdviceServiceImpl implements AdviceService {
+
+    @Autowired
+    MybatisDao mybatisDao;
+
+    /**
+     * 新增快报
+     *
+     * @param adviceModel 新增快报对象参数
+     * @return AdviceModel    快报领域对象
+     */
+    @Override
+    @Transactional
+    public AdviceModel createAdvice(AdviceModel adviceModel) {
+        Advice advice = createAdvice(adviceModel.getEntity());
+        if(advice != null){
+            return getOneAdviceModel(advice.getId());
+        }
+        return null;
+    }
+
+    /**
+     * 新增快报实体对象
+     *
+     * @param advice 新增快报实体对象参数
+     * @return Advice 快报实体对象
+     */
+    @Override
+    @Transactional
+    public Advice createAdvice(Advice advice) {
+        advice.setInsertDate(DateUtils.getNowDate());
+        advice.setInsertUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY));
+        advice.setUpdateDate(mybatisDao.getSysdate());
+        advice.setUpdateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY));
+        return mybatisDao.insertByModel(advice);
+    }
+
+    /**
+    * 批量新增快报
+    *
+    * @param adviceModels 新增快报对象集合参数
+    * @return List<AdviceModel>    快报领域对象集合
+    */
+    @Override
+    @Transactional
+    public List<AdviceModel> createAdvices(List<AdviceModel> adviceModels) {
+        List<AdviceModel> adviceModelList = null;
+        for (AdviceModel adviceModel : adviceModels) {
+            adviceModel = createAdvice(adviceModel);
+            if(adviceModel != null){
+                if(adviceModelList == null){
+                    adviceModelList = new ArrayList<>();
+                }
+                adviceModelList.add(adviceModel);
+            }
+        }
+        return adviceModelList;
+    }
+
+    /**
+     * 更新快报
+     *
+     * @param adviceModel 更新快报对象参数
+     */
+    @Override
+    @Transactional
+    public void updateAdvice(AdviceModel adviceModel) {
+        adviceModel.setUpdateDate(mybatisDao.getSysdate());
+        adviceModel.setUpdateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY));
+        mybatisDao.update(adviceModel.getEntity());
+    }
+
+    /**
+     * 更新快报实体对象
+     *
+     * @param advice 新增快报实体对象参数
+     * @return Advice 快报实体对象
+     */
+    @Override
+    @Transactional
+    public void updateAdvice(Advice advice) {
+        advice.setUpdateDate(mybatisDao.getSysdate());
+        advice.setUpdateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY));
+        mybatisDao.update(advice);
+    }
+
+    /**
+     * 删除快报
+     *
+     * @param ids 主键数组
+     */
+    @Override
+    @Transactional
+    public void deleteAdvice(String[] ids) {
+        AdviceExample adviceExample = new AdviceExample();
+        adviceExample.createCriteria().andIdIn(Arrays.<String>asList((String[]) ids));
+        mybatisDao.deleteByExample(adviceExample);
+    }
+
+    /**
+    * 删除快报
+    *
+    * @param id 主键
+    */
+    @Override
+    @Transactional
+    public void deleteAdvice(String id) {
+        mybatisDao.deleteByPrimaryKey(Advice.class, id);
+    }
+
+    /**
+     * 查询快报领域分页对象（带参数条件）
+     *
+     * @param limit     每页最大数
+     * @param offset    页码
+     * @param adviceQuery 查询参数
+     * @return Page<AdviceModel>   快报参数对象
+     */
+    @Override
+    public Page<AdviceModel> getAdviceModelPage(int limit, int offset, AdviceQuery adviceQuery) {
+        return (Page<AdviceModel>) mybatisDao.selectPage(AdviceMapperExt.AdviceMapperNameSpace + "getAdviceModel", adviceQuery, limit, offset);
+    }
+
+    /**
+     * 查询快报领域分页对象（无参数条件）
+     *
+     * @param limit  每页最大数
+     * @param offset 页码
+     * @return Page<AdviceModel> 快报领域对象
+     */
+    @Override
+    public Page<AdviceModel> getAdviceModelPage(int limit, int offset) {
+        return (Page<AdviceModel>) mybatisDao.selectPage(AdviceMapperExt.AdviceMapperNameSpace + "getAdviceModel", null, limit, offset);
+    }
+
+    /**
+     * 查询快报领域集合对象（带参数条件）
+     *
+     * @param adviceQuery 查询参数对象
+     * @return List<AdviceModel> 快报领域集合对象
+     */
+    @Override
+    public List<AdviceModel> getAdviceModelList(AdviceQuery adviceQuery) {
+        return mybatisDao.getSqlSessionTemplate().selectList(AdviceMapperExt.AdviceMapperNameSpace + "getAdviceModel", adviceQuery);
+    }
+
+    /**
+     * 查询快报领域集合对象（无参数条件）
+     *
+     * @return List<AdviceModel> 快报领域集合对象
+     */
+    @Override
+    public List<AdviceModel> getAdviceModelList() {
+        return mybatisDao.getSqlSessionTemplate().selectList(AdviceMapperExt.AdviceMapperNameSpace + "getAdviceModel");
+    }
+
+    /**
+     * 查询快报实体对象
+     *
+     * @param id 主键
+     * @return Advice 快报实体对象
+     */
+    @Override
+    public Advice getOneAdvice(String id) {
+        return mybatisDao.selectByPrimaryKey(Advice.class, id);
+    }
+
+    /**
+     * 根据主键查询单个对象
+     *
+     * @param id 主键
+     * @return AdviceModel 快报领域对象
+     */
+    @Override
+    public AdviceModel getOneAdviceModel(String id) {
+        AdviceQuery adviceQuery = new AdviceQuery();
+        adviceQuery.setId(id);
+        return mybatisDao.getSqlSessionTemplate().selectOne(AdviceMapperExt.AdviceMapperNameSpace + "getAdviceModel", adviceQuery);
+    }
+
+    /**
+     * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错）
+     *
+     * @param adviceQuery 快报查询参数对象
+     * @return AdviceModel 快报领域对象
+     */
+    @Override
+    public AdviceModel getOneAdviceModel(AdviceQuery adviceQuery) throws TooManyResultsException {
+        return mybatisDao.getSqlSessionTemplate().selectOne(AdviceMapperExt.AdviceMapperNameSpace + "getAdviceModel", adviceQuery);
+    }
+}

src/main/java/com/xmomen/module/base/constant/AppConstants.java

@@ -0,0 +1,68 @@
+package com.xmomen.module.base.constant;
+
+import java.io.Serializable;
+
+/**
+ * Created by Jeng on 16/5/10.
+ */
+public class AppConstants implements Serializable {
+
+    /**
+     * 客服经理角色代码
+     */
+    public static final String CUSTOMER_MANAGER_PERMISSION_CODE = "customer_manager";
+
+    /**
+     * 客服组
+     */
+    public static final String CUSTOMER_PERMISSION_CODE = "kehuzu";
+
+    /**
+     * 后台组
+     */
+    public static final String HOU_TAI_CODE = "houtaibu";
+
+    /**
+     * 管理员
+     */
+    public static final String ADMIN = "admin";
+
+    /**
+     * 超级管理员
+     */
+    public static final String SUPER_ADMIN = "super_admin";
+
+    /**
+     * 物流中心
+     */
+    public static final String WULIUZXB = "wuliuzxb";
+
+    /**
+     * 财务组
+     */
+    public static final String CWU = "cwu";
+
+    public static final String PACKAGE_PERMISSION_CODE = "baozhuangzu";
+
+    public static final String PACKING_PERMISSION_CODE = "zhuangxiangzu";
+    /**
+     * 运输
+     */
+    public static final String YUN_SHU_PERMISSION_CODE = "yunshubu";
+
+    /**
+     * 快递商
+     */
+    public static final String KUAI_DI_SHANG = "kuaidishang";
+
+    /**
+     * 用户sessionUserId键值
+     */
+    public static final String SESSION_USER_ID_KEY = "user_id";
+    
+    public static final String PC_PASSWORD_SALT = "dms_pc";
+
+    public static final int STOCK_CHANGE_TYPE_IN = 1;//入库
+    public static final int STOCK_CHANGE_TYPE_BROKEN = 2;//破损
+    public static final int STOCK_CHANGE_TYPE_CANCEL = 3;//核销
+}

src/main/java/com/xmomen/module/base/controller/CompanyController.java

@@ -0,0 +1,113 @@
+package com.xmomen.module.base.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import com.xmomen.module.base.constant.AppConstants;
+import com.xmomen.module.base.mapper.MemberMapper;
+import com.xmomen.module.base.model.*;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xmomen.framework.mybatis.dao.MybatisDao;
+import com.xmomen.framework.mybatis.page.Page;
+import com.xmomen.framework.web.exceptions.ArgumentValidException;
+import com.xmomen.module.base.mapper.CompanyMapper;
+import com.xmomen.module.base.service.CompanyService;
+import com.xmomen.module.logger.Log;
+
+@RestController
+public class CompanyController {
+    @Autowired
+    CompanyService companyService;
+    @Autowired
+    CompanyMapper companyMapper;
+    @Autowired
+    MybatisDao mybatisDao;
+
+    /**
+     * 查询单位公司信息
+     *
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/company", method = RequestMethod.GET)
+    @Log(actionName = "查询单位公司信息")
+    public Page<CompanyModel> getMemberList(@RequestParam(value = "limit") Integer limit,
+                                            @RequestParam(value = "offset") Integer offset,
+                                            @RequestParam(value = "id", required = false) Integer id,
+                                            @RequestParam(value = "keyword", required = false) String keyword) {
+        Map map = new HashMap<String, Object>();
+        map.put("id", id);
+        map.put("keyword", keyword);
+        //客服经理过滤 如果有客服组权限则不过滤
+        if (SecurityUtils.getSubject().hasRole(AppConstants.CUSTOMER_MANAGER_PERMISSION_CODE) && !SecurityUtils.getSubject().hasRole(AppConstants.CUSTOMER_PERMISSION_CODE)) {
+            Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY);
+            map.put("managerId", userId);
+        }
+        return (Page<CompanyModel>) mybatisDao.selectPage(CompanyMapper.CompanyMapperNameSpace + "getCompanyList", map, limit, offset);
+    }
+
+    /**
+     * 根据ID查询客户经理信息
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/company/queryCompanyManagerListById", method = RequestMethod.GET)
+    @Log(actionName = "根据ID查询客户经理信息")
+    public List<CompanyCustomerManager> queryCompanyManagerListById(@PathVariable(value = "id") Integer id) {
+        Map map = new HashMap<String, Object>();
+        map.put("id", id);
+        //客服经理过滤 如果有客服组权限则不过滤
+        if (SecurityUtils.getSubject().hasRole(AppConstants.CUSTOMER_MANAGER_PERMISSION_CODE) && !SecurityUtils.getSubject().hasRole(AppConstants.CUSTOMER_PERMISSION_CODE)) {
+            Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY);
+            map.put("managerId", userId);
+        }
+        return mybatisDao.getSqlSessionTemplate().selectList(CompanyMapper.CompanyMapperNameSpace + "queryCompanyManagerListById", map);
+    }
+
+    @RequestMapping(value = "/company", method = RequestMethod.POST)
+    @Log(actionName = "新增单位、公司")
+    public void createCompany(@RequestBody @Valid CreateCompany createCompany, BindingResult bindingResult) throws ArgumentValidException {
+        if (bindingResult != null && bindingResult.hasErrors()) {
+            throw new ArgumentValidException(bindingResult);
+        }
+        companyService.createCompany(createCompany);
+    }
+
+    /**
+     * 修改
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/company/{id}", method = RequestMethod.PUT)
+    @Log(actionName = "修改单位信息")
+    public void updateMember(@PathVariable(value = "id") Integer id,
+                             @RequestBody @Valid UpdateCompany updateCompany, BindingResult bindingResult) throws ArgumentValidException {
+        if (bindingResult != null && bindingResult.hasErrors()) {
+            throw new ArgumentValidException(bindingResult);
+        }
+        companyService.updateCompany(id, updateCompany);
+    }
+
+    /**
+     * 删除
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/company/{id}", method = RequestMethod.DELETE)
+    @Log(actionName = "删除单位信息")
+    public void deleteMember(@PathVariable(value = "id") Integer id) {
+        companyService.delete(id);
+    }
+}

src/main/java/com/xmomen/module/base/controller/ContractController.java

@@ -0,0 +1,102 @@
+package com.xmomen.module.base.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xmomen.framework.mybatis.dao.MybatisDao;
+import com.xmomen.framework.mybatis.page.Page;
+import com.xmomen.framework.web.exceptions.ArgumentValidException;
+import com.xmomen.module.base.entity.CdContract;
+import com.xmomen.module.base.mapper.ContractMapper;
+import com.xmomen.module.base.model.ContractModel;
+import com.xmomen.module.base.model.CreateContract;
+import com.xmomen.module.base.model.UpdateContract;
+import com.xmomen.module.base.service.ContractService;
+import com.xmomen.module.logger.Log;
+@RestController
+public class ContractController {
+	@Autowired
+	ContractService contractService;
+	@Autowired
+	ContractMapper contractMapper;
+	@Autowired
+    MybatisDao mybatisDao;
+    /**
+     * 查询合同信息
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/contract", method = RequestMethod.GET)
+    @Log(actionName = "查询合同信息")
+    public Page<ContractModel> getMemberList(@RequestParam(value = "limit") Integer limit,
+            @RequestParam(value = "offset") Integer offset,
+            @RequestParam(value = "id", required = false) Integer id,
+            @RequestParam(value = "keyword", required = false) String keyword){
+    	 Map map = new HashMap<String,Object>();
+         map.put("id", id);
+         map.put("keyword", keyword);
+        return (Page<ContractModel>) mybatisDao.selectPage(ContractMapper.ContractMapperNameSpace + "getContractList", map, limit, offset);
+    }
+    @RequestMapping(value = "/contract", method = RequestMethod.POST)
+    @Log(actionName = "新增合同")
+    public void createCompany(@RequestBody @Valid CreateContract createContract, BindingResult bindingResult) throws ArgumentValidException {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            throw new ArgumentValidException(bindingResult);
+        }
+        contractService.createContract(createContract);
+    }
+    
+    /**
+     * 合同查看
+     * @return
+     */
+    @RequestMapping(value = "/contract/{id}", method = RequestMethod.GET)
+    @Log(actionName = "查询合同")
+    public ContractModel getContractDetail(@PathVariable(value = "id") Integer id){
+    	//查询合同
+    	 Map map = new HashMap<String,Object>();
+         map.put("id", id);
+    	 List<ContractModel> contracts = mybatisDao.getSqlSessionTemplate().selectList(ContractMapper.ContractMapperNameSpace + "getContractListAndDetail", map);
+    	 if(contracts != null && !contracts.isEmpty() && contracts.size() == 1){
+             return contracts.get(0);
+         }
+    	 return null;
+    }
+    
+    /**
+     *  修改
+     * @param id
+     */
+    @RequestMapping(value = "/contract/{id}", method = RequestMethod.PUT)
+    @Log(actionName = "修改合同")
+    public void updateMember(@PathVariable(value = "id") Integer id,
+                                @RequestBody @Valid UpdateContract updateContract, BindingResult bindingResult) throws ArgumentValidException {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            throw new ArgumentValidException(bindingResult);
+        }
+        contractService.updateContract(id, updateContract);
+    }
+    
+    /**
+     *  删除
+     * @param id
+     */
+    @RequestMapping(value = "/contract/{id}", method = RequestMethod.DELETE)
+    @Log(actionName = "删除合同信息")
+    public void deleteMember(@PathVariable(value = "id") Integer id){
+    	contractService.delete(id);
+    }
+    
+}

src/main/java/com/xmomen/module/base/controller/CouponCategoryController.java

@@ -0,0 +1,122 @@
+package com.xmomen.module.base.controller;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xmomen.framework.mybatis.dao.MybatisDao;
+import com.xmomen.framework.mybatis.page.Page;
+import com.xmomen.framework.web.exceptions.ArgumentValidException;
+import com.xmomen.module.base.entity.CdCouponCategory;
+import com.xmomen.module.base.mapper.CouponCategoryMapper;
+import com.xmomen.module.base.model.CreateCouponCategory;
+import com.xmomen.module.base.model.ItemChildModel;
+import com.xmomen.module.base.model.UpdateCouponCategory;
+import com.xmomen.module.base.service.CouponCategoryService;
+import com.xmomen.module.logger.Log;
+
+/**
+ * Created by Jeng on 2016/3/30.
+ */
+@RestController
+public class CouponCategoryController {
+
+    @Autowired
+    CouponCategoryService couponCategoryService;
+
+    @Autowired
+    MybatisDao mybatisDao;
+
+    /**
+     * 卡券类别列表
+     * @param limit
+     * @param offset
+     * @param keyword
+     * @return
+     */
+    @RequestMapping(value = "/couponCategory", method = RequestMethod.GET)
+    @Log(actionName = "查询卡券类别列表")
+    public Page<CdCouponCategory> getUserList(@RequestParam(value = "limit") Integer limit,
+                                  @RequestParam(value = "offset") Integer offset,
+                                  @RequestParam(value = "keyword", required = false) String keyword,
+                                  @RequestParam(value = "categoryType", required = false) Integer categoryType){
+        return couponCategoryService.getCouponCategoryList(keyword,categoryType, limit, offset);
+    }
+
+    /**
+     *  卡券类别列表
+     * @param id
+     */
+    @RequestMapping(value = "/couponCategory/{id}", method = RequestMethod.GET)
+    @Log(actionName = "查询卡券类别")
+    public CdCouponCategory getUserList(@PathVariable(value = "id") Integer id){
+        return couponCategoryService.getCouponCategory(id);
+    }
+
+    /**
+     * 新增卡券类别
+     * @param createCouponCategory
+     * @param bindingResult
+     * @return
+     */
+    @RequestMapping(value = "/couponCategory", method = RequestMethod.POST)
+    @Log(actionName = "新增卡券类别")
+    public CdCouponCategory createCouponCategory(@RequestBody @Valid CreateCouponCategory createCouponCategory, BindingResult bindingResult) throws ArgumentValidException {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            throw new ArgumentValidException(bindingResult);
+        }
+        return couponCategoryService.createCouponCategory(createCouponCategory);
+    }
+
+    /**
+     * 更新卡券类别
+     * @param id
+     * @param updateCouponCategory
+     * @param bindingResult
+     * @throws ArgumentValidException
+     */
+    @RequestMapping(value = "/couponCategory/{id}", method = RequestMethod.PUT)
+    @Log(actionName = "更新卡券类别")
+    public CdCouponCategory updateCouponCategory(@PathVariable(value = "id") Integer id,
+                           @RequestBody @Valid UpdateCouponCategory updateCouponCategory, BindingResult bindingResult) throws ArgumentValidException {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            throw new ArgumentValidException(bindingResult);
+        }
+       return  couponCategoryService.updateCouponCategory(id,updateCouponCategory);
+    }
+
+    /**
+     *  删除卡券类别类别
+     * @param id
+     */
+    @RequestMapping(value = "/couponCategory/{id}", method = RequestMethod.DELETE)
+    @Log(actionName = "删除卡券类别")
+    public void deleteCouponCategory(@PathVariable(value = "id") Long id){
+        mybatisDao.deleteByPrimaryKey(CdCouponCategory.class, id);
+    }
+    /**
+     * 查询选择的产品
+     * @param parentId
+     * @return
+     */
+    @RequestMapping(value = "/getChoseItemList", method = RequestMethod.GET)
+	public List<ItemChildModel> getChildItem(@RequestParam(value = "parentId", required = false) Integer parentId){
+    	List<ItemChildModel> childItems = new ArrayList<ItemChildModel>();
+    	Map map = new HashMap<String,Object>();
+	    map.put("parentId", parentId);
+	    childItems = mybatisDao.getSqlSessionTemplate().selectList(CouponCategoryMapper.CouponCategoryMapperNameSpace + "getChoseItemList", map);
+		return childItems;
+	}
+}

src/main/java/com/xmomen/module/base/controller/CouponController.java

@@ -0,0 +1,508 @@
+package com.xmomen.module.base.controller;
+
+import com.xmomen.framework.mybatis.dao.MybatisDao;
+import com.xmomen.framework.mybatis.page.Page;
+import com.xmomen.framework.utils.AssertExt;
+import com.xmomen.framework.utils.StringUtilsExt;
+import com.xmomen.framework.web.exceptions.ArgumentValidException;
+import com.xmomen.module.base.constant.AppConstants;
+import com.xmomen.module.base.entity.*;
+import com.xmomen.module.base.mapper.CouponMapper;
+import com.xmomen.module.base.model.*;
+import com.xmomen.module.base.service.CouponService;
+import com.xmomen.module.export.model.UploadFileVo;
+import com.xmomen.module.export.util.PrintUtils;
+import com.xmomen.module.logger.Log;
+import com.xmomen.module.wx.util.DateUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Jeng on 2016/3/30.
+ */
+@RestController
+public class CouponController {
+
+    @Autowired
+    CouponService couponService;
+
+    @Autowired
+    MybatisDao mybatisDao;
+
+    /**
+     * 卡券列表
+     *
+     * @param limit
+     * @param offset
+     * @param keyword
+     * @return
+     */
+    @RequestMapping(value = "/coupon", method = RequestMethod.GET)
+    @Log(actionName = "查询卡券列表")
+    public Page<CouponModel> getCouponList(@RequestParam(value = "limit") Integer limit,
+                                           @RequestParam(value = "offset") Integer offset,
+                                           @RequestParam(value = "couponNumber", required = false) String couponNumber,
+                                           @RequestParam(value = "couponType", required = false) Integer couponType,
+                                           @RequestParam(value = "couponCategoryId", required = false) Integer couponCategoryId,
+                                           @RequestParam(value = "isSend", required = false) Integer isSend,
+                                           @RequestParam(value = "cdCompanyId", required = false) Integer cdCompanyId,
+                                           @RequestParam(value = "customerMangerId", required = false) Integer customerMangerId,
+                                           @RequestParam(value = "isUseful", required = false) Integer isUseful,
+                                           @RequestParam(value = "auditDateStart", required = false) String auditDateStart,
+                                           @RequestParam(value = "auditDateEnd", required = false) String auditDateEnd,
+                                           @RequestParam(value = "isOver", required = false) Integer isOver,
+                                           @RequestParam(value = "batch", required = false) String batch,
+                                           @RequestParam(value = "keyword", required = false) String keyword) {
+        CouponQuery couponQuery = new CouponQuery();
+        couponQuery.setKeyword(keyword);
+        couponQuery.setCdCompanyId(cdCompanyId);
+        couponQuery.setCouponCategoryId(couponCategoryId);
+        couponQuery.setCouponNumber(couponNumber);
+        couponQuery.setCouponType(couponType);
+        couponQuery.setCustomerMangerId(customerMangerId);
+        couponQuery.setIsOver(isOver);
+        couponQuery.setIsSend(isSend);
+        couponQuery.setIsUseful(isUseful);
+
+        if (StringUtilsExt.isNotBlank(auditDateStart)) {
+            couponQuery.setAuditDateStart(auditDateStart.substring(0, 10));
+        }
+
+        if (StringUtilsExt.isNotBlank(auditDateEnd)) {
+            couponQuery.setAuditDateEnd(auditDateEnd.substring(0, 10));
+        }
+
+        if (!StringUtils.isBlank(batch)) {
+            couponQuery.setBatch(batch);
+        }
+        //客服经理过滤 如果有客服组权限则不过滤
+        if (SecurityUtils.getSubject().hasRole(AppConstants.CUSTOMER_MANAGER_PERMISSION_CODE) && !SecurityUtils.getSubject().hasRole(AppConstants.CUSTOMER_PERMISSION_CODE)) {
+            Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY);
+            couponQuery.setManagerId(userId);
+        }
+        return couponService.queryCoupon(couponQuery, limit, offset);
+    }
+
+    /**
+     * 卡券列表
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/coupon/{id}", method = RequestMethod.GET)
+    @Log(actionName = "查询卡券")
+    public CdCoupon getUserList(@PathVariable(value = "id") Integer id) {
+        return couponService.getCoupon(id);
+    }
+
+    /**
+     * 新增卡券
+     *
+     * @param createCoupon
+     * @param bindingResult
+     * @return
+     */
+    @RequestMapping(value = "/coupon", method = RequestMethod.POST)
+    @Log(actionName = "新增卡券")
+    public CdCoupon createCoupon(@RequestBody @Valid CreateCoupon createCoupon, BindingResult bindingResult) throws ArgumentValidException {
+        if (bindingResult != null && bindingResult.hasErrors()) {
+            throw new ArgumentValidException(bindingResult);
+        }
+        CdCoupon cdCoupon = new CdCoupon();
+        cdCoupon.setCouponType(createCoupon.getCouponType());
+        cdCoupon.setCouponCategory(createCoupon.getCouponCategory());
+        cdCoupon.setCouponDesc(createCoupon.getCouponDesc());
+        cdCoupon.setCouponNumber(createCoupon.getCouponNumber());
+        cdCoupon.setCouponPassword(createCoupon.getCouponPassword());
+        cdCoupon.setBeginTime(createCoupon.getBeginTime());
+        cdCoupon.setEndTime(createCoupon.getEndTime());
+        cdCoupon.setCouponValue(createCoupon.getCouponValue());
+        cdCoupon.setIsGift(createCoupon.getIsGift());
+        cdCoupon.setIsUsed(createCoupon.getIsUsed());
+        cdCoupon.setIsUseful(createCoupon.getIsUseful());
+        cdCoupon.setNotes(createCoupon.getNotes());
+        cdCoupon.setPaymentType(createCoupon.getPaymentType());
+        cdCoupon.setUserPrice(createCoupon.getUserPrice());
+        return couponService.createCoupon(cdCoupon);
+    }
+
+    /**
+     * 更新卡券
+     *
+     * @param id
+     * @param updateCoupon
+     * @param bindingResult
+     * @throws ArgumentValidException
+     */
+    @RequestMapping(value = "/coupon/{id}", method = RequestMethod.PUT)
+    @Log(actionName = "更新卡券")
+    public void updateCoupon(@PathVariable(value = "id") Integer id,
+                             @RequestBody @Valid UpdateCoupon updateCoupon, BindingResult bindingResult) throws ArgumentValidException {
+        if (bindingResult != null && bindingResult.hasErrors()) {
+            throw new ArgumentValidException(bindingResult);
+        }
+        CdCoupon cdCoupon = new CdCoupon();
+        cdCoupon.setId(id);
+        cdCoupon.setCouponCategory(updateCoupon.getCouponCategory());
+        cdCoupon.setCouponType(updateCoupon.getCouponType());
+        cdCoupon.setCouponDesc(updateCoupon.getCouponDesc());
+        cdCoupon.setCouponNumber(updateCoupon.getCouponNumber());
+        cdCoupon.setCouponPassword(updateCoupon.getCouponPassword());
+        cdCoupon.setBeginTime(updateCoupon.getBeginTime());
+        cdCoupon.setEndTime(updateCoupon.getEndTime());
+        cdCoupon.setCouponValue(updateCoupon.getCouponValue());
+        cdCoupon.setIsGift(updateCoupon.getIsGift());
+        cdCoupon.setIsUsed(updateCoupon.getIsUsed());
+        cdCoupon.setUserPrice(updateCoupon.getUserPrice());
+        cdCoupon.setIsUseful(updateCoupon.getIsUseful());
+        cdCoupon.setNotes(updateCoupon.getNotes());
+        cdCoupon.setPaymentType(updateCoupon.getPaymentType());
+        couponService.updateCoupon(cdCoupon);
+    }
+
+    /**
+     * 删除卡券
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/coupon/{id}", method = RequestMethod.DELETE)
+    @Log(actionName = "删除卡券")
+    public void deleteCoupon(@PathVariable(value = "id") Long id) {
+        mybatisDao.deleteByPrimaryKey(CdCoupon.class, id);
+    }
+
+    /**
+     * @param id
+     */
+    @RequestMapping(value = "/coupon/sendOneCoupon", method = RequestMethod.GET)
+    @Log(actionName = "发放单卡")
+    public void sendOneCoupon(
+            @RequestParam(value = "id") Integer id,
+            @RequestParam(value = "companyId") Integer companyId,
+            @RequestParam(value = "customerMangerId") Integer customerMangerId,
+            @RequestParam(value = "couponNumber") String couponNumber,
+            @RequestParam(value = "batch") String batch,
+            @RequestParam(value = "isGift") Integer isGift) {
+        couponService.sendOneCoupon(id, companyId, customerMangerId, couponNumber, batch, isGift);
+    }
+
+    /**
+     * @param id
+     */
+    @RequestMapping(value = "/coupon/sendMoreCoupon", method = RequestMethod.GET)
+    @Log(actionName = "批量发放卡")
+    public void sendMoreCoupon(
+            @RequestParam(value = "companyId") Integer companyId,
+            @RequestParam(value = "customerMangerId") Integer customerMangerId,
+            @RequestParam(value = "couponNumberList") String couponNumberList,
+            @RequestParam(value = "batch") String batch,
+            @RequestParam(value = "isGift") Integer isGift) {
+        String[] couponNumbers = couponNumberList.split(",");
+        for (int i = 0, length = couponNumbers.length; i < length; i++) {
+            String couponNumber = couponNumbers[i];
+            CdCoupon coupon = new CdCoupon();
+            coupon.setCouponNumber(couponNumber);
+//    		coupon.setCouponType(1);
+            coupon.setIsSend(0);
+            coupon.setIsUseful(0);
+            coupon = mybatisDao.selectOneByModel(coupon);
+            if (coupon != null) {
+                couponService.sendOneCoupon(coupon.getId(), companyId, customerMangerId, coupon.getCouponNumber(), batch, isGift);
+            }
+        }
+    }
+
+    /**
+     * 根据批次号修改
+     */
+    @RequestMapping(value = "/coupon/updateBatchCoupon", method = RequestMethod.GET)
+    @Log(actionName = "根据批次号修改")
+    public void updateBatchCoupon(
+            @RequestParam(value = "companyId") Integer companyId,
+            @RequestParam(value = "customerMangerId") Integer customerMangerId,
+            @RequestParam(value = "couponNumberList") String couponNumberList) {
+        String[] couponNumbers = couponNumberList.split(",");
+        for (int i = 0, length = couponNumbers.length; i < length; i++) {
+            String couponNumber = couponNumbers[i];
+            CdCoupon coupon = new CdCoupon();
+            coupon.setCouponNumber(couponNumber);
+            coupon = mybatisDao.selectOneByModel(coupon);
+            coupon.setCdCompanyId(companyId);
+            coupon.setCdUserId(customerMangerId);
+            mybatisDao.updateByModel(coupon);
+        }
+    }
+
+    /**
+     * 批量修改卡类型
+     */
+    @RequestMapping(value = "/coupon/updateBatchCouponType", method = RequestMethod.GET)
+    @Log(actionName = "批量修改卡类型")
+    public void updateBatchCouponType(
+            @RequestParam(value = "couponCategoryId") Integer couponCategoryId,
+            @RequestParam(value = "couponNumberList") String couponNumberList) {
+        String[] couponNumbers = couponNumberList.split(",");
+        for (int i = 0, length = couponNumbers.length; i < length; i++) {
+            String couponNumber = couponNumbers[i];
+            CdCoupon coupon = new CdCoupon();
+            coupon.setCouponNumber(couponNumber);
+            coupon = mybatisDao.selectOneByModel(coupon);
+            coupon.setCouponCategory(couponCategoryId);
+            mybatisDao.updateByModel(coupon);
+        }
+    }
+
+    /**
+     * @param id
+     * @throws ParseException
+     */
+    @RequestMapping(value = "/coupon/activityAddress", method = RequestMethod.POST)
+    @Log(actionName = "活动送货地址信息")
+    public void activityAddress(@RequestBody CouponActivityAddressHead couponActivityAddressHead) throws ParseException {
+        CdActivityAddress activityAddress = new CdActivityAddress();
+        activityAddress.setCouponNumber(couponActivityAddressHead.getCouponNumber());
+        List<CdActivityAddress> activityAddressList = mybatisDao.selectByModel(activityAddress);
+        mybatisDao.deleteAllByModel(activityAddressList);
+        for (CouponActivityAddress couponActivityAddress : couponActivityAddressHead.getCouponActivityAddressList()) {
+
+            activityAddress = new CdActivityAddress();
+            activityAddress.setConsignmentAddress(couponActivityAddress.getConsignmentAddress());
+            activityAddress.setConsignmentPhone(couponActivityAddress.getConsignmentPhone());
+            activityAddress.setConsignmentName(couponActivityAddress.getConsignmentName());
+            activityAddress.setCouponNumber(couponActivityAddressHead.getCouponNumber());
+            activityAddress.setSendTime(couponActivityAddress.getSendTime());
+            activityAddress.setSendCount(couponActivityAddress.getSendCount());
+            mybatisDao.save(activityAddress);
+
+            //查找客户 进行添加或者修改第三个地址
+            if (StringUtilsExt.isNotBlank(couponActivityAddress.getConsignmentPhone())) {
+                CdMember member = new CdMember();
+                member.setPhoneNumber(couponActivityAddress.getConsignmentPhone());
+                List<CdMember> members = mybatisDao.selectByModel(member);
+                if (members != null && members.size() > 0) {
+                    member = members.get(0);
+                    if (StringUtilsExt.isNotBlank(couponActivityAddress.getConsignmentAddress()))
+                        member.setSpareAddress2(couponActivityAddress.getConsignmentAddress());
+                    if (StringUtilsExt.isNotBlank(couponActivityAddress.getConsignmentName()))
+                        member.setSpareName2(couponActivityAddress.getConsignmentName());
+                    member.setSpareTel2(couponActivityAddress.getConsignmentPhone());
+                    mybatisDao.update(member);
+                }
+            }
+        }
+    }
+
+    /**
+     * 审核金额
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/coupon/{id}/audit", method = RequestMethod.PUT)
+    @Log(actionName = "审核金额")
+    public void audit(@PathVariable(value = "id") Integer id,
+                      @RequestParam(value = "locked") Boolean locked) {
+        this.couponService.auditCoupon(id, locked);
+    }
+
+    /**
+     * 批量审核金额
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/coupon/batchAudit", method = RequestMethod.PUT)
+    @Log(actionName = "批量审核金额")
+    public void batchAudit(@RequestParam(value = "ids") String ids,
+                           @RequestParam(value = "locked") Boolean locked) {
+        String[] idchars = ids.split(",");
+        for (String id : idchars) {
+            this.couponService.auditCoupon(Integer.parseInt(id), locked);
+        }
+    }
+
+    /**
+     * 退卡
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/coupon/{id}/returnCoupon", method = RequestMethod.PUT)
+    @Log(actionName = "退卡")
+    public void returnCoupon(@PathVariable(value = "id") Integer id) {
+        couponService.returnCoupon(id);
+    }
+
+    /**
+     * 完结卡
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/coupon/{id}/overCoupon", method = RequestMethod.PUT)
+    @Log(actionName = "完结卡")
+    public void overCoupon(@PathVariable(value = "id") Integer id,
+                           @RequestParam(value = "isOver") Integer isOver) {
+        CdCoupon coupon = new CdCoupon();
+        coupon.setIsOver(isOver);
+        coupon.setId(id);
+        mybatisDao.update(coupon);
+    }
+
+    @RequestMapping(value = "/coupon/receivedPrice", method = RequestMethod.GET)
+    @Log(actionName = "财务实收金额添加")
+    public void received(
+            @RequestParam(value = "couponId") Integer couponId,
+            @RequestParam(value = "couponNumber") String couponNumber,
+            @RequestParam(value = "receivedPrice", required = false) BigDecimal receivedPrice,
+            @RequestParam(value = "isAutoAudit", required = false) Integer isAutoAudit) {
+        CdCouponRefExample couponRefExample = new CdCouponRefExample();
+        couponRefExample.createCriteria().andCdCouponIdEqualTo(couponId)
+                .andRefTypeEqualTo("RECEIVED_PRICE");
+        CdCouponRef couponRef = mybatisDao.selectOneByExample(couponRefExample);
+        if (couponRef == null) {
+            couponRef = new CdCouponRef();
+            couponRef.setCdCouponId(couponId);
+            couponRef.setCouponNumber(couponNumber);
+            couponRef.setRefName("财务实收金额");
+            couponRef.setRefType("RECEIVED_PRICE");
+            couponRef.setRefValue(receivedPrice.toString());
+            mybatisDao.save(couponRef);
+        }
+        else {
+            couponRef.setRefValue(receivedPrice.toString());
+            mybatisDao.update(couponRef);
+        }
+        if (isAutoAudit == 1) {
+            CdCoupon coupon = new CdCoupon();
+            coupon.setIsUseful(1);
+            //更新卡发放状态
+            CdCoupon couponDb = mybatisDao.selectByPrimaryKey(CdCoupon.class, couponId);
+            //如果是后付款类型并且是卡则记录激活时间
+            if (couponDb.getPaymentType() == 1 && couponDb.getCouponType() == 1) {
+                coupon.setUsefulDate(DateUtils.getNowDate());
+            }
+            coupon.setId(couponId);
+            if (coupon.getCouponValue() == null) {
+                coupon.setCouponValue(receivedPrice);
+            }
+            if (coupon.getCouponType() == 1) {
+                coupon.setUserPrice(receivedPrice);
+            }
+            mybatisDao.update(coupon);
+        }
+    }
+
+    @RequestMapping(value = "/coupon/readCard", method = RequestMethod.GET)
+    @Log(actionName = "读卡")
+    public ReadCardVo readCard(
+            @RequestParam(value = "couponNo") String couponNo,
+            @RequestParam(value = "password", required = false) String password
+    ) {
+        CouponQuery couponQuery = new CouponQuery();
+        couponQuery.setCouponNumber(couponNo);
+        if (StringUtilsExt.isNotEmpty(password)) {
+            couponQuery.setPassword(password);
+        }
+        return mybatisDao.getSqlSessionTemplate().selectOne(CouponMapper.CouponMapperNameSpace + "getCouponByCouponNo", couponQuery);
+    }
+
+    @RequestMapping(value = "/coupon/cardRecharge", method = RequestMethod.GET)
+    @Log(actionName = "充值")
+    public void cardRecharge(
+            @RequestParam(value = "couponNo") String couponNo,
+            @RequestParam(value = "rechargePrice") BigDecimal rechargePrice
+    ) {
+        AssertExt.notNull("couponNo", "卡号不能为空");
+        AssertExt.notNull("rechargePrice", "充值金额不能为空");
+        couponService.cardRecharge(couponNo, rechargePrice);
+    }
+
+
+    @RequestMapping(value = "/coupon/exchangeCard", method = RequestMethod.GET)
+    @Log(actionName = "换卡")
+    public void exchangeCard(
+            @RequestParam(value = "oldCouponNo") String oldCouponNo,
+            @RequestParam(value = "oldPassword") String oldPassword,
+            @RequestParam(value = "newCouponNo") String newCouponNo,
+            @RequestParam(value = "newPassword") String newPassword
+    ) {
+        AssertExt.notNull("couponNo", "卡号不能为空");
+        AssertExt.notNull("rechargePrice", "充值金额不能为空");
+        couponService.exchangeCard(oldCouponNo, oldPassword, newCouponNo, newPassword);
+    }
+
+
+    @RequestMapping(value = "/coupon/updateBalance", method = RequestMethod.GET)
+    @Log(actionName = "更新余额")
+    public void exchangeCard(
+            @RequestParam(value = "couponNo") String couponNo,
+            @RequestParam(value = "updatePrice") BigDecimal updatePrice,
+            @RequestParam(value = "remark") String remark
+    ) {
+        couponService.updateBalance(couponNo, updatePrice, remark);
+    }
+
+    /**
+     * 卡劵导入
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/coupon/importExcel", method = RequestMethod.POST)
+    public void importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(0);
+            params.setHeadRows(1);
+            params.setNeedSave(false);
+            try {
+                List<CouponReportModel> couponImportList = ExcelImportUtil.importExcel(file.getInputStream(), CouponReportModel.class, params);
+                CdCouponCategory couponCategory = new CdCouponCategory();
+                List<CdCouponCategory> cdCouponCategoryList = mybatisDao.selectByModel(couponCategory);
+                for (CouponReportModel couponImport : couponImportList) {
+                    for (CdCouponCategory cdCouponCategory : cdCouponCategoryList) {
+                        if (cdCouponCategory.getCategoryName().equals(couponImport.getCategoryName())) {
+                            couponImport.setCouponCategoryId(cdCouponCategory.getId());
+                            couponService.importCoupon(couponImport);
+                        }
+                    }
+
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    @RequestMapping(value = "/coupon/downCouponImportTemplate")
+    public void downAsnImportTemplate(HttpServletRequest request, HttpServletResponse response) {
+        UploadFileVo uploadFile = new UploadFileVo();
+        uploadFile.setRequest(request);
+        uploadFile.setResponse(response);
+        uploadFile.setExtend("xlsx");
+        uploadFile.setTitleField("卡劵导入模板");
+        uploadFile.setRealPath("/WEB-INF/excelFile/couponExcel.xlsx");
+        PrintUtils.viewOrDownloadFile(uploadFile);
+    }
+}

src/main/java/com/xmomen/module/base/controller/ExpressController.java

@@ -0,0 +1,214 @@
+package com.xmomen.module.base.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xmomen.framework.mybatis.dao.MybatisDao;
+import com.xmomen.framework.mybatis.page.Page;
+import com.xmomen.framework.utils.StringUtilsExt;
+import com.xmomen.framework.web.exceptions.ArgumentValidException;
+import com.xmomen.module.base.constant.AppConstants;
+import com.xmomen.module.base.entity.CdExpress;
+import com.xmomen.module.base.mapper.ExpressMapper;
+import com.xmomen.module.base.model.ExpressTask;
+import com.xmomen.module.base.service.ExpressService;
+import com.xmomen.module.logger.Log;
+import com.xmomen.module.order.model.OrderModel;
+import com.xmomen.module.order.model.OrderQuery;
+
+@RestController
+public class ExpressController {
+    @Autowired
+    ExpressService expressService;
+    @Autowired
+    ExpressMapper expressMapper;
+    @Autowired
+    MybatisDao mybatisDao;
+
+    /**
+     * 查询快递公司信息
+     *
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/express", method = RequestMethod.GET)
+    @Log(actionName = "查询快递公司信息")
+    public Page<CdExpress> getExpressList(@RequestParam(value = "limit") Integer limit,
+                                          @RequestParam(value = "offset") Integer offset,
+                                          @RequestParam(value = "id", required = false) Integer id,
+                                          @RequestParam(value = "keyword", required = false) String keyword) {
+        Map map = new HashMap<String, Object>();
+        map.put("id", id);
+        map.put("keyword", keyword);
+        return (Page<CdExpress>) mybatisDao.selectPage(ExpressMapper.ExpressMapperNameSpace + "getExpressList", map, limit, offset);
+    }
+
+    @RequestMapping(value = "/express", method = RequestMethod.POST)
+    @Log(actionName = "新增快递、公司")
+    public void createExpress(@RequestBody @Valid CdExpress createExpress, BindingResult bindingResult) throws ArgumentValidException {
+        if (bindingResult != null && bindingResult.hasErrors()) {
+            throw new ArgumentValidException(bindingResult);
+        }
+        expressService.createExpress(createExpress);
+    }
+
+
+    /**
+     * 快递商查询已分配未提货订单
+     *
+     * @param limit
+     * @param offset
+     * @param keyword
+     * @return
+     */
+    @RequestMapping(value = "/express/noScanOrder", method = RequestMethod.GET)
+    @Log(actionName = "快递商查询已分配未提货订单")
+    public Page<OrderModel> noScanOrder(@RequestParam(value = "limit") Integer limit,
+                                        @RequestParam(value = "offset") Integer offset,
+                                        @RequestParam(value = "keyword", required = false) String keyword,
+                                        @RequestParam(value = "startTime", required = false) String startTime,
+                                        @RequestParam(value = "endTime", required = false) String endTime) {
+        OrderQuery orderQuery = new OrderQuery();
+        if (StringUtilsExt.isNotBlank(startTime)
+                && !"undefined".equals(startTime)) {
+            orderQuery.setOrderCreateTimeStart(startTime.substring(0, 10));
+        }
+        if (StringUtilsExt.isNotBlank(endTime) && !"undefined".equals(endTime)) {
+            orderQuery.setOrderCreateTimeEnd(endTime.substring(0, 10));
+        }
+        // 运输部
+        if (SecurityUtils.getSubject().hasRole(
+                AppConstants.YUN_SHU_PERMISSION_CODE)|| SecurityUtils.getSubject().hasRole(AppConstants.KUAI_DI_SHANG)) {
+            String despatchExpressCode = (String) SecurityUtils.getSubject()
+                    .getPrincipal();
+            orderQuery.setDespatchExpressCode(despatchExpressCode);
+        }
+        return expressService.getOrderNoDespatchReportList(orderQuery, limit, offset);
+    }
+
+
+    /**
+     * 订单列表
+     *
+     * @param limit
+     * @param offset
+     * @param keyword
+     * @return
+     */
+    @RequestMapping(value = "/express/order", method = RequestMethod.GET)
+    @Log(actionName = "查询订单列表")
+    public Page<OrderModel> getUserList(@RequestParam(value = "limit") Integer limit,
+                                        @RequestParam(value = "offset") Integer offset,
+                                        @RequestParam(value = "orderStatus", required = false) Integer orderStatus,
+                                        @RequestParam(value = "keyword", required = false) String keyword,
+                                        @RequestParam(value = "orderCreateTimeStart", required = false) String orderCreateTimeStart,
+                                        @RequestParam(value = "orderCreateTimeEnd", required = false) String orderCreateTimeEnd,
+                                        @RequestParam(value = "managerId", required = false) Integer managerId,
+                                        @RequestParam(value = "consigneeName", required = false) String consigneeName,
+                                        @RequestParam(value = "hasNoShowCancel", required = false) Boolean hasNoShowCancel) {
+        OrderQuery orderQuery = new OrderQuery();
+        orderQuery.setKeyword(keyword);
+        orderQuery.setOrderStatus(orderStatus);
+        orderQuery.setManagerId(managerId);
+        orderQuery.setHasNoShowCancel(hasNoShowCancel == null ? false : hasNoShowCancel);
+        orderQuery.setConsigneeName(consigneeName);
+        if (StringUtilsExt.isNotBlank(orderCreateTimeStart)) {
+            orderQuery.setOrderCreateTimeStart(orderCreateTimeStart.substring(0, 10));
+        }
+        if (StringUtilsExt.isNotBlank(orderCreateTimeEnd)) {
+            orderQuery.setOrderCreateTimeEnd(orderCreateTimeEnd.substring(0, 10));
+        }
+        //运输部
+        if (SecurityUtils.getSubject().hasRole(AppConstants.YUN_SHU_PERMISSION_CODE) || SecurityUtils.getSubject().hasRole(AppConstants.KUAI_DI_SHANG)) {
+            String despatchExpressCode = (String) SecurityUtils.getSubject().getPrincipal();
+            orderQuery.setDespatchExpressCode(despatchExpressCode);
+        }
+        return expressService.getTakeDeliveryList(orderQuery, limit, offset);
+    }
+
+    /**
+     * 修改
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/express/{id}", method = RequestMethod.PUT)
+    @Log(actionName = "修改快递信息")
+    public void updateMember(@PathVariable(value = "id") Integer id,
+                             @RequestBody @Valid CdExpress updateExpress, BindingResult bindingResult) throws ArgumentValidException {
+        if (bindingResult != null && bindingResult.hasErrors()) {
+            throw new ArgumentValidException(bindingResult);
+        }
+        expressService.updateExpress(id, updateExpress);
+    }
+
+    /**
+     * 删除
+     *
+     * @param id
+     */
+    @RequestMapping(value = "/express/{id}", method = RequestMethod.DELETE)
+    @Log(actionName = "删除快递信息")
+    public void deleteMember(@PathVariable(value = "id") Integer id) {
+        expressService.delete(id);
+    }
+
+
+    /**
+     * 分配快递商
+     *
+     * @param packingTask
+     * @param bindingResult
+     * @return
+     */
+    @RequestMapping(value = "/express/order/bind", method = RequestMethod.PUT)
+    @Log(actionName = "分配快递商")
+    public void createPacking(@RequestBody @Valid ExpressTask expressTask, BindingResult bindingResult) throws ArgumentValidException {
+        if (bindingResult != null && bindingResult.hasErrors()) {
+            throw new ArgumentValidException(bindingResult);
+        }
+        expressService.dispatchExpress(expressTask);
+    }
+
+    /**
+     * 解绑快递商
+     *
+     * @param orderNoList
+     * @throws ArgumentValidException
+     */
+    @RequestMapping(value = "/express/order/unbind", method = RequestMethod.PUT)
+    @Log(actionName = "解绑快递商")
+    public void createPacking(@RequestParam(value = "orderNos", required = true) String[] orderNoList) throws ArgumentValidException {
+        if (orderNoList != null && orderNoList.length <= 0) {
+            return;
+        }
+        expressService.cancelExpress(orderNoList);
+    }
+
+    @RequestMapping(value = "/express/order/takeDelivery", method = RequestMethod.PUT)
+    @Log(actionName = "快递商提货")
+    /**
+     *
+     * @param boxNo 箱号
+     */
+    public void takeDelivery(@RequestParam(value = "boxNo", required = true) String boxNo) {
+        expressService.takeDelivery(boxNo);
+    }
+
+    @RequestMapping(value = "/express/order/untakeDelivery", method = RequestMethod.PUT)
+    @Log(actionName = "快递商取消提货")
+    public void untakeDelivery(@RequestParam(value = "orderNo", required = true) String orderNo) {
+        expressService.unTakeDelivery(orderNo);
+    }
+}

src/main/java/com/xmomen/module/base/controller/PublicController.java

@@ -0,0 +1,62 @@
+package com.xmomen.module.base.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xmomen.framework.mybatis.dao.MybatisDao;
+import com.xmomen.module.base.constant.AppConstants;
+import com.xmomen.module.base.entity.CdCompany;
+import com.xmomen.module.base.mapper.PublicMapper;
+import com.xmomen.module.base.model.CompanyCustomerManager;
+
+@RestController
+public class PublicController {
+
+    @Autowired
+    MybatisDao mybatisDao;
+
+    @Autowired
+    PublicMapper publicMapper;
+
+    @RequestMapping(value = "/companyList", method = RequestMethod.GET)
+    public List<CdCompany> getCompany() {
+        CdCompany company = new CdCompany();
+        List<CdCompany> companys = mybatisDao.selectByModel(company);
+        return companys;
+    }
+
+    //查询客服经理
+    @RequestMapping(value = "/customerManagerList", method = RequestMethod.GET)
+    public List<CompanyCustomerManager> getCustomerManager(
+            @RequestParam(value = "userType", required = false) String userType,
+            @RequestParam(value = "keyword", required = false) String keyword) {
+        Map map = new HashMap<String, Object>();
+        map.put("userType", userType);
+        if ("customer_manager".equals(userType)) {
+            //客服经理过滤 如果有客服组权限则不过滤
+            if (SecurityUtils.getSubject().hasRole(AppConstants.CUSTOMER_MANAGER_PERMISSION_CODE)
+                    && !SecurityUtils.getSubject().hasRole(AppConstants.CUSTOMER_PERMISSION_CODE)
+                    && !SecurityUtils.getSubject().hasRole(AppConstants.HOU_TAI_CODE)
+                    && !SecurityUtils.getSubject().hasRole(AppConstants.ADMIN)
+                    && !SecurityUtils.getSubject().hasRole(AppConstants.SUPER_ADMIN)
+                    && !SecurityUtils.getSubject().hasRole(AppConstants.WULIUZXB)) {
+                Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY);
+                map.put("managerId", userId);
+            }
+        }
+        if (StringUtils.trimToNull(keyword) != null) {
+            map.put("keyword", StringUtils.trimToEmpty(keyword));
+        }
+        List<CompanyCustomerManager> customerManagerList = mybatisDao.getSqlSessionTemplate().selectList(PublicMapper.PublicMapperNameSpace + "getManagerList", map);
+        return customerManagerList;
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_activity_address")
+public class CdActivityAddress extends BaseMybatisModel {
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 卡号
+     */
+    private String couponNumber;
+
+    /**
+     * 
+     */
+    private String consignmentName;
+
+    /**
+     * 收货手机号
+     */
+    private String consignmentPhone;
+
+    /**
+     * 收货地址
+     */
+    private String consignmentAddress;
+
+    /**
+     * 赠送日期
+     */
+    private Date sendTime;
+
+    /**
+     * 赠送份数
+     */
+    private Integer sendCount;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "COUPON_NUMBER")
+    public String getCouponNumber() {
+        return couponNumber;
+    }
+
+    public void setCouponNumber(String couponNumber) {
+        this.couponNumber = couponNumber;
+        if(couponNumber == null){
+              removeValidField("couponNumber");
+              return;
+        }
+        addValidField("couponNumber");
+    }
+
+    @Column(name = "CONSIGNMENT_NAME")
+    public String getConsignmentName() {
+        return consignmentName;
+    }
+
+    public void setConsignmentName(String consignmentName) {
+        this.consignmentName = consignmentName;
+        if(consignmentName == null){
+              removeValidField("consignmentName");
+              return;
+        }
+        addValidField("consignmentName");
+    }
+
+    @Column(name = "CONSIGNMENT_PHONE")
+    public String getConsignmentPhone() {
+        return consignmentPhone;
+    }
+
+    public void setConsignmentPhone(String consignmentPhone) {
+        this.consignmentPhone = consignmentPhone;
+        if(consignmentPhone == null){
+              removeValidField("consignmentPhone");
+              return;
+        }
+        addValidField("consignmentPhone");
+    }
+
+    @Column(name = "CONSIGNMENT_ADDRESS")
+    public String getConsignmentAddress() {
+        return consignmentAddress;
+    }
+
+    public void setConsignmentAddress(String consignmentAddress) {
+        this.consignmentAddress = consignmentAddress;
+        if(consignmentAddress == null){
+              removeValidField("consignmentAddress");
+              return;
+        }
+        addValidField("consignmentAddress");
+    }
+
+    @Column(name = "SEND_TIME")
+    public Date getSendTime() {
+        return sendTime;
+    }
+
+    public void setSendTime(Date sendTime) {
+        this.sendTime = sendTime;
+        if(sendTime == null){
+              removeValidField("sendTime");
+              return;
+        }
+        addValidField("sendTime");
+    }
+
+    @Column(name = "SEND_COUNT")
+    public Integer getSendCount() {
+        return sendCount;
+    }
+
+    public void setSendCount(Integer sendCount) {
+        this.sendCount = sendCount;
+        if(sendCount == null){
+              removeValidField("sendCount");
+              return;
+        }
+        addValidField("sendCount");
+    }
+}

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

@@ -0,0 +1,689 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisExample;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+public class CdActivityAddressExample extends BaseMybatisExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CdActivityAddressExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            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");
+            }
+            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");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        protected void addCriterionForJDBCDate(String condition, Date value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Date(value.getTime()), property);
+        }
+
+        protected void addCriterionForJDBCDate(String condition, List<Date> values, String property) {
+            if (values == null || values.size() == 0) {
+                throw new RuntimeException("Value list for " + property + " cannot be null or empty");
+            }
+            List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
+            Iterator<Date> iter = values.iterator();
+            while (iter.hasNext()) {
+                dateList.add(new java.sql.Date(iter.next().getTime()));
+            }
+            addCriterion(condition, dateList, property);
+        }
+
+        protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property);
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberIsNull() {
+            addCriterion("COUPON_NUMBER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberIsNotNull() {
+            addCriterion("COUPON_NUMBER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberEqualTo(String value) {
+            addCriterion("COUPON_NUMBER =", value, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberNotEqualTo(String value) {
+            addCriterion("COUPON_NUMBER <>", value, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberGreaterThan(String value) {
+            addCriterion("COUPON_NUMBER >", value, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("COUPON_NUMBER >=", value, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberLessThan(String value) {
+            addCriterion("COUPON_NUMBER <", value, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberLessThanOrEqualTo(String value) {
+            addCriterion("COUPON_NUMBER <=", value, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberLike(String value) {
+            addCriterion("COUPON_NUMBER like", value, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberNotLike(String value) {
+            addCriterion("COUPON_NUMBER not like", value, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberIn(List<String> values) {
+            addCriterion("COUPON_NUMBER in", values, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberNotIn(List<String> values) {
+            addCriterion("COUPON_NUMBER not in", values, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberBetween(String value1, String value2) {
+            addCriterion("COUPON_NUMBER between", value1, value2, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCouponNumberNotBetween(String value1, String value2) {
+            addCriterion("COUPON_NUMBER not between", value1, value2, "couponNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameIsNull() {
+            addCriterion("CONSIGNMENT_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameIsNotNull() {
+            addCriterion("CONSIGNMENT_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameEqualTo(String value) {
+            addCriterion("CONSIGNMENT_NAME =", value, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameNotEqualTo(String value) {
+            addCriterion("CONSIGNMENT_NAME <>", value, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameGreaterThan(String value) {
+            addCriterion("CONSIGNMENT_NAME >", value, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameGreaterThanOrEqualTo(String value) {
+            addCriterion("CONSIGNMENT_NAME >=", value, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameLessThan(String value) {
+            addCriterion("CONSIGNMENT_NAME <", value, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameLessThanOrEqualTo(String value) {
+            addCriterion("CONSIGNMENT_NAME <=", value, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameLike(String value) {
+            addCriterion("CONSIGNMENT_NAME like", value, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameNotLike(String value) {
+            addCriterion("CONSIGNMENT_NAME not like", value, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameIn(List<String> values) {
+            addCriterion("CONSIGNMENT_NAME in", values, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameNotIn(List<String> values) {
+            addCriterion("CONSIGNMENT_NAME not in", values, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameBetween(String value1, String value2) {
+            addCriterion("CONSIGNMENT_NAME between", value1, value2, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentNameNotBetween(String value1, String value2) {
+            addCriterion("CONSIGNMENT_NAME not between", value1, value2, "consignmentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneIsNull() {
+            addCriterion("CONSIGNMENT_PHONE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneIsNotNull() {
+            addCriterion("CONSIGNMENT_PHONE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneEqualTo(String value) {
+            addCriterion("CONSIGNMENT_PHONE =", value, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneNotEqualTo(String value) {
+            addCriterion("CONSIGNMENT_PHONE <>", value, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneGreaterThan(String value) {
+            addCriterion("CONSIGNMENT_PHONE >", value, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneGreaterThanOrEqualTo(String value) {
+            addCriterion("CONSIGNMENT_PHONE >=", value, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneLessThan(String value) {
+            addCriterion("CONSIGNMENT_PHONE <", value, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneLessThanOrEqualTo(String value) {
+            addCriterion("CONSIGNMENT_PHONE <=", value, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneLike(String value) {
+            addCriterion("CONSIGNMENT_PHONE like", value, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneNotLike(String value) {
+            addCriterion("CONSIGNMENT_PHONE not like", value, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneIn(List<String> values) {
+            addCriterion("CONSIGNMENT_PHONE in", values, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneNotIn(List<String> values) {
+            addCriterion("CONSIGNMENT_PHONE not in", values, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneBetween(String value1, String value2) {
+            addCriterion("CONSIGNMENT_PHONE between", value1, value2, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentPhoneNotBetween(String value1, String value2) {
+            addCriterion("CONSIGNMENT_PHONE not between", value1, value2, "consignmentPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressIsNull() {
+            addCriterion("CONSIGNMENT_ADDRESS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressIsNotNull() {
+            addCriterion("CONSIGNMENT_ADDRESS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressEqualTo(String value) {
+            addCriterion("CONSIGNMENT_ADDRESS =", value, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressNotEqualTo(String value) {
+            addCriterion("CONSIGNMENT_ADDRESS <>", value, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressGreaterThan(String value) {
+            addCriterion("CONSIGNMENT_ADDRESS >", value, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("CONSIGNMENT_ADDRESS >=", value, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressLessThan(String value) {
+            addCriterion("CONSIGNMENT_ADDRESS <", value, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressLessThanOrEqualTo(String value) {
+            addCriterion("CONSIGNMENT_ADDRESS <=", value, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressLike(String value) {
+            addCriterion("CONSIGNMENT_ADDRESS like", value, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressNotLike(String value) {
+            addCriterion("CONSIGNMENT_ADDRESS not like", value, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressIn(List<String> values) {
+            addCriterion("CONSIGNMENT_ADDRESS in", values, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressNotIn(List<String> values) {
+            addCriterion("CONSIGNMENT_ADDRESS not in", values, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressBetween(String value1, String value2) {
+            addCriterion("CONSIGNMENT_ADDRESS between", value1, value2, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsignmentAddressNotBetween(String value1, String value2) {
+            addCriterion("CONSIGNMENT_ADDRESS not between", value1, value2, "consignmentAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeIsNull() {
+            addCriterion("SEND_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeIsNotNull() {
+            addCriterion("SEND_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeEqualTo(Date value) {
+            addCriterionForJDBCDate("SEND_TIME =", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeNotEqualTo(Date value) {
+            addCriterionForJDBCDate("SEND_TIME <>", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeGreaterThan(Date value) {
+            addCriterionForJDBCDate("SEND_TIME >", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeGreaterThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("SEND_TIME >=", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeLessThan(Date value) {
+            addCriterionForJDBCDate("SEND_TIME <", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeLessThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("SEND_TIME <=", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeIn(List<Date> values) {
+            addCriterionForJDBCDate("SEND_TIME in", values, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeNotIn(List<Date> values) {
+            addCriterionForJDBCDate("SEND_TIME not in", values, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("SEND_TIME between", value1, value2, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeNotBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("SEND_TIME not between", value1, value2, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountIsNull() {
+            addCriterion("SEND_COUNT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountIsNotNull() {
+            addCriterion("SEND_COUNT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountEqualTo(Integer value) {
+            addCriterion("SEND_COUNT =", value, "sendCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountNotEqualTo(Integer value) {
+            addCriterion("SEND_COUNT <>", value, "sendCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountGreaterThan(Integer value) {
+            addCriterion("SEND_COUNT >", value, "sendCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("SEND_COUNT >=", value, "sendCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountLessThan(Integer value) {
+            addCriterion("SEND_COUNT <", value, "sendCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountLessThanOrEqualTo(Integer value) {
+            addCriterion("SEND_COUNT <=", value, "sendCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountIn(List<Integer> values) {
+            addCriterion("SEND_COUNT in", values, "sendCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountNotIn(List<Integer> values) {
+            addCriterion("SEND_COUNT not in", values, "sendCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountBetween(Integer value1, Integer value2) {
+            addCriterion("SEND_COUNT between", value1, value2, "sendCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("SEND_COUNT not between", value1, value2, "sendCount");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        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;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,742 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisExample;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CdAttachmentExample extends BaseMybatisExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CdAttachmentExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            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");
+            }
+            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");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdIsNull() {
+            addCriterion("business_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdIsNotNull() {
+            addCriterion("business_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdEqualTo(String value) {
+            addCriterion("business_id =", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotEqualTo(String value) {
+            addCriterion("business_id <>", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdGreaterThan(String value) {
+            addCriterion("business_id >", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdGreaterThanOrEqualTo(String value) {
+            addCriterion("business_id >=", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdLessThan(String value) {
+            addCriterion("business_id <", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdLessThanOrEqualTo(String value) {
+            addCriterion("business_id <=", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdLike(String value) {
+            addCriterion("business_id like", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotLike(String value) {
+            addCriterion("business_id not like", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdIn(List<String> values) {
+            addCriterion("business_id in", values, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotIn(List<String> values) {
+            addCriterion("business_id not in", values, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdBetween(String value1, String value2) {
+            addCriterion("business_id between", value1, value2, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotBetween(String value1, String value2) {
+            addCriterion("business_id not between", value1, value2, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(String value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLike(String value) {
+            addCriterion("type like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("type not like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameIsNull() {
+            addCriterion("file_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameIsNotNull() {
+            addCriterion("file_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameEqualTo(String value) {
+            addCriterion("file_name =", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotEqualTo(String value) {
+            addCriterion("file_name <>", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameGreaterThan(String value) {
+            addCriterion("file_name >", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameGreaterThanOrEqualTo(String value) {
+            addCriterion("file_name >=", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameLessThan(String value) {
+            addCriterion("file_name <", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameLessThanOrEqualTo(String value) {
+            addCriterion("file_name <=", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameLike(String value) {
+            addCriterion("file_name like", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotLike(String value) {
+            addCriterion("file_name not like", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameIn(List<String> values) {
+            addCriterion("file_name in", values, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotIn(List<String> values) {
+            addCriterion("file_name not in", values, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameBetween(String value1, String value2) {
+            addCriterion("file_name between", value1, value2, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotBetween(String value1, String value2) {
+            addCriterion("file_name not between", value1, value2, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendIsNull() {
+            addCriterion("file_extend is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendIsNotNull() {
+            addCriterion("file_extend is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendEqualTo(String value) {
+            addCriterion("file_extend =", value, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendNotEqualTo(String value) {
+            addCriterion("file_extend <>", value, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendGreaterThan(String value) {
+            addCriterion("file_extend >", value, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendGreaterThanOrEqualTo(String value) {
+            addCriterion("file_extend >=", value, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendLessThan(String value) {
+            addCriterion("file_extend <", value, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendLessThanOrEqualTo(String value) {
+            addCriterion("file_extend <=", value, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendLike(String value) {
+            addCriterion("file_extend like", value, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendNotLike(String value) {
+            addCriterion("file_extend not like", value, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendIn(List<String> values) {
+            addCriterion("file_extend in", values, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendNotIn(List<String> values) {
+            addCriterion("file_extend not in", values, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendBetween(String value1, String value2) {
+            addCriterion("file_extend between", value1, value2, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileExtendNotBetween(String value1, String value2) {
+            addCriterion("file_extend not between", value1, value2, "fileExtend");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathIsNull() {
+            addCriterion("file_path is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathIsNotNull() {
+            addCriterion("file_path is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathEqualTo(String value) {
+            addCriterion("file_path =", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathNotEqualTo(String value) {
+            addCriterion("file_path <>", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathGreaterThan(String value) {
+            addCriterion("file_path >", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathGreaterThanOrEqualTo(String value) {
+            addCriterion("file_path >=", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathLessThan(String value) {
+            addCriterion("file_path <", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathLessThanOrEqualTo(String value) {
+            addCriterion("file_path <=", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathLike(String value) {
+            addCriterion("file_path like", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathNotLike(String value) {
+            addCriterion("file_path not like", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathIn(List<String> values) {
+            addCriterion("file_path in", values, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathNotIn(List<String> values) {
+            addCriterion("file_path not in", values, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathBetween(String value1, String value2) {
+            addCriterion("file_path between", value1, value2, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathNotBetween(String value1, String value2) {
+            addCriterion("file_path not between", value1, value2, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateIsNull() {
+            addCriterion("upload_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateIsNotNull() {
+            addCriterion("upload_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateEqualTo(Date value) {
+            addCriterion("upload_date =", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateNotEqualTo(Date value) {
+            addCriterion("upload_date <>", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateGreaterThan(Date value) {
+            addCriterion("upload_date >", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("upload_date >=", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateLessThan(Date value) {
+            addCriterion("upload_date <", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateLessThanOrEqualTo(Date value) {
+            addCriterion("upload_date <=", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateIn(List<Date> values) {
+            addCriterion("upload_date in", values, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateNotIn(List<Date> values) {
+            addCriterion("upload_date not in", values, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateBetween(Date value1, Date value2) {
+            addCriterion("upload_date between", value1, value2, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateNotBetween(Date value1, Date value2) {
+            addCriterion("upload_date not between", value1, value2, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserIsNull() {
+            addCriterion("upload_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserIsNotNull() {
+            addCriterion("upload_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserEqualTo(String value) {
+            addCriterion("upload_user =", value, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserNotEqualTo(String value) {
+            addCriterion("upload_user <>", value, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserGreaterThan(String value) {
+            addCriterion("upload_user >", value, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserGreaterThanOrEqualTo(String value) {
+            addCriterion("upload_user >=", value, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserLessThan(String value) {
+            addCriterion("upload_user <", value, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserLessThanOrEqualTo(String value) {
+            addCriterion("upload_user <=", value, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserLike(String value) {
+            addCriterion("upload_user like", value, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserNotLike(String value) {
+            addCriterion("upload_user not like", value, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserIn(List<String> values) {
+            addCriterion("upload_user in", values, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserNotIn(List<String> values) {
+            addCriterion("upload_user not in", values, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserBetween(String value1, String value2) {
+            addCriterion("upload_user between", value1, value2, "uploadUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadUserNotBetween(String value1, String value2) {
+            addCriterion("upload_user not between", value1, value2, "uploadUser");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        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;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,91 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_bind")
+public class CdBind extends BaseMybatisModel {
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 如果是客户绑定则存储用户ID，如果是快递员绑定则存储快递员ID
+     */
+    private Integer userId;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 微信唯一识别号
+     */
+    private String openId;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "user_id")
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+        if(userId == null){
+              removeValidField("userId");
+              return;
+        }
+        addValidField("userId");
+    }
+
+    @Column(name = "PHONE")
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+        if(phone == null){
+              removeValidField("phone");
+              return;
+        }
+        addValidField("phone");
+    }
+
+    @Column(name = "OPEN_ID")
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+        if(openId == null){
+              removeValidField("openId");
+              return;
+        }
+        addValidField("openId");
+    }
+}

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

@@ -0,0 +1,391 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisExample;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CdCategoryExample extends BaseMybatisExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CdCategoryExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            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");
+            }
+            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");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameIsNull() {
+            addCriterion("CATEGORY_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameIsNotNull() {
+            addCriterion("CATEGORY_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameEqualTo(String value) {
+            addCriterion("CATEGORY_NAME =", value, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameNotEqualTo(String value) {
+            addCriterion("CATEGORY_NAME <>", value, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameGreaterThan(String value) {
+            addCriterion("CATEGORY_NAME >", value, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameGreaterThanOrEqualTo(String value) {
+            addCriterion("CATEGORY_NAME >=", value, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameLessThan(String value) {
+            addCriterion("CATEGORY_NAME <", value, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameLessThanOrEqualTo(String value) {
+            addCriterion("CATEGORY_NAME <=", value, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameLike(String value) {
+            addCriterion("CATEGORY_NAME like", value, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameNotLike(String value) {
+            addCriterion("CATEGORY_NAME not like", value, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameIn(List<String> values) {
+            addCriterion("CATEGORY_NAME in", values, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameNotIn(List<String> values) {
+            addCriterion("CATEGORY_NAME not in", values, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameBetween(String value1, String value2) {
+            addCriterion("CATEGORY_NAME between", value1, value2, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNameNotBetween(String value1, String value2) {
+            addCriterion("CATEGORY_NAME not between", value1, value2, "categoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIsNull() {
+            addCriterion("PARENT_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIsNotNull() {
+            addCriterion("PARENT_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdEqualTo(Integer value) {
+            addCriterion("PARENT_ID =", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotEqualTo(Integer value) {
+            addCriterion("PARENT_ID <>", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdGreaterThan(Integer value) {
+            addCriterion("PARENT_ID >", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("PARENT_ID >=", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLessThan(Integer value) {
+            addCriterion("PARENT_ID <", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLessThanOrEqualTo(Integer value) {
+            addCriterion("PARENT_ID <=", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIn(List<Integer> values) {
+            addCriterion("PARENT_ID in", values, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotIn(List<Integer> values) {
+            addCriterion("PARENT_ID not in", values, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdBetween(Integer value1, Integer value2) {
+            addCriterion("PARENT_ID between", value1, value2, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("PARENT_ID not between", value1, value2, "parentId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        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;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,129 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_company")
+public class CdCompany extends BaseMybatisModel {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 单位地址
+     */
+    private String companyAddress;
+
+    /**
+     * 单位联系人
+     */
+    private String companyLeader;
+
+    /**
+     * 联系人电话
+     */
+    private String companyLeaderTel;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "COMPANY_CODE")
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+        if(companyCode == null){
+              removeValidField("companyCode");
+              return;
+        }
+        addValidField("companyCode");
+    }
+
+    @Column(name = "COMPANY_NAME")
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+        if(companyName == null){
+              removeValidField("companyName");
+              return;
+        }
+        addValidField("companyName");
+    }
+
+    @Column(name = "COMPANY_ADDRESS")
+    public String getCompanyAddress() {
+        return companyAddress;
+    }
+
+    public void setCompanyAddress(String companyAddress) {
+        this.companyAddress = companyAddress;
+        if(companyAddress == null){
+              removeValidField("companyAddress");
+              return;
+        }
+        addValidField("companyAddress");
+    }
+
+    @Column(name = "COMPANY_LEADER")
+    public String getCompanyLeader() {
+        return companyLeader;
+    }
+
+    public void setCompanyLeader(String companyLeader) {
+        this.companyLeader = companyLeader;
+        if(companyLeader == null){
+              removeValidField("companyLeader");
+              return;
+        }
+        addValidField("companyLeader");
+    }
+
+    @Column(name = "COMPANY_LEADER_TEL")
+    public String getCompanyLeaderTel() {
+        return companyLeaderTel;
+    }
+
+    public void setCompanyLeaderTel(String companyLeaderTel) {
+        this.companyLeaderTel = companyLeaderTel;
+        if(companyLeaderTel == null){
+              removeValidField("companyLeaderTel");
+              return;
+        }
+        addValidField("companyLeaderTel");
+    }
+}

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

@@ -0,0 +1,226 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_contract")
+public class CdContract extends BaseMybatisModel {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 合同编号
+     */
+    private String contractCode;
+
+    /**
+     * 合同名称
+     */
+    private String contractName;
+
+    /**
+     * 合同价的客户
+     */
+    private Integer cdMemberId;
+
+    /**
+     * 合同价的单位
+     */
+    private Integer cdCompanyId;
+
+    /**
+     * 1-部分产品，2-全部产品
+     */
+    private Integer scope;
+
+    /**
+     * 仅当适用范围为全部产品时适用
+     */
+    private BigDecimal contractPrice;
+
+    /**
+     * 合同开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 合同结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 0-未作废，1-作废
+     */
+    private Integer isDel;
+
+    /**
+     * 0-未审核，1-审核
+     */
+    private Integer isAuditor;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "CONTRACT_CODE")
+    public String getContractCode() {
+        return contractCode;
+    }
+
+    public void setContractCode(String contractCode) {
+        this.contractCode = contractCode;
+        if(contractCode == null){
+              removeValidField("contractCode");
+              return;
+        }
+        addValidField("contractCode");
+    }
+
+    @Column(name = "CONTRACT_NAME")
+    public String getContractName() {
+        return contractName;
+    }
+
+    public void setContractName(String contractName) {
+        this.contractName = contractName;
+        if(contractName == null){
+              removeValidField("contractName");
+              return;
+        }
+        addValidField("contractName");
+    }
+
+    @Column(name = "CD_MEMBER_ID")
+    public Integer getCdMemberId() {
+        return cdMemberId;
+    }
+
+    public void setCdMemberId(Integer cdMemberId) {
+        this.cdMemberId = cdMemberId;
+        if(cdMemberId == null){
+              removeValidField("cdMemberId");
+              return;
+        }
+        addValidField("cdMemberId");
+    }
+
+    @Column(name = "CD_COMPANY_ID")
+    public Integer getCdCompanyId() {
+        return cdCompanyId;
+    }
+
+    public void setCdCompanyId(Integer cdCompanyId) {
+        this.cdCompanyId = cdCompanyId;
+        if(cdCompanyId == null){
+              removeValidField("cdCompanyId");
+              return;
+        }
+        addValidField("cdCompanyId");
+    }
+
+    @Column(name = "SCOPE")
+    public Integer getScope() {
+        return scope;
+    }
+
+    public void setScope(Integer scope) {
+        this.scope = scope;
+        if(scope == null){
+              removeValidField("scope");
+              return;
+        }
+        addValidField("scope");
+    }
+
+    @Column(name = "CONTRACT_PRICE")
+    public BigDecimal getContractPrice() {
+        return contractPrice;
+    }
+
+    public void setContractPrice(BigDecimal contractPrice) {
+        this.contractPrice = contractPrice;
+        if(contractPrice == null){
+              removeValidField("contractPrice");
+              return;
+        }
+        addValidField("contractPrice");
+    }
+
+    @Column(name = "BEGIN_TIME")
+    public Date getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Date beginTime) {
+        this.beginTime = beginTime;
+        if(beginTime == null){
+              removeValidField("beginTime");
+              return;
+        }
+        addValidField("beginTime");
+    }
+
+    @Column(name = "END_TIME")
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+        if(endTime == null){
+              removeValidField("endTime");
+              return;
+        }
+        addValidField("endTime");
+    }
+
+    @Column(name = "IS_DEL")
+    public Integer getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Integer isDel) {
+        this.isDel = isDel;
+        if(isDel == null){
+              removeValidField("isDel");
+              return;
+        }
+        addValidField("isDel");
+    }
+
+    @Column(name = "IS_AUDITOR")
+    public Integer getIsAuditor() {
+        return isAuditor;
+    }
+
+    public void setIsAuditor(Integer isAuditor) {
+        this.isAuditor = isAuditor;
+        if(isAuditor == null){
+              removeValidField("isAuditor");
+              return;
+        }
+        addValidField("isAuditor");
+    }
+}

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

@@ -0,0 +1,130 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import java.math.BigDecimal;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_contract_item")
+public class CdContractItem extends BaseMybatisModel {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 产品合同
+     */
+    private Integer cdContractId;
+
+    /**
+     * 优惠方式
+     */
+    private Integer contractType;
+
+    /**
+     * 当合同适用范围为1的时候，每种产品要设定对应的合同价
+     */
+    private Integer cdItemId;
+
+    /**
+     * 折扣
+     */
+    private BigDecimal discount;
+
+    /**
+     * 合同价格
+     */
+    private BigDecimal contractValue;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "CD_CONTRACT_ID")
+    public Integer getCdContractId() {
+        return cdContractId;
+    }
+
+    public void setCdContractId(Integer cdContractId) {
+        this.cdContractId = cdContractId;
+        if(cdContractId == null){
+              removeValidField("cdContractId");
+              return;
+        }
+        addValidField("cdContractId");
+    }
+
+    @Column(name = "CONTRACT_TYPE")
+    public Integer getContractType() {
+        return contractType;
+    }
+
+    public void setContractType(Integer contractType) {
+        this.contractType = contractType;
+        if(contractType == null){
+              removeValidField("contractType");
+              return;
+        }
+        addValidField("contractType");
+    }
+
+    @Column(name = "CD_ITEM_ID")
+    public Integer getCdItemId() {
+        return cdItemId;
+    }
+
+    public void setCdItemId(Integer cdItemId) {
+        this.cdItemId = cdItemId;
+        if(cdItemId == null){
+              removeValidField("cdItemId");
+              return;
+        }
+        addValidField("cdItemId");
+    }
+
+    @Column(name = "DISCOUNT")
+    public BigDecimal getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(BigDecimal discount) {
+        this.discount = discount;
+        if(discount == null){
+              removeValidField("discount");
+              return;
+        }
+        addValidField("discount");
+    }
+
+    @Column(name = "CONTRACT_VALUE")
+    public BigDecimal getContractValue() {
+        return contractValue;
+    }
+
+    public void setContractValue(BigDecimal contractValue) {
+        this.contractValue = contractValue;
+        if(contractValue == null){
+              removeValidField("contractValue");
+              return;
+        }
+        addValidField("contractValue");
+    }
+}

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

@@ -0,0 +1,562 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisExample;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CdContractItemExample extends BaseMybatisExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CdContractItemExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            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");
+            }
+            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");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdIsNull() {
+            addCriterion("CD_CONTRACT_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdIsNotNull() {
+            addCriterion("CD_CONTRACT_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdEqualTo(Integer value) {
+            addCriterion("CD_CONTRACT_ID =", value, "cdContractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdNotEqualTo(Integer value) {
+            addCriterion("CD_CONTRACT_ID <>", value, "cdContractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdGreaterThan(Integer value) {
+            addCriterion("CD_CONTRACT_ID >", value, "cdContractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("CD_CONTRACT_ID >=", value, "cdContractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdLessThan(Integer value) {
+            addCriterion("CD_CONTRACT_ID <", value, "cdContractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdLessThanOrEqualTo(Integer value) {
+            addCriterion("CD_CONTRACT_ID <=", value, "cdContractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdIn(List<Integer> values) {
+            addCriterion("CD_CONTRACT_ID in", values, "cdContractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdNotIn(List<Integer> values) {
+            addCriterion("CD_CONTRACT_ID not in", values, "cdContractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdBetween(Integer value1, Integer value2) {
+            addCriterion("CD_CONTRACT_ID between", value1, value2, "cdContractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdContractIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("CD_CONTRACT_ID not between", value1, value2, "cdContractId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeIsNull() {
+            addCriterion("CONTRACT_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeIsNotNull() {
+            addCriterion("CONTRACT_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeEqualTo(Integer value) {
+            addCriterion("CONTRACT_TYPE =", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeNotEqualTo(Integer value) {
+            addCriterion("CONTRACT_TYPE <>", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeGreaterThan(Integer value) {
+            addCriterion("CONTRACT_TYPE >", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("CONTRACT_TYPE >=", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeLessThan(Integer value) {
+            addCriterion("CONTRACT_TYPE <", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("CONTRACT_TYPE <=", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeIn(List<Integer> values) {
+            addCriterion("CONTRACT_TYPE in", values, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeNotIn(List<Integer> values) {
+            addCriterion("CONTRACT_TYPE not in", values, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeBetween(Integer value1, Integer value2) {
+            addCriterion("CONTRACT_TYPE between", value1, value2, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("CONTRACT_TYPE not between", value1, value2, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdIsNull() {
+            addCriterion("CD_ITEM_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdIsNotNull() {
+            addCriterion("CD_ITEM_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdEqualTo(Integer value) {
+            addCriterion("CD_ITEM_ID =", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdNotEqualTo(Integer value) {
+            addCriterion("CD_ITEM_ID <>", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdGreaterThan(Integer value) {
+            addCriterion("CD_ITEM_ID >", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("CD_ITEM_ID >=", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdLessThan(Integer value) {
+            addCriterion("CD_ITEM_ID <", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdLessThanOrEqualTo(Integer value) {
+            addCriterion("CD_ITEM_ID <=", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdIn(List<Integer> values) {
+            addCriterion("CD_ITEM_ID in", values, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdNotIn(List<Integer> values) {
+            addCriterion("CD_ITEM_ID not in", values, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdBetween(Integer value1, Integer value2) {
+            addCriterion("CD_ITEM_ID between", value1, value2, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("CD_ITEM_ID not between", value1, value2, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIsNull() {
+            addCriterion("DISCOUNT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIsNotNull() {
+            addCriterion("DISCOUNT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountEqualTo(BigDecimal value) {
+            addCriterion("DISCOUNT =", value, "discount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountNotEqualTo(BigDecimal value) {
+            addCriterion("DISCOUNT <>", value, "discount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountGreaterThan(BigDecimal value) {
+            addCriterion("DISCOUNT >", value, "discount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("DISCOUNT >=", value, "discount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountLessThan(BigDecimal value) {
+            addCriterion("DISCOUNT <", value, "discount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("DISCOUNT <=", value, "discount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountIn(List<BigDecimal> values) {
+            addCriterion("DISCOUNT in", values, "discount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountNotIn(List<BigDecimal> values) {
+            addCriterion("DISCOUNT not in", values, "discount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("DISCOUNT between", value1, value2, "discount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("DISCOUNT not between", value1, value2, "discount");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueIsNull() {
+            addCriterion("CONTRACT_VALUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueIsNotNull() {
+            addCriterion("CONTRACT_VALUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueEqualTo(BigDecimal value) {
+            addCriterion("CONTRACT_VALUE =", value, "contractValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueNotEqualTo(BigDecimal value) {
+            addCriterion("CONTRACT_VALUE <>", value, "contractValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueGreaterThan(BigDecimal value) {
+            addCriterion("CONTRACT_VALUE >", value, "contractValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("CONTRACT_VALUE >=", value, "contractValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueLessThan(BigDecimal value) {
+            addCriterion("CONTRACT_VALUE <", value, "contractValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("CONTRACT_VALUE <=", value, "contractValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueIn(List<BigDecimal> values) {
+            addCriterion("CONTRACT_VALUE in", values, "contractValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueNotIn(List<BigDecimal> values) {
+            addCriterion("CONTRACT_VALUE not in", values, "contractValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("CONTRACT_VALUE between", value1, value2, "contractValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractValueNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("CONTRACT_VALUE not between", value1, value2, "contractValue");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        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;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,435 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_coupon")
+public class CdCoupon extends BaseMybatisModel {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 卡或者劵,1-卡，2-劵
+     */
+    private Integer couponType;
+
+    /**
+     * 卡/劵类型
+     */
+    private Integer couponCategory;
+
+    /**
+     * 卡号
+     */
+    private String couponNumber;
+
+    /**
+     * 密码
+     */
+    private String couponPassword;
+
+    /**
+     * 固定金额
+     */
+    private BigDecimal couponValue;
+
+    /**
+     * 可用余额
+     */
+    private BigDecimal userPrice;
+
+    /**
+     * 单位
+     */
+    private Integer cdCompanyId;
+
+    /**
+     * 客服经理
+     */
+    private Integer cdUserId;
+
+    /**
+     * 描述
+     */
+    private String couponDesc;
+
+    /**
+     * 0-未使用，1-已使用
+     */
+    private Integer isUsed;
+
+    /**
+     * 0-无效，1-有效
+     */
+    private Integer isUseful;
+
+    /**
+     * 是否赠送。0-否，1-是
+     */
+    private Integer isGift;
+
+    /**
+     * 是否发卡，0-未发，1-已发
+     */
+    private Integer isSend;
+
+    /**
+     * 付款方式 1-预付款，2-后付款
+     */
+    private Integer paymentType;
+
+    /**
+     * 有效开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 有效结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 
+     */
+    private String notes;
+
+    /**
+     * 0-未完结 1-完结
+     */
+    private Integer isOver;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 发卡批次
+     */
+    private String batch;
+
+    /**
+     * 卡激活时间，劵使用时间
+     */
+    private Date usefulDate;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "COUPON_TYPE")
+    public Integer getCouponType() {
+        return couponType;
+    }
+
+    public void setCouponType(Integer couponType) {
+        this.couponType = couponType;
+        if(couponType == null){
+              removeValidField("couponType");
+              return;
+        }
+        addValidField("couponType");
+    }
+
+    @Column(name = "COUPON_CATEGORY")
+    public Integer getCouponCategory() {
+        return couponCategory;
+    }
+
+    public void setCouponCategory(Integer couponCategory) {
+        this.couponCategory = couponCategory;
+        if(couponCategory == null){
+              removeValidField("couponCategory");
+              return;
+        }
+        addValidField("couponCategory");
+    }
+
+    @Column(name = "COUPON_NUMBER")
+    public String getCouponNumber() {
+        return couponNumber;
+    }
+
+    public void setCouponNumber(String couponNumber) {
+        this.couponNumber = couponNumber;
+        if(couponNumber == null){
+              removeValidField("couponNumber");
+              return;
+        }
+        addValidField("couponNumber");
+    }
+
+    @Column(name = "COUPON_PASSWORD")
+    public String getCouponPassword() {
+        return couponPassword;
+    }
+
+    public void setCouponPassword(String couponPassword) {
+        this.couponPassword = couponPassword;
+        if(couponPassword == null){
+              removeValidField("couponPassword");
+              return;
+        }
+        addValidField("couponPassword");
+    }
+
+    @Column(name = "COUPON_VALUE")
+    public BigDecimal getCouponValue() {
+        return couponValue;
+    }
+
+    public void setCouponValue(BigDecimal couponValue) {
+        this.couponValue = couponValue;
+        if(couponValue == null){
+              removeValidField("couponValue");
+              return;
+        }
+        addValidField("couponValue");
+    }
+
+    @Column(name = "USER_PRICE")
+    public BigDecimal getUserPrice() {
+        return userPrice;
+    }
+
+    public void setUserPrice(BigDecimal userPrice) {
+        this.userPrice = userPrice;
+        if(userPrice == null){
+              removeValidField("userPrice");
+              return;
+        }
+        addValidField("userPrice");
+    }
+
+    @Column(name = "CD_COMPANY_ID")
+    public Integer getCdCompanyId() {
+        return cdCompanyId;
+    }
+
+    public void setCdCompanyId(Integer cdCompanyId) {
+        this.cdCompanyId = cdCompanyId;
+        if(cdCompanyId == null){
+              removeValidField("cdCompanyId");
+              return;
+        }
+        addValidField("cdCompanyId");
+    }
+
+    @Column(name = "CD_USER_ID")
+    public Integer getCdUserId() {
+        return cdUserId;
+    }
+
+    public void setCdUserId(Integer cdUserId) {
+        this.cdUserId = cdUserId;
+        if(cdUserId == null){
+              removeValidField("cdUserId");
+              return;
+        }
+        addValidField("cdUserId");
+    }
+
+    @Column(name = "COUPON_DESC")
+    public String getCouponDesc() {
+        return couponDesc;
+    }
+
+    public void setCouponDesc(String couponDesc) {
+        this.couponDesc = couponDesc;
+        if(couponDesc == null){
+              removeValidField("couponDesc");
+              return;
+        }
+        addValidField("couponDesc");
+    }
+
+    @Column(name = "IS_USED")
+    public Integer getIsUsed() {
+        return isUsed;
+    }
+
+    public void setIsUsed(Integer isUsed) {
+        this.isUsed = isUsed;
+        if(isUsed == null){
+              removeValidField("isUsed");
+              return;
+        }
+        addValidField("isUsed");
+    }
+
+    @Column(name = "IS_USEFUL")
+    public Integer getIsUseful() {
+        return isUseful;
+    }
+
+    public void setIsUseful(Integer isUseful) {
+        this.isUseful = isUseful;
+        if(isUseful == null){
+              removeValidField("isUseful");
+              return;
+        }
+        addValidField("isUseful");
+    }
+
+    @Column(name = "IS_GIFT")
+    public Integer getIsGift() {
+        return isGift;
+    }
+
+    public void setIsGift(Integer isGift) {
+        this.isGift = isGift;
+        if(isGift == null){
+              removeValidField("isGift");
+              return;
+        }
+        addValidField("isGift");
+    }
+
+    @Column(name = "IS_SEND")
+    public Integer getIsSend() {
+        return isSend;
+    }
+
+    public void setIsSend(Integer isSend) {
+        this.isSend = isSend;
+        if(isSend == null){
+              removeValidField("isSend");
+              return;
+        }
+        addValidField("isSend");
+    }
+
+    @Column(name = "PAYMENT_TYPE")
+    public Integer getPaymentType() {
+        return paymentType;
+    }
+
+    public void setPaymentType(Integer paymentType) {
+        this.paymentType = paymentType;
+        if(paymentType == null){
+              removeValidField("paymentType");
+              return;
+        }
+        addValidField("paymentType");
+    }
+
+    @Column(name = "BEGIN_TIME")
+    public Date getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Date beginTime) {
+        this.beginTime = beginTime;
+        if(beginTime == null){
+              removeValidField("beginTime");
+              return;
+        }
+        addValidField("beginTime");
+    }
+
+    @Column(name = "END_TIME")
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+        if(endTime == null){
+              removeValidField("endTime");
+              return;
+        }
+        addValidField("endTime");
+    }
+
+    @Column(name = "NOTES")
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+        if(notes == null){
+              removeValidField("notes");
+              return;
+        }
+        addValidField("notes");
+    }
+
+    @Column(name = "IS_OVER")
+    public Integer getIsOver() {
+        return isOver;
+    }
+
+    public void setIsOver(Integer isOver) {
+        this.isOver = isOver;
+        if(isOver == null){
+              removeValidField("isOver");
+              return;
+        }
+        addValidField("isOver");
+    }
+
+    @Column(name = "AUDIT_DATE")
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+        if(auditDate == null){
+              removeValidField("auditDate");
+              return;
+        }
+        addValidField("auditDate");
+    }
+
+    @Column(name = "BATCH")
+    public String getBatch() {
+        return batch;
+    }
+
+    public void setBatch(String batch) {
+        this.batch = batch;
+        if(batch == null){
+              removeValidField("batch");
+              return;
+        }
+        addValidField("batch");
+    }
+
+    @Column(name = "USEFUL_DATE")
+    public Date getUsefulDate() {
+        return usefulDate;
+    }
+
+    public void setUsefulDate(Date usefulDate) {
+        this.usefulDate = usefulDate;
+        if(usefulDate == null){
+              removeValidField("usefulDate");
+              return;
+        }
+        addValidField("usefulDate");
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_coupon_category")
+public class CdCouponCategory extends BaseMybatisModel {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 类别类型(1-卡，2-劵)
+     */
+    private Integer categoryType;
+
+    /**
+     * 类别名称
+     */
+    private String categoryName;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "CATEGORY_TYPE")
+    public Integer getCategoryType() {
+        return categoryType;
+    }
+
+    public void setCategoryType(Integer categoryType) {
+        this.categoryType = categoryType;
+        if(categoryType == null){
+              removeValidField("categoryType");
+              return;
+        }
+        addValidField("categoryType");
+    }
+
+    @Column(name = "CATEGORY_NAME")
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+        if(categoryName == null){
+              removeValidField("categoryName");
+              return;
+        }
+        addValidField("categoryName");
+    }
+}

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

@@ -0,0 +1,591 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisExample;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CdCouponCategoryRefExample extends BaseMybatisExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CdCouponCategoryRefExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            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");
+            }
+            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");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdIsNull() {
+            addCriterion("CD_COUPON_CATEGORY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdIsNotNull() {
+            addCriterion("CD_COUPON_CATEGORY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdEqualTo(Integer value) {
+            addCriterion("CD_COUPON_CATEGORY_ID =", value, "cdCouponCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdNotEqualTo(Integer value) {
+            addCriterion("CD_COUPON_CATEGORY_ID <>", value, "cdCouponCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdGreaterThan(Integer value) {
+            addCriterion("CD_COUPON_CATEGORY_ID >", value, "cdCouponCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("CD_COUPON_CATEGORY_ID >=", value, "cdCouponCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdLessThan(Integer value) {
+            addCriterion("CD_COUPON_CATEGORY_ID <", value, "cdCouponCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdLessThanOrEqualTo(Integer value) {
+            addCriterion("CD_COUPON_CATEGORY_ID <=", value, "cdCouponCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdIn(List<Integer> values) {
+            addCriterion("CD_COUPON_CATEGORY_ID in", values, "cdCouponCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdNotIn(List<Integer> values) {
+            addCriterion("CD_COUPON_CATEGORY_ID not in", values, "cdCouponCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdBetween(Integer value1, Integer value2) {
+            addCriterion("CD_COUPON_CATEGORY_ID between", value1, value2, "cdCouponCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCouponCategoryIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("CD_COUPON_CATEGORY_ID not between", value1, value2, "cdCouponCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeIsNull() {
+            addCriterion("REF_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeIsNotNull() {
+            addCriterion("REF_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeEqualTo(String value) {
+            addCriterion("REF_TYPE =", value, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeNotEqualTo(String value) {
+            addCriterion("REF_TYPE <>", value, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeGreaterThan(String value) {
+            addCriterion("REF_TYPE >", value, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("REF_TYPE >=", value, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeLessThan(String value) {
+            addCriterion("REF_TYPE <", value, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeLessThanOrEqualTo(String value) {
+            addCriterion("REF_TYPE <=", value, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeLike(String value) {
+            addCriterion("REF_TYPE like", value, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeNotLike(String value) {
+            addCriterion("REF_TYPE not like", value, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeIn(List<String> values) {
+            addCriterion("REF_TYPE in", values, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeNotIn(List<String> values) {
+            addCriterion("REF_TYPE not in", values, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeBetween(String value1, String value2) {
+            addCriterion("REF_TYPE between", value1, value2, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefTypeNotBetween(String value1, String value2) {
+            addCriterion("REF_TYPE not between", value1, value2, "refType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameIsNull() {
+            addCriterion("REF_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameIsNotNull() {
+            addCriterion("REF_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameEqualTo(String value) {
+            addCriterion("REF_NAME =", value, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameNotEqualTo(String value) {
+            addCriterion("REF_NAME <>", value, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameGreaterThan(String value) {
+            addCriterion("REF_NAME >", value, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameGreaterThanOrEqualTo(String value) {
+            addCriterion("REF_NAME >=", value, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameLessThan(String value) {
+            addCriterion("REF_NAME <", value, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameLessThanOrEqualTo(String value) {
+            addCriterion("REF_NAME <=", value, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameLike(String value) {
+            addCriterion("REF_NAME like", value, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameNotLike(String value) {
+            addCriterion("REF_NAME not like", value, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameIn(List<String> values) {
+            addCriterion("REF_NAME in", values, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameNotIn(List<String> values) {
+            addCriterion("REF_NAME not in", values, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameBetween(String value1, String value2) {
+            addCriterion("REF_NAME between", value1, value2, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefNameNotBetween(String value1, String value2) {
+            addCriterion("REF_NAME not between", value1, value2, "refName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueIsNull() {
+            addCriterion("REF_VALUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueIsNotNull() {
+            addCriterion("REF_VALUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueEqualTo(String value) {
+            addCriterion("REF_VALUE =", value, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueNotEqualTo(String value) {
+            addCriterion("REF_VALUE <>", value, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueGreaterThan(String value) {
+            addCriterion("REF_VALUE >", value, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueGreaterThanOrEqualTo(String value) {
+            addCriterion("REF_VALUE >=", value, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueLessThan(String value) {
+            addCriterion("REF_VALUE <", value, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueLessThanOrEqualTo(String value) {
+            addCriterion("REF_VALUE <=", value, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueLike(String value) {
+            addCriterion("REF_VALUE like", value, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueNotLike(String value) {
+            addCriterion("REF_VALUE not like", value, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueIn(List<String> values) {
+            addCriterion("REF_VALUE in", values, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueNotIn(List<String> values) {
+            addCriterion("REF_VALUE not in", values, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueBetween(String value1, String value2) {
+            addCriterion("REF_VALUE between", value1, value2, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefValueNotBetween(String value1, String value2) {
+            addCriterion("REF_VALUE not between", value1, value2, "refValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountIsNull() {
+            addCriterion("REF_COUNT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountIsNotNull() {
+            addCriterion("REF_COUNT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountEqualTo(Integer value) {
+            addCriterion("REF_COUNT =", value, "refCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountNotEqualTo(Integer value) {
+            addCriterion("REF_COUNT <>", value, "refCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountGreaterThan(Integer value) {
+            addCriterion("REF_COUNT >", value, "refCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("REF_COUNT >=", value, "refCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountLessThan(Integer value) {
+            addCriterion("REF_COUNT <", value, "refCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountLessThanOrEqualTo(Integer value) {
+            addCriterion("REF_COUNT <=", value, "refCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountIn(List<Integer> values) {
+            addCriterion("REF_COUNT in", values, "refCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountNotIn(List<Integer> values) {
+            addCriterion("REF_COUNT not in", values, "refCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountBetween(Integer value1, Integer value2) {
+            addCriterion("REF_COUNT between", value1, value2, "refCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("REF_COUNT not between", value1, value2, "refCount");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        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;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,129 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_coupon_ref")
+public class CdCouponRef extends BaseMybatisModel {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 卡劵
+     */
+    private Integer cdCouponId;
+
+    /**
+     * 卡号
+     */
+    private String couponNumber;
+
+    /**
+     * 拓展类型
+     */
+    private String refType;
+
+    /**
+     * 拓展描述
+     */
+    private String refName;
+
+    /**
+     * 拓展值
+     */
+    private String refValue;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "CD_COUPON_ID")
+    public Integer getCdCouponId() {
+        return cdCouponId;
+    }
+
+    public void setCdCouponId(Integer cdCouponId) {
+        this.cdCouponId = cdCouponId;
+        if(cdCouponId == null){
+              removeValidField("cdCouponId");
+              return;
+        }
+        addValidField("cdCouponId");
+    }
+
+    @Column(name = "COUPON_NUMBER")
+    public String getCouponNumber() {
+        return couponNumber;
+    }
+
+    public void setCouponNumber(String couponNumber) {
+        this.couponNumber = couponNumber;
+        if(couponNumber == null){
+              removeValidField("couponNumber");
+              return;
+        }
+        addValidField("couponNumber");
+    }
+
+    @Column(name = "REF_TYPE")
+    public String getRefType() {
+        return refType;
+    }
+
+    public void setRefType(String refType) {
+        this.refType = refType;
+        if(refType == null){
+              removeValidField("refType");
+              return;
+        }
+        addValidField("refType");
+    }
+
+    @Column(name = "REF_NAME")
+    public String getRefName() {
+        return refName;
+    }
+
+    public void setRefName(String refName) {
+        this.refName = refName;
+        if(refName == null){
+              removeValidField("refName");
+              return;
+        }
+        addValidField("refName");
+    }
+
+    @Column(name = "REF_VALUE")
+    public String getRefValue() {
+        return refValue;
+    }
+
+    public void setRefValue(String refValue) {
+        this.refValue = refValue;
+        if(refValue == null){
+              removeValidField("refValue");
+              return;
+        }
+        addValidField("refValue");
+    }
+}

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

@@ -0,0 +1,511 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_item")
+public class CdItem extends BaseMybatisModel {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 产品编号
+     */
+    private String itemCode;
+
+    /**
+     * 产品归属的类别
+     */
+    private Integer cdCategoryId;
+
+    /**
+     * 产品名称
+     */
+    private String itemName;
+
+    /**
+     * 产品描述
+     */
+    private String itemDescribe;
+
+    /**
+     * 产品类型(1-常规商品，2-组合商品)
+     */
+    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;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "ITEM_CODE")
+    public String getItemCode() {
+        return itemCode;
+    }
+
+    public void setItemCode(String itemCode) {
+        this.itemCode = itemCode;
+        if(itemCode == null){
+              removeValidField("itemCode");
+              return;
+        }
+        addValidField("itemCode");
+    }
+
+    @Column(name = "CD_CATEGORY_ID")
+    public Integer getCdCategoryId() {
+        return cdCategoryId;
+    }
+
+    public void setCdCategoryId(Integer cdCategoryId) {
+        this.cdCategoryId = cdCategoryId;
+        if(cdCategoryId == null){
+              removeValidField("cdCategoryId");
+              return;
+        }
+        addValidField("cdCategoryId");
+    }
+
+    @Column(name = "ITEM_NAME")
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+        if(itemName == null){
+              removeValidField("itemName");
+              return;
+        }
+        addValidField("itemName");
+    }
+
+    @Column(name = "ITEM_DESCRIBE")
+    public String getItemDescribe() {
+        return itemDescribe;
+    }
+
+    public void setItemDescribe(String itemDescribe) {
+        this.itemDescribe = itemDescribe;
+        if(itemDescribe == null){
+              removeValidField("itemDescribe");
+              return;
+        }
+        addValidField("itemDescribe");
+    }
+
+    @Column(name = "ITEM_TYPE")
+    public Integer getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(Integer itemType) {
+        this.itemType = itemType;
+        if(itemType == null){
+              removeValidField("itemType");
+              return;
+        }
+        addValidField("itemType");
+    }
+
+    @Column(name = "YIELDLY")
+    public String getYieldly() {
+        return yieldly;
+    }
+
+    public void setYieldly(String yieldly) {
+        this.yieldly = yieldly;
+        if(yieldly == null){
+              removeValidField("yieldly");
+              return;
+        }
+        addValidField("yieldly");
+    }
+
+    @Column(name = "SPEC")
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+        if(spec == null){
+              removeValidField("spec");
+              return;
+        }
+        addValidField("spec");
+    }
+
+    @Column(name = "BASE_PRICE")
+    public BigDecimal getBasePrice() {
+        return basePrice;
+    }
+
+    public void setBasePrice(BigDecimal basePrice) {
+        this.basePrice = basePrice;
+        if(basePrice == null){
+              removeValidField("basePrice");
+              return;
+        }
+        addValidField("basePrice");
+    }
+
+    @Column(name = "MEMBER_PRICE")
+    public BigDecimal getMemberPrice() {
+        return memberPrice;
+    }
+
+    public void setMemberPrice(BigDecimal memberPrice) {
+        this.memberPrice = memberPrice;
+        if(memberPrice == null){
+              removeValidField("memberPrice");
+              return;
+        }
+        addValidField("memberPrice");
+    }
+
+    @Column(name = "PRICING_MANNER")
+    public String getPricingManner() {
+        return pricingManner;
+    }
+
+    public void setPricingManner(String pricingManner) {
+        this.pricingManner = pricingManner;
+        if(pricingManner == null){
+              removeValidField("pricingManner");
+              return;
+        }
+        addValidField("pricingManner");
+    }
+
+    @Column(name = "SELL_STATUS")
+    public Integer getSellStatus() {
+        return sellStatus;
+    }
+
+    public void setSellStatus(Integer sellStatus) {
+        this.sellStatus = sellStatus;
+        if(sellStatus == null){
+              removeValidField("sellStatus");
+              return;
+        }
+        addValidField("sellStatus");
+    }
+
+    @Column(name = "SELL_UNIT")
+    public String getSellUnit() {
+        return sellUnit;
+    }
+
+    public void setSellUnit(String sellUnit) {
+        this.sellUnit = sellUnit;
+        if(sellUnit == null){
+              removeValidField("sellUnit");
+              return;
+        }
+        addValidField("sellUnit");
+    }
+
+    @Column(name = "SELL_PRICE")
+    public BigDecimal getSellPrice() {
+        return sellPrice;
+    }
+
+    public void setSellPrice(BigDecimal sellPrice) {
+        this.sellPrice = sellPrice;
+        if(sellPrice == null){
+              removeValidField("sellPrice");
+              return;
+        }
+        addValidField("sellPrice");
+    }
+
+    @Column(name = "IS_AUDIT")
+    public Integer getIsAudit() {
+        return isAudit;
+    }
+
+    public void setIsAudit(Integer isAudit) {
+        this.isAudit = isAudit;
+        if(isAudit == null){
+              removeValidField("isAudit");
+              return;
+        }
+        addValidField("isAudit");
+    }
+
+    @Column(name = "CREATE_DATE_TIME")
+    public Date getCreateDateTime() {
+        return createDateTime;
+    }
+
+    public void setCreateDateTime(Date createDateTime) {
+        this.createDateTime = createDateTime;
+        if(createDateTime == null){
+              removeValidField("createDateTime");
+              return;
+        }
+        addValidField("createDateTime");
+    }
+
+    @Column(name = "CREATE_USER_CODE")
+    public String getCreateUserCode() {
+        return createUserCode;
+    }
+
+    public void setCreateUserCode(String createUserCode) {
+        this.createUserCode = createUserCode;
+        if(createUserCode == null){
+              removeValidField("createUserCode");
+              return;
+        }
+        addValidField("createUserCode");
+    }
+
+    @Column(name = "CAIZAI_USER")
+    public String getCaizaiUser() {
+        return caizaiUser;
+    }
+
+    public void setCaizaiUser(String caizaiUser) {
+        this.caizaiUser = caizaiUser;
+        if(caizaiUser == null){
+              removeValidField("caizaiUser");
+              return;
+        }
+        addValidField("caizaiUser");
+    }
+
+    @Column(name = "JIANCE_USER")
+    public String getJianceUser() {
+        return jianceUser;
+    }
+
+    public void setJianceUser(String jianceUser) {
+        this.jianceUser = jianceUser;
+        if(jianceUser == null){
+              removeValidField("jianceUser");
+              return;
+        }
+        addValidField("jianceUser");
+    }
+
+    @Column(name = "NONG_CAN_LV")
+    public String getNongCanLv() {
+        return nongCanLv;
+    }
+
+    public void setNongCanLv(String nongCanLv) {
+        this.nongCanLv = nongCanLv;
+        if(nongCanLv == null){
+              removeValidField("nongCanLv");
+              return;
+        }
+        addValidField("nongCanLv");
+    }
+
+    @Column(name = "YI_YANG_CHEN_FEN")
+    public String getYiYangChenFen() {
+        return yiYangChenFen;
+    }
+
+    public void setYiYangChenFen(String yiYangChenFen) {
+        this.yiYangChenFen = yiYangChenFen;
+        if(yiYangChenFen == null){
+              removeValidField("yiYangChenFen");
+              return;
+        }
+        addValidField("yiYangChenFen");
+    }
+
+    @Column(name = "BAO_ZHI_QI")
+    public Integer getBaoZhiQi() {
+        return baoZhiQi;
+    }
+
+    public void setBaoZhiQi(Integer baoZhiQi) {
+        this.baoZhiQi = baoZhiQi;
+        if(baoZhiQi == null){
+              removeValidField("baoZhiQi");
+              return;
+        }
+        addValidField("baoZhiQi");
+    }
+
+    @Column(name = "SHI_YI_REN_QUN")
+    public String getShiYiRenQun() {
+        return shiYiRenQun;
+    }
+
+    public void setShiYiRenQun(String shiYiRenQun) {
+        this.shiYiRenQun = shiYiRenQun;
+        if(shiYiRenQun == null){
+              removeValidField("shiYiRenQun");
+              return;
+        }
+        addValidField("shiYiRenQun");
+    }
+
+    @Column(name = "XIAN_SHI_QIANG_GOU")
+    public Integer getXianShiQiangGou() {
+        return xianShiQiangGou;
+    }
+
+    public void setXianShiQiangGou(Integer xianShiQiangGou) {
+        this.xianShiQiangGou = xianShiQiangGou;
+        if(xianShiQiangGou == null){
+              removeValidField("xianShiQiangGou");
+              return;
+        }
+        addValidField("xianShiQiangGou");
+    }
+
+    @Column(name = "XIN_PIN_CHANG_XIAN")
+    public Integer getXinPinChangXian() {
+        return xinPinChangXian;
+    }
+
+    public void setXinPinChangXian(Integer xinPinChangXian) {
+        this.xinPinChangXian = xinPinChangXian;
+        if(xinPinChangXian == null){
+              removeValidField("xinPinChangXian");
+              return;
+        }
+        addValidField("xinPinChangXian");
+    }
+
+    @Column(name = "RE_MAI_TUI_JIAN")
+    public Integer getReMaiTuiJian() {
+        return reMaiTuiJian;
+    }
+
+    public void setReMaiTuiJian(Integer reMaiTuiJian) {
+        this.reMaiTuiJian = reMaiTuiJian;
+        if(reMaiTuiJian == null){
+              removeValidField("reMaiTuiJian");
+              return;
+        }
+        addValidField("reMaiTuiJian");
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_item_detail")
+public class CdItemDetail extends BaseMybatisModel {
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 商品ID
+     */
+    private Integer cdItemId;
+
+    /**
+     * 商品的详细内容
+     */
+    private String itemDetailContent;
+
+    @Column(name = "id")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "cd_item_id")
+    public Integer getCdItemId() {
+        return cdItemId;
+    }
+
+    public void setCdItemId(Integer cdItemId) {
+        this.cdItemId = cdItemId;
+        if(cdItemId == null){
+              removeValidField("cdItemId");
+              return;
+        }
+        addValidField("cdItemId");
+    }
+
+    @Column(name = "item_detail_content")
+    public String getItemDetailContent() {
+        return itemDetailContent;
+    }
+
+    public void setItemDetailContent(String itemDetailContent) {
+        this.itemDetailContent = itemDetailContent;
+        if(itemDetailContent == null){
+              removeValidField("itemDetailContent");
+              return;
+        }
+        addValidField("itemDetailContent");
+    }
+}

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

@@ -0,0 +1,360 @@
+package com.xmomen.module.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_member")
+public class CdMember extends BaseMybatisModel {
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 手机号
+     */
+    private String phoneNumber;
+
+    /**
+     * 收货地址
+     */
+    private String address;
+
+    /**
+     * 所属单位
+     */
+    private Integer cdCompanyId;
+
+    /**
+     * 所属客服经理
+     */
+    private Integer cdUserId;
+
+    /**
+     * 备用收货人
+     */
+    private String spareName;
+
+    /**
+     * 备用收货人2
+     */
+    private String spareName2;
+
+    /**
+     * 备用手机号1
+     */
+    private String spareTel;
+
+    /**
+     * 备用手机号2
+     */
+    private String spareTel2;
+
+    /**
+     * 家庭固话
+     */
+    private String telNumber;
+
+    /**
+     * 办公室电话
+     */
+    private String officeTel;
+
+    /**
+     * 备用地址1
+     */
+    private String spareAddress;
+
+    /**
+     * 备用地址2
+     */
+    private String spareAddress2;
+
+    /**
+     * 说明
+     */
+    private String flag;
+
+    /**
+     * 1-潜在客户，2-普通客户，3-优质客户
+     */
+    private Integer memberType;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if (id == null) {
+            removeValidField("id");
+            return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "NAME")
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+        if (name == null) {
+            removeValidField("name");
+            return;
+        }
+        addValidField("name");
+    }
+
+    @JsonIgnore
+    @Column(name = "PASSWORD")
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+        if (password == null) {
+            removeValidField("password");
+            return;
+        }
+        addValidField("password");
+    }
+
+    @Column(name = "PHONE_NUMBER")
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+        if (phoneNumber == null) {
+            removeValidField("phoneNumber");
+            return;
+        }
+        addValidField("phoneNumber");
+    }
+
+    @Column(name = "ADDRESS")
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+        if (address == null) {
+            removeValidField("address");
+            return;
+        }
+        addValidField("address");
+    }
+
+    @Column(name = "CD_COMPANY_ID")
+    public Integer getCdCompanyId() {
+        return cdCompanyId;
+    }
+
+    public void setCdCompanyId(Integer cdCompanyId) {
+        this.cdCompanyId = cdCompanyId;
+        if (cdCompanyId == null) {
+            removeValidField("cdCompanyId");
+            return;
+        }
+        addValidField("cdCompanyId");
+    }
+
+    @Column(name = "CD_USER_ID")
+    public Integer getCdUserId() {
+        return cdUserId;
+    }
+
+    public void setCdUserId(Integer cdUserId) {
+        this.cdUserId = cdUserId;
+        if (cdUserId == null) {
+            removeValidField("cdUserId");
+            return;
+        }
+        addValidField("cdUserId");
+    }
+
+    @Column(name = "SPARE_NAME")
+    public String getSpareName() {
+        return spareName;
+    }
+
+    public void setSpareName(String spareName) {
+        this.spareName = spareName;
+        if (spareName == null) {
+            removeValidField("spareName");
+            return;
+        }
+        addValidField("spareName");
+    }
+
+    @Column(name = "SPARE_NAME2")
+    public String getSpareName2() {
+        return spareName2;
+    }
+
+    public void setSpareName2(String spareName2) {
+        this.spareName2 = spareName2;
+        if (spareName2 == null) {
+            removeValidField("spareName2");
+            return;
+        }
+        addValidField("spareName2");
+    }
+
+    @Column(name = "SPARE_TEL")
+    public String getSpareTel() {
+        return spareTel;
+    }
+
+    public void setSpareTel(String spareTel) {
+        this.spareTel = spareTel;
+        if (spareTel == null) {
+            removeValidField("spareTel");
+            return;
+        }
+        addValidField("spareTel");
+    }
+
+    @Column(name = "SPARE_TEL2")
+    public String getSpareTel2() {
+        return spareTel2;
+    }
+
+    public void setSpareTel2(String spareTel2) {
+        this.spareTel2 = spareTel2;
+        if (spareTel2 == null) {
+            removeValidField("spareTel2");
+            return;
+        }
+        addValidField("spareTel2");
+    }
+
+    @Column(name = "TEL_NUMBER")
+    public String getTelNumber() {
+        return telNumber;
+    }
+
+    public void setTelNumber(String telNumber) {
+        this.telNumber = telNumber;
+        if (telNumber == null) {
+            removeValidField("telNumber");
+            return;
+        }
+        addValidField("telNumber");
+    }
+
+    @Column(name = "OFFICE_TEL")
+    public String getOfficeTel() {
+        return officeTel;
+    }
+
+    public void setOfficeTel(String officeTel) {
+        this.officeTel = officeTel;
+        if (officeTel == null) {
+            removeValidField("officeTel");
+            return;
+        }
+        addValidField("officeTel");
+    }
+
+    @Column(name = "SPARE_ADDRESS")
+    public String getSpareAddress() {
+        return spareAddress;
+    }
+
+    public void setSpareAddress(String spareAddress) {
+        this.spareAddress = spareAddress;
+        if (spareAddress == null) {
+            removeValidField("spareAddress");
+            return;
+        }
+        addValidField("spareAddress");
+    }
+
+    @Column(name = "SPARE_ADDRESS2")
+    public String getSpareAddress2() {
+        return spareAddress2;
+    }
+
+    public void setSpareAddress2(String spareAddress2) {
+        this.spareAddress2 = spareAddress2;
+        if (spareAddress2 == null) {
+            removeValidField("spareAddress2");
+            return;
+        }
+        addValidField("spareAddress2");
+    }
+
+    @Column(name = "FLAG")
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+        if (flag == null) {
+            removeValidField("flag");
+            return;
+        }
+        addValidField("flag");
+    }
+
+    @Column(name = "MEMBER_TYPE")
+    public Integer getMemberType() {
+        return memberType;
+    }
+
+    public void setMemberType(Integer memberType) {
+        this.memberType = memberType;
+        if (memberType == null) {
+            removeValidField("memberType");
+            return;
+        }
+        addValidField("memberType");
+    }
+
+    @Column(name = "email")
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+        if (email == null) {
+            removeValidField("email");
+            return;
+        }
+        addValidField("email");
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_member_coupon_relation")
+public class CdMemberCouponRelation extends BaseMybatisModel {
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 客户代码
+     */
+    private Integer cdMemberId;
+
+    /**
+     * 卡号
+     */
+    private String couponNumber;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "CD_MEMBER_ID")
+    public Integer getCdMemberId() {
+        return cdMemberId;
+    }
+
+    public void setCdMemberId(Integer cdMemberId) {
+        this.cdMemberId = cdMemberId;
+        if(cdMemberId == null){
+              removeValidField("cdMemberId");
+              return;
+        }
+        addValidField("cdMemberId");
+    }
+
+    @Column(name = "COUPON_NUMBER")
+    public String getCouponNumber() {
+        return couponNumber;
+    }
+
+    public void setCouponNumber(String couponNumber) {
+        this.couponNumber = couponNumber;
+        if(couponNumber == null){
+              removeValidField("couponNumber");
+              return;
+        }
+        addValidField("couponNumber");
+    }
+}

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

@@ -0,0 +1,245 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_plan")
+public class CdPlan extends BaseMybatisModel {
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 计划名称
+     */
+    private String planName;
+
+    /**
+     * 计划创建人
+     */
+    private String createUser;
+
+    /**
+     * 计划创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 配送频率（1-一天,2-一周，3-一月）
+     */
+    private Integer deliveryType;
+
+    /**
+     * 配送时间(一周的星期几，一月的几号等）
+     */
+    private String deliveryTime;
+
+    /**
+     * 配送的次数
+     */
+    private Integer deliverCount;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 是否随机
+     */
+    private Integer isRandom;
+
+    /**
+     * 产品归属的类别
+     */
+    private Integer cdCategoryId;
+
+    /**
+     * 随机数
+     */
+    private Integer randomNum;
+
+    /**
+     * 起效时间
+     */
+    private Date beginTime;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "PLAN_NAME")
+    public String getPlanName() {
+        return planName;
+    }
+
+    public void setPlanName(String planName) {
+        this.planName = planName;
+        if(planName == null){
+              removeValidField("planName");
+              return;
+        }
+        addValidField("planName");
+    }
+
+    @Column(name = "CREATE_USER")
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+        if(createUser == null){
+              removeValidField("createUser");
+              return;
+        }
+        addValidField("createUser");
+    }
+
+    @Column(name = "CREATE_TIME")
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        if(createTime == null){
+              removeValidField("createTime");
+              return;
+        }
+        addValidField("createTime");
+    }
+
+    @Column(name = "DELIVERY_TYPE")
+    public Integer getDeliveryType() {
+        return deliveryType;
+    }
+
+    public void setDeliveryType(Integer deliveryType) {
+        this.deliveryType = deliveryType;
+        if(deliveryType == null){
+              removeValidField("deliveryType");
+              return;
+        }
+        addValidField("deliveryType");
+    }
+
+    @Column(name = "DELIVERY_TIME")
+    public String getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(String deliveryTime) {
+        this.deliveryTime = deliveryTime;
+        if(deliveryTime == null){
+              removeValidField("deliveryTime");
+              return;
+        }
+        addValidField("deliveryTime");
+    }
+
+    @Column(name = "DELIVER_COUNT")
+    public Integer getDeliverCount() {
+        return deliverCount;
+    }
+
+    public void setDeliverCount(Integer deliverCount) {
+        this.deliverCount = deliverCount;
+        if(deliverCount == null){
+              removeValidField("deliverCount");
+              return;
+        }
+        addValidField("deliverCount");
+    }
+
+    @Column(name = "PRICE")
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+        if(price == null){
+              removeValidField("price");
+              return;
+        }
+        addValidField("price");
+    }
+
+    @Column(name = "IS_RANDOM")
+    public Integer getIsRandom() {
+        return isRandom;
+    }
+
+    public void setIsRandom(Integer isRandom) {
+        this.isRandom = isRandom;
+        if(isRandom == null){
+              removeValidField("isRandom");
+              return;
+        }
+        addValidField("isRandom");
+    }
+
+    @Column(name = "CD_CATEGORY_ID")
+    public Integer getCdCategoryId() {
+        return cdCategoryId;
+    }
+
+    public void setCdCategoryId(Integer cdCategoryId) {
+        this.cdCategoryId = cdCategoryId;
+        if(cdCategoryId == null){
+              removeValidField("cdCategoryId");
+              return;
+        }
+        addValidField("cdCategoryId");
+    }
+
+    @Column(name = "RANDOM_NUM")
+    public Integer getRandomNum() {
+        return randomNum;
+    }
+
+    public void setRandomNum(Integer randomNum) {
+        this.randomNum = randomNum;
+        if(randomNum == null){
+              removeValidField("randomNum");
+              return;
+        }
+        addValidField("randomNum");
+    }
+
+    @Column(name = "BEGIN_TIME")
+    public Date getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Date beginTime) {
+        this.beginTime = beginTime;
+        if(beginTime == null){
+              removeValidField("beginTime");
+              return;
+        }
+        addValidField("beginTime");
+    }
+}

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

@@ -0,0 +1,953 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisExample;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CdPlanExample extends BaseMybatisExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CdPlanExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            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");
+            }
+            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");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameIsNull() {
+            addCriterion("PLAN_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameIsNotNull() {
+            addCriterion("PLAN_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameEqualTo(String value) {
+            addCriterion("PLAN_NAME =", value, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameNotEqualTo(String value) {
+            addCriterion("PLAN_NAME <>", value, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameGreaterThan(String value) {
+            addCriterion("PLAN_NAME >", value, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameGreaterThanOrEqualTo(String value) {
+            addCriterion("PLAN_NAME >=", value, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameLessThan(String value) {
+            addCriterion("PLAN_NAME <", value, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameLessThanOrEqualTo(String value) {
+            addCriterion("PLAN_NAME <=", value, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameLike(String value) {
+            addCriterion("PLAN_NAME like", value, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameNotLike(String value) {
+            addCriterion("PLAN_NAME not like", value, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameIn(List<String> values) {
+            addCriterion("PLAN_NAME in", values, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameNotIn(List<String> values) {
+            addCriterion("PLAN_NAME not in", values, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameBetween(String value1, String value2) {
+            addCriterion("PLAN_NAME between", value1, value2, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanNameNotBetween(String value1, String value2) {
+            addCriterion("PLAN_NAME not between", value1, value2, "planName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeIsNull() {
+            addCriterion("DELIVERY_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeIsNotNull() {
+            addCriterion("DELIVERY_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeEqualTo(Integer value) {
+            addCriterion("DELIVERY_TYPE =", value, "deliveryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeNotEqualTo(Integer value) {
+            addCriterion("DELIVERY_TYPE <>", value, "deliveryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeGreaterThan(Integer value) {
+            addCriterion("DELIVERY_TYPE >", value, "deliveryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("DELIVERY_TYPE >=", value, "deliveryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeLessThan(Integer value) {
+            addCriterion("DELIVERY_TYPE <", value, "deliveryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("DELIVERY_TYPE <=", value, "deliveryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeIn(List<Integer> values) {
+            addCriterion("DELIVERY_TYPE in", values, "deliveryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeNotIn(List<Integer> values) {
+            addCriterion("DELIVERY_TYPE not in", values, "deliveryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeBetween(Integer value1, Integer value2) {
+            addCriterion("DELIVERY_TYPE between", value1, value2, "deliveryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("DELIVERY_TYPE not between", value1, value2, "deliveryType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeIsNull() {
+            addCriterion("DELIVERY_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeIsNotNull() {
+            addCriterion("DELIVERY_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeEqualTo(String value) {
+            addCriterion("DELIVERY_TIME =", value, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeNotEqualTo(String value) {
+            addCriterion("DELIVERY_TIME <>", value, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeGreaterThan(String value) {
+            addCriterion("DELIVERY_TIME >", value, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("DELIVERY_TIME >=", value, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeLessThan(String value) {
+            addCriterion("DELIVERY_TIME <", value, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeLessThanOrEqualTo(String value) {
+            addCriterion("DELIVERY_TIME <=", value, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeLike(String value) {
+            addCriterion("DELIVERY_TIME like", value, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeNotLike(String value) {
+            addCriterion("DELIVERY_TIME not like", value, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeIn(List<String> values) {
+            addCriterion("DELIVERY_TIME in", values, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeNotIn(List<String> values) {
+            addCriterion("DELIVERY_TIME not in", values, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeBetween(String value1, String value2) {
+            addCriterion("DELIVERY_TIME between", value1, value2, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryTimeNotBetween(String value1, String value2) {
+            addCriterion("DELIVERY_TIME not between", value1, value2, "deliveryTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountIsNull() {
+            addCriterion("DELIVER_COUNT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountIsNotNull() {
+            addCriterion("DELIVER_COUNT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountEqualTo(Integer value) {
+            addCriterion("DELIVER_COUNT =", value, "deliverCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountNotEqualTo(Integer value) {
+            addCriterion("DELIVER_COUNT <>", value, "deliverCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountGreaterThan(Integer value) {
+            addCriterion("DELIVER_COUNT >", value, "deliverCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("DELIVER_COUNT >=", value, "deliverCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountLessThan(Integer value) {
+            addCriterion("DELIVER_COUNT <", value, "deliverCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountLessThanOrEqualTo(Integer value) {
+            addCriterion("DELIVER_COUNT <=", value, "deliverCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountIn(List<Integer> values) {
+            addCriterion("DELIVER_COUNT in", values, "deliverCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountNotIn(List<Integer> values) {
+            addCriterion("DELIVER_COUNT not in", values, "deliverCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountBetween(Integer value1, Integer value2) {
+            addCriterion("DELIVER_COUNT between", value1, value2, "deliverCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("DELIVER_COUNT not between", value1, value2, "deliverCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceIsNull() {
+            addCriterion("PRICE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceIsNotNull() {
+            addCriterion("PRICE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceEqualTo(BigDecimal value) {
+            addCriterion("PRICE =", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceNotEqualTo(BigDecimal value) {
+            addCriterion("PRICE <>", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceGreaterThan(BigDecimal value) {
+            addCriterion("PRICE >", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("PRICE >=", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceLessThan(BigDecimal value) {
+            addCriterion("PRICE <", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("PRICE <=", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceIn(List<BigDecimal> values) {
+            addCriterion("PRICE in", values, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceNotIn(List<BigDecimal> values) {
+            addCriterion("PRICE not in", values, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("PRICE between", value1, value2, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("PRICE not between", value1, value2, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomIsNull() {
+            addCriterion("IS_RANDOM is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomIsNotNull() {
+            addCriterion("IS_RANDOM is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomEqualTo(Integer value) {
+            addCriterion("IS_RANDOM =", value, "isRandom");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomNotEqualTo(Integer value) {
+            addCriterion("IS_RANDOM <>", value, "isRandom");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomGreaterThan(Integer value) {
+            addCriterion("IS_RANDOM >", value, "isRandom");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomGreaterThanOrEqualTo(Integer value) {
+            addCriterion("IS_RANDOM >=", value, "isRandom");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomLessThan(Integer value) {
+            addCriterion("IS_RANDOM <", value, "isRandom");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomLessThanOrEqualTo(Integer value) {
+            addCriterion("IS_RANDOM <=", value, "isRandom");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomIn(List<Integer> values) {
+            addCriterion("IS_RANDOM in", values, "isRandom");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomNotIn(List<Integer> values) {
+            addCriterion("IS_RANDOM not in", values, "isRandom");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomBetween(Integer value1, Integer value2) {
+            addCriterion("IS_RANDOM between", value1, value2, "isRandom");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRandomNotBetween(Integer value1, Integer value2) {
+            addCriterion("IS_RANDOM not between", value1, value2, "isRandom");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdIsNull() {
+            addCriterion("CD_CATEGORY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdIsNotNull() {
+            addCriterion("CD_CATEGORY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdEqualTo(Integer value) {
+            addCriterion("CD_CATEGORY_ID =", value, "cdCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdNotEqualTo(Integer value) {
+            addCriterion("CD_CATEGORY_ID <>", value, "cdCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdGreaterThan(Integer value) {
+            addCriterion("CD_CATEGORY_ID >", value, "cdCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("CD_CATEGORY_ID >=", value, "cdCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdLessThan(Integer value) {
+            addCriterion("CD_CATEGORY_ID <", value, "cdCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdLessThanOrEqualTo(Integer value) {
+            addCriterion("CD_CATEGORY_ID <=", value, "cdCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdIn(List<Integer> values) {
+            addCriterion("CD_CATEGORY_ID in", values, "cdCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdNotIn(List<Integer> values) {
+            addCriterion("CD_CATEGORY_ID not in", values, "cdCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdBetween(Integer value1, Integer value2) {
+            addCriterion("CD_CATEGORY_ID between", value1, value2, "cdCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdCategoryIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("CD_CATEGORY_ID not between", value1, value2, "cdCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumIsNull() {
+            addCriterion("RANDOM_NUM is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumIsNotNull() {
+            addCriterion("RANDOM_NUM is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumEqualTo(Integer value) {
+            addCriterion("RANDOM_NUM =", value, "randomNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumNotEqualTo(Integer value) {
+            addCriterion("RANDOM_NUM <>", value, "randomNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumGreaterThan(Integer value) {
+            addCriterion("RANDOM_NUM >", value, "randomNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("RANDOM_NUM >=", value, "randomNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumLessThan(Integer value) {
+            addCriterion("RANDOM_NUM <", value, "randomNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumLessThanOrEqualTo(Integer value) {
+            addCriterion("RANDOM_NUM <=", value, "randomNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumIn(List<Integer> values) {
+            addCriterion("RANDOM_NUM in", values, "randomNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumNotIn(List<Integer> values) {
+            addCriterion("RANDOM_NUM not in", values, "randomNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumBetween(Integer value1, Integer value2) {
+            addCriterion("RANDOM_NUM between", value1, value2, "randomNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andRandomNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("RANDOM_NUM not between", value1, value2, "randomNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeIsNull() {
+            addCriterion("BEGIN_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeIsNotNull() {
+            addCriterion("BEGIN_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeEqualTo(Date value) {
+            addCriterion("BEGIN_TIME =", value, "beginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeNotEqualTo(Date value) {
+            addCriterion("BEGIN_TIME <>", value, "beginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeGreaterThan(Date value) {
+            addCriterion("BEGIN_TIME >", value, "beginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("BEGIN_TIME >=", value, "beginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeLessThan(Date value) {
+            addCriterion("BEGIN_TIME <", value, "beginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeLessThanOrEqualTo(Date value) {
+            addCriterion("BEGIN_TIME <=", value, "beginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeIn(List<Date> values) {
+            addCriterion("BEGIN_TIME in", values, "beginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeNotIn(List<Date> values) {
+            addCriterion("BEGIN_TIME not in", values, "beginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeBetween(Date value1, Date value2) {
+            addCriterion("BEGIN_TIME between", value1, value2, "beginTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeginTimeNotBetween(Date value1, Date value2) {
+            addCriterion("BEGIN_TIME not between", value1, value2, "beginTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        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;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,91 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "cd_plan_item")
+public class CdPlanItem extends BaseMybatisModel {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 计划ID
+     */
+    private Integer cdPlanId;
+
+    /**
+     * 搭配的产品
+     */
+    private Integer cdItemId;
+
+    /**
+     * 份数
+     */
+    private Integer countValue;
+
+    @Column(name = "ID")
+    @Id
+    @GeneratedValue(generator = "UUIDGenerator")
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+        if(id == null){
+              removeValidField("id");
+              return;
+        }
+        addValidField("id");
+    }
+
+    @Column(name = "CD_PLAN_ID")
+    public Integer getCdPlanId() {
+        return cdPlanId;
+    }
+
+    public void setCdPlanId(Integer cdPlanId) {
+        this.cdPlanId = cdPlanId;
+        if(cdPlanId == null){
+              removeValidField("cdPlanId");
+              return;
+        }
+        addValidField("cdPlanId");
+    }
+
+    @Column(name = "CD_ITEM_ID")
+    public Integer getCdItemId() {
+        return cdItemId;
+    }
+
+    public void setCdItemId(Integer cdItemId) {
+        this.cdItemId = cdItemId;
+        if(cdItemId == null){
+              removeValidField("cdItemId");
+              return;
+        }
+        addValidField("cdItemId");
+    }
+
+    @Column(name = "COUNT_VALUE")
+    public Integer getCountValue() {
+        return countValue;
+    }
+
+    public void setCountValue(Integer countValue) {
+        this.countValue = countValue;
+        if(countValue == null){
+              removeValidField("countValue");
+              return;
+        }
+        addValidField("countValue");
+    }
+}

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

@@ -0,0 +1,441 @@
+package com.xmomen.module.base.entity;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisExample;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CdPlanItemExample extends BaseMybatisExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public CdPlanItemExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            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");
+            }
+            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");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdIsNull() {
+            addCriterion("CD_PLAN_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdIsNotNull() {
+            addCriterion("CD_PLAN_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdEqualTo(Integer value) {
+            addCriterion("CD_PLAN_ID =", value, "cdPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdNotEqualTo(Integer value) {
+            addCriterion("CD_PLAN_ID <>", value, "cdPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdGreaterThan(Integer value) {
+            addCriterion("CD_PLAN_ID >", value, "cdPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("CD_PLAN_ID >=", value, "cdPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdLessThan(Integer value) {
+            addCriterion("CD_PLAN_ID <", value, "cdPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdLessThanOrEqualTo(Integer value) {
+            addCriterion("CD_PLAN_ID <=", value, "cdPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdIn(List<Integer> values) {
+            addCriterion("CD_PLAN_ID in", values, "cdPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdNotIn(List<Integer> values) {
+            addCriterion("CD_PLAN_ID not in", values, "cdPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdBetween(Integer value1, Integer value2) {
+            addCriterion("CD_PLAN_ID between", value1, value2, "cdPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdPlanIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("CD_PLAN_ID not between", value1, value2, "cdPlanId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdIsNull() {
+            addCriterion("CD_ITEM_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdIsNotNull() {
+            addCriterion("CD_ITEM_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdEqualTo(Integer value) {
+            addCriterion("CD_ITEM_ID =", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdNotEqualTo(Integer value) {
+            addCriterion("CD_ITEM_ID <>", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdGreaterThan(Integer value) {
+            addCriterion("CD_ITEM_ID >", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("CD_ITEM_ID >=", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdLessThan(Integer value) {
+            addCriterion("CD_ITEM_ID <", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdLessThanOrEqualTo(Integer value) {
+            addCriterion("CD_ITEM_ID <=", value, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdIn(List<Integer> values) {
+            addCriterion("CD_ITEM_ID in", values, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdNotIn(List<Integer> values) {
+            addCriterion("CD_ITEM_ID not in", values, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdBetween(Integer value1, Integer value2) {
+            addCriterion("CD_ITEM_ID between", value1, value2, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdItemIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("CD_ITEM_ID not between", value1, value2, "cdItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueIsNull() {
+            addCriterion("COUNT_VALUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueIsNotNull() {
+            addCriterion("COUNT_VALUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueEqualTo(Integer value) {
+            addCriterion("COUNT_VALUE =", value, "countValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueNotEqualTo(Integer value) {
+            addCriterion("COUNT_VALUE <>", value, "countValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueGreaterThan(Integer value) {
+            addCriterion("COUNT_VALUE >", value, "countValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueGreaterThanOrEqualTo(Integer value) {
+            addCriterion("COUNT_VALUE >=", value, "countValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueLessThan(Integer value) {
+            addCriterion("COUNT_VALUE <", value, "countValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueLessThanOrEqualTo(Integer value) {
+            addCriterion("COUNT_VALUE <=", value, "countValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueIn(List<Integer> values) {
+            addCriterion("COUNT_VALUE in", values, "countValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueNotIn(List<Integer> values) {
+            addCriterion("COUNT_VALUE not in", values, "countValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueBetween(Integer value1, Integer value2) {
+            addCriterion("COUNT_VALUE between", value1, value2, "countValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountValueNotBetween(Integer value1, Integer value2) {
+            addCriterion("COUNT_VALUE not between", value1, value2, "countValue");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        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;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdActivityMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdActivity;
+import com.xmomen.module.base.entity.CdActivityExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdActivityMapper extends MybatisMapper {
+    int countByExample(CdActivityExample example);
+
+    int deleteByExample(CdActivityExample example);
+
+    int insertSelective(CdActivity record);
+
+    int updateByExampleSelective(@Param("record") CdActivity record, @Param("example") CdActivityExample example);
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdBindMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdBind;
+import com.xmomen.module.base.entity.CdBindExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdBindMapper extends MybatisMapper {
+    int countByExample(CdBindExample example);
+
+    int deleteByExample(CdBindExample example);
+
+    int insertSelective(CdBind record);
+
+    int updateByExampleSelective(@Param("record") CdBind record, @Param("example") CdBindExample example);
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdCategoryMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdCategory;
+import com.xmomen.module.base.entity.CdCategoryExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdCategoryMapper extends MybatisMapper {
+    int countByExample(CdCategoryExample example);
+
+    int deleteByExample(CdCategoryExample example);
+
+    int insertSelective(CdCategory record);
+
+    int updateByExampleSelective(@Param("record") CdCategory record, @Param("example") CdCategoryExample example);
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdCompanyMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdCompany;
+import com.xmomen.module.base.entity.CdCompanyExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdCompanyMapper extends MybatisMapper {
+    int countByExample(CdCompanyExample example);
+
+    int deleteByExample(CdCompanyExample example);
+
+    int insertSelective(CdCompany record);
+
+    int updateByExampleSelective(@Param("record") CdCompany record, @Param("example") CdCompanyExample example);
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdContractItemMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdContractItem;
+import com.xmomen.module.base.entity.CdContractItemExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdContractItemMapper extends MybatisMapper {
+    int countByExample(CdContractItemExample example);
+
+    int deleteByExample(CdContractItemExample example);
+
+    int insertSelective(CdContractItem record);
+
+    int updateByExampleSelective(@Param("record") CdContractItem record, @Param("example") CdContractItemExample example);
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdCouponCategoryRefMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdCouponCategoryRef;
+import com.xmomen.module.base.entity.CdCouponCategoryRefExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdCouponCategoryRefMapper extends MybatisMapper {
+    int countByExample(CdCouponCategoryRefExample example);
+
+    int deleteByExample(CdCouponCategoryRefExample example);
+
+    int insertSelective(CdCouponCategoryRef record);
+
+    int updateByExampleSelective(@Param("record") CdCouponCategoryRef record, @Param("example") CdCouponCategoryRefExample example);
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdCouponMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdCoupon;
+import com.xmomen.module.base.entity.CdCouponExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdCouponMapper extends MybatisMapper {
+    int countByExample(CdCouponExample example);
+
+    int deleteByExample(CdCouponExample example);
+
+    int insertSelective(CdCoupon record);
+
+    int updateByExampleSelective(@Param("record") CdCoupon record, @Param("example") CdCouponExample example);
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdCouponRefMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdCouponRef;
+import com.xmomen.module.base.entity.CdCouponRefExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdCouponRefMapper extends MybatisMapper {
+    int countByExample(CdCouponRefExample example);
+
+    int deleteByExample(CdCouponRefExample example);
+
+    int insertSelective(CdCouponRef record);
+
+    int updateByExampleSelective(@Param("record") CdCouponRef record, @Param("example") CdCouponRefExample example);
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdExpressMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdExpress;
+import com.xmomen.module.base.entity.CdExpressExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdExpressMapper extends MybatisMapper {
+    int countByExample(CdExpressExample example);
+
+    int deleteByExample(CdExpressExample example);
+
+    int insertSelective(CdExpress record);
+
+    int updateByExampleSelective(@Param("record") CdExpress record, @Param("example") CdExpressExample example);
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdExpressMemberMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdExpressMember;
+import com.xmomen.module.base.entity.CdExpressMemberExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdExpressMemberMapper extends MybatisMapper {
+    int countByExample(CdExpressMemberExample example);
+
+    int deleteByExample(CdExpressMemberExample example);
+
+    int insertSelective(CdExpressMember record);
+
+    int updateByExampleSelective(@Param("record") CdExpressMember record, @Param("example") CdExpressMemberExample example);
+}

src/main/java/com/xmomen/module/base/entity/mapper/CdPlanMapper.java

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.entity.mapper;
+
+import com.xmomen.framework.mybatis.mapper.MybatisMapper;
+import com.xmomen.module.base.entity.CdPlan;
+import com.xmomen.module.base.entity.CdPlanExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CdPlanMapper extends MybatisMapper {
+    int countByExample(CdPlanExample example);
+
+    int deleteByExample(CdPlanExample example);
+
+    int insertSelective(CdPlan record);
+
+    int updateByExampleSelective(@Param("record") CdPlan record, @Param("example") CdPlanExample example);
+}

src/main/java/com/xmomen/module/base/mapper/BasePlanMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xmomen.module.base.mapper.BasePlanMapper" >
+
+	<select id="getBasePlanList" resultType="com.xmomen.module.base.model.PlanModel" parameterType="java.util.HashMap">
+        SELECT
+			cp.*,
+			cc.CATEGORY_NAME
+        FROM
+			cd_plan cp
+   		left join 
+        	cd_category cc on cp.cd_category_id = cc.id	
+        <where>
+              <if test="keyword">
+                AND (cp.plan_name LIKE CONCAT('%', #{keyword}, '%')
+                )
+            </if>
+        </where>
+    </select>
+	
+
+<!--        查询消息    -->
+	<select id="getChosePlanItemList" resultType="com.xmomen.module.base.model.ItemChildModel" parameterType="java.util.HashMap">
+        SELECT
+			cm.id,
+        	cm.item_name,
+			cm.item_code,
+        	cc.category_name,
+        	cir.COUNT_VALUE as count
+        FROM
+			cd_plan_item cir
+		left join 
+			cd_item cm on cm.id = cir.cd_item_id
+   		left join 
+        	cd_category cc on cm.cd_category_id = cc.id	
+        <where>
+             <if test = 'parentId'>
+             	AND cir.CD_PLAN_ID = #{parentId}
+             </if>	
+        </where>
+    </select>
+</mapper>

src/main/java/com/xmomen/module/base/mapper/CompanyMapper.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xmomen.module.base.mapper.CompanyMapper" >
+
+	<resultMap type="com.xmomen.module.base.model.CompanyModel" id="CustomerCompany">
+		 	<id column="id" property="id"/>
+		 	<result column="company_leader_tel" property="companyLeaderTel" />
+		 	<result column="company_name" property="companyName" />
+		 	<result column="company_address" property="companyAddress" />
+		 	<result column="company_leader" property="companyLeader" />
+			<collection property="companyCustomerManagers" ofType="com.xmomen.module.base.model.CompanyCustomerManager" column="id" select="queryCompanyManagerList"></collection>
+    </resultMap>
+
+    <!--    查询消息    -->
+    <select id="getCompanyList" resultMap="CustomerCompany" parameterType="java.util.HashMap">
+       select 
+       	cc.*
+       from cd_company cc
+        <if test="managerId != null">
+				LEFT JOIN cd_manager_company mc
+			ON mc.CD_COMPANY_ID = cc.ID
+		</if>
+		<where>
+              <if test="keyword">
+                  AND cc.company_Code LIKE CONCAT('%', #{keyword}, '%') or cc.company_name LIKE CONCAT('%', #{keyword}, '%')
+              </if>
+              <if test="id">
+                  AND cc.id = #{id}
+              </if>
+			  <if test="managerId">
+				  AND mc.CD_MANAGER_ID = #{managerId}
+			  </if>
+          </where>
+    </select>
+    
+    <select id="queryCompanyManagerList" resultType="com.xmomen.module.base.model.CompanyCustomerManager" parameterType="Integer">
+		select  
+			su.realName as customerManger,
+			su.id as customerMangerId
+		from 
+			cd_manager_company cmc 
+		left join 
+			sys_users su on cmc.CD_MANAGER_ID = su.id
+		where 
+			cmc.CD_COMPANY_ID = #{id}
+	</select>
+
+
+	<select id="queryCompanyManagerListById" resultType="com.xmomen.module.base.model.CompanyCustomerManager" parameterType="java.util.HashMap">
+		select
+			su.realName as customerManger,
+			su.id as customerMangerId
+		from
+			cd_manager_company cmc
+		left join
+			sys_users su on cmc.CD_MANAGER_ID = su.id
+		where
+			cmc.CD_COMPANY_ID = #{id}
+		<if test="managerId">
+			AND cmc.CD_MANAGER_ID = #{managerId}
+		</if>
+	</select>
+</mapper>
+

src/main/java/com/xmomen/module/base/mapper/ContractMapper.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xmomen.module.base.mapper.ContractMapper" >
+
+    <!--    查询消息    -->
+    <select id="getContractList" resultType="com.xmomen.module.base.model.ContractModel" parameterType="java.util.HashMap">
+        SELECT
+        cc.*,
+        cco.company_name
+        FROM
+        cd_contract cc
+        left join cd_company cco on cc.cd_company_id = cco.id
+        <where>
+              <if test="keyword">
+                  AND cc.contract_code LIKE CONCAT('%', #{keyword}, '%') or cc.contract_name LIKE CONCAT('%', #{keyword}, '%')
+              </if>
+              <if test="id">
+                  AND cc.id = #{id}
+              </if>
+          </where>
+    </select>
+    
+    <resultMap type="com.xmomen.module.base.model.ContractModel" id="ContractModel">
+			<collection property="contractItemList" ofType="com.xmomen.module.base.model.ContractItemModel" column="id" select="queryContractItemList"></collection>
+    </resultMap>
+    
+    <select id="getContractListAndDetail" resultMap="ContractModel" parameterType="java.util.HashMap">
+        SELECT
+        cc.*,
+        cco.company_name
+        FROM
+        cd_contract cc
+        left join cd_company cco on cc.cd_company_id = cco.id
+        <where>
+              <if test="id">
+                  AND cc.id = #{id}
+              </if>
+          </where>
+    </select>
+    
+    <select id="queryContractItemList" resultType="com.xmomen.module.base.model.ContractItemModel" parameterType="Integer">
+		select cci.*,
+			ci.item_code,
+			ci.ITEM_NAME,
+			ci.SELL_PRICE,
+			CASE
+				WHEN cci.CONTRACT_TYPE = 1
+				THEN '无'
+				ELSE cci.discount
+			end as contractTypeName,
+			CASE
+				WHEN cci.CONTRACT_TYPE = 1
+				THEN '按固定金额'
+				ELSE '按固定折扣' 
+			end as discountText
+ 		from 
+			cd_contract_item cci
+		left join cd_item  ci on cci.CD_ITEM_ID = ci.ID
+		where 
+			cci.CD_CONTRACT_ID = #{id}
+	</select>
+    
+</mapper>

src/main/java/com/xmomen/module/base/mapper/CouponCategoryMapper.java

@@ -0,0 +1,11 @@
+package com.xmomen.module.base.mapper;
+
+/**
+ * Created by Jeng on 2016/3/30.
+ */
+public interface CouponCategoryMapper {
+
+	public static final String CouponCategoryMapperNameSpace = "com.xmomen.module.base.mapper.CouponCategoryMapper.";
+
+	public static final String COUPON_RELATION_ITEM_CODE = "TICKET_ITEM";
+}

src/main/java/com/xmomen/module/base/mapper/CouponCategoryMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xmomen.module.base.mapper.CouponCategoryMapper" >
+
+<!--        查询消息    -->
+	<select id="getChoseItemList" resultType="com.xmomen.module.base.model.ItemChildModel" parameterType="java.util.HashMap">
+        SELECT
+			cm.id,
+        	cm.item_name,
+			cm.item_code,
+			cm.sell_status,
+        	cc.category_name,
+        	cir.ref_count as count
+        FROM
+			cd_coupon_category_ref cir
+		left join 
+			cd_item cm on cm.id = cir.REF_VALUE
+   		left join 
+        	cd_category cc on cm.cd_category_id = cc.id	
+        <where>
+        cir.REF_TYPE='TICKET_ITEM'
+             <if test = 'parentId'>
+             	AND cir.CD_COUPON_CATEGORY_ID = #{parentId}
+             </if>	
+        </where>
+    </select>
+</mapper>

src/main/java/com/xmomen/module/base/mapper/CouponMapper.xml

@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xmomen.module.base.mapper.CouponMapper">
+
+    <resultMap type="com.xmomen.module.base.model.CouponModel" id="couponModelMap" autoMapping="true">
+        <collection property="relationItemList" ofType="com.xmomen.module.base.model.CouponRelationItem" column="coupon_category" select="queryRelationItemList"></collection>
+    </resultMap>
+
+    <resultMap type="com.xmomen.module.base.model.CouponModel" id="couponItemsModel">
+        <id property="id" column="id"></id>
+        <result property="couponType" column="coupon_type"></result>
+        <result property="couponCategory" column="coupon_category"></result>
+        <result property="couponValue" column="coupon_value"></result>
+        <result property="companyId" column="cd_company_id"></result>
+        <result property="managerId" column="cd_user_id"/>
+        <collection property="relationItemList" ofType="com.xmomen.module.base.model.CouponRelationItem"></collection>
+    </resultMap>
+
+    <select id="queryRelationItemList" resultType="com.xmomen.module.base.model.CouponRelationItem" parameterType="Integer">
+       SELECT 
+          cccr.REF_VALUE AS itemId,
+          cccr.REF_COUNT AS itemNumber 
+        FROM
+          cd_coupon_category ccc 
+          LEFT JOIN cd_coupon_category_ref cccr 
+            ON cccr.CD_COUPON_CATEGORY_ID = ccc.ID 
+        WHERE ccc.ID = #{coupon_category}
+    </select>
+
+    <!-- -->
+    <select id="getCouponList" resultMap="couponModelMap" parameterType="com.xmomen.module.base.model.CouponQuery">
+        SELECT
+        cc.*,
+        cc.COUPON_CATEGORY as couponCategoryId,
+        ccc.CATEGORY_NAME,
+        cd_company.id as companyId,
+        cd_company.COMPANY_NAME,
+        r.cd_member_id AS memberId,
+        su.realname as managerName,
+        su.id as managerId,
+        price.ref_value as receivedPrice
+        FROM
+        cd_coupon cc
+        left join cd_coupon_category ccc on cc.COUPON_CATEGORY = ccc.id
+        left join cd_company cd_company on cc.cd_company_id = cd_company.id
+        left join sys_users su on cc.cd_user_id = su.id
+        LEFT JOIN cd_member_coupon_relation r ON r.COUPON_NUMBER = cc.COUPON_NUMBER
+        left join cd_coupon_ref price on cc.id = price.cd_coupon_id and price.ref_type='RECEIVED_PRICE'
+        <where>
+            <![CDATA[ (cc.IS_USED = 0 or cc.IS_USED = 1) ]]>
+            <if test="keyword !=null and keyword !=''">
+                AND (cc.COUPON_NUMBER LIKE CONCAT('%', #{keyword}, '%') or cc.COUPON_DESC LIKE CONCAT('%', #{keyword}, '%'))
+            </if>
+            <if test="couponNumber !=null and couponNumber !=''">
+                AND cc.COUPON_NUMBER = #{couponNumber}
+            </if>
+            <if test="categoryType">
+                AND ccc.category_type = #{categoryType}
+            </if>
+            <if test="couponType != null">
+                AND cc.COUPON_TYPE = #{couponType}
+            </if>
+            <if test="couponCategoryId != null">
+                AND cc.COUPON_CATEGORY = #{couponCategoryId}
+            </if>
+            <if test="isSend != null">
+                AND cc.is_send = #{isSend}
+            </if>
+            <if test="batch">
+                AND cc.batch = #{batch}
+            </if>
+            <if test="isUseful == 0 || isUseful == 1">
+                AND cc.is_useful = #{isUseful}
+            </if>
+            <if test="isUseful == 3">
+                AND cc.is_useful = 0 and cc.coupon_Value > 0 AND cc.PAYMENT_TYPE = 1 AND cc.coupon_type = 1
+            </if>
+            <if test="isUseful == 4">
+                AND ( cc.coupon_type = 2 or (cc.PAYMENT_TYPE = 2 and cc.COUPON_TYPE =1))
+            </if>
+            <if test="customerMangerId">
+                AND cc.cd_user_id = #{customerMangerId}
+            </if>
+            <if test="cdCompanyId != null">
+                AND cc.cd_company_id = #{cdCompanyId}
+            </if>
+            <if test="managerId != null">
+                AND cc.cd_user_id = #{managerId}
+            </if>
+            <if test="isOver != null">
+                AND cc.is_over = #{isOver}
+            </if>
+            <if test="auditDateStart">
+                <![CDATA[
+	                  AND DATE_FORMAT(cc.AUDIT_DATE ,'%Y-%m-%d')>= #{auditDateStart}
+	                ]]>
+            </if>
+            <if test="auditDateEnd">
+                <![CDATA[
+	                  AND DATE_FORMAT(cc.AUDIT_DATE ,'%Y-%m-%d')<= #{auditDateEnd}
+	                ]]>
+            </if>
+        </where>
+    </select>
+
+    <!--金额回填查询-->
+    <select id="getCouponActivityList" resultType="com.xmomen.module.base.model.CouponModel" parameterType="com.xmomen.module.base.model.CouponQuery">
+        SELECT
+        cc.id,
+        car.CD_ACTIVITY_ID,
+        cc.COUPON_TYPE,
+        cc.USER_PRICE,
+        cc.COUPON_NUMBER,
+        cc.BATCH,
+        cc.COUPON_CATEGORY as couponCategoryId,
+        ccc.CATEGORY_NAME,
+        cd_company.COMPANY_NAME,
+        r.CD_MEMBER_ID AS memberId,
+        su.realname as managerName,
+        price.ref_value as receivedPrice
+        FROM
+        cd_coupon cc
+        left join cd_coupon_category ccc on cc.COUPON_CATEGORY = ccc.id
+        left join cd_company cd_company on cc.cd_company_id = cd_company.id
+        left join sys_users su on cc.cd_user_id = su.id
+        left join cd_coupon_ref price on cc.id = price.cd_coupon_id and price.ref_type='RECEIVED_PRICE'
+        LEFT JOIN cd_member_coupon_relation r ON r.COUPON_NUMBER = cc.COUPON_NUMBER
+        left join cd_activity_ref car on cc.COUPON_CATEGORY = car.REF_VALUE and car.REF_TYPE ='COUPON'
+        <where>
+            <![CDATA[ (cc.IS_USED = 0 or cc.IS_USED = 1) ]]>
+            <if test="keyword !=null and keyword !=''">
+                AND (cc.COUPON_NUMBER LIKE CONCAT('%', #{keyword}, '%'))
+            </if>
+            <if test="couponNumber !=null and couponNumber !=''">
+                AND cc.COUPON_NUMBER = #{couponNumber}
+            </if>
+            <if test="categoryType">
+                AND ccc.category_type = #{categoryType}
+            </if>
+            <if test="couponType != null">
+                AND cc.COUPON_TYPE = #{couponType}
+            </if>
+            <if test="couponCategoryId != null">
+                AND cc.COUPON_CATEGORY = #{couponCategoryId}
+            </if>
+            <if test="isSend != null">
+                AND cc.is_send = #{isSend}
+            </if>
+            <if test="batch">
+                AND cc.batch = #{batch}
+            </if>
+            <if test="isUseful == 0 || isUseful == 1">
+                AND cc.is_useful = #{isUseful}
+            </if>
+            <if test="isUseful == 3">
+                AND cc.is_useful = 0 and cc.coupon_Value > 0
+            </if>
+            <if test="customerMangerId">
+                AND cc.cd_user_id = #{customerMangerId}
+            </if>
+            <if test="cdCompanyId != null">
+                AND cc.cd_company_id = #{cdCompanyId}
+            </if>
+            <if test="managerId != null">
+                AND cc.cd_user_id = #{managerId}
+            </if>
+            <if test="isOver != null">
+                AND cc.is_over = #{isOver}
+            </if>
+        </where>
+    </select>
+
+    <!--参与活动卡劵回填查询-->
+    <select id="getCouponActivityAddressList" resultType="com.xmomen.module.base.model.CouponModel" parameterType="com.xmomen.module.base.model.CouponQuery">
+        SELECT
+        cc.id,
+        car.CD_ACTIVITY_ID,
+        cc.COUPON_TYPE,
+        cc.USER_PRICE,
+        cc.COUPON_NUMBER,
+        cc.BATCH,
+        cc.COUPON_CATEGORY as couponCategoryId,
+        ccc.CATEGORY_NAME,
+        cd_company.COMPANY_NAME,
+        r.CD_MEMBER_ID AS memberId,
+        su.realname as managerName,
+        price.ref_value as receivedPrice,
+        activity.LOWEST_PRICE
+        FROM
+        cd_coupon cc
+        left join cd_coupon_category ccc on cc.COUPON_CATEGORY = ccc.id
+        left join cd_company cd_company on cc.cd_company_id = cd_company.id
+        left join sys_users su on cc.cd_user_id = su.id
+        left join cd_coupon_ref price on cc.id = price.cd_coupon_id and price.ref_type='RECEIVED_PRICE'
+        LEFT JOIN cd_member_coupon_relation r ON r.COUPON_NUMBER = cc.COUPON_NUMBER
+        left join cd_activity_ref car on cc.COUPON_CATEGORY = car.REF_VALUE and car.REF_TYPE ='COUPON'
+        left join cd_activity activity on car.CD_ACTIVITY_ID = activity.id
+        <where>
+            <![CDATA[ (cc.IS_USED = 0 or cc.IS_USED = 1) and car.cd_Activity_Id != 0 and cc.user_price > 0]]>
+            <if test="keyword !=null and keyword !=''">
+                AND (cc.COUPON_NUMBER LIKE CONCAT('%', #{keyword}, '%'))
+            </if>
+            <if test="couponNumber !=null and couponNumber !=''">
+                AND cc.COUPON_NUMBER = #{couponNumber}
+            </if>
+            <if test="categoryType">
+                AND ccc.category_type = #{categoryType}
+            </if>
+            <if test="couponType != null">
+                AND cc.COUPON_TYPE = #{couponType}
+            </if>
+            <if test="couponCategoryId != null">
+                AND cc.COUPON_CATEGORY = #{couponCategoryId}
+            </if>
+            <if test="isSend != null">
+                AND cc.is_send = #{isSend}
+            </if>
+            <if test="batch">
+                AND cc.batch = #{batch}
+            </if>
+            <if test="isUseful == 0 || isUseful == 1">
+                AND cc.is_useful = #{isUseful}
+            </if>
+            <if test="isUseful == 3">
+                AND cc.is_useful = 0 and cc.coupon_Value > 0
+            </if>
+            <if test="customerMangerId">
+                AND cc.cd_user_id = #{customerMangerId}
+            </if>
+            <if test="cdCompanyId != null">
+                AND cc.cd_company_id = #{cdCompanyId}
+            </if>
+            <if test="managerId != null">
+                AND cc.cd_user_id = #{managerId}
+            </if>
+            <if test="isOver != null">
+                AND cc.is_over = #{isOver}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getCouponByCouponNo" resultType="com.xmomen.module.base.model.ReadCardVo" parameterType="com.xmomen.module.base.model.CouponQuery">
+        select
+        cc.COUPON_NUMBER as couponNo,
+        cc.USER_PRICE as couponPrice,
+        cm.`NAME` as userName,
+        cm.PHONE_NUMBER,
+        cc.COUPON_PASSWORD
+        from cd_coupon cc
+        left join cd_member_coupon_relation cmcr on cc.COUPON_NUMBER = cmcr.COUPON_NUMBER
+        left join cd_member cm on cmcr.CD_MEMBER_ID = cm.ID
+        <where>
+            <if test="couponNumber != null">
+                AND cc.COUPON_NUMBER = #{couponNumber}
+            </if>
+            <if test="password != null">
+                AND cc.COUPON_PASSWORD = #{password}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateReturnCoupon" parameterType="Integer">
+		update cd_coupon 
+		set
+        is_send=0 ,
+        is_useful = 0,
+        useful_date = null,
+        batch = null,
+		cd_company_id = null,
+		cd_user_id = null,
+		USER_PRICE = null
+		where id=#{id}
+	</update>
+
+    <!-- 查询卡的送羊地址 -->
+    <select id="getActivityAddress" resultType="com.xmomen.module.base.model.CouponActivityAddress" parameterType="String">
+		select * from 
+		cd_activity_address
+		where 
+			coupon_number = #{couponNumber}
+	</select>
+
+    <select id="getCouponItemsByByCouponNo" resultMap="couponItemsModel" parameterType="String">
+	    select cc.id, cc.coupon_type, cc.coupon_category, cc.coupon_value,
+	    cc.cd_company_id, cc.cd_user_id,
+	     cccr.REF_VALUE as itemId, cccr.REF_COUNT as itemNumber
+		from cd_coupon cc
+		inner join cd_coupon_category ccc
+		on cc.COUPON_CATEGORY = ccc.id
+		left join cd_coupon_category_ref cccr
+		on cccr.CD_COUPON_CATEGORY_ID = ccc.ID
+		where cc.coupon_number = #{couponNumber};
+	</select>
+
+    <select id="getMyCouponList" resultType="com.xmomen.module.wx.module.coupon.model.WxCouponModel"
+            parameterType="com.xmomen.module.wx.module.coupon.model.CouponQueryModel">
+        select cc.id, cc.coupon_type, cc.coupon_category, cc.coupon_value, cc.coupon_number, cc.user_price
+        from cd_coupon cc
+        <where>
+            cc.coupon_number in (
+            select coupon_number from cd_member_coupon_relation cmcr where cmcr.cd_member_id = #{cdUserId}
+            )
+
+            <if test="couponType != null">
+                AND cc.coupon_type = #{couponType}
+            </if>
+            <if test="useable != null and useable">
+                AND cc.user_price > 0
+            </if>
+            <if test="useable != null and !useable">
+                <![CDATA[ AND cc.user_price <= 0]]>
+            </if>
+        </where>
+    </select>
+</mapper>

src/main/java/com/xmomen/module/base/mapper/ExpressMapper.java

@@ -0,0 +1,6 @@
+package com.xmomen.module.base.mapper;
+
+public interface ExpressMapper {
+    public static final String ExpressMapperNameSpace = "com.xmomen.module.base.mapper.ExpressMapper.";
+
+}

src/main/java/com/xmomen/module/base/mapper/ExpressMapper.xml

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xmomen.module.base.mapper.ExpressMapper" >
+
+	<!-- 取消分配 -->
+	<update id="cancelDespatch" parameterType="java.lang.String">
+	    	update 
+	    		tb_order
+	    	set 
+	    		Despatch_Express_Id = null
+	    	where 
+	    		order_no=#{orderNo}
+	</update>
+	
+    <!--    查询消息    -->
+    <select id="getExpressList" resultType="com.xmomen.module.base.entity.CdExpress" parameterType="java.util.HashMap">
+       select 
+       	cc.*
+       from cd_express cc
+		<where>
+              <if test="keyword">
+                  AND cc.express_code LIKE CONCAT('%', #{keyword}, '%') or cc.express_name LIKE CONCAT('%', #{keyword}, '%')
+              </if>
+              <if test="id">
+                  AND cc.id = #{id}
+              </if>
+        </where>
+    </select>
+    
+    <!--    查询提货订单    -->
+    <select id="getOrderList" resultType="com.xmomen.module.order.model.OrderModel" parameterType="com.xmomen.module.order.model.OrderQuery">
+        select
+        torp.REF_VALUE as couponNumber,
+        sp.SHOW_VALUE AS orderTypeDesc,
+        ssp.SHOW_VALUE AS orderStatusDesc,
+        paymentp.SHOW_VALUE AS paymentModeDesc,
+        osp.SHOW_VALUE AS orderSourceDesc,
+        ce.express_name,
+        users.realname as manager_name,
+        tb.*
+        FROM
+		tb_order_ref tor
+		left join tb_order tb on tb.order_no = tor.order_no
+        LEFT JOIN sys_dictionary s on s.DICTIONARY_CODE='ORDER_TYPE'
+        left join sys_dictionary_parameter sp on sp.SYS_DICTIONARY_ID=s.ID and tb.ORDER_TYPE = sp.REAL_VALUE
+
+        LEFT JOIN sys_dictionary ss on ss.DICTIONARY_CODE='ORDER_STATUS'
+        left join sys_dictionary_parameter ssp on ssp.SYS_DICTIONARY_ID=ss.ID and tb.ORDER_STATUS = ssp.REAL_VALUE
+
+        LEFT JOIN sys_dictionary payment on payment.DICTIONARY_CODE='PAYMENT_MODE'
+        left join sys_dictionary_parameter paymentp on paymentp.SYS_DICTIONARY_ID=payment.ID and tb.PAYMENT_MODE = paymentp.REAL_VALUE
+
+        LEFT JOIN sys_dictionary oss on oss.DICTIONARY_CODE='ORDER_SOURCE'
+        left join sys_dictionary_parameter osp on osp.SYS_DICTIONARY_ID=oss.ID and tb.ORDER_SOURCE = osp.REAL_VALUE
+
+        LEFT JOIN tb_order_relation torp ON torp.ORDER_NO = tb.ORDER_NO AND torp.REF_TYPE = 'ORDER_PAY_RELATION'
+        left join cd_express ce on tb.despatch_express_id = ce.id
+        
+        left join sys_users users on users.id = tb.MANAGER_ID
+        <where>
+        	tor.ref_type ='TAKE_DELIVERY'
+        	AND tb.order_status = 12
+            <if test="orderStatus">
+                  AND tb.order_status = #{orderStatus}
+            </if>
+            <if test="keyword">
+                AND (tb.order_no LIKE CONCAT('%', #{keyword}, '%')
+                or tb.consignee_phone LIKE CONCAT('%', #{keyword}, '%')
+                or tb.consignee_name like CONCAT('%', #{keyword}, '%')
+                )
+            </if>
+            <if test="id">
+                AND tb.id = #{id}
+            </if>
+             <if test="managerId">
+                AND tb.MANAGER_ID = #{managerId}
+            </if>
+             <if test="consigneeName">
+                AND tb.consignee_name LIKE CONCAT('%', #{consigneeName}, '%')
+            </if>
+            <if test="orderNo">
+                AND tb.ORDER_NO = #{orderNo}
+            </if>
+            <if test="orderNos">
+                AND tb.ORDER_NO IN
+                <foreach collection="orderNos" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="orderCreateTimeStart">
+                <![CDATA[
+                  AND DATE_FORMAT(tb.APPOINTMENT_TIME ,'%Y-%m-%d')>= #{orderCreateTimeStart}
+                ]]>
+            </if>
+            <if test="orderCreateTimeEnd">
+                <![CDATA[
+                  AND DATE_FORMAT(tb.APPOINTMENT_TIME ,'%Y-%m-%d')<= #{orderCreateTimeEnd}
+                ]]>
+            </if>
+            
+            <if test="createUserId">
+            	AND tb.create_user_id = #{createUserId}
+            </if>
+            <if test="despatchExpressCode">
+            	AND ce.EXPRESS_CODE =#{despatchExpressCode}
+            </if>
+          </where>
+          order by tb.CREATE_TIME desc
+    </select>
+    
+    <!--    查询提货订单 导出   -->
+    <select id="getOrderReportList" resultType="com.xmomen.module.report.model.OrderDeliveryReport" parameterType="com.xmomen.module.order.model.OrderQuery">
+        select
+			paymentp.SHOW_VALUE AS paymentModeDesc,
+			otherPaymentp.show_value as otherPaymentModeDesc,
+			ce.express_name,
+			tb.create_time,
+			tb.order_no,
+			tb.consignee_name,
+			tb.consignee_phone,
+			tb.consignee_address,
+			if(tb.PAYMENT_MODE=4,tb.TOTAL_AMOUNT,null) TOTAL_AMOUNT,
+			if(tb.PAYMENT_MODE=4,pay.AMOUNT,null) payAmount,
+			if(tb.PAYMENT_MODE=4,other_pay.AMOUNT,null) otherPayAmount,
+			tb.appointment_time,
+			tb.remark			
+			FROM
+	 			tb_order tb 
+		
+			LEFT JOIN sys_dictionary payment on payment.DICTIONARY_CODE='PAYMENT_MODE'
+			left join sys_dictionary_parameter paymentp on paymentp.SYS_DICTIONARY_ID=payment.ID and tb.PAYMENT_MODE = paymentp.REAL_VALUE
+
+			LEFT JOIN sys_dictionary otherPayment on otherPayment.DICTIONARY_CODE='PAYMENT_MODE'
+			left join sys_dictionary_parameter otherPaymentp on otherPaymentp.SYS_DICTIONARY_ID=otherPayment.ID and tb.PAYMENT_MODE = otherPaymentp.REAL_VALUE
+			
+			left join cd_express ce on tb.despatch_express_id = ce.id
+			LEFT JOIN tb_trade_record pay ON pay.TRADE_NO =tb.ORDER_NO and pay.TRADE_TYPE in('COUPON','CARD','NORMAL')
+			LEFT JOIN tb_trade_record other_pay ON other_pay.TRADE_NO =tb.ORDER_NO and other_pay.TRADE_TYPE = tb.OTHER_PAYMENT_MODE
+        <where>
+        	 tb.order_status = 12
+            <if test="orderCreateTimeStart">
+                <![CDATA[
+                  AND DATE_FORMAT(tb.APPOINTMENT_TIME ,'%Y-%m-%d')>= #{orderCreateTimeStart}
+                ]]>
+            </if>
+            <if test="orderCreateTimeEnd">
+                <![CDATA[
+                  AND DATE_FORMAT(tb.APPOINTMENT_TIME ,'%Y-%m-%d')<= #{orderCreateTimeEnd}
+                ]]>
+            </if>
+          
+            <if test="despatchExpressCode">
+            	AND ce.EXPRESS_CODE =#{despatchExpressCode}
+            </if>
+          </where>
+          order by tb.CREATE_TIME desc
+    </select>
+    
+    
+    <!--    查询已分配未提货的订单 导出   -->
+    <select id="getOrderNoDespatchReportList" resultType="com.xmomen.module.report.model.OrderDeliveryReport" parameterType="com.xmomen.module.order.model.OrderQuery">
+        select
+			paymentp.SHOW_VALUE AS paymentModeDesc,
+			otherPaymentp.show_value as otherPaymentModeDesc,
+			ce.express_name,
+			tb.create_time,
+			tb.order_no,
+			tb.consignee_name,
+			tb.consignee_phone,
+			tb.consignee_address,
+			if(tb.PAYMENT_MODE=4,tb.TOTAL_AMOUNT,null) TOTAL_AMOUNT,
+			if(tb.PAYMENT_MODE=4,pay.AMOUNT,null) payAmount,
+			if(tb.PAYMENT_MODE=4,other_pay.AMOUNT,null) otherPayAmount,
+			tb.appointment_time,
+			tb.remark,
+	        ssp.SHOW_VALUE AS orderStatusDesc,
+	        tb.total_box_num,
+	        tb.EXPRESS_SCAN_BOX_NUM
+		FROM
+ 			tb_order tb 
+		 
+	 	LEFT JOIN sys_dictionary ss on ss.DICTIONARY_CODE='ORDER_STATUS'
+       	left join sys_dictionary_parameter ssp on ssp.SYS_DICTIONARY_ID=ss.ID and tb.ORDER_STATUS = ssp.REAL_VALUE
+       
+		LEFT JOIN sys_dictionary payment on payment.DICTIONARY_CODE='PAYMENT_MODE'
+		left join sys_dictionary_parameter paymentp on paymentp.SYS_DICTIONARY_ID=payment.ID and tb.PAYMENT_MODE = paymentp.REAL_VALUE
+
+		LEFT JOIN sys_dictionary otherPayment on otherPayment.DICTIONARY_CODE='PAYMENT_MODE'
+		left join sys_dictionary_parameter otherPaymentp on otherPaymentp.SYS_DICTIONARY_ID=otherPayment.ID and tb.PAYMENT_MODE = otherPaymentp.REAL_VALUE
+		
+		left join cd_express ce on tb.despatch_express_id = ce.id
+		LEFT JOIN tb_trade_record pay ON pay.TRADE_NO =tb.ORDER_NO and pay.TRADE_TYPE in('COUPON','CARD','NORMAL')
+		LEFT JOIN tb_trade_record other_pay ON other_pay.TRADE_NO =tb.ORDER_NO and other_pay.TRADE_TYPE = tb.OTHER_PAYMENT_MODE
+			
+       	<where>
+        	tb.DESPATCH_EXPRESS_ID is not NULL
+				and tb.ORDER_STATUS in(1,2,3,4,13)
+            <if test="orderCreateTimeStart">
+                <![CDATA[
+                  AND DATE_FORMAT(tb.APPOINTMENT_TIME ,'%Y-%m-%d')>= #{orderCreateTimeStart}
+                ]]>
+            </if>
+            <if test="orderCreateTimeEnd">
+                <![CDATA[
+                  AND DATE_FORMAT(tb.APPOINTMENT_TIME ,'%Y-%m-%d')<= #{orderCreateTimeEnd}
+                ]]>
+            </if>
+            <if test="despatchExpressCode">
+            	AND ce.EXPRESS_CODE =#{despatchExpressCode}
+            </if>
+         </where>
+         order by tb.CREATE_TIME desc
+    </select>
+</mapper>
+

src/main/java/com/xmomen/module/base/mapper/ExpressMemberMapper.java

@@ -0,0 +1,6 @@
+package com.xmomen.module.base.mapper;
+
+public interface ExpressMemberMapper {
+    public static final String ExpressMemberMapperNameSpace = "com.xmomen.module.base.mapper.ExpressMemberMapper.";
+
+}

src/main/java/com/xmomen/module/base/mapper/ItemCategoryMapper.java

@@ -0,0 +1,19 @@
+package com.xmomen.module.base.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import com.xmomen.module.base.model.ItemCategoryModel;
+
+/**
+ * Created by Jeng on 16/3/27.
+ */
+public interface ItemCategoryMapper {
+
+    @Select(value = "SELECT s.ID,s.CATEGORY_NAME AS name, s.PARENT_ID,p.CATEGORY_NAME AS parent_name FROM cd_category s LEFT JOIN cd_category p ON p.ID=s.PARENT_ID where FIND_IN_SET(s.id, query_children_category(${id}))")
+    @ResultType(ItemCategoryModel.class)
+    public List<ItemCategoryModel> getItemCategoryTree(@Param(value = "id") Integer id);
+}

src/main/java/com/xmomen/module/base/mapper/ItemDetailMapper.java

@@ -0,0 +1,6 @@
+package com.xmomen.module.base.mapper;
+
+public interface ItemDetailMapper {
+    public static final String ItemDetailMapperNameSpace = "com.xmomen.module.base.mapper.ItemDetailMapper.";
+
+}

src/main/java/com/xmomen/module/base/mapper/ItemDetailMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xmomen.module.base.mapper.ItemDetailMapper" >
+
+</mapper>

src/main/java/com/xmomen/module/base/mapper/ItemMapper.java

@@ -0,0 +1,6 @@
+package com.xmomen.module.base.mapper;
+
+public interface ItemMapper {
+    public static final String ItemMapperNameSpace = "com.xmomen.module.base.mapper.ItemMapper.";
+
+}

src/main/java/com/xmomen/module/base/mapper/MemberMapper.java

@@ -0,0 +1,5 @@
+package com.xmomen.module.base.mapper;
+
+public interface MemberMapper {
+    public static final String MemberMapperNameSpace = "com.xmomen.module.base.mapper.MemberMapper.";
+}

src/main/java/com/xmomen/module/base/mapper/MemberMapper.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xmomen.module.base.mapper.MemberMapper">
+
+    <resultMap type="com.xmomen.module.base.model.MemberModel" id="Memeber">
+        <id column="id" property="id"/>
+        <collection property="couponNumbers" ofType="com.xmomen.module.base.model.MemberCouponModel" column="id" select="queryCouponNumberList"></collection>
+    </resultMap>
+
+    <!--    查询消息    -->
+    <select id="getMemberList" resultMap="Memeber" parameterType="java.util.HashMap">
+        SELECT
+        cm.*,
+        cc.company_name,
+        su.realName as managerName
+        FROM
+        cd_member cm
+        left join cd_company cc on cm.cd_company_id = cc.id
+        left join sys_users su on cm.cd_user_id = su.id
+        <where>
+            cm.phone_number is not null
+            <if test="keyword">
+                AND (cm.name LIKE CONCAT('%', #{keyword}, '%') or cm.phone_number like CONCAT('%', #{keyword}, '%'))
+            </if>
+            <if test="id">
+                AND cm.id = #{id}
+            </if>
+            <if test="phoneNumber">
+                AND cm.phone_number = #{phoneNumber}
+            </if>
+            <if test="managerId">
+                AND cm.cd_user_id = #{managerId}
+            </if>
+            <if test="couponNumber">
+                AND cm.id in (SELECT CD_MEMBER_ID from cd_member_coupon_relation cmcr where cmcr.coupon_number like CONCAT('%', #{couponNumber}, '%') )
+            </if>
+        </where>
+    </select>
+
+    <select id="queryCouponNumberList" resultType="com.xmomen.module.base.model.MemberCouponModel" parameterType="Integer">
+		select  
+			cmcr.COUPON_NUMBER,
+			cc.user_price
+		from 
+			cd_member_coupon_relation cmcr
+		left join 
+			cd_coupon cc on cmcr.coupon_number = cc.coupon_number 
+		where 
+			cmcr.cd_member_id = #{id}
+	</select>
+
+</mapper>

src/main/java/com/xmomen/module/base/mapper/PublicMapper.java

@@ -0,0 +1,13 @@
+package com.xmomen.module.base.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import com.xmomen.module.user.entity.SysUsers;
+
+public interface PublicMapper {
+	
+    public static final String PublicMapperNameSpace = "com.xmomen.module.base.mapper.PublicMapper.";
+}

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

@@ -0,0 +1,51 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+
+public class ActivityRefModel implements Serializable{
+	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;
+	}
+
+	public Integer getCdItemId() {
+		return cdItemId;
+	}
+
+	public void setCdItemId(Integer cdItemId) {
+		this.cdItemId = cdItemId;
+	}
+	
+}

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

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

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

@@ -0,0 +1,40 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import lombok.Data;
+
+public @Data class ContractItemModel implements Serializable {
+	
+	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;
+
+    /**
+     * 产品合同
+     */
+    private Integer cdContractId;
+
+    /**
+     * 当合同适用范围为1的时候，每种产品要设定对应的合同价
+     */
+    private Integer cdItemId;
+
+    /**
+     * 合同价格
+     */
+    private BigDecimal contractValue;
+    /**
+     * 合同折扣
+     */
+    private BigDecimal discount;
+}

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

@@ -0,0 +1,59 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+public @Data class ContractModel implements Serializable {
+	private Integer id;
+	/**
+     * 合同名称
+     */
+    private String contractName;
+	/**
+     * 合同编号
+     */
+    private String contractCode;
+	/**
+     * 合同价的客户
+     */
+    private Integer cdMemberId;
+    /**
+     * 单位名称
+     */
+    private String companyName;
+    /**
+     * 合同价的单位
+     */
+    private Integer cdCompanyId;
+
+    /**
+     * 1-部分产品，2-全部产品
+     */
+    private Integer scope;
+
+    /**
+     * 仅当适用范围为全部产品时适用
+     */
+    private BigDecimal contractPrice;
+
+    /**
+     * 合同开始时间
+     */
+    private Date beginTime;
+    
+    /**
+     * 合同开始时间
+     */
+    private Date endTime;
+    
+    /**
+     * 是否作废
+     */
+    private int isDel;
+     
+    private List<ContractItemModel> contractItemList;
+}

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

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+
+public @Data class CouponActivityAddressHead implements Serializable{
+	/**
+     * 卡
+     */
+    private String couponNumber;
+    
+    private List<CouponActivityAddress> couponActivityAddressList;
+    
+}

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

@@ -0,0 +1,152 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * Created by Jeng on 2016/3/30.
+ */
+public @Data class CouponModel implements Serializable {
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 卡或者劵,1-卡，2-劵
+     */
+    private Integer couponType;
+
+    private String couponTypeDesc;
+    
+    private Integer couponCategoryId;
+    
+    private Integer couponCategory;
+
+	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
+     */
+    private Integer managerId;
+    /**
+     * 发放单位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
+     */
+    private int cdActivityId;
+    
+	private List<CouponRelationItem> relationItemList;
+
+}

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

@@ -0,0 +1,29 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+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;
+    private Integer couponCategoryId;
+    private Integer categoryType;
+    private Integer isSend;
+    private Integer cdCompanyId;
+    private Integer customerMangerId;
+    private Integer isUseful;
+    private Integer isOver;
+    private Integer managerId;
+    private String batch;
+    private String auditDateStart;
+    private String auditDateEnd;
+}

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

@@ -0,0 +1,28 @@
+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{
+    private Integer itemId;
+    private BigDecimal itemNumber;
+
+    public Integer getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Integer itemId) {
+        this.itemId = itemId;
+    }
+
+    public BigDecimal getItemNumber() {
+        return itemNumber;
+    }
+
+    public void setItemNumber(BigDecimal itemNumber) {
+        this.itemNumber = itemNumber;
+    }
+}

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

@@ -0,0 +1,119 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import lombok.Data;
+
+/**
+ */
+public class CouponReportModel implements Serializable {
+
+    /**
+     * 卡或者劵,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-后付款
+     */
+	@Excel(name="是否预付款",replace={"预付款_1","后付款_2"})
+    private Integer paymentType;
+
+	public Integer getCouponType() {
+		return couponType;
+	}
+
+	public void setCouponType(Integer couponType) {
+		this.couponType = couponType;
+	}
+
+	public String getCategoryName() {
+		return categoryName;
+	}
+
+	public void setCategoryName(String categoryName) {
+		this.categoryName = categoryName;
+	}
+
+	public String getCouponDesc() {
+		return couponDesc;
+	}
+
+	public void setCouponDesc(String couponDesc) {
+		this.couponDesc = couponDesc;
+	}
+
+	public String getCouponNumber() {
+		return couponNumber;
+	}
+
+	public void setCouponNumber(String couponNumber) {
+		this.couponNumber = couponNumber;
+	}
+
+	public BigDecimal getCouponValue() {
+		return couponValue;
+	}
+
+	public void setCouponValue(BigDecimal couponValue) {
+		this.couponValue = couponValue;
+	}
+
+	public String getCouponPassword() {
+		return couponPassword;
+	}
+
+	public void setCouponPassword(String couponPassword) {
+		this.couponPassword = couponPassword;
+	}
+
+	public Integer getPaymentType() {
+		return paymentType;
+	}
+
+	public void setPaymentType(Integer paymentType) {
+		this.paymentType = paymentType;
+	}
+
+	public Integer getCouponCategoryId() {
+		return couponCategoryId;
+	}
+
+	public void setCouponCategoryId(Integer couponCategoryId) {
+		this.couponCategoryId = couponCategoryId;
+	}
+	
+}

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

@@ -0,0 +1,36 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import lombok.Data;
+
+public @Data class CreateContractItem implements Serializable{
+	private Integer addType;//添加方式
+    private Integer cdCategoryId;
+    private String itemCode;
+    /**
+     * 1-固定价格，2-固定金额
+     */
+    private Integer contractType;
+
+    /**
+     * 产品合同
+     */
+    private Integer cdContractId;
+
+    /**
+     * 当合同适用范围为1的时候，每种产品要设定对应的合同价
+     */
+    private Integer cdItemId;
+    
+    /**
+     * 合同折扣
+     */
+    private BigDecimal discount;
+    /**
+     * 合同价格
+     */
+    private BigDecimal contractValue;
+
+}

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

@@ -0,0 +1,32 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Data;
+
+/**
+ * Created by Jeng on 2016/3/30.
+ */
+public @Data class CreateCoupon implements Serializable {
+
+    @NotNull
+    private Integer couponType;
+    private String couponDesc;
+    @NotNull
+    private Integer couponCategory;
+    private String couponNumber;
+    private String couponPassword;
+    private Date beginTime;
+    private Date endTime;
+    private BigDecimal couponValue;
+    private Integer isUsed;
+    private Integer isUseful;
+    private Integer isGift;
+    private String notes;
+    private Integer paymentType;
+    private BigDecimal userPrice;
+}

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

@@ -0,0 +1,48 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.NotBlank;
+
+/**
+ * Created by Jeng on 16/3/26.
+ */
+public class CreateCouponCategory implements Serializable {
+
+    @NotNull
+    @NotBlank
+    private String categoryName;
+    @NotNull
+    private Integer categoryType;
+   
+    private List<CouponCategoryRefModel> categoryRefs;
+
+	public String getCategoryName() {
+		return categoryName;
+	}
+
+	public void setCategoryName(String categoryName) {
+		this.categoryName = categoryName;
+	}
+
+	public Integer getCategoryType() {
+		return categoryType;
+	}
+
+	public void setCategoryType(Integer categoryType) {
+		this.categoryType = categoryType;
+	}
+
+	public List<CouponCategoryRefModel> getCategoryRefs() {
+		return categoryRefs;
+	}
+
+	public void setCategoryRefs(List<CouponCategoryRefModel> categoryRefs) {
+		this.categoryRefs = categoryRefs;
+	}
+    
+    
+}

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

@@ -0,0 +1,23 @@
+package com.xmomen.module.base.model;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import lombok.Data;
+
+import javax.persistence.*;
+
+public @Data class CreateItemDetail extends BaseMybatisModel {
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 商品ID
+     */
+    private Integer cdItemId;
+
+    /**
+     * 商品的详细内容
+     */
+    private String itemDetailContent;
+}

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

@@ -0,0 +1,165 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import com.xmomen.module.member.model.MemberAddressCreate;
+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;
+
+    /**
+     * 所属单位
+     */
+    private Integer cdCompanyId;
+
+    /**
+     * 所属客服经理
+     */
+    private Integer cdUserId;
+    
+    private String password;
+    
+    private String email;
+
+    //地址集合
+    List<MemberAddressCreate> memberAddressList;
+
+    public List<MemberAddressCreate> getMemberAddressList() {
+        return memberAddressList;
+    }
+
+    public void setMemberAddressList(List<MemberAddressCreate> memberAddressList) {
+        this.memberAddressList = 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;
+    }
+
+    public Integer getCdCompanyId() {
+        return cdCompanyId;
+    }
+
+    public void setCdCompanyId(Integer cdCompanyId) {
+        this.cdCompanyId = cdCompanyId;
+    }
+
+    public Integer getCdUserId() {
+        return cdUserId;
+    }
+
+    public void setCdUserId(Integer cdUserId) {
+        this.cdUserId = cdUserId;
+    }
+
+    public String getCouponNumber() {
+        return couponNumber;
+    }
+
+    public void setCouponNumber(String couponNumber) {
+        this.couponNumber = couponNumber;
+    }
+    
+    public String getPassword() {
+        return password;
+    }
+    
+    public void setPassword(String password) {
+        this.password = password;
+    }
+    
+    public String getEmail() {
+    	return email; 
+    }
+    
+    public void setEmail(String email) {
+    	this.email = email;
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+public @Data class ExpressMemberModel implements Serializable{
+	/**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 快递商id
+     */
+    private Integer cdExpressId;
+
+    /**
+     * 快递员姓名
+     */
+    private String memberName;
+
+    /**
+     * 电话号码
+     */
+    private String phone;
+
+    private String expressName;
+}

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

@@ -0,0 +1,55 @@
+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 {
+
+    private Integer id;
+    private String name;
+    private Integer parentId;
+    private String parentName;
+    private List<ItemCategoryModel> nodes;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public List<ItemCategoryModel> getNodes() {
+        return nodes;
+    }
+
+    public void setNodes(List<ItemCategoryModel> nodes) {
+        this.nodes = nodes;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.xmomen.module.base.model;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+public @Data class ItemChildModel implements Serializable{
+	
+	private Integer id;
+	private String itemName;
+	private String itemCode;
+	private String categoryName;
+	private Integer count;
+	private Integer sellStatus;//状态0-下架 1-上架
+	
+}

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

@@ -0,0 +1,21 @@
+package com.xmomen.module.base.model;
+
+import com.xmomen.framework.mybatis.model.BaseMybatisModel;
+import lombok.Data;
+
+public @Data class ItemDetailQuery extends BaseMybatisModel {
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 商品ID
+     */
+    private Integer cdItemId;
+
+    /**
+     * 商品的详细内容
+     */
+    private String itemDetailContent;
+}

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

@@ -0,0 +1,23 @@
+package com.xmomen.module.base.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Created by Jeng on 2016/5/13.
+ */
+public @Data
+class ItemQuery implements Serializable{
+
+    private Integer id;
+    private String keyword;
+    private Integer sellStatus;
+    private Integer companyId;
+    private Integer itemType;
+    private String[] itemCodes;
+    private String sellUnit;
+    private Integer[] ids;
+    private Integer[] excludeIds;
+    private Integer excludeStock;
+}

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

@@ -0,0 +1,21 @@
+package com.xmomen.module.base.model;
+
+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;
+	}
+}