<![CDATA[title1]]>

commit 359008a5de9c9d77bba378243e0331bd9860b3e5 Author: wzw <1794779437@qq.com> Date: Mon Mar 17 21:18:12 2025 +0800 122 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d05a8bd --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# Created by .ignore support plugin (hsz.mobi) +### Example user template template +### Example user template + +# IntelliJ project files +.idea +*.iml +out +gen### Java template +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +target \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..11b2d7a --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016 xmomen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/documents/README.MD b/documents/README.MD new file mode 100644 index 0000000..a472858 --- /dev/null +++ b/documents/README.MD @@ -0,0 +1,9 @@ +## 卡类下单 +- 卡号已与客户绑定， +- 卡号未登记，只有卡号，余额，密码，需填写客户信息并与卡号绑定 + + +## 券类下单 +- 券存在且没有被使用过，券可用 +- 券存在且被使用过，券不可用，提示已使用 +- 券不存在，提示券不存在 \ No newline at end of file diff --git a/documents/微信商城导出的订单.xls b/documents/微信商城导出的订单.xls new file mode 100644 index 0000000..989f865 Binary files /dev/null and b/documents/微信商城导出的订单.xls differ diff --git a/documents/服务器远程连接.txt b/documents/服务器远程连接.txt new file mode 100644 index 0000000..ed5ef79 --- /dev/null +++ b/documents/服务器远程连接.txt @@ -0,0 +1,2 @@ +124.117.230.45 +��Wjhy1402)(*&^%$#@!~ \ No newline at end of file diff --git a/documents/生鲜配送管理系统进度表(初版).xlsx b/documents/生鲜配送管理系统进度表(初版).xlsx new file mode 100644 index 0000000..ee6b802 Binary files /dev/null and b/documents/生鲜配送管理系统进度表(初版).xlsx differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..9457e33 --- /dev/null +++ b/pom.xml @@ -0,0 +1,550 @@ + + + 4.0.0 + + com.xmomen + dms-webapp + 1.0-SNAPSHOT + war + + UTF-8 + UTF-8 + UTF-8 + + + + sonatype-nexus-snapshots + Nexus Snapshots Repository + default + https://oss.sonatype.org/content/repositories/snapshots + + + + + sonatype-nexus-snapshots + Nexus Snapshots Repository + default + https://oss.sonatype.org/content/repositories/snapshots + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dev + + dev + + + true + + + + local + + local + + + + prd + + prd + + + + rls + + rls + + + + + ROOT + + src/main/resources/deploy/env-${env}.properties + + + + src/main/java + + **/*.java + + + + src/main/resources + true + + **/*.properties + **/*.xml + **/*.xls + **/*.conf + + + deploy/** + sql/** + + + + + + org.apache.maven.plugins + maven-war-plugin + + + + ${project.basedir}/lib + WEB-INF/lib + true + + **/*.jar + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + 1.7 + 1.7 + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.8.v20121106 + + + / + + + + 8700 + 60000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.0 + + + org.mybatis.generator + mybatis-generator-core + 1.3.2 + + + com.xmomen.maven.plugins + mybatis-generator + 1.0.0-SNAPSHOT + + + + src/main/resources/tools/generatorConfig.xml + true + true + + + + com.xmomen.maven.plugins + xmomen-generator-maven-plugin + 1.0-SNAPSHOT + + + org.mybatis.generator + mybatis-generator-core + 1.3.2 + + + com.xmomen.maven.plugins + mybatis-generator + 1.1.0-SNAPSHOT + compile + + + mysql + mysql-connector-java + 5.1.31 + runtime + + + + + src/main/resources/tools/generatorConfig-member.xml + + + + + + + + org.json + json + 20160212 + + + + + + + + + + commons-io + commons-io + 2.4 + + + + org.apache.commons + commons-lang3 + 3.4 + + + + com.google.guava + guava + 18.0 + + + + com.thoughtworks.xstream + xstream + 1.4.7 + + + + + com.xmomen.framework + easy-mybatis + 1.2.0-SNAPSHOT + + + + + + + + + + org.projectlombok + lombok + 1.14.4 + + + + org.springframework.hateoas + spring-hateoas + 0.16.0.RELEASE + + + + + + + + + + commons-collections + commons-collections + 3.2.1 + + + + javax.el + javax.el-api + 2.2.4 + + + org.glassfish.web + javax.el + 2.2.4 + + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + javax.servlet.jsp + jsp-api + 2.2 + + + javax.servlet + jstl + 1.2 + + + + org.apache.shiro + shiro-core + 1.2.2 + + + org.apache.shiro + shiro-ehcache + 1.2.2 + + + org.apache.shiro + shiro-web + 1.2.2 + + + org.apache.shiro + shiro-quartz + 1.2.2 + + + org.apache.shiro + shiro-spring + 1.2.2 + + + + + com.fasterxml.jackson.core + jackson-databind + 2.4.6 + + + org.hibernate + hibernate-validator + 5.0.2.Final + + + + com.alibaba + druid + 0.2.23 + + + com.alibaba + fastjson + 1.1.41 + + + + + org.slf4j + slf4j-api + 1.7.5 + + + org.slf4j + log4j-over-slf4j + 1.7.5 + + + org.slf4j + jcl-over-slf4j + 1.7.5 + + + ch.qos.logback + logback-core + 1.0.9 + + + ch.qos.logback + logback-classic + 1.0.9 + + + ch.qos.logback + logback-access + 1.0.9 + + + org.springframework + spring-context-support + 4.1.7.RELEASE + + + org.springframework + spring-context + 4.1.7.RELEASE + + + org.springframework + spring-aop + 4.1.7.RELEASE + + + org.springframework + spring-aspects + 4.1.7.RELEASE + + + org.aspectj + aspectjweaver + 1.8.6 + + + + org.jeecg + easypoi-base + 2.3.1 + + + org.jeecg + easypoi-web + 2.3.1 + + + org.jeecg + easypoi-annotation + 2.3.1 + + + + junit + junit + 4.11 + test + + + + + org.apache.httpcomponents + httpclient + 4.3.5 + + + org.apache.httpcomponents + httpcore + 4.3.2 + + + commons-httpclient + commons-httpclient + 3.1 + + + dom4j + dom4j + 1.6.1 + + + + + + + + + + + stax + stax-api + 1.0 + + + + org.jeecg + easypoi-base + 2.3.1 + + + org.jeecg + easypoi-web + 2.3.1 + + + org.jeecg + easypoi-annotation + 2.3.1 + + + + commons-fileupload + commons-fileupload + 1.3.2 + + + + org.mybatis.generator + mybatis-generator-core + 1.3.2 + test + + + com.xmomen.maven.plugins + mybatis-generator + 1.1.0-SNAPSHOT + test + + + + diff --git a/src/main/java/com/xmomen/module/account/credentials/RetryLimitHashedCredentialsMatcher.java b/src/main/java/com/xmomen/module/account/credentials/RetryLimitHashedCredentialsMatcher.java new file mode 100644 index 0000000..fb6980b --- /dev/null +++ b/src/main/java/com/xmomen/module/account/credentials/RetryLimitHashedCredentialsMatcher.java @@ -0,0 +1,46 @@ +package com.xmomen.module.account.credentials; + +import org.apache.shiro.authc.AuthenticationInfo; +import org.apache.shiro.authc.AuthenticationToken; +import org.apache.shiro.authc.ExcessiveAttemptsException; +import org.apache.shiro.authc.credential.HashedCredentialsMatcher; +import org.apache.shiro.cache.Cache; +import org.apache.shiro.cache.CacheManager; + +import java.util.concurrent.atomic.AtomicInteger; + +/** + *

User: Zhang Kaitao + *

Date: 14-1-28 + *

Version: 1.0 + */ +public class RetryLimitHashedCredentialsMatcher extends HashedCredentialsMatcher { + + private Cache passwordRetryCache; + + public RetryLimitHashedCredentialsMatcher(CacheManager cacheManager) { + passwordRetryCache = cacheManager.getCache("passwordRetryCache"); + } + + @Override + public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) { + String username = (String)token.getPrincipal(); + //retry count + 1 +// AtomicInteger retryCount = passwordRetryCache.get(username); +// if(retryCount == null) { +// retryCount = new AtomicInteger(0); +// passwordRetryCache.put(username, retryCount); +// } +// if(retryCount.incrementAndGet() > 5) { +// //if retry count > 5 throw +// throw new ExcessiveAttemptsException(); +// } + + boolean matches = super.doCredentialsMatch(token, info); + if(matches) { + //clear retry count + passwordRetryCache.remove(username); + } + return matches; + } +} diff --git a/src/main/java/com/xmomen/module/account/mapper/UserMapper.java b/src/main/java/com/xmomen/module/account/mapper/UserMapper.java new file mode 100644 index 0000000..fd17e8d --- /dev/null +++ b/src/main/java/com/xmomen/module/account/mapper/UserMapper.java @@ -0,0 +1,44 @@ +package com.xmomen.module.account.mapper; + +import com.xmomen.module.user.entity.SysPermissions; +import com.xmomen.module.user.entity.SysRoles; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.ResultType; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + + +/** + * Created by Jeng on 2016/1/22. + */ +public interface UserMapper { + + public static final String UserMapperNameSpace = "com.xmomen.module.account.mapper.UserMapper."; + + @Select("select r.* from sys_roles r left join sys_users_roles ur on ur.role_id = r.id left join sys_users u on u.id=ur.user_id where u.username = #{username}") + @ResultType(SysRoles.class) + public List getRoleList(String username); + + /** + * 查询用户所有权限 + * @param username + * @return + */ + @Select("select p.* from sys_permissions p left join `sys_roles_permissions` rp on rp.`PERMISSION_ID`=p.`ID` left join sys_roles r on rp.`ROLE_ID`=r.`ID` left join sys_users_roles ur on ur.role_id = r.id left join sys_users u on u.id=ur.user_id where u.username = #{username}") + @ResultType(SysPermissions.class) + public List getPermissionList(String username); + + /** + * 修改密码 + * @param username + * @param currentPassword + * @param password + */ + @Update("UPDATE sys_users SET PASSWORD = #{password},SALT=#{salt} WHERE username = #{username} AND PASSWORD=#{currentPassword}") + public void resetPassword(@Param(value = "username") String username, + @Param(value = "currentPassword") String currentPassword, + @Param(value = "password") String password, + @Param(value = "salt") String salt); +} diff --git a/src/main/java/com/xmomen/module/account/mapper/UserMapper.xml b/src/main/java/com/xmomen/module/account/mapper/UserMapper.xml new file mode 100644 index 0000000..92edf67 --- /dev/null +++ b/src/main/java/com/xmomen/module/account/mapper/UserMapper.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/account/model/UserGroup.java b/src/main/java/com/xmomen/module/account/model/UserGroup.java new file mode 100644 index 0000000..2505326 --- /dev/null +++ b/src/main/java/com/xmomen/module/account/model/UserGroup.java @@ -0,0 +1,10 @@ +package com.xmomen.module.account.model; + +import java.io.Serializable; + +import lombok.Data; + +public @Data class UserGroup implements Serializable{ + private String userGorup; + private Integer userGroupId; +} diff --git a/src/main/java/com/xmomen/module/account/realm/MemberRealm.java b/src/main/java/com/xmomen/module/account/realm/MemberRealm.java new file mode 100644 index 0000000..a2bb951 --- /dev/null +++ b/src/main/java/com/xmomen/module/account/realm/MemberRealm.java @@ -0,0 +1,89 @@ +package com.xmomen.module.account.realm; + +import java.util.Set; +import java.util.TreeSet; + +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authc.AuthenticationInfo; +import org.apache.shiro.authc.AuthenticationToken; +import org.apache.shiro.authc.IncorrectCredentialsException; +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 com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.base.entity.CdMember; +import com.xmomen.module.base.service.MemberService; +import com.xmomen.module.core.web.token.MemberUserToken; + +public class MemberRealm extends AuthorizingRealm { + + MemberService memberService; + + public void setMemberService(MemberService memberService) { + this.memberService = memberService; + } + @Override + protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { + Set roles = new TreeSet(); + //用户默认有member的权限,最好检查下数据库中用户是否存在 + Set realmNames = principals.getRealmNames(); + for(String realmName: realmNames) { + if(realmName.contains("MemberRealm")) { + roles.add("member"); + } + } + SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo(); + authorizationInfo.setRoles(roles); + authorizationInfo.setStringPermissions(new TreeSet()); + return authorizationInfo; + } + + @Override + public boolean supports(AuthenticationToken token) { + if(token instanceof MemberUserToken) { + return super.supports(token); + } + return false; + } + + @Override + protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException { + String phoneNumber = (String)token.getPrincipal(); + if(StringUtils.trimToNull(phoneNumber) == null){ + throw new IncorrectCredentialsException();//账号或密码错误 + } + CdMember query = new CdMember(); + query.setPhoneNumber(phoneNumber); + CdMember member = memberService.findMember(query); + if(member == null) { + throw new UnknownAccountException();//没找到帐号 + } + SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo( + phoneNumber, //用户名 + member.getPassword(), //密码 + ByteSource.Util.bytes(AppConstants.PC_PASSWORD_SALT),//salt=phoneNumber + getName() //realm name + ); + return authenticationInfo; + } + + public void clearAllCachedAuthorizationInfo() { + getAuthorizationCache().clear(); + } + + public void clearAllCachedAuthenticationInfo() { + getAuthenticationCache().clear(); + } + + public void clearAllCache() { + clearAllCachedAuthenticationInfo(); + clearAllCachedAuthorizationInfo(); + } + +} diff --git a/src/main/java/com/xmomen/module/account/service/PermissionService.java b/src/main/java/com/xmomen/module/account/service/PermissionService.java new file mode 100644 index 0000000..c4f58cd --- /dev/null +++ b/src/main/java/com/xmomen/module/account/service/PermissionService.java @@ -0,0 +1,24 @@ +package com.xmomen.module.account.service; + + +import com.xmomen.module.user.entity.SysPermissions; + +/** + *

User: Zhang Kaitao + *

Date: 14-1-28 + *

Version: 1.0 + */ +public interface PermissionService { + /** + * 创建权限资源 + * @param permission + * @return + */ + public SysPermissions createPermission(SysPermissions permission); + + /** + * 删除权限资源 + * @param permissionId + */ + public void deletePermission(Long permissionId); +} diff --git a/src/main/java/com/xmomen/module/account/service/RoleService.java b/src/main/java/com/xmomen/module/account/service/RoleService.java new file mode 100644 index 0000000..0f6e5ec --- /dev/null +++ b/src/main/java/com/xmomen/module/account/service/RoleService.java @@ -0,0 +1,91 @@ +package com.xmomen.module.account.service; + +import com.xmomen.module.account.web.controller.vo.GroupPermissionRelation; +import com.xmomen.module.account.web.controller.vo.UserGroupRelation; +import com.xmomen.module.user.entity.SysRoles; +import com.xmomen.framework.mybatis.page.Page; + +import java.util.List; + +/** + *

User: Zhang Kaitao + *

Date: 14-1-28 + *

Version: 1.0 + */ +public interface RoleService { + + /** + * 根据角色ID查询用户 + * @param roleId + * @param pageSize + * @param pageNum + * @return + */ + public Page findUsersByRoles(String roleId, boolean chose, Integer pageSize, Integer pageNum); + + /** + * 查询用户角色 + * @param keyValue + * @param pageSize + * @param pageNum + * @return + */ + public Page findRoles(String keyValue, Integer pageSize, Integer pageNum); + + /** + * 获取角色 + * @param roleId + */ + public SysRoles getRole(Integer roleId); + + /** + * 获取角色 + * @param sysRoles + */ + public void updateRole(SysRoles sysRoles); + + /** + * 更新用户组信息并添加用户 + * @param sysRoles + * @param userIdList + */ + public void updateRole(SysRoles sysRoles, List userIdList); + + /** + * 创建角色 + * @param role + * @return + */ + public SysRoles createRole(SysRoles role); + + /** + * 删除角色 + * @param roleId + */ + public void deleteRole(Integer roleId); + + /** + * 根据角色查询权限 + * @param roleId + * @param chose + * @param pageSize + * @param pageNum + * @return + */ + public Page findPermissionByRoles(String roleId, boolean chose, Integer pageSize, Integer pageNum); + + /** + * 添加角色-权限之间关系 + * @param roleId + * @param permissionIds + */ + public void correlationPermissions(Integer roleId, Integer... permissionIds); + + /** + * 移除角色-权限之间关系 + * @param roleId + * @param permissionIds + */ + public void unCorrelationPermissions(Integer roleId, Integer... permissionIds); + +} diff --git a/src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java b/src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java new file mode 100644 index 0000000..c7c6025 --- /dev/null +++ b/src/main/java/com/xmomen/module/account/service/RoleServiceImpl.java @@ -0,0 +1,144 @@ +package com.xmomen.module.account.service; + +import com.xmomen.module.account.mapper.UserMapper; +import com.xmomen.module.account.web.controller.vo.GroupPermissionRelation; +import com.xmomen.module.account.web.controller.vo.UserGroupRelation; +import com.xmomen.module.user.entity.SysRoles; +import com.xmomen.module.user.entity.SysRolesExample; +import com.xmomen.module.user.entity.SysRolesPermissions; +import com.xmomen.module.user.entity.SysRolesPermissionsExample; +import com.xmomen.framework.mybatis.page.Page; +import org.apache.commons.lang.StringUtils; +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; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + *

User: Zhang Kaitao + *

Date: 14-1-28 + *

Version: 1.0 + */ +@Service +public class RoleServiceImpl implements RoleService { + + @Autowired + private MybatisDao mybatisDao; + + @Autowired + UserService userService; + + /** + * 根据角色ID查询用户 + * + * @param roleId + * @param pageSize + * @param pageNum + * @return + */ + @Override + public Page findUsersByRoles(String roleId, boolean chose, Integer pageSize, Integer pageNum) { + Map map = new HashMap(); + map.put("id" , roleId); + map.put("chose" , chose); + return (Page) mybatisDao.selectPage(UserMapper.UserMapperNameSpace + "findUsersByRolesId", map, pageSize, pageNum); + } + + @Override + public Page findRoles(String keyValue, Integer pageSize, Integer pageNum) { + SysRolesExample sysRolesExample = new SysRolesExample(); + if(StringUtils.isNotBlank(keyValue)){ + sysRolesExample.createCriteria() + .andRoleLike(keyValue); + sysRolesExample.or().andDescriptionLike(keyValue); + } + return mybatisDao.selectPageByExample(sysRolesExample, pageSize, pageNum); + } + + /** + * 获取角色 + * + * @param roleId + */ + @Override + public SysRoles getRole(Integer roleId) { + return mybatisDao.selectByPrimaryKey(SysRoles.class, roleId); + } + + /** + * 更新角色 + * + * @param sysRoles + */ + @Override + public void updateRole(SysRoles sysRoles) { + mybatisDao.update(sysRoles); + } + + /** + * 更新用户组信息并添加用户 + * + * @param sysRoles + * @param userIdList + */ + @Override + @Transactional + public void updateRole(SysRoles sysRoles, List userIdList) { + mybatisDao.update(sysRoles); + for (Integer userId : userIdList) { + userService.correlationRoles(userId, sysRoles.getId()); + } + } + + + public SysRoles createRole(SysRoles role) { + role = mybatisDao.saveByModel(role); + return role; + } + + public void deleteRole(Integer roleId) { + mybatisDao.deleteByPrimaryKey(SysRoles.class, roleId); + } + + @Override + public Page findPermissionByRoles(String roleId, boolean chose, Integer pageSize, Integer pageNum) { + Map map = new HashMap(); + map.put("id" , roleId); + map.put("chose" , chose); + return (Page) mybatisDao.selectPage(UserMapper.UserMapperNameSpace + "findPermissionByRole", map, pageSize, pageNum); + } + + /** + * 添加角色-权限之间关系 + * @param roleId + * @param permissionIds + */ + public void correlationPermissions(Integer roleId, Integer... permissionIds) { + for(Integer permissionId : permissionIds){ + SysRolesPermissions sysRolesPermissionsKey = new SysRolesPermissions(); + sysRolesPermissionsKey.setPermissionId(permissionId); + sysRolesPermissionsKey.setRoleId(roleId); + mybatisDao.save(sysRolesPermissionsKey); + } + } + + /** + * 移除角色-权限之间关系 + * @param roleId + * @param permissionIds + */ + public void unCorrelationPermissions(Integer roleId, Integer... permissionIds) { + SysRolesPermissionsExample sysRolesPermissionsExample = new SysRolesPermissionsExample(); + sysRolesPermissionsExample.createCriteria() + .andRoleIdEqualTo(roleId) + .andPermissionIdIn(Arrays.asList(permissionIds)); + mybatisDao.deleteByExample(sysRolesPermissionsExample); + } + +} diff --git a/src/main/java/com/xmomen/module/account/service/UserService.java b/src/main/java/com/xmomen/module/account/service/UserService.java new file mode 100644 index 0000000..17a795d --- /dev/null +++ b/src/main/java/com/xmomen/module/account/service/UserService.java @@ -0,0 +1,78 @@ +package com.xmomen.module.account.service; + +import java.util.Set; + +import com.xmomen.module.account.model.CreateUser; +import com.xmomen.module.account.web.controller.vo.UpdateUserVo; +import com.xmomen.module.user.entity.SysUsers; + +/** + *

User: Zhang Kaitao + *

Date: 14-1-28 + *

Version: 1.0 + */ +public interface UserService { + + /** + * 创建用户 + * @param user + */ + public SysUsers createUser(CreateUser user); + + /** + * 更新用户 + * @param updateUserVo + */ + public void updateUser(UpdateUserVo updateUserVo); + + /** + * 修改密码 + * @param userId + * @param newPassword + */ + public void changePassword(Integer userId, String newPassword); + + /** + * 修改密码 + * @param currentPassword + * @param newPassword + */ + public void changePassword(String username, String currentPassword, String newPassword); + + /** + * 添加用户-角色关系 + * @param userId + * @param roleIds + */ + public void correlationRoles(Integer userId, Integer... roleIds); + + + /** + * 移除用户-角色关系 + * @param userId + * @param roleIds + */ + public void uncorrelationRoles(Integer userId, Integer... roleIds); + + /** + * 根据用户名查找用户 + * @param username + * @return + */ + public SysUsers findByUsername(String username); + + /** + * 根据用户名查找其角色 + * @param username + * @return + */ + public Set findRoles(String username); + + /** + * 根据用户名查找其权限 + * @param username + * @return + */ + public Set findPermissions(String username); + +} diff --git a/src/main/java/com/xmomen/module/account/service/UserServiceImpl.java b/src/main/java/com/xmomen/module/account/service/UserServiceImpl.java new file mode 100644 index 0000000..19a4bd7 --- /dev/null +++ b/src/main/java/com/xmomen/module/account/service/UserServiceImpl.java @@ -0,0 +1,230 @@ +package com.xmomen.module.account.service; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.module.account.mapper.UserMapper; +import com.xmomen.module.account.model.CreateUser; +import com.xmomen.module.account.web.controller.vo.UpdateUserVo; +import com.xmomen.module.system.entity.SysUserOrganization; +import com.xmomen.module.system.entity.SysUserOrganizationExample; +import com.xmomen.module.user.entity.SysPermissions; +import com.xmomen.module.user.entity.SysRoles; +import com.xmomen.module.user.entity.SysUsers; +import com.xmomen.module.user.entity.SysUsersExample; +import com.xmomen.module.user.entity.SysUsersRoles; +import com.xmomen.module.user.entity.SysUsersRolesExample; + +/** + *

User: Zhang Kaitao + *

Date: 14-1-28 + *

Version: 1.0 + */ +@Service +public class UserServiceImpl implements UserService { + + + private PasswordHelper passwordHelper; + + public void setPasswordHelper(PasswordHelper passwordHelper) { + this.passwordHelper = passwordHelper; + } + + @Autowired + MybatisDao mybatisDao; + + @Autowired(required = false) + UserMapper userMapper; + + /** + * 创建用户 + * + * @param user + */ + @Transactional + public SysUsers createUser(CreateUser user) { + //加密密码 + String salt = passwordHelper.getSalt(); + String newPassword = passwordHelper.encryptPassword(user.getPassword(), salt); + SysUsers sysUsers = new SysUsers(); + sysUsers.setSalt(UUID.randomUUID().toString().toUpperCase()); + sysUsers.setUsername(user.getUsername()); + sysUsers.setEmail(user.getEmail()); + sysUsers.setRealname(user.getRealname()); + sysUsers.setAge(user.getAge()); + sysUsers.setOfficeTel(user.getOfficeTel()); + sysUsers.setPhoneNumber(user.getPhoneNumber()); + sysUsers.setQq(user.getQq()); + sysUsers.setSex(user.getSex()); + sysUsers.setSalt(salt); + sysUsers.setPassword(newPassword); + sysUsers.setLocked(user.getLocked() ? 1 : 0); + sysUsers = mybatisDao.saveByModel(sysUsers); + for (int userGroupId : user.getUserGroupIds()) { + SysUsersRoles userRoles = new SysUsersRoles(); + userRoles.setRoleId(userGroupId); + userRoles.setUserId(sysUsers.getId()); + mybatisDao.save(userRoles); + } + SysUserOrganization userOrganization = new SysUserOrganization(); + userOrganization.setOrganizationId(user.getOrganizationId()); + userOrganization.setUserId(sysUsers.getId()); + mybatisDao.save(userOrganization); + return sysUsers; + } + + /** + * 更新用户 + * + * @param updateUserVo + */ + @Transactional + @Override + public void updateUser(UpdateUserVo updateUserVo) { + SysUsers sysUsers = new SysUsers(); + sysUsers.setId(updateUserVo.getId()); + sysUsers.setUsername(updateUserVo.getUsername()); + sysUsers.setEmail(updateUserVo.getEmail()); + sysUsers.setLocked(updateUserVo.getLocked() ? 1 : 0); + sysUsers.setAge(updateUserVo.getAge()); + sysUsers.setOfficeTel(updateUserVo.getOfficeTel()); + sysUsers.setPhoneNumber(updateUserVo.getPhoneNumber()); + sysUsers.setSex(updateUserVo.getSex()); + sysUsers.setQq(updateUserVo.getQq()); + sysUsers.setRealname(updateUserVo.getRealName()); + //更新权限 + SysUsersRolesExample sysUsersRolesExample = new SysUsersRolesExample(); + sysUsersRolesExample.createCriteria().andUserIdEqualTo(sysUsers.getId()); + mybatisDao.deleteByExample(sysUsersRolesExample); + for (int userGroupId : updateUserVo.getUserGroupIds()) { + SysUsersRoles userRoles = new SysUsersRoles(); + userRoles.setRoleId(userGroupId); + userRoles.setUserId(sysUsers.getId()); + mybatisDao.save(userRoles); + } + SysUserOrganizationExample sysUserOrganizationExample = new SysUserOrganizationExample(); + sysUserOrganizationExample.createCriteria().andUserIdEqualTo(sysUsers.getId()); + mybatisDao.deleteByExample(sysUserOrganizationExample); + SysUserOrganization userOrganization = new SysUserOrganization(); + userOrganization.setOrganizationId(updateUserVo.getOrganizationId()); + userOrganization.setUserId(sysUsers.getId()); + mybatisDao.save(userOrganization); + mybatisDao.save(sysUsers); + } + + /** + * 修改密码 + * + * @param userId + * @param newPassword + */ + @Transactional + public void changePassword(Integer userId, String newPassword) { + SysUsers user = mybatisDao.selectByPrimaryKey(SysUsers.class, userId); + String salt = passwordHelper.getSalt(); + newPassword = passwordHelper.encryptPassword(newPassword, salt); + user.setPassword(newPassword); + user.setSalt(salt); + mybatisDao.update(user); + } + + @Override + public void changePassword(String username, String currentPassword, String newPassword) { + SysUsers sysUsers = new SysUsers(); + sysUsers.setUsername(username); + sysUsers = mybatisDao.selectOneByModel(sysUsers); + String currentRealPwd = passwordHelper.encryptPassword(currentPassword, sysUsers.getSalt()); + if (sysUsers == null || !sysUsers.getPassword().equals(currentRealPwd)) { + throw new IllegalArgumentException("当前密码错误"); + } + String newSalt = passwordHelper.getSalt(); + String newCurrentRealPwd = passwordHelper.encryptPassword(newPassword, newSalt); + userMapper.resetPassword(username, currentRealPwd, newCurrentRealPwd, newSalt); + } + + /** + * 添加用户-角色关系 + * + * @param userId + * @param roleIds + */ + @Transactional + public void correlationRoles(Integer userId, Integer... roleIds) { + for (int i = 0; i < roleIds.length; i++) { + Integer roleId = roleIds[i]; + SysUsersRoles sysUsersRoles = new SysUsersRoles(); + sysUsersRoles.setUserId(userId); + sysUsersRoles.setRoleId(roleId); + mybatisDao.insert(sysUsersRoles); + } + } + + + /** + * 移除用户-角色关系 + * + * @param userId + * @param roleIds + */ + public void uncorrelationRoles(Integer userId, Integer... roleIds) { + SysUsersRolesExample sysUsersRolesExample = new SysUsersRolesExample(); + sysUsersRolesExample.createCriteria() + .andUserIdEqualTo(userId) + .andRoleIdIn(Arrays.asList(roleIds)); + mybatisDao.deleteByExample(sysUsersRolesExample); + } + + /** + * 根据用户名查找用户 + * + * @param username + * @return + */ + public SysUsers findByUsername(String username) { + SysUsersExample sysUsersExample = new SysUsersExample(); + sysUsersExample.createCriteria().andUsernameEqualTo(username); + sysUsersExample.or().andEmailEqualTo(username); + sysUsersExample.or().andPhoneNumberEqualTo(username); + List userses = mybatisDao.selectByExample(sysUsersExample); + return userses.size() > 0 ? userses.get(0) : null; + } + + /** + * 根据用户名查找其角色 + * + * @param username + * @return + */ + public Set findRoles(String username) { + List sysRolesList = userMapper.getRoleList(username); + Set roles = new HashSet(); + for (int i = 0; i < sysRolesList.size(); i++) { + roles.add(sysRolesList.get(i).getRole()); + } + return roles; + } + + /** + * 根据用户名查找其权限 + * + * @param username + * @return + */ + public Set findPermissions(String username) { + List sysPermissionsList = userMapper.getPermissionList(username); + Set permissions = new HashSet(); + for (int i = 0; i < sysPermissionsList.size(); i++) { + permissions.add(sysPermissionsList.get(i).getPermission()); + } + return permissions; + } + +} diff --git a/src/main/java/com/xmomen/module/account/web/controller/UserGroupController.java b/src/main/java/com/xmomen/module/account/web/controller/UserGroupController.java new file mode 100644 index 0000000..ed99c14 --- /dev/null +++ b/src/main/java/com/xmomen/module/account/web/controller/UserGroupController.java @@ -0,0 +1,184 @@ +package com.xmomen.module.account.web.controller; + +import com.xmomen.module.account.service.RoleService; +import com.xmomen.module.account.service.UserService; +import com.xmomen.module.account.web.controller.vo.CreateUserGroup; +import com.xmomen.module.account.web.controller.vo.GroupPermissionRelation; +import com.xmomen.module.account.web.controller.vo.UpdateUserGroup; +import com.xmomen.module.account.web.controller.vo.UserGroupRelation; +import com.xmomen.module.user.entity.SysRoles; +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.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * Created by Jeng on 2016/1/5. + */ +@RestController +public class UserGroupController { + + @Autowired + RoleService roleService; + @Autowired + UserService userService; + + /** + * 查询用户组列表 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/group", method = RequestMethod.GET) + @Log(actionName = "查询用户组列表") + public Page getUserList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "keyword", required = false) String keyword){ + keyword = StringUtils.trimToEmpty(keyword); + return roleService.findRoles("%" + keyword + "%", limit, offset); + } + + /** + * 查询用户组 + * @param id + */ + @RequestMapping(value = "/group/{id}", method = RequestMethod.GET) + @Log(actionName = "查询用户组") + public SysRoles getUserList(@PathVariable(value = "id") Integer id){ + return roleService.getRole(id); + } + + /** + * 新增用户组 + * @param createUserGroup + * @param bindingResult + * @throws ArgumentValidException + */ + @RequestMapping(value = "/group", method = RequestMethod.POST) + @Log(actionName = "新增用户组") + public void createUser(@RequestBody @Valid CreateUserGroup createUserGroup, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + SysRoles sysRoles = new SysRoles(); + sysRoles.setRole(createUserGroup.getUserGroup()); + sysRoles.setDescription(createUserGroup.getDescription()); + sysRoles.setAvailable(createUserGroup.getAvailable() != null && createUserGroup.getAvailable() ? 1 : 0); + roleService.createRole(sysRoles); + } + + /** + * 删除用户组 + * @param id + */ + @RequestMapping(value = "/group/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除用户组") + public void deleteUser(@PathVariable(value = "id") Integer id){ + roleService.deleteRole(id); + } + + /** + * 修改用户组 + * @param id + */ + @RequestMapping(value = "/group/{id}", method = RequestMethod.PUT) + @Log(actionName = "修改用户组") + public void updateUserGroup(@PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdateUserGroup updateUserGroup, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + SysRoles sysRoles = new SysRoles(); + sysRoles.setId(id); + sysRoles.setDescription(updateUserGroup.getDescription()); + if(updateUserGroup.getAvailable() != null){ + sysRoles.setAvailable(updateUserGroup.getAvailable() ? 1 : 0); + } + if(updateUserGroup.getUserIdList() != null && updateUserGroup.getUserIdList().size() > 0){ + roleService.updateRole(sysRoles); + }else{ + roleService.updateRole(sysRoles, updateUserGroup.getUserIdList()); + } + } + + /** + * 查询用户组用户 + * @param groupId + * @param limit + * @param offset + * @return + */ + @RequestMapping(value = "/group/{groupId}/user") + @Log(actionName = "查询用户组下属用户") + public Page findUsersByGroup(@PathVariable(value = "groupId") String groupId, + @RequestParam(value = "chose") Boolean unChose, + @RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset){ + if(unChose == null){ + unChose = false; + } + return roleService.findUsersByRoles(groupId, unChose, limit, offset); + } + + /** + * 绑定用户 + * @param groupId + * @param chose + * @param userId + */ + @Log(actionName = "修改用户组下属用户关系") + @RequestMapping(value = "/group/{groupId}/user", method = RequestMethod.PUT) + public void findUsersByGroup(@PathVariable(value = "groupId") Integer groupId, + @RequestParam(value = "chose") Boolean chose, + @RequestParam(value = "userId") Integer userId){ + if(chose != null && chose){ + userService.correlationRoles(userId, groupId); + }else{ + userService.uncorrelationRoles(userId, groupId); + } + } + + /** + * 查询用户组权限 + * @param groupId + * @param limit + * @param offset + * @return + */ + @Log(actionName = "查询用户组所属权限") + @RequestMapping(value = "/group/{groupId}/permissions") + public Page findPermissionByGroup(@PathVariable(value = "groupId") String groupId, + @RequestParam(value = "chose") Boolean unChose, + @RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset){ + if(unChose == null){ + unChose = false; + } + return roleService.findPermissionByRoles(groupId, unChose, limit, offset); + } + + /** + * 绑定权限 + * @param groupId + * @param chose + * @param permissionId + */ + @Log(actionName = "修改用户组所属权限") + @RequestMapping(value = "/group/{groupId}/permissions", method = RequestMethod.PUT) + public void correlationPermission(@PathVariable(value = "groupId") Integer groupId, + @RequestParam(value = "chose") Boolean chose, + @RequestParam(value = "permissionId") Integer permissionId){ + if(chose != null && chose){ + roleService.correlationPermissions(groupId, permissionId); + }else{ + roleService.unCorrelationPermissions(groupId, permissionId); + } + } + +} diff --git a/src/main/java/com/xmomen/module/account/web/controller/vo/CreatePermissionVo.java b/src/main/java/com/xmomen/module/account/web/controller/vo/CreatePermissionVo.java new file mode 100644 index 0000000..da48c31 --- /dev/null +++ b/src/main/java/com/xmomen/module/account/web/controller/vo/CreatePermissionVo.java @@ -0,0 +1,44 @@ +package com.xmomen.module.account.web.controller.vo; + +import org.hibernate.validator.constraints.NotBlank; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * Created by Jeng on 2016/3/18. + */ +public class CreatePermissionVo implements Serializable { + + @NotBlank + @NotNull + private String permissionCode; + @NotBlank + @NotNull + private String description; + private Boolean available; + + public String getPermissionCode() { + return permissionCode; + } + + public void setPermissionCode(String permissionCode) { + this.permissionCode = permissionCode; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Boolean getAvailable() { + return available; + } + + public void setAvailable(Boolean available) { + this.available = available; + } +} diff --git a/src/main/java/com/xmomen/module/account/web/controller/vo/CreateUserGroup.java b/src/main/java/com/xmomen/module/account/web/controller/vo/CreateUserGroup.java new file mode 100644 index 0000000..a0505d9 --- /dev/null +++ b/src/main/java/com/xmomen/module/account/web/controller/vo/CreateUserGroup.java @@ -0,0 +1,42 @@ +package com.xmomen.module.account.web.controller.vo; + +import org.hibernate.validator.constraints.NotBlank; +import org.hibernate.validator.constraints.NotEmpty; + +import java.io.Serializable; + +/** + * Created by Jeng on 2016/2/1. + */ +public class CreateUserGroup implements Serializable { + + @NotBlank + private String userGroup; + @NotEmpty + private String description; + private Boolean available; + + public String getUserGroup() { + return userGroup; + } + + public void setUserGroup(String userGroup) { + this.userGroup = userGroup; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Boolean getAvailable() { + return available; + } + + public void setAvailable(Boolean available) { + this.available = available; + } +} diff --git a/src/main/java/com/xmomen/module/account/web/controller/vo/GroupPermissionRelation.java b/src/main/java/com/xmomen/module/account/web/controller/vo/GroupPermissionRelation.java new file mode 100644 index 0000000..5950f8f --- /dev/null +++ b/src/main/java/com/xmomen/module/account/web/controller/vo/GroupPermissionRelation.java @@ -0,0 +1,46 @@ +package com.xmomen.module.account.web.controller.vo; + +import java.io.Serializable; + +/** + * Created by Jeng on 2016/2/1. + */ +public class GroupPermissionRelation implements Serializable { + + private String groupId; + private String permissionCode; + private String permissionDescription; + private String permissionId; + + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public String getPermissionCode() { + return permissionCode; + } + + public void setPermissionCode(String permissionCode) { + this.permissionCode = permissionCode; + } + + public String getPermissionDescription() { + return permissionDescription; + } + + public void setPermissionDescription(String permissionDescription) { + this.permissionDescription = permissionDescription; + } + + public String getPermissionId() { + return permissionId; + } + + public void setPermissionId(String permissionId) { + this.permissionId = permissionId; + } +} diff --git a/src/main/java/com/xmomen/module/account/web/controller/vo/UpdateUserGroup.java b/src/main/java/com/xmomen/module/account/web/controller/vo/UpdateUserGroup.java new file mode 100644 index 0000000..bc6531c --- /dev/null +++ b/src/main/java/com/xmomen/module/account/web/controller/vo/UpdateUserGroup.java @@ -0,0 +1,41 @@ +package com.xmomen.module.account.web.controller.vo; + +import org.hibernate.validator.constraints.Length; + +import java.io.Serializable; +import java.util.List; + +/** + * Created by Jeng on 2016/2/1. + */ +public class UpdateUserGroup implements Serializable { + + @Length(min = 0, max = 100) + private String description; + private List userIdList; + private Boolean available; + + public List getUserIdList() { + return userIdList; + } + + public void setUserIdList(List userIdList) { + this.userIdList = userIdList; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Boolean getAvailable() { + return available; + } + + public void setAvailable(Boolean available) { + this.available = available; + } +} diff --git a/src/main/java/com/xmomen/module/account/web/controller/vo/UserGroupRelation.java b/src/main/java/com/xmomen/module/account/web/controller/vo/UserGroupRelation.java new file mode 100644 index 0000000..b463213 --- /dev/null +++ b/src/main/java/com/xmomen/module/account/web/controller/vo/UserGroupRelation.java @@ -0,0 +1,37 @@ +package com.xmomen.module.account.web.controller.vo; + +import java.io.Serializable; + +/** + * Created by Jeng on 2016/2/1. + */ +public class UserGroupRelation implements Serializable { + + private String username; + private String email; + private String userId; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } +} diff --git a/src/main/java/com/xmomen/module/advice/controller/AdviceController.java b/src/main/java/com/xmomen/module/advice/controller/AdviceController.java new file mode 100644 index 0000000..9a3004b --- /dev/null +++ b/src/main/java/com/xmomen/module/advice/controller/AdviceController.java @@ -0,0 +1,126 @@ +package com.xmomen.module.advice.controller; + +import com.xmomen.framework.exception.BusinessException; +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.logger.Log; +import com.xmomen.module.advice.model.AdviceQuery; +import com.xmomen.module.advice.model.AdviceModel; +import com.xmomen.module.advice.service.AdviceService; + +import org.apache.commons.io.IOUtils; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.entity.result.ExcelImportResult; +import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; +import org.jeecgframework.poi.exception.excel.ExcelImportException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ui.ModelMap; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.ModelAndView; + +import javax.validation.Valid; +import java.io.Serializable; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; + +/** + * @author tanxinzheng + * @version 1.0.0 + * @date 2017-5-14 20:05:05 + */ +@RestController +@RequestMapping(value = "/advice") +public class AdviceController { + + @Autowired + AdviceService adviceService; + + /** + * 快报列表 + * + * @param limit 每页结果数 + * @param offset 页码 + * @param id 主键 + * @param ids 主键数组 + * @param excludeIds 不包含主键数组 + * @return Page 快报领域分页对象 + */ + @RequestMapping(method = RequestMethod.GET) + @Log(actionName = "查询快报列表") + public Page getAdviceList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "id", required = false) String id, + @RequestParam(value = "ids", required = false) String[] ids, + @RequestParam(value = "excludeIds", required = false) String[] excludeIds) { + AdviceQuery adviceQuery = new AdviceQuery(); + adviceQuery.setId(id); + adviceQuery.setExcludeIds(excludeIds); + adviceQuery.setIds(ids); + return adviceService.getAdviceModelPage(limit, offset, adviceQuery); + } + + /** + * 查询单个快报 + * + * @param id 主键 + * @return AdviceModel 快报领域对象 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + @Log(actionName = "查询快报") + public AdviceModel getAdviceById(@PathVariable(value = "id") String id) { + return adviceService.getOneAdviceModel(id); + } + + /** + * 新增快报 + * + * @param adviceModel 新增对象参数 + * @return AdviceModel 快报领域对象 + */ + @RequestMapping(method = RequestMethod.POST) + @Log(actionName = "新增快报") + public AdviceModel createAdvice(@RequestBody @Valid AdviceModel adviceModel) { + return adviceService.createAdvice(adviceModel); + } + + /** + * 更新快报 + * + * @param id 主键 + * @param adviceModel 更新对象参数 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.PUT) + @Log(actionName = "更新快报") + public void updateAdvice(@PathVariable(value = "id") String id, + @RequestBody @Valid AdviceModel adviceModel) { + adviceService.updateAdvice(adviceModel); + } + + /** + * 删除快报 + * + * @param id 主键 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除单个快报") + public void deleteAdvice(@PathVariable(value = "id") String id) { + adviceService.deleteAdvice(id); + } + + /** + * 删除快报 + * + * @param ids 主键 + */ + @RequestMapping(method = RequestMethod.DELETE) + @Log(actionName = "批量删除快报") + public void deleteAdvices(@RequestParam(value = "ids") String[] ids) { + adviceService.deleteAdvice(ids); + } + + +} diff --git a/src/main/java/com/xmomen/module/advice/entity/AdviceExample.java b/src/main/java/com/xmomen/module/advice/entity/AdviceExample.java new file mode 100644 index 0000000..3a6c777 --- /dev/null +++ b/src/main/java/com/xmomen/module/advice/entity/AdviceExample.java @@ -0,0 +1,582 @@ +package com.xmomen.module.advice.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class AdviceExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public AdviceExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andTitleIsNull() { + addCriterion("title is null"); + return (Criteria) this; + } + + public Criteria andTitleIsNotNull() { + addCriterion("title is not null"); + return (Criteria) this; + } + + public Criteria andTitleEqualTo(String value) { + addCriterion("title =", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotEqualTo(String value) { + addCriterion("title <>", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleGreaterThan(String value) { + addCriterion("title >", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleGreaterThanOrEqualTo(String value) { + addCriterion("title >=", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLessThan(String value) { + addCriterion("title <", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLessThanOrEqualTo(String value) { + addCriterion("title <=", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLike(String value) { + addCriterion("title like", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotLike(String value) { + addCriterion("title not like", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleIn(List values) { + addCriterion("title in", values, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotIn(List values) { + addCriterion("title not in", values, "title"); + return (Criteria) this; + } + + public Criteria andTitleBetween(String value1, String value2) { + addCriterion("title between", value1, value2, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotBetween(String value1, String value2) { + addCriterion("title not between", value1, value2, "title"); + return (Criteria) this; + } + + public Criteria andInsertDateIsNull() { + addCriterion("insert_date is null"); + return (Criteria) this; + } + + public Criteria andInsertDateIsNotNull() { + addCriterion("insert_date is not null"); + return (Criteria) this; + } + + public Criteria andInsertDateEqualTo(Date value) { + addCriterion("insert_date =", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateNotEqualTo(Date value) { + addCriterion("insert_date <>", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateGreaterThan(Date value) { + addCriterion("insert_date >", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateGreaterThanOrEqualTo(Date value) { + addCriterion("insert_date >=", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateLessThan(Date value) { + addCriterion("insert_date <", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateLessThanOrEqualTo(Date value) { + addCriterion("insert_date <=", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateIn(List values) { + addCriterion("insert_date in", values, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateNotIn(List values) { + addCriterion("insert_date not in", values, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateBetween(Date value1, Date value2) { + addCriterion("insert_date between", value1, value2, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateNotBetween(Date value1, Date value2) { + addCriterion("insert_date not between", value1, value2, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertUserIdIsNull() { + addCriterion("insert_user_id is null"); + return (Criteria) this; + } + + public Criteria andInsertUserIdIsNotNull() { + addCriterion("insert_user_id is not null"); + return (Criteria) this; + } + + public Criteria andInsertUserIdEqualTo(Integer value) { + addCriterion("insert_user_id =", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdNotEqualTo(Integer value) { + addCriterion("insert_user_id <>", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdGreaterThan(Integer value) { + addCriterion("insert_user_id >", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdGreaterThanOrEqualTo(Integer value) { + addCriterion("insert_user_id >=", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdLessThan(Integer value) { + addCriterion("insert_user_id <", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdLessThanOrEqualTo(Integer value) { + addCriterion("insert_user_id <=", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdIn(List values) { + addCriterion("insert_user_id in", values, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdNotIn(List values) { + addCriterion("insert_user_id not in", values, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdBetween(Integer value1, Integer value2) { + addCriterion("insert_user_id between", value1, value2, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdNotBetween(Integer value1, Integer value2) { + addCriterion("insert_user_id not between", value1, value2, "insertUserId"); + return (Criteria) this; + } + + public Criteria andUpdateDateIsNull() { + addCriterion("update_date is null"); + return (Criteria) this; + } + + public Criteria andUpdateDateIsNotNull() { + addCriterion("update_date is not null"); + return (Criteria) this; + } + + public Criteria andUpdateDateEqualTo(Date value) { + addCriterion("update_date =", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateNotEqualTo(Date value) { + addCriterion("update_date <>", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateGreaterThan(Date value) { + addCriterion("update_date >", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateGreaterThanOrEqualTo(Date value) { + addCriterion("update_date >=", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateLessThan(Date value) { + addCriterion("update_date <", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateLessThanOrEqualTo(Date value) { + addCriterion("update_date <=", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateIn(List values) { + addCriterion("update_date in", values, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateNotIn(List values) { + addCriterion("update_date not in", values, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateBetween(Date value1, Date value2) { + addCriterion("update_date between", value1, value2, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateNotBetween(Date value1, Date value2) { + addCriterion("update_date not between", value1, value2, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdIsNull() { + addCriterion("update_user_id is null"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdIsNotNull() { + addCriterion("update_user_id is not null"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdEqualTo(Integer value) { + addCriterion("update_user_id =", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdNotEqualTo(Integer value) { + addCriterion("update_user_id <>", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdGreaterThan(Integer value) { + addCriterion("update_user_id >", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdGreaterThanOrEqualTo(Integer value) { + addCriterion("update_user_id >=", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdLessThan(Integer value) { + addCriterion("update_user_id <", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdLessThanOrEqualTo(Integer value) { + addCriterion("update_user_id <=", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdIn(List values) { + addCriterion("update_user_id in", values, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdNotIn(List values) { + addCriterion("update_user_id not in", values, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdBetween(Integer value1, Integer value2) { + addCriterion("update_user_id between", value1, value2, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdNotBetween(Integer value1, Integer value2) { + addCriterion("update_user_id not between", value1, value2, "updateUserId"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/advice/entity/mapper/AdviceMapper.xml b/src/main/java/com/xmomen/module/advice/entity/mapper/AdviceMapper.xml new file mode 100644 index 0000000..2701a75 --- /dev/null +++ b/src/main/java/com/xmomen/module/advice/entity/mapper/AdviceMapper.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, title, insert_date, insert_user_id, update_date, update_user_id + + + content + + + + delete from cd_advice + + + + + + + SELECT replace(UUID(),'-','') + + insert into cd_advice + + id, + + title, + + + insert_date, + + + insert_user_id, + + + update_date, + + + update_user_id, + + + content, + + + + #{id,jdbcType=VARCHAR}, + + #{title,jdbcType=VARCHAR}, + + + #{insertDate,jdbcType=TIMESTAMP}, + + + #{insertUserId,jdbcType=INTEGER}, + + + #{updateDate,jdbcType=TIMESTAMP}, + + + #{updateUserId,jdbcType=INTEGER}, + + + #{content,jdbcType=LONGVARCHAR}, + + + + + + update cd_advice + + + id = #{record.id,jdbcType=VARCHAR}, + + + title = #{record.title,jdbcType=VARCHAR}, + + + insert_date = #{record.insertDate,jdbcType=TIMESTAMP}, + + + insert_user_id = #{record.insertUserId,jdbcType=INTEGER}, + + + update_date = #{record.updateDate,jdbcType=TIMESTAMP}, + + + update_user_id = #{record.updateUserId,jdbcType=INTEGER}, + + + content = #{record.content,jdbcType=LONGVARCHAR}, + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/advice/mapper/AdviceMapperExt.java b/src/main/java/com/xmomen/module/advice/mapper/AdviceMapperExt.java new file mode 100644 index 0000000..0bb44b1 --- /dev/null +++ b/src/main/java/com/xmomen/module/advice/mapper/AdviceMapperExt.java @@ -0,0 +1,12 @@ +package com.xmomen.module.advice.mapper; + +/** + * @author tanxinzheng + * @date 2017-5-14 20:05:05 + * @version 1.0.0 + */ +public interface AdviceMapperExt { + + public static final String AdviceMapperNameSpace = "com.xmomen.module.advice.mapper.AdviceMapperExt."; + +} diff --git a/src/main/java/com/xmomen/module/advice/model/AdviceCreate.java b/src/main/java/com/xmomen/module/advice/model/AdviceCreate.java new file mode 100644 index 0000000..94c3a2d --- /dev/null +++ b/src/main/java/com/xmomen/module/advice/model/AdviceCreate.java @@ -0,0 +1,39 @@ +package com.xmomen.module.advice.model; + +import lombok.Data; +import com.xmomen.module.advice.entity.Advice; +import org.springframework.beans.BeanUtils; + + import java.lang.String; + import java.lang.Integer; + import java.util.Date; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-5-14 20:05:05 + * @version 1.0.0 + */ +public @Data class AdviceCreate implements Serializable { + + /** 主键 */ + private String id; + /** 标题 */ + private String title; + /** 创建时间 */ + private Date insertDate; + /** 创建人 */ + private Integer insertUserId; + /** 更新时间 */ + private Date updateDate; + /** 更新人 */ + private Integer updateUserId; + /** 内容 */ + private String content; + + public Advice getEntity(){ + Advice advice = new Advice(); + BeanUtils.copyProperties(this, advice); + return advice; + } +} diff --git a/src/main/java/com/xmomen/module/advice/model/AdviceQuery.java b/src/main/java/com/xmomen/module/advice/model/AdviceQuery.java new file mode 100644 index 0000000..20ec121 --- /dev/null +++ b/src/main/java/com/xmomen/module/advice/model/AdviceQuery.java @@ -0,0 +1,20 @@ +package com.xmomen.module.advice.model; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-5-14 20:05:05 + * @version 1.0.0 + */ +public @Data class AdviceQuery implements Serializable { + /** 主键 */ + private String id; + /** 包含主键集 */ + private String[] ids; + /** 排除主键集 */ + private String[] excludeIds; + +} diff --git a/src/main/java/com/xmomen/module/advice/model/AdviceUpdate.java b/src/main/java/com/xmomen/module/advice/model/AdviceUpdate.java new file mode 100644 index 0000000..fdba3ad --- /dev/null +++ b/src/main/java/com/xmomen/module/advice/model/AdviceUpdate.java @@ -0,0 +1,40 @@ +package com.xmomen.module.advice.model; + +import lombok.Data; +import com.xmomen.module.advice.entity.Advice; +import org.springframework.beans.BeanUtils; + + import java.lang.String; + import java.lang.Integer; + import java.util.Date; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-5-14 20:05:05 + * @version 1.0.0 + */ +public @Data class AdviceUpdate implements Serializable { + + /** 主键 */ + private String id; + /** 标题 */ + private String title; + /** 创建时间 */ + private Date insertDate; + /** 创建人 */ + private Integer insertUserId; + /** 更新时间 */ + private Date updateDate; + /** 更新人 */ + private Integer updateUserId; + /** 内容 */ + private String content; + + + public Advice getEntity(){ + Advice advice = new Advice(); + BeanUtils.copyProperties(this, advice); + return advice; + } +} diff --git a/src/main/java/com/xmomen/module/advice/service/AdviceService.java b/src/main/java/com/xmomen/module/advice/service/AdviceService.java new file mode 100644 index 0000000..3652d8a --- /dev/null +++ b/src/main/java/com/xmomen/module/advice/service/AdviceService.java @@ -0,0 +1,115 @@ +package com.xmomen.module.advice.service; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.advice.model.AdviceQuery; +import com.xmomen.module.advice.model.AdviceModel; +import com.xmomen.module.advice.entity.Advice; +import org.apache.ibatis.exceptions.TooManyResultsException; + +import java.io.Serializable; +import java.util.List; + +/** + * @author tanxinzheng + * @date 2017-5-14 20:05:05 + * @version 1.0.0 + */ +public interface AdviceService { + + /** + * 新增快报 + * @param adviceModel 新增快报对象参数 + * @return AdviceModel 快报领域对象 + */ + public AdviceModel createAdvice(AdviceModel adviceModel); + + /** + * 新增快报实体对象 + * @param advice 新增快报实体对象参数 + * @return Advice 快报实体对象 + */ + public Advice createAdvice(Advice advice); + + /** + * 批量新增快报 + * @param AdviceModel 新增快报对象集合参数 + * @return List 快报领域对象集合 + */ + List createAdvices(List adviceModels); + + /** + * 更新快报 + * @param adviceModel 更新快报对象参数 + */ + public void updateAdvice(AdviceModel adviceModel); + + /** + * 更新快报实体对象 + * @param advice 新增快报实体对象参数 + * @return Advice 快报实体对象 + */ + public void updateAdvice(Advice advice); + + /** + * 批量删除快报 + * @param ids 主键数组 + */ + public void deleteAdvice(String[] ids); + + /** + * 删除快报 + * @param id 主键 + */ + public void deleteAdvice(String id); + + /** + * 查询快报领域分页对象（带参数条件） + * @param adviceQuery 查询参数 + * @param limit 每页最大数 + * @param offset 页码 + * @return Page 快报参数对象 + */ + public Page getAdviceModelPage(int limit, int offset, AdviceQuery adviceQuery); + + /** + * 查询快报领域分页对象（无参数条件） + * @param limit 每页最大数 + * @param offset 页码 + * @return Page 快报领域对象 + */ + public Page getAdviceModelPage(int limit, int offset); + + /** + * 查询快报领域集合对象（带参数条件） + * @param adviceQuery 查询参数对象 + * @return List 快报领域集合对象 + */ + public List getAdviceModelList(AdviceQuery adviceQuery); + + /** + * 查询快报领域集合对象（无参数条件） + * @return List 快报领域集合对象 + */ + public List getAdviceModelList(); + + /** + * 查询快报实体对象 + * @param id 主键 + * @return Advice 快报实体对象 + */ + public Advice getOneAdvice(String id); + + /** + * 根据主键查询单个对象 + * @param id 主键 + * @return AdviceModel 快报领域对象 + */ + public AdviceModel getOneAdviceModel(String id); + + /** + * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错） + * @param adviceQuery 快报查询参数对象 + * @return AdviceModel 快报领域对象 + */ + public AdviceModel getOneAdviceModel(AdviceQuery adviceQuery) throws TooManyResultsException; +} diff --git a/src/main/java/com/xmomen/module/base/controller/ActivityController.java b/src/main/java/com/xmomen/module/base/controller/ActivityController.java new file mode 100644 index 0000000..ecdaf40 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/controller/ActivityController.java @@ -0,0 +1,115 @@ +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.CdActivity; +import com.xmomen.module.base.mapper.ActivityMapper; +import com.xmomen.module.base.mapper.CouponCategoryMapper; +import com.xmomen.module.base.model.ActivityModel; +import com.xmomen.module.base.model.CreateActivity; +import com.xmomen.module.base.model.ItemChildModel; +import com.xmomen.module.base.model.UpdateActivity; +import com.xmomen.module.base.service.ActivityService; +import com.xmomen.module.logger.Log; + +/** + */ +@RestController +public class ActivityController { + + @Autowired + ActivityService activityService; + + @Autowired + MybatisDao mybatisDao; + + /** + * 活动列表 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/activity", method = RequestMethod.GET) + @Log(actionName = "查询活动列表") + public Page getUserList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "keyword", required = false) String keyword){ + Map map = new HashMap(); + map.put("keyword", keyword); + return (Page) mybatisDao.selectPage(ActivityMapper.ActivityMapperNameSpace + "getActivityList", map, limit, offset); + } + + + /** + * 新增活动 + * @param createActivity + * @param bindingResult + * @return + */ + @RequestMapping(value = "/activity", method = RequestMethod.POST) + @Log(actionName = "新增活动") + public void createActivity(@RequestBody @Valid CreateActivity createActivity, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + activityService.createActivity(createActivity); + } + + /** + * 更新活动 + * @param id + * @param updateActivity + * @param bindingResult + * @throws ArgumentValidException + */ + @RequestMapping(value = "/activity/{id}", method = RequestMethod.PUT) + @Log(actionName = "更新活动") + public void updateActivity(@PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdateActivity updateActivity, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + activityService.updateActivity(id,updateActivity); + } + + /** + * 删除活动 + * @param id + */ + @RequestMapping(value = "/activity/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除活动") + public void deleteActivity(@PathVariable(value = "id") Long id){ + mybatisDao.deleteByPrimaryKey(CdActivity.class, id); + } + /** + * 查询选择的产品 + * @param parentId + * @return + */ + @RequestMapping(value = "/activity/getChoseItemList", method = RequestMethod.GET) + public List getChildItem(@RequestParam(value = "parentId", required = false) Integer parentId){ + List childItems = new ArrayList(); + Map map = new HashMap(); + map.put("parentId", parentId); + childItems = mybatisDao.getSqlSessionTemplate().selectList(ActivityMapper.ActivityMapperNameSpace + "getChoseItemList", map); + return childItems; + } +} diff --git a/src/main/java/com/xmomen/module/base/controller/BasePlanController.java b/src/main/java/com/xmomen/module/base/controller/BasePlanController.java new file mode 100644 index 0000000..aafbfaf --- /dev/null +++ b/src/main/java/com/xmomen/module/base/controller/BasePlanController.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.CdPlan; +import com.xmomen.module.base.mapper.BasePlanMapper; +import com.xmomen.module.base.model.CreatePlan; +import com.xmomen.module.base.model.ItemChildModel; +import com.xmomen.module.base.model.PlanModel; +import com.xmomen.module.base.model.UpdatePlan; +import com.xmomen.module.base.service.BasePlanService; +import com.xmomen.module.logger.Log; + +/** + * Created by Jeng on 2016/3/30. + */ +@RestController +public class BasePlanController { + + @Autowired + BasePlanService basePlanService; + + @Autowired + MybatisDao mybatisDao; + + /** + * 计划列表 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/basePlan", method = RequestMethod.GET) + @Log(actionName = "查询计划列表") + public Page getUserList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "keyword", required = false) String keyword){ + return basePlanService.getPlanList(keyword, limit, offset); + } + + /** + * 计划列表 + * @param id + */ + @RequestMapping(value = "/basePlan/{id}", method = RequestMethod.GET) + @Log(actionName = "查询计划") + public CdPlan getUserList(@PathVariable(value = "id") Integer id){ + return basePlanService.getPlan(id); + } + + /** + * 新增计划 + * @param createPlan + * @param bindingResult + * @return + */ + @RequestMapping(value = "/basePlan", method = RequestMethod.POST) + @Log(actionName = "新增计划") + public CdPlan createPlan(@RequestBody @Valid CreatePlan createPlan, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + return basePlanService.createPlan(createPlan); + } + + /** + * 更新计划 + * @param id + * @param updatePlan + * @param bindingResult + * @throws ArgumentValidException + */ + @RequestMapping(value = "/basePlan/{id}", method = RequestMethod.PUT) + @Log(actionName = "更新计划") + public CdPlan updatePlan(@PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdatePlan updatePlan, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + return basePlanService.updatePlan(id,updatePlan); + } + + /** + * 删除计划 + * @param id + */ + @RequestMapping(value = "/basePlan/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除计划") + public void deletePlan(@PathVariable(value = "id") Long id){ + mybatisDao.deleteByPrimaryKey(CdPlan.class, id); + } + /** + * 查询选择的产品 + * @param parentId + * @return + */ + @RequestMapping(value = "/basePlan/getChosePlanItemList", method = RequestMethod.GET) + public List getChildItem(@RequestParam(value = "parentId", required = false) Integer parentId){ + List childItems = new ArrayList(); + Map map = new HashMap(); + map.put("parentId", parentId); + childItems = mybatisDao.getSqlSessionTemplate().selectList(BasePlanMapper.BasePlanMapperNameSpace + "getChosePlanItemList", map); + return childItems; + } +} diff --git a/src/main/java/com/xmomen/module/base/controller/ContractItemController.java b/src/main/java/com/xmomen/module/base/controller/ContractItemController.java new file mode 100644 index 0000000..dc86800 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/controller/ContractItemController.java @@ -0,0 +1,82 @@ +package com.xmomen.module.base.controller; + +import java.util.HashMap; +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.mapper.ContractItemMapper; +import com.xmomen.module.base.model.ContractItemModel; +import com.xmomen.module.base.model.CreateContractItem; +import com.xmomen.module.base.model.UpdateContractItem; +import com.xmomen.module.base.service.ContractItemService; +import com.xmomen.module.logger.Log; +@RestController +public class ContractItemController { + @Autowired + ContractItemService contractItemService; + @Autowired + ContractItemMapper contractItemMapper; + @Autowired + MybatisDao mybatisDao; + /** + * 查询合同价格信息 + * @param id + * @return + */ + @RequestMapping(value = "/contractItem", method = RequestMethod.GET) + @Log(actionName = "查询合同价格信息") + public Page 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(); + map.put("id", id); + map.put("keyword", keyword); + return (Page) mybatisDao.selectPage(ContractItemMapper.ContractItemMapperNameSpace + "getContractItemList", map, limit, offset); + } + @RequestMapping(value = "/contractItem", method = RequestMethod.POST) + @Log(actionName = "新增合同价格") + public void createCompany(@RequestBody @Valid CreateContractItem createContractItem, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + contractItemService.createContractItem(createContractItem); + } + + /** + * 修改 + * @param id + */ + @RequestMapping(value = "/contractItem/{id}", method = RequestMethod.PUT) + @Log(actionName = "修改合同价格") + public void updateMember(@PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdateContractItem updateContractItem, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + contractItemService.updateContractItem(id, updateContractItem); + } + + /** + * 删除 + * @param id + */ + @RequestMapping(value = "/contractItem/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除合同价格信息") + public void deleteMember(@PathVariable(value = "id") Integer id){ + contractItemService.delete(id); + } +} diff --git a/src/main/java/com/xmomen/module/base/controller/CouponActivityController.java b/src/main/java/com/xmomen/module/base/controller/CouponActivityController.java new file mode 100644 index 0000000..7e4a7af --- /dev/null +++ b/src/main/java/com/xmomen/module/base/controller/CouponActivityController.java @@ -0,0 +1,154 @@ +package com.xmomen.module.base.controller; + +import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.validation.Valid; + +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.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.AssertExt; +import com.xmomen.framework.web.exceptions.ArgumentValidException; +import com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.base.entity.CdActivityAddress; +import com.xmomen.module.base.entity.CdCoupon; +import com.xmomen.module.base.entity.CdCouponRef; +import com.xmomen.module.base.entity.CdCouponRefExample; +import com.xmomen.module.base.mapper.CouponMapper; +import com.xmomen.module.base.mapper.ItemMapper; +import com.xmomen.module.base.model.CouponActivityAddress; +import com.xmomen.module.base.model.CouponModel; +import com.xmomen.module.base.model.CouponQuery; +import com.xmomen.module.base.model.CreateCoupon; +import com.xmomen.module.base.model.ItemChildModel; +import com.xmomen.module.base.model.ReadCardVo; +import com.xmomen.module.base.model.UpdateCoupon; +import com.xmomen.module.base.service.CouponService; +import com.xmomen.module.logger.Log; + +/** + * Created by Jeng on 2016/3/30. + */ +@RestController +public class CouponActivityController { + + @Autowired + CouponService couponService; + + @Autowired + MybatisDao mybatisDao; + + /** + * 卡券列表 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/couponActivity", method = RequestMethod.GET) + @Log(actionName = "卡劵回填查询") + public Page 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 = "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(!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.queryCouponActivity(couponQuery, limit, offset); + } + + /** + * 卡券列表 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/couponActivity/couponActivityAddress", method = RequestMethod.GET) + @Log(actionName = "参与活动卡劵回填查询") + public Page getCouponActivityAddressList(@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 = "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(!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 (Page) mybatisDao.selectPage(CouponMapper.CouponMapperNameSpace + "getCouponActivityAddressList", couponQuery, limit, offset); + } + + + /** + * 查询卡填写的活动送货地址 + * @param parentId + * @return + */ + @RequestMapping(value = "/couponActivity/getCouponActivityAddress", method = RequestMethod.GET) + public List getCouponActivityAddress(@RequestParam(value = "couponNumber", required = false) String couponNumber){ + List couponActivityAddressList = new ArrayList(); + couponActivityAddressList = mybatisDao.getSqlSessionTemplate().selectList(CouponMapper.CouponMapperNameSpace + "getActivityAddress", couponNumber); + return couponActivityAddressList; + } +} diff --git a/src/main/java/com/xmomen/module/base/controller/ExpressMemberController.java b/src/main/java/com/xmomen/module/base/controller/ExpressMemberController.java new file mode 100644 index 0000000..07c8a30 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/controller/ExpressMemberController.java @@ -0,0 +1,93 @@ +package com.xmomen.module.base.controller; + +import java.util.HashMap; +import java.util.Map; + +import javax.validation.Valid; + +import com.xmomen.module.base.constant.AppConstants; +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.entity.CdExpressMember; +import com.xmomen.module.base.mapper.ExpressMemberMapper; +import com.xmomen.module.base.service.ExpressMemberService; +import com.xmomen.module.logger.Log; + +@RestController +public class ExpressMemberController { + @Autowired + ExpressMemberService expressMemberService; + @Autowired + ExpressMemberMapper expressMemberMapper; + @Autowired + MybatisDao mybatisDao; + + /** + * 查询快递员员信息 + * + * @param id + * @return + */ + @RequestMapping(value = "/expressMember", method = RequestMethod.GET) + @Log(actionName = "查询快递员员信息") + public Page getExpressMemberList(@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(); + map.put("id", id); + map.put("keyword", keyword); + //快递商进行数据过滤 + if (SecurityUtils.getSubject().hasRole(AppConstants.KUAI_DI_SHANG)) { + map.put("expressCode", (String) SecurityUtils.getSubject().getPrincipal()); + } + return (Page) mybatisDao.selectPage(ExpressMemberMapper.ExpressMemberMapperNameSpace + "getExpressMemberList", map, limit, offset); + } + + @RequestMapping(value = "/expressMember", method = RequestMethod.POST) + @Log(actionName = "新增快递员") + public void createExpressMember(@RequestBody @Valid CdExpressMember createExpressMember, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + expressMemberService.createExpressMember(createExpressMember); + } + + /** + * 修改 + * + * @param id + */ + @RequestMapping(value = "/expressMember/{id}", method = RequestMethod.PUT) + @Log(actionName = "修改快递员信息") + public void updateMember(@PathVariable(value = "id") Integer id, + @RequestBody @Valid CdExpressMember updateExpressMember, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + expressMemberService.updateExpressMember(id, updateExpressMember); + } + + /** + * 删除 + * + * @param id + */ + @RequestMapping(value = "/expressMember/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除快递员信息") + public void deleteMember(@PathVariable(value = "id") Integer id) { + expressMemberService.delete(id); + } + +} diff --git a/src/main/java/com/xmomen/module/base/controller/ItemCategoryController.java b/src/main/java/com/xmomen/module/base/controller/ItemCategoryController.java new file mode 100644 index 0000000..c21ed7e --- /dev/null +++ b/src/main/java/com/xmomen/module/base/controller/ItemCategoryController.java @@ -0,0 +1,88 @@ +package com.xmomen.module.base.controller; + +import java.util.List; + +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.web.exceptions.ArgumentValidException; +import com.xmomen.module.base.entity.CdCategory; +import com.xmomen.module.base.model.CreateItemCategory; +import com.xmomen.module.base.model.ItemCategoryModel; +import com.xmomen.module.base.service.ItemCategoryService; +import com.xmomen.module.logger.Log; + +/** + * Created by Jeng on 16/3/25. + */ +@RestController +public class ItemCategoryController { + + @Autowired + ItemCategoryService itemCategoryService; + + /** + * 查询产品分类信息 + * @param id + * @return + */ + @RequestMapping(value = "/itemCategory", method = RequestMethod.GET) + @Log(actionName = "查询产品分类信息") + public List getItemCategoryTree(@RequestParam(value = "id", required = false) Integer id){ + return itemCategoryService.getItemCategoryTree(id); + } + + /** + * 新增产品分类 + * @param createItemCategory + * @param bindingResult + * @throws ArgumentValidException + */ + @RequestMapping(value = "/itemCategory", method = RequestMethod.POST) + @Log(actionName = "新增产品分类") + public void createItemCategory(@RequestBody @Valid CreateItemCategory createItemCategory, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + CdCategory cdCategory = new CdCategory(); + cdCategory.setCategoryName(createItemCategory.getName()); + cdCategory.setParentId(createItemCategory.getParentId()); + itemCategoryService.createItemCategory(cdCategory); + } + + /** + * 删除机构组织 + * @param id + */ + @RequestMapping(value = "/itemCategory/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除产品分类") + public void deleteItemCategory(@PathVariable(value = "id") Integer id){ + itemCategoryService.delete(id); + } + + /** + * 修改产品分类 + * @param id + */ + @RequestMapping(value = "/itemCategory/{id}", method = RequestMethod.PUT) + @Log(actionName = "修改产品分类") + public void updateItemCategory(@PathVariable(value = "id") Integer id, + @RequestBody @Valid CreateItemCategory createItemCategory, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + CdCategory cdCategory = new CdCategory(); + cdCategory.setId(id); + cdCategory.setCategoryName(createItemCategory.getName()); + cdCategory.setParentId(createItemCategory.getParentId()); + itemCategoryService.updateItemCategory(cdCategory); + } +} diff --git a/src/main/java/com/xmomen/module/base/controller/ItemController.java b/src/main/java/com/xmomen/module/base/controller/ItemController.java new file mode 100644 index 0000000..c567e74 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/controller/ItemController.java @@ -0,0 +1,220 @@ +package com.xmomen.module.base.controller; + +import java.io.File; +import java.io.IOException; +import java.util.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +import com.xmomen.module.base.model.*; + +import com.xmomen.module.resource.entity.Resource; +import com.xmomen.module.resource.service.ResourceService; +import com.xmomen.module.resource.service.ResourceUtilsService; +import com.xmomen.module.wx.util.DateUtils; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +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.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.ResponseBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; + +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.ItemMapper; +import com.xmomen.module.base.service.ItemService; +import com.xmomen.module.logger.Log; + +@RestController +public class ItemController { + @Autowired + ItemService itemService; + @Autowired + ItemMapper itemMapper; + @Autowired + MybatisDao mybatisDao; + @Autowired + ResourceService resourceService; + + /** + * 查询产品信息 + * + * @param id + * @return + */ + @RequestMapping(value = "/item", method = RequestMethod.GET) + @Log(actionName = "查询产品信息") + public Page getMemberList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "id", required = false) Integer id, + @RequestParam(value = "companyId", required = false) Integer companyId, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "sellStatus", required = false) Integer sellStatus, + @RequestParam(value = "itemType", required = false) Integer itemType, + @RequestParam(value = "sellUnit", required = false) String sellUnit, + @RequestParam(value = "excludeStock", required = false) Integer excludeStock, + @RequestParam(value = "ids", required = false) Integer[] ids, + @RequestParam(value = "exclude_ids", required = false) Integer[] exclude_ids) { + ItemQuery itemQuery = new ItemQuery(); + itemQuery.setId(id); + itemQuery.setKeyword(keyword); + if (companyId != null) { + itemQuery.setCompanyId(companyId); + } + if (sellStatus != null) { + itemQuery.setSellStatus(sellStatus); + } + if (itemType != null) { + itemQuery.setItemType(itemType); + } + if (exclude_ids != null) { + itemQuery.setExcludeIds(exclude_ids); + } + if (ids != null) { + itemQuery.setIds(ids); + } + if (excludeStock != null) { + itemQuery.setExcludeStock(excludeStock); + } + if (StringUtils.isNotBlank(sellUnit)) { + itemQuery.setSellUnit(sellUnit); + } + return itemService.queryItemList(itemQuery, offset, limit); + } + + /** + * 新增产品 + * + * @param createItem + * @param bindingResult + * @throws ArgumentValidException + */ + @RequestMapping(value = "/item", method = RequestMethod.POST) + @Log(actionName = "新增产品") + public void createCompany(@RequestBody @Valid CreateItem createItem, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + itemService.createItem(createItem); + } + + /** + * 修改 + * + * @param id + */ + @RequestMapping(value = "/item/{id}", method = RequestMethod.PUT) + @Log(actionName = "修改产品") + public void updateMember(@PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdateItem updateItem, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + itemService.updateItem(id, updateItem); + } + + /** + * 删除 + * + * @param id + */ + @RequestMapping(value = "/item/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除产品信息") + public void deleteMember(@PathVariable(value = "id") Integer id) { + itemService.delete(id); + } + + /** + * 查询子产品 + * + * @param parentId + * @return + */ + @RequestMapping(value = "/getChildItem", method = RequestMethod.GET) + public List getChildItem(@RequestParam(value = "parentId", required = false) Integer parentId) { + List childItems = new ArrayList(); + Map map = new HashMap(); + map.put("parentId", parentId); + childItems = mybatisDao.getSqlSessionTemplate().selectList(ItemMapper.ItemMapperNameSpace + "getChildItemList", map); + return childItems; + } + + @RequestMapping(value = "/item/picture", method = RequestMethod.POST) + @ResponseBody + public Resource importExcel(HttpServletRequest request, HttpServletResponse response) { + String itemId = request.getParameter("itemId"); + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + try { + String imagePath = "/itemPicture/" + DateUtils.getNowDateString("yyyy-MM-dd") + "/"; + // 文件保存路径 + String filePath = request.getSession().getServletContext().getRealPath("/") + imagePath; + File fileDir = new File(filePath); + if (!fileDir.exists()) { + fileDir.mkdirs(); + } + String imageName = UUID.randomUUID() + "." + file.getOriginalFilename().split("\\.")[1]; + //图片全地址 + String imageFullPath = filePath + imageName; + // 转存文件 + file.transferTo(new File(imageFullPath)); + + //上传到FastDFS + String remotePath = ResourceUtilsService.uploadFile(new File(imageFullPath)); + if (StringUtils.isNotEmpty(remotePath)) { + //保存资源文件 + Resource resource = new Resource(); + resource.setEntityId(itemId); + resource.setEntityType("cd_item"); + resource.setPath(remotePath); + resource.setIsDefault(0); + resource.setResourceType("PICTURE"); + this.resourceService.createResource(resource); + String fullPath = ResourceUtilsService.getWholeHttpPath(resource.getPath()); + resource.setPath(fullPath); + return resource; + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return null; + } + + + /** + * 默认封面图片 + * + * @param resourceId 资源目录id + * @return + */ + @RequestMapping(value = "/item/defaultImage", method = RequestMethod.GET) + @ResponseBody + public Boolean defaultImage( + @RequestParam(value = "resourceId") String resourceId) { + this.itemService.defaultImage(resourceId); + return Boolean.TRUE; + } + +} diff --git a/src/main/java/com/xmomen/module/base/controller/ItemDetailController.java b/src/main/java/com/xmomen/module/base/controller/ItemDetailController.java new file mode 100644 index 0000000..53a3603 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/controller/ItemDetailController.java @@ -0,0 +1,72 @@ +package com.xmomen.module.base.controller; + +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.ItemDetailMapper; +import com.xmomen.module.base.mapper.ItemMapper; +import com.xmomen.module.base.model.*; +import com.xmomen.module.base.service.ItemDetailService; +import com.xmomen.module.base.service.ItemService; +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 javax.validation.Valid; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +public class ItemDetailController { + @Autowired + ItemDetailService itemDetailService; + @Autowired + ItemDetailMapper itemDetailMapper; + @Autowired + MybatisDao mybatisDao; + + /** + * 新增产品详情 + * + * @param createItemDetail + * @param bindingResult + * @throws ArgumentValidException + */ + @RequestMapping(value = "/itemDetail", method = RequestMethod.POST) + @Log(actionName = "新增产品") + public void createItemDeatil(@RequestBody @Valid CreateItemDetail createItemDetail, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + itemDetailService.createItemDetail(createItemDetail); + } + + /** + * 修改产品详情 + * + * @param id + */ + @RequestMapping(value = "/itemDetail/{id}", method = RequestMethod.PUT) + @Log(actionName = "修改产品详情") + public void updateItemDetail(@PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdateItemDetail updateItemDetail, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + itemDetailService.updateItemDetail(id, updateItemDetail); + } + + /** + * 删除商品详情 + * + * @param id + */ + @RequestMapping(value = "/itemDetail/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除产品详情信息") + public void deleteItemDetail(@PathVariable(value = "id") Integer id) { + itemDetailService.delete(id); + } +} diff --git a/src/main/java/com/xmomen/module/base/controller/MemberController.java b/src/main/java/com/xmomen/module/base/controller/MemberController.java new file mode 100644 index 0000000..3fd6568 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/controller/MemberController.java @@ -0,0 +1,132 @@ +package com.xmomen.module.base.controller; + +import java.util.HashMap; +import java.util.Map; + +import javax.validation.Valid; + +import com.xmomen.module.account.service.RoleService; +import com.xmomen.module.base.constant.AppConstants; +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.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.MemberMapper; +import com.xmomen.module.base.model.CreateMember; +import com.xmomen.module.base.model.MemberModel; +import com.xmomen.module.base.model.UpdateMember; +import com.xmomen.module.base.service.MemberService; +import com.xmomen.module.logger.Log; + +/** + * Created by ted on 16/3/28. + */ +@RestController +public class MemberController { + + @Autowired + MemberService memberService; + @Autowired + MemberMapper memberMapper; + @Autowired + MybatisDao mybatisDao; + + @Autowired + RoleService roleService; + + /** + * 查询客户信息 + * + * @param id + * @return + */ + @RequestMapping(value = "/member", method = RequestMethod.GET) + @Log(actionName = "查询客户信息") + public Page 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, + @RequestParam(value = "phoneNumber", required = false) String phoneNumber, + @RequestParam(value = "isFilter", required = false) String isFilter, + @RequestParam(value = "couponNumber", required = false) String couponNumber) { + Map map = new HashMap(); + map.put("id", id); + if (StringUtils.trimToNull(keyword) != null) { + map.put("keyword", keyword); + } + if (StringUtils.trimToNull(phoneNumber) != null) { + map.put("phoneNumber", phoneNumber); + } + if (StringUtils.trimToNull(couponNumber) != null) { + map.put("couponNumber", couponNumber); + } + //是否过滤 + if (StringUtils.isEmpty(isFilter)) { + //客服经理过滤如果有客服组权限则不过滤 + 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) mybatisDao.selectPage(MemberMapper.MemberMapperNameSpace + "getMemberList", map, limit, offset); + } + + + @RequestMapping(value = "/member", method = RequestMethod.POST) + @Log(actionName = "新增客户") + public void createMember(@RequestBody @Valid CreateMember createMember, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + memberService.createMember(createMember); + } + + /** + * 根据ID查询客户信息 + * + * @param id + */ + @RequestMapping(value = "/member/{id:[0-9]+}", method = RequestMethod.GET) + @Log(actionName = "根据ID查询客户信息") + public MemberModel getMember(@PathVariable(value = "id") Integer id) { + Map map = new HashMap(); + map.put("id", id); + return mybatisDao.getSqlSessionTemplate().selectOne(MemberMapper.MemberMapperNameSpace + "getMemberList", map); + } + + /** + * 修改 + * + * @param id + */ + @RequestMapping(value = "/member/{id}", method = RequestMethod.PUT) + @Log(actionName = "修改客户信息") + public void updateMember(@PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdateMember updateMember, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + memberService.updateMember(id, updateMember); + } + + /** + * 删除 + * + * @param id + */ + @RequestMapping(value = "/member/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除客户信息") + public void deleteMember(@PathVariable(value = "id") Integer id) { + memberService.delete(id); + } +} diff --git a/src/main/java/com/xmomen/module/base/entity/CdActivity.java b/src/main/java/com/xmomen/module/base/entity/CdActivity.java new file mode 100644 index 0000000..16e6f39 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdActivity.java @@ -0,0 +1,169 @@ +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_activity") +public class CdActivity extends BaseMybatisModel { + /** + * 主键 + */ + private Integer id; + + /** + * 活动名称 + */ + private String activityName; + + /** + * 活动开始时间 + */ + private Date activityBeginTime; + + /** + * 活动结束时间 + */ + private Date activityEndTime; + + /** + * 活动介绍 + */ + private String activityDescribe; + + /** + * 参与活动的卡类型 + */ + private Integer activityType; + + /** + * 是否启用（0-不启用，1-启用） + */ + private Integer available; + + /** + * 最低配送金额 + */ + private BigDecimal lowestPrice; + + @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 = "ACTIVITY_NAME") + public String getActivityName() { + return activityName; + } + + public void setActivityName(String activityName) { + this.activityName = activityName; + if(activityName == null){ + removeValidField("activityName"); + return; + } + addValidField("activityName"); + } + + @Column(name = "ACTIVITY_BEGIN_TIME") + public Date getActivityBeginTime() { + return activityBeginTime; + } + + public void setActivityBeginTime(Date activityBeginTime) { + this.activityBeginTime = activityBeginTime; + if(activityBeginTime == null){ + removeValidField("activityBeginTime"); + return; + } + addValidField("activityBeginTime"); + } + + @Column(name = "ACTIVITY_END_TIME") + public Date getActivityEndTime() { + return activityEndTime; + } + + public void setActivityEndTime(Date activityEndTime) { + this.activityEndTime = activityEndTime; + if(activityEndTime == null){ + removeValidField("activityEndTime"); + return; + } + addValidField("activityEndTime"); + } + + @Column(name = "ACTIVITY_DESCRIBE") + public String getActivityDescribe() { + return activityDescribe; + } + + public void setActivityDescribe(String activityDescribe) { + this.activityDescribe = activityDescribe; + if(activityDescribe == null){ + removeValidField("activityDescribe"); + return; + } + addValidField("activityDescribe"); + } + + @Column(name = "ACTIVITY_TYPE") + public Integer getActivityType() { + return activityType; + } + + public void setActivityType(Integer activityType) { + this.activityType = activityType; + if(activityType == null){ + removeValidField("activityType"); + return; + } + addValidField("activityType"); + } + + @Column(name = "AVAILABLE") + public Integer getAvailable() { + return available; + } + + public void setAvailable(Integer available) { + this.available = available; + if(available == null){ + removeValidField("available"); + return; + } + addValidField("available"); + } + + @Column(name = "LOWEST_PRICE") + public BigDecimal getLowestPrice() { + return lowestPrice; + } + + public void setLowestPrice(BigDecimal lowestPrice) { + this.lowestPrice = lowestPrice; + if(lowestPrice == null){ + removeValidField("lowestPrice"); + return; + } + addValidField("lowestPrice"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdActivityExample.java b/src/main/java/com/xmomen/module/base/entity/CdActivityExample.java new file mode 100644 index 0000000..81a4407 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdActivityExample.java @@ -0,0 +1,703 @@ +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 CdActivityExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdActivityExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andActivityNameIsNull() { + addCriterion("ACTIVITY_NAME is null"); + return (Criteria) this; + } + + public Criteria andActivityNameIsNotNull() { + addCriterion("ACTIVITY_NAME is not null"); + return (Criteria) this; + } + + public Criteria andActivityNameEqualTo(String value) { + addCriterion("ACTIVITY_NAME =", value, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameNotEqualTo(String value) { + addCriterion("ACTIVITY_NAME <>", value, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameGreaterThan(String value) { + addCriterion("ACTIVITY_NAME >", value, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameGreaterThanOrEqualTo(String value) { + addCriterion("ACTIVITY_NAME >=", value, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameLessThan(String value) { + addCriterion("ACTIVITY_NAME <", value, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameLessThanOrEqualTo(String value) { + addCriterion("ACTIVITY_NAME <=", value, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameLike(String value) { + addCriterion("ACTIVITY_NAME like", value, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameNotLike(String value) { + addCriterion("ACTIVITY_NAME not like", value, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameIn(List values) { + addCriterion("ACTIVITY_NAME in", values, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameNotIn(List values) { + addCriterion("ACTIVITY_NAME not in", values, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameBetween(String value1, String value2) { + addCriterion("ACTIVITY_NAME between", value1, value2, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityNameNotBetween(String value1, String value2) { + addCriterion("ACTIVITY_NAME not between", value1, value2, "activityName"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeIsNull() { + addCriterion("ACTIVITY_BEGIN_TIME is null"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeIsNotNull() { + addCriterion("ACTIVITY_BEGIN_TIME is not null"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeEqualTo(Date value) { + addCriterion("ACTIVITY_BEGIN_TIME =", value, "activityBeginTime"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeNotEqualTo(Date value) { + addCriterion("ACTIVITY_BEGIN_TIME <>", value, "activityBeginTime"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeGreaterThan(Date value) { + addCriterion("ACTIVITY_BEGIN_TIME >", value, "activityBeginTime"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeGreaterThanOrEqualTo(Date value) { + addCriterion("ACTIVITY_BEGIN_TIME >=", value, "activityBeginTime"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeLessThan(Date value) { + addCriterion("ACTIVITY_BEGIN_TIME <", value, "activityBeginTime"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeLessThanOrEqualTo(Date value) { + addCriterion("ACTIVITY_BEGIN_TIME <=", value, "activityBeginTime"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeIn(List values) { + addCriterion("ACTIVITY_BEGIN_TIME in", values, "activityBeginTime"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeNotIn(List values) { + addCriterion("ACTIVITY_BEGIN_TIME not in", values, "activityBeginTime"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeBetween(Date value1, Date value2) { + addCriterion("ACTIVITY_BEGIN_TIME between", value1, value2, "activityBeginTime"); + return (Criteria) this; + } + + public Criteria andActivityBeginTimeNotBetween(Date value1, Date value2) { + addCriterion("ACTIVITY_BEGIN_TIME not between", value1, value2, "activityBeginTime"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeIsNull() { + addCriterion("ACTIVITY_END_TIME is null"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeIsNotNull() { + addCriterion("ACTIVITY_END_TIME is not null"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeEqualTo(Date value) { + addCriterion("ACTIVITY_END_TIME =", value, "activityEndTime"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeNotEqualTo(Date value) { + addCriterion("ACTIVITY_END_TIME <>", value, "activityEndTime"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeGreaterThan(Date value) { + addCriterion("ACTIVITY_END_TIME >", value, "activityEndTime"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeGreaterThanOrEqualTo(Date value) { + addCriterion("ACTIVITY_END_TIME >=", value, "activityEndTime"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeLessThan(Date value) { + addCriterion("ACTIVITY_END_TIME <", value, "activityEndTime"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeLessThanOrEqualTo(Date value) { + addCriterion("ACTIVITY_END_TIME <=", value, "activityEndTime"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeIn(List values) { + addCriterion("ACTIVITY_END_TIME in", values, "activityEndTime"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeNotIn(List values) { + addCriterion("ACTIVITY_END_TIME not in", values, "activityEndTime"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeBetween(Date value1, Date value2) { + addCriterion("ACTIVITY_END_TIME between", value1, value2, "activityEndTime"); + return (Criteria) this; + } + + public Criteria andActivityEndTimeNotBetween(Date value1, Date value2) { + addCriterion("ACTIVITY_END_TIME not between", value1, value2, "activityEndTime"); + return (Criteria) this; + } + + public Criteria andActivityDescribeIsNull() { + addCriterion("ACTIVITY_DESCRIBE is null"); + return (Criteria) this; + } + + public Criteria andActivityDescribeIsNotNull() { + addCriterion("ACTIVITY_DESCRIBE is not null"); + return (Criteria) this; + } + + public Criteria andActivityDescribeEqualTo(String value) { + addCriterion("ACTIVITY_DESCRIBE =", value, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeNotEqualTo(String value) { + addCriterion("ACTIVITY_DESCRIBE <>", value, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeGreaterThan(String value) { + addCriterion("ACTIVITY_DESCRIBE >", value, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeGreaterThanOrEqualTo(String value) { + addCriterion("ACTIVITY_DESCRIBE >=", value, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeLessThan(String value) { + addCriterion("ACTIVITY_DESCRIBE <", value, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeLessThanOrEqualTo(String value) { + addCriterion("ACTIVITY_DESCRIBE <=", value, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeLike(String value) { + addCriterion("ACTIVITY_DESCRIBE like", value, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeNotLike(String value) { + addCriterion("ACTIVITY_DESCRIBE not like", value, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeIn(List values) { + addCriterion("ACTIVITY_DESCRIBE in", values, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeNotIn(List values) { + addCriterion("ACTIVITY_DESCRIBE not in", values, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeBetween(String value1, String value2) { + addCriterion("ACTIVITY_DESCRIBE between", value1, value2, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityDescribeNotBetween(String value1, String value2) { + addCriterion("ACTIVITY_DESCRIBE not between", value1, value2, "activityDescribe"); + return (Criteria) this; + } + + public Criteria andActivityTypeIsNull() { + addCriterion("ACTIVITY_TYPE is null"); + return (Criteria) this; + } + + public Criteria andActivityTypeIsNotNull() { + addCriterion("ACTIVITY_TYPE is not null"); + return (Criteria) this; + } + + public Criteria andActivityTypeEqualTo(Integer value) { + addCriterion("ACTIVITY_TYPE =", value, "activityType"); + return (Criteria) this; + } + + public Criteria andActivityTypeNotEqualTo(Integer value) { + addCriterion("ACTIVITY_TYPE <>", value, "activityType"); + return (Criteria) this; + } + + public Criteria andActivityTypeGreaterThan(Integer value) { + addCriterion("ACTIVITY_TYPE >", value, "activityType"); + return (Criteria) this; + } + + public Criteria andActivityTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("ACTIVITY_TYPE >=", value, "activityType"); + return (Criteria) this; + } + + public Criteria andActivityTypeLessThan(Integer value) { + addCriterion("ACTIVITY_TYPE <", value, "activityType"); + return (Criteria) this; + } + + public Criteria andActivityTypeLessThanOrEqualTo(Integer value) { + addCriterion("ACTIVITY_TYPE <=", value, "activityType"); + return (Criteria) this; + } + + public Criteria andActivityTypeIn(List values) { + addCriterion("ACTIVITY_TYPE in", values, "activityType"); + return (Criteria) this; + } + + public Criteria andActivityTypeNotIn(List values) { + addCriterion("ACTIVITY_TYPE not in", values, "activityType"); + return (Criteria) this; + } + + public Criteria andActivityTypeBetween(Integer value1, Integer value2) { + addCriterion("ACTIVITY_TYPE between", value1, value2, "activityType"); + return (Criteria) this; + } + + public Criteria andActivityTypeNotBetween(Integer value1, Integer value2) { + addCriterion("ACTIVITY_TYPE not between", value1, value2, "activityType"); + return (Criteria) this; + } + + public Criteria andAvailableIsNull() { + addCriterion("AVAILABLE is null"); + return (Criteria) this; + } + + public Criteria andAvailableIsNotNull() { + addCriterion("AVAILABLE is not null"); + return (Criteria) this; + } + + public Criteria andAvailableEqualTo(Integer value) { + addCriterion("AVAILABLE =", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableNotEqualTo(Integer value) { + addCriterion("AVAILABLE <>", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableGreaterThan(Integer value) { + addCriterion("AVAILABLE >", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableGreaterThanOrEqualTo(Integer value) { + addCriterion("AVAILABLE >=", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableLessThan(Integer value) { + addCriterion("AVAILABLE <", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableLessThanOrEqualTo(Integer value) { + addCriterion("AVAILABLE <=", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableIn(List values) { + addCriterion("AVAILABLE in", values, "available"); + return (Criteria) this; + } + + public Criteria andAvailableNotIn(List values) { + addCriterion("AVAILABLE not in", values, "available"); + return (Criteria) this; + } + + public Criteria andAvailableBetween(Integer value1, Integer value2) { + addCriterion("AVAILABLE between", value1, value2, "available"); + return (Criteria) this; + } + + public Criteria andAvailableNotBetween(Integer value1, Integer value2) { + addCriterion("AVAILABLE not between", value1, value2, "available"); + return (Criteria) this; + } + + public Criteria andLowestPriceIsNull() { + addCriterion("LOWEST_PRICE is null"); + return (Criteria) this; + } + + public Criteria andLowestPriceIsNotNull() { + addCriterion("LOWEST_PRICE is not null"); + return (Criteria) this; + } + + public Criteria andLowestPriceEqualTo(BigDecimal value) { + addCriterion("LOWEST_PRICE =", value, "lowestPrice"); + return (Criteria) this; + } + + public Criteria andLowestPriceNotEqualTo(BigDecimal value) { + addCriterion("LOWEST_PRICE <>", value, "lowestPrice"); + return (Criteria) this; + } + + public Criteria andLowestPriceGreaterThan(BigDecimal value) { + addCriterion("LOWEST_PRICE >", value, "lowestPrice"); + return (Criteria) this; + } + + public Criteria andLowestPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("LOWEST_PRICE >=", value, "lowestPrice"); + return (Criteria) this; + } + + public Criteria andLowestPriceLessThan(BigDecimal value) { + addCriterion("LOWEST_PRICE <", value, "lowestPrice"); + return (Criteria) this; + } + + public Criteria andLowestPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("LOWEST_PRICE <=", value, "lowestPrice"); + return (Criteria) this; + } + + public Criteria andLowestPriceIn(List values) { + addCriterion("LOWEST_PRICE in", values, "lowestPrice"); + return (Criteria) this; + } + + public Criteria andLowestPriceNotIn(List values) { + addCriterion("LOWEST_PRICE not in", values, "lowestPrice"); + return (Criteria) this; + } + + public Criteria andLowestPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("LOWEST_PRICE between", value1, value2, "lowestPrice"); + return (Criteria) this; + } + + public Criteria andLowestPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("LOWEST_PRICE not between", value1, value2, "lowestPrice"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdActivityRef.java b/src/main/java/com/xmomen/module/base/entity/CdActivityRef.java new file mode 100644 index 0000000..636c7e8 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdActivityRef.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_activity_ref") +public class CdActivityRef extends BaseMybatisModel { + /** + * + */ + private Integer id; + + /** + * 活动ID + */ + private Integer cdActivityId; + + /** + * 拓展值 + */ + private String refValue; + + /** + * 拓展类型 + */ + private String refType; + + /** + * 拓展描述 + */ + private String refName; + + /** + * 份数 + */ + private Integer refCount; + + @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_ACTIVITY_ID") + public Integer getCdActivityId() { + return cdActivityId; + } + + public void setCdActivityId(Integer cdActivityId) { + this.cdActivityId = cdActivityId; + if(cdActivityId == null){ + removeValidField("cdActivityId"); + return; + } + addValidField("cdActivityId"); + } + + @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"); + } + + @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_COUNT") + public Integer getRefCount() { + return refCount; + } + + public void setRefCount(Integer refCount) { + this.refCount = refCount; + if(refCount == null){ + removeValidField("refCount"); + return; + } + addValidField("refCount"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdActivityRefExample.java b/src/main/java/com/xmomen/module/base/entity/CdActivityRefExample.java new file mode 100644 index 0000000..c6d0b42 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdActivityRefExample.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 CdActivityRefExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdActivityRefExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andCdActivityIdIsNull() { + addCriterion("CD_ACTIVITY_ID is null"); + return (Criteria) this; + } + + public Criteria andCdActivityIdIsNotNull() { + addCriterion("CD_ACTIVITY_ID is not null"); + return (Criteria) this; + } + + public Criteria andCdActivityIdEqualTo(Integer value) { + addCriterion("CD_ACTIVITY_ID =", value, "cdActivityId"); + return (Criteria) this; + } + + public Criteria andCdActivityIdNotEqualTo(Integer value) { + addCriterion("CD_ACTIVITY_ID <>", value, "cdActivityId"); + return (Criteria) this; + } + + public Criteria andCdActivityIdGreaterThan(Integer value) { + addCriterion("CD_ACTIVITY_ID >", value, "cdActivityId"); + return (Criteria) this; + } + + public Criteria andCdActivityIdGreaterThanOrEqualTo(Integer value) { + addCriterion("CD_ACTIVITY_ID >=", value, "cdActivityId"); + return (Criteria) this; + } + + public Criteria andCdActivityIdLessThan(Integer value) { + addCriterion("CD_ACTIVITY_ID <", value, "cdActivityId"); + return (Criteria) this; + } + + public Criteria andCdActivityIdLessThanOrEqualTo(Integer value) { + addCriterion("CD_ACTIVITY_ID <=", value, "cdActivityId"); + return (Criteria) this; + } + + public Criteria andCdActivityIdIn(List values) { + addCriterion("CD_ACTIVITY_ID in", values, "cdActivityId"); + return (Criteria) this; + } + + public Criteria andCdActivityIdNotIn(List values) { + addCriterion("CD_ACTIVITY_ID not in", values, "cdActivityId"); + return (Criteria) this; + } + + public Criteria andCdActivityIdBetween(Integer value1, Integer value2) { + addCriterion("CD_ACTIVITY_ID between", value1, value2, "cdActivityId"); + return (Criteria) this; + } + + public Criteria andCdActivityIdNotBetween(Integer value1, Integer value2) { + addCriterion("CD_ACTIVITY_ID not between", value1, value2, "cdActivityId"); + 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 values) { + addCriterion("REF_VALUE in", values, "refValue"); + return (Criteria) this; + } + + public Criteria andRefValueNotIn(List 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 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 values) { + addCriterion("REF_TYPE in", values, "refType"); + return (Criteria) this; + } + + public Criteria andRefTypeNotIn(List 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 values) { + addCriterion("REF_NAME in", values, "refName"); + return (Criteria) this; + } + + public Criteria andRefNameNotIn(List 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 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 values) { + addCriterion("REF_COUNT in", values, "refCount"); + return (Criteria) this; + } + + public Criteria andRefCountNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdAttachment.java b/src/main/java/com/xmomen/module/base/entity/CdAttachment.java new file mode 100644 index 0000000..7b21d68 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdAttachment.java @@ -0,0 +1,168 @@ +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_attachment") +public class CdAttachment extends BaseMybatisModel { + /** + * 主键 + */ + private Integer id; + + /** + * 业务主键 + */ + private String businessId; + + /** + * 附件类型 + */ + private String type; + + /** + * 附件名称 + */ + private String fileName; + + /** + * 后缀 + */ + private String fileExtend; + + /** + * 存储路径 + */ + private String filePath; + + /** + * 上传时间 + */ + private Date uploadDate; + + /** + * 上传人 + */ + private String uploadUser; + + @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 = "business_id") + public String getBusinessId() { + return businessId; + } + + public void setBusinessId(String businessId) { + this.businessId = businessId; + if(businessId == null){ + removeValidField("businessId"); + return; + } + addValidField("businessId"); + } + + @Column(name = "type") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + if(type == null){ + removeValidField("type"); + return; + } + addValidField("type"); + } + + @Column(name = "file_name") + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + if(fileName == null){ + removeValidField("fileName"); + return; + } + addValidField("fileName"); + } + + @Column(name = "file_extend") + public String getFileExtend() { + return fileExtend; + } + + public void setFileExtend(String fileExtend) { + this.fileExtend = fileExtend; + if(fileExtend == null){ + removeValidField("fileExtend"); + return; + } + addValidField("fileExtend"); + } + + @Column(name = "file_path") + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + if(filePath == null){ + removeValidField("filePath"); + return; + } + addValidField("filePath"); + } + + @Column(name = "upload_date") + public Date getUploadDate() { + return uploadDate; + } + + public void setUploadDate(Date uploadDate) { + this.uploadDate = uploadDate; + if(uploadDate == null){ + removeValidField("uploadDate"); + return; + } + addValidField("uploadDate"); + } + + @Column(name = "upload_user") + public String getUploadUser() { + return uploadUser; + } + + public void setUploadUser(String uploadUser) { + this.uploadUser = uploadUser; + if(uploadUser == null){ + removeValidField("uploadUser"); + return; + } + addValidField("uploadUser"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdBindExample.java b/src/main/java/com/xmomen/module/base/entity/CdBindExample.java new file mode 100644 index 0000000..97fb9c5 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdBindExample.java @@ -0,0 +1,461 @@ +package com.xmomen.module.base.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class CdBindExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdBindExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Integer value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Integer value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Integer value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Integer value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Integer value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Integer value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Integer value1, Integer value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Integer value1, Integer value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andPhoneIsNull() { + addCriterion("PHONE is null"); + return (Criteria) this; + } + + public Criteria andPhoneIsNotNull() { + addCriterion("PHONE is not null"); + return (Criteria) this; + } + + public Criteria andPhoneEqualTo(String value) { + addCriterion("PHONE =", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotEqualTo(String value) { + addCriterion("PHONE <>", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThan(String value) { + addCriterion("PHONE >", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThanOrEqualTo(String value) { + addCriterion("PHONE >=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThan(String value) { + addCriterion("PHONE <", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThanOrEqualTo(String value) { + addCriterion("PHONE <=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLike(String value) { + addCriterion("PHONE like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotLike(String value) { + addCriterion("PHONE not like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneIn(List values) { + addCriterion("PHONE in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotIn(List values) { + addCriterion("PHONE not in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneBetween(String value1, String value2) { + addCriterion("PHONE between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotBetween(String value1, String value2) { + addCriterion("PHONE not between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andOpenIdIsNull() { + addCriterion("OPEN_ID is null"); + return (Criteria) this; + } + + public Criteria andOpenIdIsNotNull() { + addCriterion("OPEN_ID is not null"); + return (Criteria) this; + } + + public Criteria andOpenIdEqualTo(String value) { + addCriterion("OPEN_ID =", value, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdNotEqualTo(String value) { + addCriterion("OPEN_ID <>", value, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdGreaterThan(String value) { + addCriterion("OPEN_ID >", value, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdGreaterThanOrEqualTo(String value) { + addCriterion("OPEN_ID >=", value, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdLessThan(String value) { + addCriterion("OPEN_ID <", value, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdLessThanOrEqualTo(String value) { + addCriterion("OPEN_ID <=", value, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdLike(String value) { + addCriterion("OPEN_ID like", value, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdNotLike(String value) { + addCriterion("OPEN_ID not like", value, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdIn(List values) { + addCriterion("OPEN_ID in", values, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdNotIn(List values) { + addCriterion("OPEN_ID not in", values, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdBetween(String value1, String value2) { + addCriterion("OPEN_ID between", value1, value2, "openId"); + return (Criteria) this; + } + + public Criteria andOpenIdNotBetween(String value1, String value2) { + addCriterion("OPEN_ID not between", value1, value2, "openId"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdCategory.java b/src/main/java/com/xmomen/module/base/entity/CdCategory.java new file mode 100644 index 0000000..9cfa1dd --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdCategory.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_category") +public class CdCategory extends BaseMybatisModel { + /** + * + */ + private Integer id; + + /** + * 类别名称 + */ + private String categoryName; + + /** + * 上级类别 + */ + private Integer parentId; + + @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_NAME") + public String getCategoryName() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName = categoryName; + if(categoryName == null){ + removeValidField("categoryName"); + return; + } + addValidField("categoryName"); + } + + @Column(name = "PARENT_ID") + public Integer getParentId() { + return parentId; + } + + public void setParentId(Integer parentId) { + this.parentId = parentId; + if(parentId == null){ + removeValidField("parentId"); + return; + } + addValidField("parentId"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdCompanyExample.java b/src/main/java/com/xmomen/module/base/entity/CdCompanyExample.java new file mode 100644 index 0000000..ed269f3 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdCompanyExample.java @@ -0,0 +1,611 @@ +package com.xmomen.module.base.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class CdCompanyExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdCompanyExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andCompanyCodeIsNull() { + addCriterion("COMPANY_CODE is null"); + return (Criteria) this; + } + + public Criteria andCompanyCodeIsNotNull() { + addCriterion("COMPANY_CODE is not null"); + return (Criteria) this; + } + + public Criteria andCompanyCodeEqualTo(String value) { + addCriterion("COMPANY_CODE =", value, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeNotEqualTo(String value) { + addCriterion("COMPANY_CODE <>", value, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeGreaterThan(String value) { + addCriterion("COMPANY_CODE >", value, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeGreaterThanOrEqualTo(String value) { + addCriterion("COMPANY_CODE >=", value, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeLessThan(String value) { + addCriterion("COMPANY_CODE <", value, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeLessThanOrEqualTo(String value) { + addCriterion("COMPANY_CODE <=", value, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeLike(String value) { + addCriterion("COMPANY_CODE like", value, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeNotLike(String value) { + addCriterion("COMPANY_CODE not like", value, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeIn(List values) { + addCriterion("COMPANY_CODE in", values, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeNotIn(List values) { + addCriterion("COMPANY_CODE not in", values, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeBetween(String value1, String value2) { + addCriterion("COMPANY_CODE between", value1, value2, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyCodeNotBetween(String value1, String value2) { + addCriterion("COMPANY_CODE not between", value1, value2, "companyCode"); + return (Criteria) this; + } + + public Criteria andCompanyNameIsNull() { + addCriterion("COMPANY_NAME is null"); + return (Criteria) this; + } + + public Criteria andCompanyNameIsNotNull() { + addCriterion("COMPANY_NAME is not null"); + return (Criteria) this; + } + + public Criteria andCompanyNameEqualTo(String value) { + addCriterion("COMPANY_NAME =", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotEqualTo(String value) { + addCriterion("COMPANY_NAME <>", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameGreaterThan(String value) { + addCriterion("COMPANY_NAME >", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameGreaterThanOrEqualTo(String value) { + addCriterion("COMPANY_NAME >=", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLessThan(String value) { + addCriterion("COMPANY_NAME <", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLessThanOrEqualTo(String value) { + addCriterion("COMPANY_NAME <=", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLike(String value) { + addCriterion("COMPANY_NAME like", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotLike(String value) { + addCriterion("COMPANY_NAME not like", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameIn(List values) { + addCriterion("COMPANY_NAME in", values, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotIn(List values) { + addCriterion("COMPANY_NAME not in", values, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameBetween(String value1, String value2) { + addCriterion("COMPANY_NAME between", value1, value2, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotBetween(String value1, String value2) { + addCriterion("COMPANY_NAME not between", value1, value2, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyAddressIsNull() { + addCriterion("COMPANY_ADDRESS is null"); + return (Criteria) this; + } + + public Criteria andCompanyAddressIsNotNull() { + addCriterion("COMPANY_ADDRESS is not null"); + return (Criteria) this; + } + + public Criteria andCompanyAddressEqualTo(String value) { + addCriterion("COMPANY_ADDRESS =", value, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressNotEqualTo(String value) { + addCriterion("COMPANY_ADDRESS <>", value, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressGreaterThan(String value) { + addCriterion("COMPANY_ADDRESS >", value, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressGreaterThanOrEqualTo(String value) { + addCriterion("COMPANY_ADDRESS >=", value, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressLessThan(String value) { + addCriterion("COMPANY_ADDRESS <", value, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressLessThanOrEqualTo(String value) { + addCriterion("COMPANY_ADDRESS <=", value, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressLike(String value) { + addCriterion("COMPANY_ADDRESS like", value, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressNotLike(String value) { + addCriterion("COMPANY_ADDRESS not like", value, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressIn(List values) { + addCriterion("COMPANY_ADDRESS in", values, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressNotIn(List values) { + addCriterion("COMPANY_ADDRESS not in", values, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressBetween(String value1, String value2) { + addCriterion("COMPANY_ADDRESS between", value1, value2, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyAddressNotBetween(String value1, String value2) { + addCriterion("COMPANY_ADDRESS not between", value1, value2, "companyAddress"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderIsNull() { + addCriterion("COMPANY_LEADER is null"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderIsNotNull() { + addCriterion("COMPANY_LEADER is not null"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderEqualTo(String value) { + addCriterion("COMPANY_LEADER =", value, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderNotEqualTo(String value) { + addCriterion("COMPANY_LEADER <>", value, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderGreaterThan(String value) { + addCriterion("COMPANY_LEADER >", value, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderGreaterThanOrEqualTo(String value) { + addCriterion("COMPANY_LEADER >=", value, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderLessThan(String value) { + addCriterion("COMPANY_LEADER <", value, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderLessThanOrEqualTo(String value) { + addCriterion("COMPANY_LEADER <=", value, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderLike(String value) { + addCriterion("COMPANY_LEADER like", value, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderNotLike(String value) { + addCriterion("COMPANY_LEADER not like", value, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderIn(List values) { + addCriterion("COMPANY_LEADER in", values, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderNotIn(List values) { + addCriterion("COMPANY_LEADER not in", values, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderBetween(String value1, String value2) { + addCriterion("COMPANY_LEADER between", value1, value2, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderNotBetween(String value1, String value2) { + addCriterion("COMPANY_LEADER not between", value1, value2, "companyLeader"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelIsNull() { + addCriterion("COMPANY_LEADER_TEL is null"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelIsNotNull() { + addCriterion("COMPANY_LEADER_TEL is not null"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelEqualTo(String value) { + addCriterion("COMPANY_LEADER_TEL =", value, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelNotEqualTo(String value) { + addCriterion("COMPANY_LEADER_TEL <>", value, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelGreaterThan(String value) { + addCriterion("COMPANY_LEADER_TEL >", value, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelGreaterThanOrEqualTo(String value) { + addCriterion("COMPANY_LEADER_TEL >=", value, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelLessThan(String value) { + addCriterion("COMPANY_LEADER_TEL <", value, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelLessThanOrEqualTo(String value) { + addCriterion("COMPANY_LEADER_TEL <=", value, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelLike(String value) { + addCriterion("COMPANY_LEADER_TEL like", value, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelNotLike(String value) { + addCriterion("COMPANY_LEADER_TEL not like", value, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelIn(List values) { + addCriterion("COMPANY_LEADER_TEL in", values, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelNotIn(List values) { + addCriterion("COMPANY_LEADER_TEL not in", values, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelBetween(String value1, String value2) { + addCriterion("COMPANY_LEADER_TEL between", value1, value2, "companyLeaderTel"); + return (Criteria) this; + } + + public Criteria andCompanyLeaderTelNotBetween(String value1, String value2) { + addCriterion("COMPANY_LEADER_TEL not between", value1, value2, "companyLeaderTel"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdContractExample.java b/src/main/java/com/xmomen/module/base/entity/CdContractExample.java new file mode 100644 index 0000000..9b1f71d --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdContractExample.java @@ -0,0 +1,883 @@ +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 CdContractExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdContractExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andContractCodeIsNull() { + addCriterion("CONTRACT_CODE is null"); + return (Criteria) this; + } + + public Criteria andContractCodeIsNotNull() { + addCriterion("CONTRACT_CODE is not null"); + return (Criteria) this; + } + + public Criteria andContractCodeEqualTo(String value) { + addCriterion("CONTRACT_CODE =", value, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeNotEqualTo(String value) { + addCriterion("CONTRACT_CODE <>", value, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeGreaterThan(String value) { + addCriterion("CONTRACT_CODE >", value, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeGreaterThanOrEqualTo(String value) { + addCriterion("CONTRACT_CODE >=", value, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeLessThan(String value) { + addCriterion("CONTRACT_CODE <", value, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeLessThanOrEqualTo(String value) { + addCriterion("CONTRACT_CODE <=", value, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeLike(String value) { + addCriterion("CONTRACT_CODE like", value, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeNotLike(String value) { + addCriterion("CONTRACT_CODE not like", value, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeIn(List values) { + addCriterion("CONTRACT_CODE in", values, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeNotIn(List values) { + addCriterion("CONTRACT_CODE not in", values, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeBetween(String value1, String value2) { + addCriterion("CONTRACT_CODE between", value1, value2, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractCodeNotBetween(String value1, String value2) { + addCriterion("CONTRACT_CODE not between", value1, value2, "contractCode"); + return (Criteria) this; + } + + public Criteria andContractNameIsNull() { + addCriterion("CONTRACT_NAME is null"); + return (Criteria) this; + } + + public Criteria andContractNameIsNotNull() { + addCriterion("CONTRACT_NAME is not null"); + return (Criteria) this; + } + + public Criteria andContractNameEqualTo(String value) { + addCriterion("CONTRACT_NAME =", value, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameNotEqualTo(String value) { + addCriterion("CONTRACT_NAME <>", value, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameGreaterThan(String value) { + addCriterion("CONTRACT_NAME >", value, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameGreaterThanOrEqualTo(String value) { + addCriterion("CONTRACT_NAME >=", value, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameLessThan(String value) { + addCriterion("CONTRACT_NAME <", value, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameLessThanOrEqualTo(String value) { + addCriterion("CONTRACT_NAME <=", value, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameLike(String value) { + addCriterion("CONTRACT_NAME like", value, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameNotLike(String value) { + addCriterion("CONTRACT_NAME not like", value, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameIn(List values) { + addCriterion("CONTRACT_NAME in", values, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameNotIn(List values) { + addCriterion("CONTRACT_NAME not in", values, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameBetween(String value1, String value2) { + addCriterion("CONTRACT_NAME between", value1, value2, "contractName"); + return (Criteria) this; + } + + public Criteria andContractNameNotBetween(String value1, String value2) { + addCriterion("CONTRACT_NAME not between", value1, value2, "contractName"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIsNull() { + addCriterion("CD_MEMBER_ID is null"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIsNotNull() { + addCriterion("CD_MEMBER_ID is not null"); + return (Criteria) this; + } + + public Criteria andCdMemberIdEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID =", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID <>", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdGreaterThan(Integer value) { + addCriterion("CD_MEMBER_ID >", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdGreaterThanOrEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID >=", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdLessThan(Integer value) { + addCriterion("CD_MEMBER_ID <", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdLessThanOrEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID <=", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIn(List values) { + addCriterion("CD_MEMBER_ID in", values, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotIn(List values) { + addCriterion("CD_MEMBER_ID not in", values, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdBetween(Integer value1, Integer value2) { + addCriterion("CD_MEMBER_ID between", value1, value2, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotBetween(Integer value1, Integer value2) { + addCriterion("CD_MEMBER_ID not between", value1, value2, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdIsNull() { + addCriterion("CD_COMPANY_ID is null"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdIsNotNull() { + addCriterion("CD_COMPANY_ID is not null"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdEqualTo(Integer value) { + addCriterion("CD_COMPANY_ID =", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdNotEqualTo(Integer value) { + addCriterion("CD_COMPANY_ID <>", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdGreaterThan(Integer value) { + addCriterion("CD_COMPANY_ID >", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdGreaterThanOrEqualTo(Integer value) { + addCriterion("CD_COMPANY_ID >=", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdLessThan(Integer value) { + addCriterion("CD_COMPANY_ID <", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdLessThanOrEqualTo(Integer value) { + addCriterion("CD_COMPANY_ID <=", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdIn(List values) { + addCriterion("CD_COMPANY_ID in", values, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdNotIn(List values) { + addCriterion("CD_COMPANY_ID not in", values, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdBetween(Integer value1, Integer value2) { + addCriterion("CD_COMPANY_ID between", value1, value2, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdNotBetween(Integer value1, Integer value2) { + addCriterion("CD_COMPANY_ID not between", value1, value2, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andScopeIsNull() { + addCriterion("SCOPE is null"); + return (Criteria) this; + } + + public Criteria andScopeIsNotNull() { + addCriterion("SCOPE is not null"); + return (Criteria) this; + } + + public Criteria andScopeEqualTo(Integer value) { + addCriterion("SCOPE =", value, "scope"); + return (Criteria) this; + } + + public Criteria andScopeNotEqualTo(Integer value) { + addCriterion("SCOPE <>", value, "scope"); + return (Criteria) this; + } + + public Criteria andScopeGreaterThan(Integer value) { + addCriterion("SCOPE >", value, "scope"); + return (Criteria) this; + } + + public Criteria andScopeGreaterThanOrEqualTo(Integer value) { + addCriterion("SCOPE >=", value, "scope"); + return (Criteria) this; + } + + public Criteria andScopeLessThan(Integer value) { + addCriterion("SCOPE <", value, "scope"); + return (Criteria) this; + } + + public Criteria andScopeLessThanOrEqualTo(Integer value) { + addCriterion("SCOPE <=", value, "scope"); + return (Criteria) this; + } + + public Criteria andScopeIn(List values) { + addCriterion("SCOPE in", values, "scope"); + return (Criteria) this; + } + + public Criteria andScopeNotIn(List values) { + addCriterion("SCOPE not in", values, "scope"); + return (Criteria) this; + } + + public Criteria andScopeBetween(Integer value1, Integer value2) { + addCriterion("SCOPE between", value1, value2, "scope"); + return (Criteria) this; + } + + public Criteria andScopeNotBetween(Integer value1, Integer value2) { + addCriterion("SCOPE not between", value1, value2, "scope"); + return (Criteria) this; + } + + public Criteria andContractPriceIsNull() { + addCriterion("CONTRACT_PRICE is null"); + return (Criteria) this; + } + + public Criteria andContractPriceIsNotNull() { + addCriterion("CONTRACT_PRICE is not null"); + return (Criteria) this; + } + + public Criteria andContractPriceEqualTo(BigDecimal value) { + addCriterion("CONTRACT_PRICE =", value, "contractPrice"); + return (Criteria) this; + } + + public Criteria andContractPriceNotEqualTo(BigDecimal value) { + addCriterion("CONTRACT_PRICE <>", value, "contractPrice"); + return (Criteria) this; + } + + public Criteria andContractPriceGreaterThan(BigDecimal value) { + addCriterion("CONTRACT_PRICE >", value, "contractPrice"); + return (Criteria) this; + } + + public Criteria andContractPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("CONTRACT_PRICE >=", value, "contractPrice"); + return (Criteria) this; + } + + public Criteria andContractPriceLessThan(BigDecimal value) { + addCriterion("CONTRACT_PRICE <", value, "contractPrice"); + return (Criteria) this; + } + + public Criteria andContractPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("CONTRACT_PRICE <=", value, "contractPrice"); + return (Criteria) this; + } + + public Criteria andContractPriceIn(List values) { + addCriterion("CONTRACT_PRICE in", values, "contractPrice"); + return (Criteria) this; + } + + public Criteria andContractPriceNotIn(List values) { + addCriterion("CONTRACT_PRICE not in", values, "contractPrice"); + return (Criteria) this; + } + + public Criteria andContractPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("CONTRACT_PRICE between", value1, value2, "contractPrice"); + return (Criteria) this; + } + + public Criteria andContractPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("CONTRACT_PRICE not between", value1, value2, "contractPrice"); + 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 values) { + addCriterion("BEGIN_TIME in", values, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotIn(List 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 Criteria andEndTimeIsNull() { + addCriterion("END_TIME is null"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNotNull() { + addCriterion("END_TIME is not null"); + return (Criteria) this; + } + + public Criteria andEndTimeEqualTo(Date value) { + addCriterion("END_TIME =", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotEqualTo(Date value) { + addCriterion("END_TIME <>", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThan(Date value) { + addCriterion("END_TIME >", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThanOrEqualTo(Date value) { + addCriterion("END_TIME >=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThan(Date value) { + addCriterion("END_TIME <", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThanOrEqualTo(Date value) { + addCriterion("END_TIME <=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIn(List values) { + addCriterion("END_TIME in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotIn(List values) { + addCriterion("END_TIME not in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeBetween(Date value1, Date value2) { + addCriterion("END_TIME between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotBetween(Date value1, Date value2) { + addCriterion("END_TIME not between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andIsDelIsNull() { + addCriterion("IS_DEL is null"); + return (Criteria) this; + } + + public Criteria andIsDelIsNotNull() { + addCriterion("IS_DEL is not null"); + return (Criteria) this; + } + + public Criteria andIsDelEqualTo(Integer value) { + addCriterion("IS_DEL =", value, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelNotEqualTo(Integer value) { + addCriterion("IS_DEL <>", value, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelGreaterThan(Integer value) { + addCriterion("IS_DEL >", value, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelGreaterThanOrEqualTo(Integer value) { + addCriterion("IS_DEL >=", value, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelLessThan(Integer value) { + addCriterion("IS_DEL <", value, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelLessThanOrEqualTo(Integer value) { + addCriterion("IS_DEL <=", value, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelIn(List values) { + addCriterion("IS_DEL in", values, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelNotIn(List values) { + addCriterion("IS_DEL not in", values, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelBetween(Integer value1, Integer value2) { + addCriterion("IS_DEL between", value1, value2, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelNotBetween(Integer value1, Integer value2) { + addCriterion("IS_DEL not between", value1, value2, "isDel"); + return (Criteria) this; + } + + public Criteria andIsAuditorIsNull() { + addCriterion("IS_AUDITOR is null"); + return (Criteria) this; + } + + public Criteria andIsAuditorIsNotNull() { + addCriterion("IS_AUDITOR is not null"); + return (Criteria) this; + } + + public Criteria andIsAuditorEqualTo(Integer value) { + addCriterion("IS_AUDITOR =", value, "isAuditor"); + return (Criteria) this; + } + + public Criteria andIsAuditorNotEqualTo(Integer value) { + addCriterion("IS_AUDITOR <>", value, "isAuditor"); + return (Criteria) this; + } + + public Criteria andIsAuditorGreaterThan(Integer value) { + addCriterion("IS_AUDITOR >", value, "isAuditor"); + return (Criteria) this; + } + + public Criteria andIsAuditorGreaterThanOrEqualTo(Integer value) { + addCriterion("IS_AUDITOR >=", value, "isAuditor"); + return (Criteria) this; + } + + public Criteria andIsAuditorLessThan(Integer value) { + addCriterion("IS_AUDITOR <", value, "isAuditor"); + return (Criteria) this; + } + + public Criteria andIsAuditorLessThanOrEqualTo(Integer value) { + addCriterion("IS_AUDITOR <=", value, "isAuditor"); + return (Criteria) this; + } + + public Criteria andIsAuditorIn(List values) { + addCriterion("IS_AUDITOR in", values, "isAuditor"); + return (Criteria) this; + } + + public Criteria andIsAuditorNotIn(List values) { + addCriterion("IS_AUDITOR not in", values, "isAuditor"); + return (Criteria) this; + } + + public Criteria andIsAuditorBetween(Integer value1, Integer value2) { + addCriterion("IS_AUDITOR between", value1, value2, "isAuditor"); + return (Criteria) this; + } + + public Criteria andIsAuditorNotBetween(Integer value1, Integer value2) { + addCriterion("IS_AUDITOR not between", value1, value2, "isAuditor"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdCouponCategoryExample.java b/src/main/java/com/xmomen/module/base/entity/CdCouponCategoryExample.java new file mode 100644 index 0000000..062bb1a --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdCouponCategoryExample.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 CdCouponCategoryExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdCouponCategoryExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andCategoryTypeIsNull() { + addCriterion("CATEGORY_TYPE is null"); + return (Criteria) this; + } + + public Criteria andCategoryTypeIsNotNull() { + addCriterion("CATEGORY_TYPE is not null"); + return (Criteria) this; + } + + public Criteria andCategoryTypeEqualTo(Integer value) { + addCriterion("CATEGORY_TYPE =", value, "categoryType"); + return (Criteria) this; + } + + public Criteria andCategoryTypeNotEqualTo(Integer value) { + addCriterion("CATEGORY_TYPE <>", value, "categoryType"); + return (Criteria) this; + } + + public Criteria andCategoryTypeGreaterThan(Integer value) { + addCriterion("CATEGORY_TYPE >", value, "categoryType"); + return (Criteria) this; + } + + public Criteria andCategoryTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("CATEGORY_TYPE >=", value, "categoryType"); + return (Criteria) this; + } + + public Criteria andCategoryTypeLessThan(Integer value) { + addCriterion("CATEGORY_TYPE <", value, "categoryType"); + return (Criteria) this; + } + + public Criteria andCategoryTypeLessThanOrEqualTo(Integer value) { + addCriterion("CATEGORY_TYPE <=", value, "categoryType"); + return (Criteria) this; + } + + public Criteria andCategoryTypeIn(List values) { + addCriterion("CATEGORY_TYPE in", values, "categoryType"); + return (Criteria) this; + } + + public Criteria andCategoryTypeNotIn(List values) { + addCriterion("CATEGORY_TYPE not in", values, "categoryType"); + return (Criteria) this; + } + + public Criteria andCategoryTypeBetween(Integer value1, Integer value2) { + addCriterion("CATEGORY_TYPE between", value1, value2, "categoryType"); + return (Criteria) this; + } + + public Criteria andCategoryTypeNotBetween(Integer value1, Integer value2) { + addCriterion("CATEGORY_TYPE not between", value1, value2, "categoryType"); + 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 values) { + addCriterion("CATEGORY_NAME in", values, "categoryName"); + return (Criteria) this; + } + + public Criteria andCategoryNameNotIn(List 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 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdCouponCategoryRef.java b/src/main/java/com/xmomen/module/base/entity/CdCouponCategoryRef.java new file mode 100644 index 0000000..ca1c18e --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdCouponCategoryRef.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_category_ref") +public class CdCouponCategoryRef extends BaseMybatisModel { + /** + * + */ + private Integer id; + + /** + * 卡劵类别 + */ + private Integer cdCouponCategoryId; + + /** + * 拓展类型 + */ + private String refType; + + /** + * 拓展描述 + */ + private String refName; + + /** + * 拓展值 + */ + private String refValue; + + /** + * 份数 + */ + private Integer refCount; + + @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_CATEGORY_ID") + public Integer getCdCouponCategoryId() { + return cdCouponCategoryId; + } + + public void setCdCouponCategoryId(Integer cdCouponCategoryId) { + this.cdCouponCategoryId = cdCouponCategoryId; + if(cdCouponCategoryId == null){ + removeValidField("cdCouponCategoryId"); + return; + } + addValidField("cdCouponCategoryId"); + } + + @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"); + } + + @Column(name = "REF_COUNT") + public Integer getRefCount() { + return refCount; + } + + public void setRefCount(Integer refCount) { + this.refCount = refCount; + if(refCount == null){ + removeValidField("refCount"); + return; + } + addValidField("refCount"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdCouponRefExample.java b/src/main/java/com/xmomen/module/base/entity/CdCouponRefExample.java new file mode 100644 index 0000000..43c9837 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdCouponRefExample.java @@ -0,0 +1,601 @@ +package com.xmomen.module.base.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class CdCouponRefExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdCouponRefExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andCdCouponIdIsNull() { + addCriterion("CD_COUPON_ID is null"); + return (Criteria) this; + } + + public Criteria andCdCouponIdIsNotNull() { + addCriterion("CD_COUPON_ID is not null"); + return (Criteria) this; + } + + public Criteria andCdCouponIdEqualTo(Integer value) { + addCriterion("CD_COUPON_ID =", value, "cdCouponId"); + return (Criteria) this; + } + + public Criteria andCdCouponIdNotEqualTo(Integer value) { + addCriterion("CD_COUPON_ID <>", value, "cdCouponId"); + return (Criteria) this; + } + + public Criteria andCdCouponIdGreaterThan(Integer value) { + addCriterion("CD_COUPON_ID >", value, "cdCouponId"); + return (Criteria) this; + } + + public Criteria andCdCouponIdGreaterThanOrEqualTo(Integer value) { + addCriterion("CD_COUPON_ID >=", value, "cdCouponId"); + return (Criteria) this; + } + + public Criteria andCdCouponIdLessThan(Integer value) { + addCriterion("CD_COUPON_ID <", value, "cdCouponId"); + return (Criteria) this; + } + + public Criteria andCdCouponIdLessThanOrEqualTo(Integer value) { + addCriterion("CD_COUPON_ID <=", value, "cdCouponId"); + return (Criteria) this; + } + + public Criteria andCdCouponIdIn(List values) { + addCriterion("CD_COUPON_ID in", values, "cdCouponId"); + return (Criteria) this; + } + + public Criteria andCdCouponIdNotIn(List values) { + addCriterion("CD_COUPON_ID not in", values, "cdCouponId"); + return (Criteria) this; + } + + public Criteria andCdCouponIdBetween(Integer value1, Integer value2) { + addCriterion("CD_COUPON_ID between", value1, value2, "cdCouponId"); + return (Criteria) this; + } + + public Criteria andCdCouponIdNotBetween(Integer value1, Integer value2) { + addCriterion("CD_COUPON_ID not between", value1, value2, "cdCouponId"); + 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 values) { + addCriterion("COUPON_NUMBER in", values, "couponNumber"); + return (Criteria) this; + } + + public Criteria andCouponNumberNotIn(List 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 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 values) { + addCriterion("REF_TYPE in", values, "refType"); + return (Criteria) this; + } + + public Criteria andRefTypeNotIn(List 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 values) { + addCriterion("REF_NAME in", values, "refName"); + return (Criteria) this; + } + + public Criteria andRefNameNotIn(List 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 values) { + addCriterion("REF_VALUE in", values, "refValue"); + return (Criteria) this; + } + + public Criteria andRefValueNotIn(List 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 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdExpress.java b/src/main/java/com/xmomen/module/base/entity/CdExpress.java new file mode 100644 index 0000000..2c13b9f --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdExpress.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_express") +public class CdExpress extends BaseMybatisModel { + /** + * 主键 + */ + private Integer id; + + /** + * 快递编号 + */ + private String expressCode; + + /** + * 快递公司名 + */ + private String expressName; + + @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 = "EXPRESS_CODE") + public String getExpressCode() { + return expressCode; + } + + public void setExpressCode(String expressCode) { + this.expressCode = expressCode; + if(expressCode == null){ + removeValidField("expressCode"); + return; + } + addValidField("expressCode"); + } + + @Column(name = "EXPRESS_NAME") + public String getExpressName() { + return expressName; + } + + public void setExpressName(String expressName) { + this.expressName = expressName; + if(expressName == null){ + removeValidField("expressName"); + return; + } + addValidField("expressName"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdExpressExample.java b/src/main/java/com/xmomen/module/base/entity/CdExpressExample.java new file mode 100644 index 0000000..770e35e --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdExpressExample.java @@ -0,0 +1,401 @@ +package com.xmomen.module.base.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class CdExpressExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdExpressExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andExpressCodeIsNull() { + addCriterion("EXPRESS_CODE is null"); + return (Criteria) this; + } + + public Criteria andExpressCodeIsNotNull() { + addCriterion("EXPRESS_CODE is not null"); + return (Criteria) this; + } + + public Criteria andExpressCodeEqualTo(String value) { + addCriterion("EXPRESS_CODE =", value, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeNotEqualTo(String value) { + addCriterion("EXPRESS_CODE <>", value, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeGreaterThan(String value) { + addCriterion("EXPRESS_CODE >", value, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeGreaterThanOrEqualTo(String value) { + addCriterion("EXPRESS_CODE >=", value, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeLessThan(String value) { + addCriterion("EXPRESS_CODE <", value, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeLessThanOrEqualTo(String value) { + addCriterion("EXPRESS_CODE <=", value, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeLike(String value) { + addCriterion("EXPRESS_CODE like", value, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeNotLike(String value) { + addCriterion("EXPRESS_CODE not like", value, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeIn(List values) { + addCriterion("EXPRESS_CODE in", values, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeNotIn(List values) { + addCriterion("EXPRESS_CODE not in", values, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeBetween(String value1, String value2) { + addCriterion("EXPRESS_CODE between", value1, value2, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressCodeNotBetween(String value1, String value2) { + addCriterion("EXPRESS_CODE not between", value1, value2, "expressCode"); + return (Criteria) this; + } + + public Criteria andExpressNameIsNull() { + addCriterion("EXPRESS_NAME is null"); + return (Criteria) this; + } + + public Criteria andExpressNameIsNotNull() { + addCriterion("EXPRESS_NAME is not null"); + return (Criteria) this; + } + + public Criteria andExpressNameEqualTo(String value) { + addCriterion("EXPRESS_NAME =", value, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameNotEqualTo(String value) { + addCriterion("EXPRESS_NAME <>", value, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameGreaterThan(String value) { + addCriterion("EXPRESS_NAME >", value, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameGreaterThanOrEqualTo(String value) { + addCriterion("EXPRESS_NAME >=", value, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameLessThan(String value) { + addCriterion("EXPRESS_NAME <", value, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameLessThanOrEqualTo(String value) { + addCriterion("EXPRESS_NAME <=", value, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameLike(String value) { + addCriterion("EXPRESS_NAME like", value, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameNotLike(String value) { + addCriterion("EXPRESS_NAME not like", value, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameIn(List values) { + addCriterion("EXPRESS_NAME in", values, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameNotIn(List values) { + addCriterion("EXPRESS_NAME not in", values, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameBetween(String value1, String value2) { + addCriterion("EXPRESS_NAME between", value1, value2, "expressName"); + return (Criteria) this; + } + + public Criteria andExpressNameNotBetween(String value1, String value2) { + addCriterion("EXPRESS_NAME not between", value1, value2, "expressName"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdExpressMember.java b/src/main/java/com/xmomen/module/base/entity/CdExpressMember.java new file mode 100644 index 0000000..9fd5643 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdExpressMember.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_express_member") +public class CdExpressMember extends BaseMybatisModel { + /** + * 主键 + */ + private Integer id; + + /** + * 快递商id + */ + private Integer cdExpressId; + + /** + * 快递员姓名 + */ + private String memberName; + + /** + * 电话号码 + */ + private String phone; + + @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_EXPRESS_ID") + public Integer getCdExpressId() { + return cdExpressId; + } + + public void setCdExpressId(Integer cdExpressId) { + this.cdExpressId = cdExpressId; + if(cdExpressId == null){ + removeValidField("cdExpressId"); + return; + } + addValidField("cdExpressId"); + } + + @Column(name = "MEMBER_NAME") + public String getMemberName() { + return memberName; + } + + public void setMemberName(String memberName) { + this.memberName = memberName; + if(memberName == null){ + removeValidField("memberName"); + return; + } + addValidField("memberName"); + } + + @Column(name = "PHONE") + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + if(phone == null){ + removeValidField("phone"); + return; + } + addValidField("phone"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdExpressMemberExample.java b/src/main/java/com/xmomen/module/base/entity/CdExpressMemberExample.java new file mode 100644 index 0000000..d59085c --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdExpressMemberExample.java @@ -0,0 +1,461 @@ +package com.xmomen.module.base.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class CdExpressMemberExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdExpressMemberExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andCdExpressIdIsNull() { + addCriterion("CD_EXPRESS_ID is null"); + return (Criteria) this; + } + + public Criteria andCdExpressIdIsNotNull() { + addCriterion("CD_EXPRESS_ID is not null"); + return (Criteria) this; + } + + public Criteria andCdExpressIdEqualTo(Integer value) { + addCriterion("CD_EXPRESS_ID =", value, "cdExpressId"); + return (Criteria) this; + } + + public Criteria andCdExpressIdNotEqualTo(Integer value) { + addCriterion("CD_EXPRESS_ID <>", value, "cdExpressId"); + return (Criteria) this; + } + + public Criteria andCdExpressIdGreaterThan(Integer value) { + addCriterion("CD_EXPRESS_ID >", value, "cdExpressId"); + return (Criteria) this; + } + + public Criteria andCdExpressIdGreaterThanOrEqualTo(Integer value) { + addCriterion("CD_EXPRESS_ID >=", value, "cdExpressId"); + return (Criteria) this; + } + + public Criteria andCdExpressIdLessThan(Integer value) { + addCriterion("CD_EXPRESS_ID <", value, "cdExpressId"); + return (Criteria) this; + } + + public Criteria andCdExpressIdLessThanOrEqualTo(Integer value) { + addCriterion("CD_EXPRESS_ID <=", value, "cdExpressId"); + return (Criteria) this; + } + + public Criteria andCdExpressIdIn(List values) { + addCriterion("CD_EXPRESS_ID in", values, "cdExpressId"); + return (Criteria) this; + } + + public Criteria andCdExpressIdNotIn(List values) { + addCriterion("CD_EXPRESS_ID not in", values, "cdExpressId"); + return (Criteria) this; + } + + public Criteria andCdExpressIdBetween(Integer value1, Integer value2) { + addCriterion("CD_EXPRESS_ID between", value1, value2, "cdExpressId"); + return (Criteria) this; + } + + public Criteria andCdExpressIdNotBetween(Integer value1, Integer value2) { + addCriterion("CD_EXPRESS_ID not between", value1, value2, "cdExpressId"); + return (Criteria) this; + } + + public Criteria andMemberNameIsNull() { + addCriterion("MEMBER_NAME is null"); + return (Criteria) this; + } + + public Criteria andMemberNameIsNotNull() { + addCriterion("MEMBER_NAME is not null"); + return (Criteria) this; + } + + public Criteria andMemberNameEqualTo(String value) { + addCriterion("MEMBER_NAME =", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameNotEqualTo(String value) { + addCriterion("MEMBER_NAME <>", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameGreaterThan(String value) { + addCriterion("MEMBER_NAME >", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameGreaterThanOrEqualTo(String value) { + addCriterion("MEMBER_NAME >=", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameLessThan(String value) { + addCriterion("MEMBER_NAME <", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameLessThanOrEqualTo(String value) { + addCriterion("MEMBER_NAME <=", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameLike(String value) { + addCriterion("MEMBER_NAME like", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameNotLike(String value) { + addCriterion("MEMBER_NAME not like", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameIn(List values) { + addCriterion("MEMBER_NAME in", values, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameNotIn(List values) { + addCriterion("MEMBER_NAME not in", values, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameBetween(String value1, String value2) { + addCriterion("MEMBER_NAME between", value1, value2, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameNotBetween(String value1, String value2) { + addCriterion("MEMBER_NAME not between", value1, value2, "memberName"); + return (Criteria) this; + } + + public Criteria andPhoneIsNull() { + addCriterion("PHONE is null"); + return (Criteria) this; + } + + public Criteria andPhoneIsNotNull() { + addCriterion("PHONE is not null"); + return (Criteria) this; + } + + public Criteria andPhoneEqualTo(String value) { + addCriterion("PHONE =", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotEqualTo(String value) { + addCriterion("PHONE <>", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThan(String value) { + addCriterion("PHONE >", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThanOrEqualTo(String value) { + addCriterion("PHONE >=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThan(String value) { + addCriterion("PHONE <", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThanOrEqualTo(String value) { + addCriterion("PHONE <=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLike(String value) { + addCriterion("PHONE like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotLike(String value) { + addCriterion("PHONE not like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneIn(List values) { + addCriterion("PHONE in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotIn(List values) { + addCriterion("PHONE not in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneBetween(String value1, String value2) { + addCriterion("PHONE between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotBetween(String value1, String value2) { + addCriterion("PHONE not between", value1, value2, "phone"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdItemDetailExample.java b/src/main/java/com/xmomen/module/base/entity/CdItemDetailExample.java new file mode 100644 index 0000000..712edc1 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdItemDetailExample.java @@ -0,0 +1,321 @@ +package com.xmomen.module.base.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class CdItemDetailExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdItemDetailExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 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 values) { + addCriterion("cd_item_id in", values, "cdItemId"); + return (Criteria) this; + } + + public Criteria andCdItemIdNotIn(List 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 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdItemRef.java b/src/main/java/com/xmomen/module/base/entity/CdItemRef.java new file mode 100644 index 0000000..5b83085 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdItemRef.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_item_ref") +public class CdItemRef extends BaseMybatisModel { + /** + * + */ + private Integer cdItemRefId; + + /** + * 拓展类型 + */ + private String refType; + + /** + * 拓展描述 + */ + private String refName; + + /** + * 拓展值 + */ + private String refValue; + + /** + * 对应产品 + */ + private Integer cdItemId; + + /** + * 份数 + */ + private Integer refCount; + + @Column(name = "CD_ITEM_REF_ID") + @Id + @GeneratedValue(generator = "UUIDGenerator") + public Integer getCdItemRefId() { + return cdItemRefId; + } + + public void setCdItemRefId(Integer cdItemRefId) { + this.cdItemRefId = cdItemRefId; + if(cdItemRefId == null){ + removeValidField("cdItemRefId"); + return; + } + addValidField("cdItemRefId"); + } + + @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"); + } + + @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 = "REF_COUNT") + public Integer getRefCount() { + return refCount; + } + + public void setRefCount(Integer refCount) { + this.refCount = refCount; + if(refCount == null){ + removeValidField("refCount"); + return; + } + addValidField("refCount"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdItemRefExample.java b/src/main/java/com/xmomen/module/base/entity/CdItemRefExample.java new file mode 100644 index 0000000..b931f5a --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdItemRefExample.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 CdItemRefExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdItemRefExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 andCdItemRefIdIsNull() { + addCriterion("CD_ITEM_REF_ID is null"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdIsNotNull() { + addCriterion("CD_ITEM_REF_ID is not null"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdEqualTo(Integer value) { + addCriterion("CD_ITEM_REF_ID =", value, "cdItemRefId"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdNotEqualTo(Integer value) { + addCriterion("CD_ITEM_REF_ID <>", value, "cdItemRefId"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdGreaterThan(Integer value) { + addCriterion("CD_ITEM_REF_ID >", value, "cdItemRefId"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdGreaterThanOrEqualTo(Integer value) { + addCriterion("CD_ITEM_REF_ID >=", value, "cdItemRefId"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdLessThan(Integer value) { + addCriterion("CD_ITEM_REF_ID <", value, "cdItemRefId"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdLessThanOrEqualTo(Integer value) { + addCriterion("CD_ITEM_REF_ID <=", value, "cdItemRefId"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdIn(List values) { + addCriterion("CD_ITEM_REF_ID in", values, "cdItemRefId"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdNotIn(List values) { + addCriterion("CD_ITEM_REF_ID not in", values, "cdItemRefId"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdBetween(Integer value1, Integer value2) { + addCriterion("CD_ITEM_REF_ID between", value1, value2, "cdItemRefId"); + return (Criteria) this; + } + + public Criteria andCdItemRefIdNotBetween(Integer value1, Integer value2) { + addCriterion("CD_ITEM_REF_ID not between", value1, value2, "cdItemRefId"); + 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 values) { + addCriterion("REF_TYPE in", values, "refType"); + return (Criteria) this; + } + + public Criteria andRefTypeNotIn(List 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 values) { + addCriterion("REF_NAME in", values, "refName"); + return (Criteria) this; + } + + public Criteria andRefNameNotIn(List 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 values) { + addCriterion("REF_VALUE in", values, "refValue"); + return (Criteria) this; + } + + public Criteria andRefValueNotIn(List 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 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 values) { + addCriterion("CD_ITEM_ID in", values, "cdItemId"); + return (Criteria) this; + } + + public Criteria andCdItemIdNotIn(List 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 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 values) { + addCriterion("REF_COUNT in", values, "refCount"); + return (Criteria) this; + } + + public Criteria andRefCountNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdManagerCompany.java b/src/main/java/com/xmomen/module/base/entity/CdManagerCompany.java new file mode 100644 index 0000000..e062baa --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdManagerCompany.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_manager_company") +public class CdManagerCompany extends BaseMybatisModel { + /** + * + */ + private Integer id; + + /** + * 单位 + */ + private Integer cdCompanyId; + + /** + * 客户经理 + */ + private Integer cdManagerId; + + @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_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_MANAGER_ID") + public Integer getCdManagerId() { + return cdManagerId; + } + + public void setCdManagerId(Integer cdManagerId) { + this.cdManagerId = cdManagerId; + if(cdManagerId == null){ + removeValidField("cdManagerId"); + return; + } + addValidField("cdManagerId"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdManagerCompanyExample.java b/src/main/java/com/xmomen/module/base/entity/CdManagerCompanyExample.java new file mode 100644 index 0000000..a5edd94 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdManagerCompanyExample.java @@ -0,0 +1,381 @@ +package com.xmomen.module.base.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class CdManagerCompanyExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdManagerCompanyExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andCdCompanyIdIsNull() { + addCriterion("CD_COMPANY_ID is null"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdIsNotNull() { + addCriterion("CD_COMPANY_ID is not null"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdEqualTo(Integer value) { + addCriterion("CD_COMPANY_ID =", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdNotEqualTo(Integer value) { + addCriterion("CD_COMPANY_ID <>", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdGreaterThan(Integer value) { + addCriterion("CD_COMPANY_ID >", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdGreaterThanOrEqualTo(Integer value) { + addCriterion("CD_COMPANY_ID >=", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdLessThan(Integer value) { + addCriterion("CD_COMPANY_ID <", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdLessThanOrEqualTo(Integer value) { + addCriterion("CD_COMPANY_ID <=", value, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdIn(List values) { + addCriterion("CD_COMPANY_ID in", values, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdNotIn(List values) { + addCriterion("CD_COMPANY_ID not in", values, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdBetween(Integer value1, Integer value2) { + addCriterion("CD_COMPANY_ID between", value1, value2, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdCompanyIdNotBetween(Integer value1, Integer value2) { + addCriterion("CD_COMPANY_ID not between", value1, value2, "cdCompanyId"); + return (Criteria) this; + } + + public Criteria andCdManagerIdIsNull() { + addCriterion("CD_MANAGER_ID is null"); + return (Criteria) this; + } + + public Criteria andCdManagerIdIsNotNull() { + addCriterion("CD_MANAGER_ID is not null"); + return (Criteria) this; + } + + public Criteria andCdManagerIdEqualTo(Integer value) { + addCriterion("CD_MANAGER_ID =", value, "cdManagerId"); + return (Criteria) this; + } + + public Criteria andCdManagerIdNotEqualTo(Integer value) { + addCriterion("CD_MANAGER_ID <>", value, "cdManagerId"); + return (Criteria) this; + } + + public Criteria andCdManagerIdGreaterThan(Integer value) { + addCriterion("CD_MANAGER_ID >", value, "cdManagerId"); + return (Criteria) this; + } + + public Criteria andCdManagerIdGreaterThanOrEqualTo(Integer value) { + addCriterion("CD_MANAGER_ID >=", value, "cdManagerId"); + return (Criteria) this; + } + + public Criteria andCdManagerIdLessThan(Integer value) { + addCriterion("CD_MANAGER_ID <", value, "cdManagerId"); + return (Criteria) this; + } + + public Criteria andCdManagerIdLessThanOrEqualTo(Integer value) { + addCriterion("CD_MANAGER_ID <=", value, "cdManagerId"); + return (Criteria) this; + } + + public Criteria andCdManagerIdIn(List values) { + addCriterion("CD_MANAGER_ID in", values, "cdManagerId"); + return (Criteria) this; + } + + public Criteria andCdManagerIdNotIn(List values) { + addCriterion("CD_MANAGER_ID not in", values, "cdManagerId"); + return (Criteria) this; + } + + public Criteria andCdManagerIdBetween(Integer value1, Integer value2) { + addCriterion("CD_MANAGER_ID between", value1, value2, "cdManagerId"); + return (Criteria) this; + } + + public Criteria andCdManagerIdNotBetween(Integer value1, Integer value2) { + addCriterion("CD_MANAGER_ID not between", value1, value2, "cdManagerId"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/CdMemberCouponRelationExample.java b/src/main/java/com/xmomen/module/base/entity/CdMemberCouponRelationExample.java new file mode 100644 index 0000000..70c5968 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/CdMemberCouponRelationExample.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 CdMemberCouponRelationExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CdMemberCouponRelationExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andCdMemberIdIsNull() { + addCriterion("CD_MEMBER_ID is null"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIsNotNull() { + addCriterion("CD_MEMBER_ID is not null"); + return (Criteria) this; + } + + public Criteria andCdMemberIdEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID =", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID <>", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdGreaterThan(Integer value) { + addCriterion("CD_MEMBER_ID >", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdGreaterThanOrEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID >=", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdLessThan(Integer value) { + addCriterion("CD_MEMBER_ID <", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdLessThanOrEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID <=", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIn(List values) { + addCriterion("CD_MEMBER_ID in", values, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotIn(List values) { + addCriterion("CD_MEMBER_ID not in", values, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdBetween(Integer value1, Integer value2) { + addCriterion("CD_MEMBER_ID between", value1, value2, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotBetween(Integer value1, Integer value2) { + addCriterion("CD_MEMBER_ID not between", value1, value2, "cdMemberId"); + 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 values) { + addCriterion("COUPON_NUMBER in", values, "couponNumber"); + return (Criteria) this; + } + + public Criteria andCouponNumberNotIn(List 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 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/ChildItemModel.java b/src/main/java/com/xmomen/module/base/entity/ChildItemModel.java new file mode 100644 index 0000000..a3c22b0 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/ChildItemModel.java @@ -0,0 +1,35 @@ +package com.xmomen.module.base.entity; + +import java.io.Serializable; + +public class ChildItemModel implements Serializable { + private Integer childItemId; + private String itemName; + private String itemCode; + private String itemCategory; + public Integer getChildItemId() { + return childItemId; + } + public void setChildItemId(Integer childItemId) { + this.childItemId = childItemId; + } + 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 getItemCategory() { + return itemCategory; + } + public void setItemCategory(String itemCategory) { + this.itemCategory = itemCategory; + } + +} diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdActivityAddressMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdActivityAddressMapper.java new file mode 100644 index 0000000..1531bdc --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdActivityAddressMapper.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.CdActivityAddress; +import com.xmomen.module.base.entity.CdActivityAddressExample; +import org.apache.ibatis.annotations.Param; + +public interface CdActivityAddressMapper extends MybatisMapper { + int countByExample(CdActivityAddressExample example); + + int deleteByExample(CdActivityAddressExample example); + + int insertSelective(CdActivityAddress record); + + int updateByExampleSelective(@Param("record") CdActivityAddress record, @Param("example") CdActivityAddressExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdActivityRefMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdActivityRefMapper.java new file mode 100644 index 0000000..bdd747c --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdActivityRefMapper.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.CdActivityRef; +import com.xmomen.module.base.entity.CdActivityRefExample; +import org.apache.ibatis.annotations.Param; + +public interface CdActivityRefMapper extends MybatisMapper { + int countByExample(CdActivityRefExample example); + + int deleteByExample(CdActivityRefExample example); + + int insertSelective(CdActivityRef record); + + int updateByExampleSelective(@Param("record") CdActivityRef record, @Param("example") CdActivityRefExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdAttachmentMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdAttachmentMapper.java new file mode 100644 index 0000000..6d031d4 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdAttachmentMapper.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.CdAttachment; +import com.xmomen.module.base.entity.CdAttachmentExample; +import org.apache.ibatis.annotations.Param; + +public interface CdAttachmentMapper extends MybatisMapper { + int countByExample(CdAttachmentExample example); + + int deleteByExample(CdAttachmentExample example); + + int insertSelective(CdAttachment record); + + int updateByExampleSelective(@Param("record") CdAttachment record, @Param("example") CdAttachmentExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdContractMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdContractMapper.java new file mode 100644 index 0000000..79324b0 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdContractMapper.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.CdContract; +import com.xmomen.module.base.entity.CdContractExample; +import org.apache.ibatis.annotations.Param; + +public interface CdContractMapper extends MybatisMapper { + int countByExample(CdContractExample example); + + int deleteByExample(CdContractExample example); + + int insertSelective(CdContract record); + + int updateByExampleSelective(@Param("record") CdContract record, @Param("example") CdContractExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdCouponCategoryMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdCouponCategoryMapper.java new file mode 100644 index 0000000..f117ec8 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdCouponCategoryMapper.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.CdCouponCategory; +import com.xmomen.module.base.entity.CdCouponCategoryExample; +import org.apache.ibatis.annotations.Param; + +public interface CdCouponCategoryMapper extends MybatisMapper { + int countByExample(CdCouponCategoryExample example); + + int deleteByExample(CdCouponCategoryExample example); + + int insertSelective(CdCouponCategory record); + + int updateByExampleSelective(@Param("record") CdCouponCategory record, @Param("example") CdCouponCategoryExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdItemDetailMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdItemDetailMapper.java new file mode 100644 index 0000000..ac6c502 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdItemDetailMapper.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.CdItemDetail; +import com.xmomen.module.base.entity.CdItemDetailExample; +import org.apache.ibatis.annotations.Param; + +public interface CdItemDetailMapper extends MybatisMapper { + int countByExample(CdItemDetailExample example); + + int deleteByExample(CdItemDetailExample example); + + int insertSelective(CdItemDetail record); + + int updateByExampleSelective(@Param("record") CdItemDetail record, @Param("example") CdItemDetailExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdItemMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdItemMapper.java new file mode 100644 index 0000000..a62b061 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdItemMapper.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.CdItem; +import com.xmomen.module.base.entity.CdItemExample; +import org.apache.ibatis.annotations.Param; + +public interface CdItemMapper extends MybatisMapper { + int countByExample(CdItemExample example); + + int deleteByExample(CdItemExample example); + + int insertSelective(CdItem record); + + int updateByExampleSelective(@Param("record") CdItem record, @Param("example") CdItemExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdItemRefMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdItemRefMapper.java new file mode 100644 index 0000000..2a4e3be --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdItemRefMapper.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.CdItemRef; +import com.xmomen.module.base.entity.CdItemRefExample; +import org.apache.ibatis.annotations.Param; + +public interface CdItemRefMapper extends MybatisMapper { + int countByExample(CdItemRefExample example); + + int deleteByExample(CdItemRefExample example); + + int insertSelective(CdItemRef record); + + int updateByExampleSelective(@Param("record") CdItemRef record, @Param("example") CdItemRefExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdManagerCompanyMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdManagerCompanyMapper.java new file mode 100644 index 0000000..0fd3076 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdManagerCompanyMapper.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.CdManagerCompany; +import com.xmomen.module.base.entity.CdManagerCompanyExample; +import org.apache.ibatis.annotations.Param; + +public interface CdManagerCompanyMapper extends MybatisMapper { + int countByExample(CdManagerCompanyExample example); + + int deleteByExample(CdManagerCompanyExample example); + + int insertSelective(CdManagerCompany record); + + int updateByExampleSelective(@Param("record") CdManagerCompany record, @Param("example") CdManagerCompanyExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdMemberCouponRelationMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdMemberCouponRelationMapper.java new file mode 100644 index 0000000..7074ca6 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdMemberCouponRelationMapper.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.CdMemberCouponRelation; +import com.xmomen.module.base.entity.CdMemberCouponRelationExample; +import org.apache.ibatis.annotations.Param; + +public interface CdMemberCouponRelationMapper extends MybatisMapper { + int countByExample(CdMemberCouponRelationExample example); + + int deleteByExample(CdMemberCouponRelationExample example); + + int insertSelective(CdMemberCouponRelation record); + + int updateByExampleSelective(@Param("record") CdMemberCouponRelation record, @Param("example") CdMemberCouponRelationExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdMemberMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdMemberMapper.java new file mode 100644 index 0000000..fc868ec --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdMemberMapper.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.CdMember; +import com.xmomen.module.base.entity.CdMemberExample; +import org.apache.ibatis.annotations.Param; + +public interface CdMemberMapper extends MybatisMapper { + int countByExample(CdMemberExample example); + + int deleteByExample(CdMemberExample example); + + int insertSelective(CdMember record); + + int updateByExampleSelective(@Param("record") CdMember record, @Param("example") CdMemberExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/entity/mapper/CdPlanItemMapper.java b/src/main/java/com/xmomen/module/base/entity/mapper/CdPlanItemMapper.java new file mode 100644 index 0000000..4d632b2 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/entity/mapper/CdPlanItemMapper.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.CdPlanItem; +import com.xmomen.module.base.entity.CdPlanItemExample; +import org.apache.ibatis.annotations.Param; + +public interface CdPlanItemMapper extends MybatisMapper { + int countByExample(CdPlanItemExample example); + + int deleteByExample(CdPlanItemExample example); + + int insertSelective(CdPlanItem record); + + int updateByExampleSelective(@Param("record") CdPlanItem record, @Param("example") CdPlanItemExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/mapper/ActivityMapper.java b/src/main/java/com/xmomen/module/base/mapper/ActivityMapper.java new file mode 100644 index 0000000..452d326 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/ActivityMapper.java @@ -0,0 +1,8 @@ +package com.xmomen.module.base.mapper; + +/** + * Created by Jeng on 2016/3/30. + */ +public interface ActivityMapper { + public static final String ActivityMapperNameSpace = "com.xmomen.module.base.mapper.ActivityMapper."; +} diff --git a/src/main/java/com/xmomen/module/base/mapper/ActivityMapper.xml b/src/main/java/com/xmomen/module/base/mapper/ActivityMapper.xml new file mode 100644 index 0000000..fbee774 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/ActivityMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/mapper/BasePlanMapper.java b/src/main/java/com/xmomen/module/base/mapper/BasePlanMapper.java new file mode 100644 index 0000000..1fb1e76 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/BasePlanMapper.java @@ -0,0 +1,8 @@ +package com.xmomen.module.base.mapper; + +/** + * Created by Jeng on 2016/3/30. + */ +public interface BasePlanMapper { + public static final String BasePlanMapperNameSpace = "com.xmomen.module.base.mapper.BasePlanMapper."; +} diff --git a/src/main/java/com/xmomen/module/base/mapper/CompanyMapper.java b/src/main/java/com/xmomen/module/base/mapper/CompanyMapper.java new file mode 100644 index 0000000..487d4b2 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/CompanyMapper.java @@ -0,0 +1,6 @@ +package com.xmomen.module.base.mapper; + +public interface CompanyMapper { + public static final String CompanyMapperNameSpace = "com.xmomen.module.base.mapper.CompanyMapper."; + +} diff --git a/src/main/java/com/xmomen/module/base/mapper/ContractItemMapper.java b/src/main/java/com/xmomen/module/base/mapper/ContractItemMapper.java new file mode 100644 index 0000000..2f6976d --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/ContractItemMapper.java @@ -0,0 +1,6 @@ +package com.xmomen.module.base.mapper; + +public interface ContractItemMapper { + public static final String ContractItemMapperNameSpace = "com.xmomen.module.base.mapper.ContractItemMapper."; + +} diff --git a/src/main/java/com/xmomen/module/base/mapper/ContractItemMapper.xml b/src/main/java/com/xmomen/module/base/mapper/ContractItemMapper.xml new file mode 100644 index 0000000..2f35d4d --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/ContractItemMapper.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/mapper/ContractMapper.java b/src/main/java/com/xmomen/module/base/mapper/ContractMapper.java new file mode 100644 index 0000000..aca6565 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/ContractMapper.java @@ -0,0 +1,6 @@ +package com.xmomen.module.base.mapper; + +public interface ContractMapper { + public static final String ContractMapperNameSpace = "com.xmomen.module.base.mapper.ContractMapper."; + +} diff --git a/src/main/java/com/xmomen/module/base/mapper/CouponMapper.java b/src/main/java/com/xmomen/module/base/mapper/CouponMapper.java new file mode 100644 index 0000000..ef27a28 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/CouponMapper.java @@ -0,0 +1,8 @@ +package com.xmomen.module.base.mapper; + +/** + * Created by Jeng on 2016/3/30. + */ +public interface CouponMapper { + public static final String CouponMapperNameSpace = "com.xmomen.module.base.mapper.CouponMapper."; +} diff --git a/src/main/java/com/xmomen/module/base/mapper/ExpressMemberMapper.xml b/src/main/java/com/xmomen/module/base/mapper/ExpressMemberMapper.xml new file mode 100644 index 0000000..9ac4e02 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/ExpressMemberMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/src/main/java/com/xmomen/module/base/mapper/ItemMapper.xml b/src/main/java/com/xmomen/module/base/mapper/ItemMapper.xml new file mode 100644 index 0000000..36b02af --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/ItemMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/mapper/PublicMapper.xml b/src/main/java/com/xmomen/module/base/mapper/PublicMapper.xml new file mode 100644 index 0000000..189a08a --- /dev/null +++ b/src/main/java/com/xmomen/module/base/mapper/PublicMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/src/main/java/com/xmomen/module/base/model/ActivityModel.java b/src/main/java/com/xmomen/module/base/model/ActivityModel.java new file mode 100644 index 0000000..bb62398 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/ActivityModel.java @@ -0,0 +1,127 @@ +package com.xmomen.module.base.model; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +public class ActivityModel implements Serializable { + private Integer id; + /** + * 活动名称 + */ + private String activityName; + /** + * 活动开始时间 + */ + private Date activityBeginTime; + + /** + * 活动结束时间 + */ + private Date activityEndTime; + + /** + * 活动介绍 + */ + private String activityDescribe; + + /** + * 参与活动的卡类型 + */ + private Integer activityType; + + private BigDecimal lowestPrice; + + private Integer couponCategory; + /** + * 活动下单时间 + */ + private Integer activityDay; + + /** + * 是否启用（0-不启用，1-启用） + */ + private Integer available; + + public String getActivityName() { + return activityName; + } + + public void setActivityName(String activityName) { + this.activityName = activityName; + } + + public Date getActivityBeginTime() { + return activityBeginTime; + } + + public void setActivityBeginTime(Date activityBeginTime) { + this.activityBeginTime = activityBeginTime; + } + + public Date getActivityEndTime() { + return activityEndTime; + } + + public void setActivityEndTime(Date activityEndTime) { + this.activityEndTime = activityEndTime; + } + + public String getActivityDescribe() { + return activityDescribe; + } + + public void setActivityDescribe(String activityDescribe) { + this.activityDescribe = activityDescribe; + } + + public Integer getActivityType() { + return activityType; + } + + public void setActivityType(Integer activityType) { + this.activityType = activityType; + } + + public Integer getActivityDay() { + return activityDay; + } + + public void setActivityDay(Integer activityDay) { + this.activityDay = activityDay; + } + + public Integer getAvailable() { + return available; + } + + public void setAvailable(Integer available) { + this.available = available; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public BigDecimal getLowestPrice() { + return lowestPrice; + } + + public void setLowestPrice(BigDecimal lowestPrice) { + this.lowestPrice = lowestPrice; + } + + public Integer getCouponCategory() { + return couponCategory; + } + + public void setCouponCategory(Integer couponCategory) { + this.couponCategory = couponCategory; + } + +} diff --git a/src/main/java/com/xmomen/module/base/model/CompanyCustomerManager.java b/src/main/java/com/xmomen/module/base/model/CompanyCustomerManager.java new file mode 100644 index 0000000..1a69b59 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/CompanyCustomerManager.java @@ -0,0 +1,21 @@ +package com.xmomen.module.base.model; + +import java.io.Serializable; + +public class CompanyCustomerManager implements Serializable{ + private Integer customerMangerId; + private String customerManger; + public Integer getCustomerMangerId() { + return customerMangerId; + } + public void setCustomerMangerId(Integer customerMangerId) { + this.customerMangerId = customerMangerId; + } + public String getCustomerManger() { + return customerManger; + } + public void setCustomerManger(String customerManger) { + this.customerManger = customerManger; + } + +} diff --git a/src/main/java/com/xmomen/module/base/model/CouponActivityAddress.java b/src/main/java/com/xmomen/module/base/model/CouponActivityAddress.java new file mode 100644 index 0000000..b6a912e --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/CouponActivityAddress.java @@ -0,0 +1,35 @@ +package com.xmomen.module.base.model; + +import java.io.Serializable; +import java.util.Date; + +import org.springframework.web.bind.annotation.RequestParam; + +import lombok.Data; + +public @Data class CouponActivityAddress implements Serializable { + + /** + * 收货人 + */ + private String consignmentName; + /** + * 手机号 + */ + private String consignmentPhone; + /** + * 地址 + */ + private String consignmentAddress; + + /** + * 赠送时间 + */ + private Date sendTime; + + /** + * 赠送数量 + */ + private Integer sendCount; + +} diff --git a/src/main/java/com/xmomen/module/base/model/CouponCategoryModel.java b/src/main/java/com/xmomen/module/base/model/CouponCategoryModel.java new file mode 100644 index 0000000..710f484 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/CouponCategoryModel.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 CouponCategoryModel implements Serializable { + + private Integer id; + private String name; + private Integer parentId; + private String parentName; + private List 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 getNodes() { + return nodes; + } + + public void setNodes(List nodes) { + this.nodes = nodes; + } +} diff --git a/src/main/java/com/xmomen/module/base/model/CouponCategoryRefModel.java b/src/main/java/com/xmomen/module/base/model/CouponCategoryRefModel.java new file mode 100644 index 0000000..f5197fe --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/CouponCategoryRefModel.java @@ -0,0 +1,51 @@ +package com.xmomen.module.base.model; + +import java.io.Serializable; + +public class CouponCategoryRefModel 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; + } + +} diff --git a/src/main/java/com/xmomen/module/base/model/CreateActivity.java b/src/main/java/com/xmomen/module/base/model/CreateActivity.java new file mode 100644 index 0000000..14e3a47 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/CreateActivity.java @@ -0,0 +1,129 @@ +package com.xmomen.module.base.model; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +public class CreateActivity implements Serializable { + /** + * 活动名称 + */ + private String activityName; + + /** + * 活动开始时间 + */ + private Date activityBeginTime; + + /** + * 活动结束时间 + */ + private Date activityEndTime; + + /** + * 活动介绍 + */ + private String activityDescribe; + + /** + * 参与活动的卡类型 + */ + private Integer activityType; + + private BigDecimal lowestPrice; + + private Integer couponCategory; + + /** + * 活动下单时间 + */ + private Integer activityDay; + + /** + * 是否启用（0-不启用，1-启用） + */ + private Integer available; + + private List activityRefList; + + public String getActivityName() { + return activityName; + } + + public void setActivityName(String activityName) { + this.activityName = activityName; + } + + public Date getActivityBeginTime() { + return activityBeginTime; + } + + public void setActivityBeginTime(Date activityBeginTime) { + this.activityBeginTime = activityBeginTime; + } + + public Date getActivityEndTime() { + return activityEndTime; + } + + public void setActivityEndTime(Date activityEndTime) { + this.activityEndTime = activityEndTime; + } + + public String getActivityDescribe() { + return activityDescribe; + } + + public void setActivityDescribe(String activityDescribe) { + this.activityDescribe = activityDescribe; + } + + public Integer getActivityType() { + return activityType; + } + + public void setActivityType(Integer activityType) { + this.activityType = activityType; + } + + public Integer getActivityDay() { + return activityDay; + } + + public void setActivityDay(Integer activityDay) { + this.activityDay = activityDay; + } + + public Integer getAvailable() { + return available; + } + + public void setAvailable(Integer available) { + this.available = available; + } + + public BigDecimal getLowestPrice() { + return lowestPrice; + } + + public void setLowestPrice(BigDecimal lowestPrice) { + this.lowestPrice = lowestPrice; + } + + public Integer getCouponCategory() { + return couponCategory; + } + + public void setCouponCategory(Integer couponCategory) { + this.couponCategory = couponCategory; + } + + public List getActivityRefList() { + return activityRefList; + } + + public void setActivityRefList(List activityRefList) { + this.activityRefList = activityRefList; + } +} diff --git a/src/main/java/com/xmomen/module/base/model/CreateCompany.java b/src/main/java/com/xmomen/module/base/model/CreateCompany.java new file mode 100644 index 0000000..42c135a --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/CreateCompany.java @@ -0,0 +1,87 @@ +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; + +public class CreateCompany implements Serializable{ + /** + * 单位编号 + */ + private String companyCode; + + /** + * 单位名称 + */ + @NotBlank + @NotNull + private String companyName; + + /** + * 单位地址 + */ + private String companyAddress; + + /** + * 单位联系人 + */ + private String companyLeader; + + /** + * 联系人电话 + */ + private String companyLeaderTel; + + private List customerManagerIds; + + public String getCompanyCode() { + return companyCode; + } + + public void setCompanyCode(String companyCode) { + this.companyCode = companyCode; + } + + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public String getCompanyAddress() { + return companyAddress; + } + + public void setCompanyAddress(String companyAddress) { + this.companyAddress = companyAddress; + } + + public String getCompanyLeader() { + return companyLeader; + } + + public void setCompanyLeader(String companyLeader) { + this.companyLeader = companyLeader; + } + + public String getCompanyLeaderTel() { + return companyLeaderTel; + } + + public void setCompanyLeaderTel(String companyLeaderTel) { + this.companyLeaderTel = companyLeaderTel; + } + + public List getCustomerManagerIds() { + return customerManagerIds; + } + + public void setCustomerManagerIds(List customerManagerIds) { + this.customerManagerIds = customerManagerIds; + } +} diff --git a/src/main/java/com/xmomen/module/base/model/CreateContract.java b/src/main/java/com/xmomen/module/base/model/CreateContract.java new file mode 100644 index 0000000..dddc305 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/CreateContract.java @@ -0,0 +1,60 @@ +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 CreateContract implements Serializable { + /** + * 合同名称 + */ + private String contractName; + /** + * 合同编号 + */ + private String contractCode; + /** + * 合同价的客户 + */ + private Integer cdMemberId; + + /** + * 合同价的单位 + */ + private Integer cdCompanyId; + + /** + * 1-部分产品，2-全部产品 + */ + private Integer scope; + + /** + * 仅当适用范围为全部产品时适用 + */ + private BigDecimal contractPrice; + + /** + * 合同开始时间 + */ + private Date beginTime; + + /** + * 合同结束时间 + */ + private Date endTime; + + /** + * 0-未审核，1-审核 + */ + private Integer isAuditor; + + + /** + * 合同明细 + */ + private List contractItemList; + +} diff --git a/src/main/java/com/xmomen/module/base/model/CreateItem.java b/src/main/java/com/xmomen/module/base/model/CreateItem.java new file mode 100644 index 0000000..ce58549 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/CreateItem.java @@ -0,0 +1,344 @@ +package com.xmomen.module.base.model; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +public class CreateItem implements Serializable { + /** + * 产品编号 + */ + private String itemCode; + + /** + * 产品归属的类别 + */ + private Integer cdCategoryId; + + /** + * 产品名称 + */ + private String itemName; + + /** + * 产品描述 + */ + private String itemDescribe; + + /** + * 产品类型 + */ + private Integer itemType; + + /** + * 生产地 + */ + private String yieldly; + + /** + * 产品规格 + */ + private String spec; + + /** + * 基础价格 + */ + private BigDecimal basePrice; + + /** + * 会员价格 + */ + private BigDecimal memberPrice; + + /** + * 计价方式 + */ + private String pricingManner; + + /** + * 0-下架 1-上架 + */ + private Integer sellStatus; + + /** + * 销售单位 + */ + private String sellUnit; + + /** + * 销售金额 + */ + private BigDecimal sellPrice; + + /** + * 0-未审核，1-审核 + */ + private Integer isAudit; + + /** + * 录入时间 + */ + private Date createDateTime; + + /** + * 录入人 + */ + private String createUserCode; + + /** + * 采摘人 + */ + private String caizaiUser; + + /** + * 检测人 + */ + private String jianceUser; + + /** + * 农残率 + */ + private String nongCanLv; + + /** + * 营养成分 + */ + private String yiYangChenFen; + + /** + * 保质期 + */ + private Integer baoZhiQi; + + /** + * 适应人群 + */ + private String shiYiRenQun; + + /** + * 限时抢购 + */ + private Integer xianShiQiangGou; + + /** + * 新品尝鲜 + */ + private Integer xinPinChangXian; + + /** + * 热卖推荐 + */ + private Integer reMaiTuiJian; + + private List childItems; + + public String getItemCode() { + return itemCode; + } + + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public Integer getCdCategoryId() { + return cdCategoryId; + } + + public void setCdCategoryId(Integer cdCategoryId) { + this.cdCategoryId = cdCategoryId; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getItemDescribe() { + return itemDescribe; + } + + public void setItemDescribe(String itemDescribe) { + this.itemDescribe = itemDescribe; + } + + public Integer getItemType() { + return itemType; + } + + public void setItemType(Integer itemType) { + this.itemType = itemType; + } + + public String getYieldly() { + return yieldly; + } + + public void setYieldly(String yieldly) { + this.yieldly = yieldly; + } + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public BigDecimal getBasePrice() { + return basePrice; + } + + public void setBasePrice(BigDecimal basePrice) { + this.basePrice = basePrice; + } + + public BigDecimal getMemberPrice() { + return memberPrice; + } + + public void setMemberPrice(BigDecimal memberPrice) { + this.memberPrice = memberPrice; + } + + public String getPricingManner() { + return pricingManner; + } + + public void setPricingManner(String pricingManner) { + this.pricingManner = pricingManner; + } + + public Integer getSellStatus() { + return sellStatus; + } + + public void setSellStatus(Integer sellStatus) { + this.sellStatus = sellStatus; + } + + public String getSellUnit() { + return sellUnit; + } + + public void setSellUnit(String sellUnit) { + this.sellUnit = sellUnit; + } + + public BigDecimal getSellPrice() { + return sellPrice; + } + + public void setSellPrice(BigDecimal sellPrice) { + this.sellPrice = sellPrice; + } + + + public Integer getIsAudit() { + return isAudit; + } + + public void setIsAudit(Integer isAudit) { + this.isAudit = isAudit; + } + + public Date getCreateDateTime() { + return createDateTime; + } + + public void setCreateDateTime(Date createDateTime) { + this.createDateTime = createDateTime; + } + + public String getCreateUserCode() { + return createUserCode; + } + + public void setCreateUserCode(String createUserCode) { + this.createUserCode = createUserCode; + } + + public List getChildItems() { + return childItems; + } + + public void setChildItems(List childItems) { + this.childItems = childItems; + } + + public String getCaizaiUser() { + return caizaiUser; + } + + public void setCaizaiUser(String caizaiUser) { + this.caizaiUser = caizaiUser; + } + + public String getJianceUser() { + return jianceUser; + } + + public void setJianceUser(String jianceUser) { + this.jianceUser = jianceUser; + } + + public String getNongCanLv() { + return nongCanLv; + } + + public void setNongCanLv(String nongCanLv) { + this.nongCanLv = nongCanLv; + } + + public String getYiYangChenFen() { + return yiYangChenFen; + } + + public void setYiYangChenFen(String yiYangChenFen) { + this.yiYangChenFen = yiYangChenFen; + } + + public Integer getBaoZhiQi() { + return baoZhiQi; + } + + public void setBaoZhiQi(Integer baoZhiQi) { + this.baoZhiQi = baoZhiQi; + } + + public String getShiYiRenQun() { + return shiYiRenQun; + } + + public void setShiYiRenQun(String shiYiRenQun) { + this.shiYiRenQun = shiYiRenQun; + } + + public Integer getXianShiQiangGou() { + return xianShiQiangGou; + } + + public void setXianShiQiangGou(Integer xianShiQiangGou) { + this.xianShiQiangGou = xianShiQiangGou; + } + + public Integer getXinPinChangXian() { + return xinPinChangXian; + } + + public void setXinPinChangXian(Integer xinPinChangXian) { + this.xinPinChangXian = xinPinChangXian; + } + + public Integer getReMaiTuiJian() { + return reMaiTuiJian; + } + + public void setReMaiTuiJian(Integer reMaiTuiJian) { + this.reMaiTuiJian = reMaiTuiJian; + } +} diff --git a/src/main/java/com/xmomen/module/base/model/CreateItemCategory.java b/src/main/java/com/xmomen/module/base/model/CreateItemCategory.java new file mode 100644 index 0000000..d40588c --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/CreateItemCategory.java @@ -0,0 +1,33 @@ +package com.xmomen.module.base.model; + +import org.hibernate.validator.constraints.NotBlank; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * Created by Jeng on 16/3/26. + */ +public class CreateItemCategory implements Serializable { + + @NotNull + @NotBlank + private String name; + private Integer parentId; + + 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; + } +} diff --git a/src/main/java/com/xmomen/module/base/model/CreatePlan.java b/src/main/java/com/xmomen/module/base/model/CreatePlan.java new file mode 100644 index 0000000..b4d39e1 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/CreatePlan.java @@ -0,0 +1,76 @@ +package com.xmomen.module.base.model; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import javax.validation.constraints.NotNull; + +import lombok.Data; + +import org.hibernate.validator.constraints.NotBlank; + +public @Data class CreatePlan implements Serializable { + /** + * 主键 + */ + private Integer id; + + /** + * 计划名称 + */ + @NotBlank + private String planName; + + /** + * 计划创建人 + */ + + private String createUser; + + /** + * 计划创建时间 + */ + private Date createTime; + + /** + * 配送频率 + */ + @NotNull + private Integer deliveryType; + + /** + * 配送时间(一周的星期几） + */ + private String deliveryTime; + + /** + * 配送的次数 + */ + @NotNull + private Integer deliverCount; + + @NotNull + private BigDecimal price; + + /** + * 是否随机 + */ + private Integer isRandom; + + /** + * 产品归属的类别 + */ + private Integer cdCategoryId; + + /** + * 随机数 + */ + private Integer randomNum; + + private Date beginTime; + + private List planItems; + +} diff --git a/src/main/java/com/xmomen/module/base/model/ExpressTask.java b/src/main/java/com/xmomen/module/base/model/ExpressTask.java new file mode 100644 index 0000000..97e0ce0 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/ExpressTask.java @@ -0,0 +1,27 @@ +package com.xmomen.module.base.model; + +import lombok.Data; +import org.hibernate.validator.constraints.NotEmpty; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + */ +public @Data +class ExpressTask implements Serializable { + + /** + * 订单号集合 + */ + @NotNull + @NotEmpty + private List orderNos; + /** + * 快递商ID + */ + @NotNull + private Integer expressId; + +} diff --git a/src/main/java/com/xmomen/module/base/model/ItemDetailModel.java b/src/main/java/com/xmomen/module/base/model/ItemDetailModel.java new file mode 100644 index 0000000..130ed17 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/ItemDetailModel.java @@ -0,0 +1,21 @@ +package com.xmomen.module.base.model; + +import com.xmomen.framework.mybatis.model.BaseMybatisModel; +import lombok.Data; + +public @Data class ItemDetailModel extends BaseMybatisModel { + /** + * 主键 + */ + private Integer id; + + /** + * 商品ID + */ + private Integer cdItemId; + + /** + * 商品的详细内容 + */ + private String itemDetailContent; +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/model/ItemModel.java b/src/main/java/com/xmomen/module/base/model/ItemModel.java new file mode 100644 index 0000000..922fd30 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/ItemModel.java @@ -0,0 +1,395 @@ +package com.xmomen.module.base.model; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class ItemModel implements Serializable { + private Integer id; + /** + * 产品编号 + */ + private String itemCode; + + /** + * 产品归属的类别 + */ + private Integer cdCategoryId; + + private String categoryName; + + /** + * 产品名称 + */ + private String itemName; + + /** + * 产品描述 + */ + private String itemDescribe; + + /** + * 产品类型 + */ + private Integer itemType; + + /** + * 生产地 + */ + private String yieldly; + + /** + * 产品规格 + */ + private String spec; + + /** + * 基础价格 + */ + private BigDecimal basePrice; + + /** + * 会员价格 + */ + private BigDecimal memberPrice; + + /** + * 计价方式 + */ + private String pricingManner; + + /** + * 0-下架 1-上架 + */ + private Integer sellStatus; + + /** + * 销售单位 + */ + private String sellUnit; + + /** + * 销售金额 + */ + private BigDecimal sellPrice; + + /** + * 折扣价格 + */ + private BigDecimal discountPrice; + + + /** + * 0-未审核，1-审核 + */ + private Integer isAudit; + + /** + * 录入时间 + */ + private Date createDateTime; + + /** + * 录入人 + */ + private String createUserCode; + + /** + * 采摘人 + */ + private String caizaiUser; + + /** + * 检测人 + */ + private String jianceUser; + + /** + * 农残率 + */ + private String nongCanLv; + + /** + * 营养成分 + */ + private String yiYangChenFen; + + /** + * 保质期 + */ + private Integer baoZhiQi; + + /** + * 适应人群 + */ + private String shiYiRenQun; + + /** + * 限时抢购 + */ + private Integer xianShiQiangGou; + + /** + * 新品尝鲜 + */ + private Integer xinPinChangXian; + + /** + * 热卖推荐 + */ + private Integer reMaiTuiJian; + + private Integer itemDetailId; + private String itemDetailContent; + + //库存 + private Integer stockNum; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getItemCode() { + return itemCode; + } + + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public Integer getCdCategoryId() { + return cdCategoryId; + } + + public void setCdCategoryId(Integer cdCategoryId) { + this.cdCategoryId = cdCategoryId; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getItemDescribe() { + return itemDescribe; + } + + public void setItemDescribe(String itemDescribe) { + this.itemDescribe = itemDescribe; + } + + public Integer getItemType() { + return itemType; + } + + public void setItemType(Integer itemType) { + this.itemType = itemType; + } + + public String getYieldly() { + return yieldly; + } + + public void setYieldly(String yieldly) { + this.yieldly = yieldly; + } + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public BigDecimal getBasePrice() { + return basePrice; + } + + public void setBasePrice(BigDecimal basePrice) { + this.basePrice = basePrice; + } + + public BigDecimal getMemberPrice() { + return memberPrice; + } + + public void setMemberPrice(BigDecimal memberPrice) { + this.memberPrice = memberPrice; + } + + public String getPricingManner() { + return pricingManner; + } + + public void setPricingManner(String pricingManner) { + this.pricingManner = pricingManner; + } + + public Integer getSellStatus() { + return sellStatus; + } + + public void setSellStatus(Integer sellStatus) { + this.sellStatus = sellStatus; + } + + public String getSellUnit() { + return sellUnit; + } + + public void setSellUnit(String sellUnit) { + this.sellUnit = sellUnit; + } + + public BigDecimal getSellPrice() { + return sellPrice; + } + + public void setSellPrice(BigDecimal sellPrice) { + this.sellPrice = sellPrice; + } + + public Integer getIsAudit() { + return isAudit; + } + + public void setIsAudit(Integer isAudit) { + this.isAudit = isAudit; + } + + public Date getCreateDateTime() { + return createDateTime; + } + + public void setCreateDateTime(Date createDateTime) { + this.createDateTime = createDateTime; + } + + public String getCreateUserCode() { + return createUserCode; + } + + public void setCreateUserCode(String createUserCode) { + this.createUserCode = createUserCode; + } + + public String getCategoryName() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName = categoryName; + } + + public BigDecimal getDiscountPrice() { + return discountPrice; + } + + public void setDiscountPrice(BigDecimal discountPrice) { + this.discountPrice = discountPrice; + } + + public String getCaizaiUser() { + return caizaiUser; + } + + public void setCaizaiUser(String caizaiUser) { + this.caizaiUser = caizaiUser; + } + + public String getJianceUser() { + return jianceUser; + } + + public void setJianceUser(String jianceUser) { + this.jianceUser = jianceUser; + } + + public String getNongCanLv() { + return nongCanLv; + } + + public void setNongCanLv(String nongCanLv) { + this.nongCanLv = nongCanLv; + } + + public String getYiYangChenFen() { + return yiYangChenFen; + } + + public void setYiYangChenFen(String yiYangChenFen) { + this.yiYangChenFen = yiYangChenFen; + } + + public Integer getBaoZhiQi() { + return baoZhiQi; + } + + public void setBaoZhiQi(Integer baoZhiQi) { + this.baoZhiQi = baoZhiQi; + } + + public String getShiYiRenQun() { + return shiYiRenQun; + } + + public void setShiYiRenQun(String shiYiRenQun) { + this.shiYiRenQun = shiYiRenQun; + } + + public Integer getXianShiQiangGou() { + return xianShiQiangGou; + } + + public void setXianShiQiangGou(Integer xianShiQiangGou) { + this.xianShiQiangGou = xianShiQiangGou; + } + + public Integer getXinPinChangXian() { + return xinPinChangXian; + } + + public void setXinPinChangXian(Integer xinPinChangXian) { + this.xinPinChangXian = xinPinChangXian; + } + + public Integer getReMaiTuiJian() { + return reMaiTuiJian; + } + + public void setReMaiTuiJian(Integer reMaiTuiJian) { + this.reMaiTuiJian = reMaiTuiJian; + } + + public Integer getItemDetailId() { + return itemDetailId; + } + + public void setItemDetailId(Integer itemDetailId) { + this.itemDetailId = itemDetailId; + } + + public String getItemDetailContent() { + return itemDetailContent; + } + + public void setItemDetailContent(String itemDetailContent) { + this.itemDetailContent = itemDetailContent; + } + + public Integer getStockNum() { + return stockNum; + } + + public void setStockNum(Integer stockNum) { + this.stockNum = stockNum; + } +} diff --git a/src/main/java/com/xmomen/module/base/model/UpdateCompany.java b/src/main/java/com/xmomen/module/base/model/UpdateCompany.java new file mode 100644 index 0000000..e1c2d07 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/UpdateCompany.java @@ -0,0 +1,85 @@ +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; + +public class UpdateCompany implements Serializable{ + /** + * 单位编号 + */ + private String companyCode; + + /** + * 单位名称 + */ + @NotBlank + @NotNull + private String companyName; + + /** + * 单位地址 + */ + private String companyAddress; + + /** + * 单位联系人 + */ + private String companyLeader; + + /** + * 联系人电话 + */ + private String companyLeaderTel; + private List customerManagerIds; + public String getCompanyCode() { + return companyCode; + } + + public void setCompanyCode(String companyCode) { + this.companyCode = companyCode; + } + + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public String getCompanyAddress() { + return companyAddress; + } + + public void setCompanyAddress(String companyAddress) { + this.companyAddress = companyAddress; + } + + public String getCompanyLeader() { + return companyLeader; + } + + public void setCompanyLeader(String companyLeader) { + this.companyLeader = companyLeader; + } + + public String getCompanyLeaderTel() { + return companyLeaderTel; + } + + public void setCompanyLeaderTel(String companyLeaderTel) { + this.companyLeaderTel = companyLeaderTel; + } + + public List getCustomerManagerIds() { + return customerManagerIds; + } + + public void setCustomerManagerIds(List customerManagerIds) { + this.customerManagerIds = customerManagerIds; + } +} diff --git a/src/main/java/com/xmomen/module/base/model/UpdateContractItem.java b/src/main/java/com/xmomen/module/base/model/UpdateContractItem.java new file mode 100644 index 0000000..47a9960 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/UpdateContractItem.java @@ -0,0 +1,96 @@ +package com.xmomen.module.base.model; + +import com.xmomen.framework.mybatis.model.BaseMybatisModel; + +import java.io.Serializable; +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; + +public class UpdateContractItem implements Serializable{ + private Integer addType;//添加方式 + private Integer cdCategoryId; + private String itemCode; + /** + * 1-固定价格，2-固定金额 + */ + private Integer contractType; + + /** + * 产品合同 + */ + private Integer cdContractId; + + /** + * 当合同适用范围为1的时候，每种产品要设定对应的合同价 + */ + private Integer cdItemId; + + /** + * 合同价格 + */ + private BigDecimal contractValue; + + public Integer getContractType() { + return contractType; + } + + public void setContractType(Integer contractType) { + this.contractType = contractType; + } + + public Integer getCdContractId() { + return cdContractId; + } + + public void setCdContractId(Integer cdContractId) { + this.cdContractId = cdContractId; + } + + public Integer getCdItemId() { + return cdItemId; + } + + public void setCdItemId(Integer cdItemId) { + this.cdItemId = cdItemId; + } + + public BigDecimal getContractValue() { + return contractValue; + } + + public void setContractValue(BigDecimal contractValue) { + this.contractValue = contractValue; + } + + public Integer getCdCategoryId() { + return cdCategoryId; + } + + public void setCdCategoryId(Integer cdCategoryId) { + this.cdCategoryId = cdCategoryId; + } + + public String getItemCode() { + return itemCode; + } + + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public Integer getAddType() { + return addType; + } + + public void setAddType(Integer addType) { + this.addType = addType; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/base/model/UpdateCouponCategory.java b/src/main/java/com/xmomen/module/base/model/UpdateCouponCategory.java new file mode 100644 index 0000000..8887ebf --- /dev/null +++ b/src/main/java/com/xmomen/module/base/model/UpdateCouponCategory.java @@ -0,0 +1,48 @@ +package com.xmomen.module.base.model; + +import org.hibernate.validator.constraints.NotBlank; + +import javax.validation.constraints.NotNull; + +import java.io.Serializable; +import java.util.List; + +/** + * Created by Jeng on 16/3/26. + */ +public class UpdateCouponCategory implements Serializable { + + @NotNull + @NotBlank + private String categoryName; + @NotNull + private Integer categoryType; + + private List categoryRefs; + + public String getCategoryName() { + 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 getCategoryRefs() { + return categoryRefs; + } + + public void setCategoryRefs(List categoryRefs) { + this.categoryRefs = categoryRefs; + } + + +} diff --git a/src/main/java/com/xmomen/module/base/service/CompanyService.java b/src/main/java/com/xmomen/module/base/service/CompanyService.java new file mode 100644 index 0000000..37bc376 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/CompanyService.java @@ -0,0 +1,12 @@ +package com.xmomen.module.base.service; + +import com.xmomen.module.base.model.CreateCompany; +import com.xmomen.module.base.model.UpdateCompany; + +public interface CompanyService { + public void createCompany(CreateCompany createCompany); + + public void updateCompany(Integer id,UpdateCompany updateCompany); + + public void delete(Integer id); +} diff --git a/src/main/java/com/xmomen/module/base/service/ContractItemService.java b/src/main/java/com/xmomen/module/base/service/ContractItemService.java new file mode 100644 index 0000000..4bce16e --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/ContractItemService.java @@ -0,0 +1,13 @@ +package com.xmomen.module.base.service; + +import com.xmomen.module.base.model.CreateContractItem; +import com.xmomen.module.base.model.UpdateContractItem; + +public interface ContractItemService { + + public void createContractItem(CreateContractItem createContractItem); + + public void updateContractItem(Integer id,UpdateContractItem updateContractItem); + + public void delete(Integer id); +} diff --git a/src/main/java/com/xmomen/module/base/service/ContractService.java b/src/main/java/com/xmomen/module/base/service/ContractService.java new file mode 100644 index 0000000..720d22a --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/ContractService.java @@ -0,0 +1,14 @@ +package com.xmomen.module.base.service; + +import com.xmomen.module.base.model.CreateContract; +import com.xmomen.module.base.model.CreateContractItem; +import com.xmomen.module.base.model.UpdateContract; + +public interface ContractService { + public void createContract(CreateContract createContract); + + public void updateContract(Integer id,UpdateContract updateContract); + + public void delete(Integer id); + +} diff --git a/src/main/java/com/xmomen/module/base/service/CouponCategoryService.java b/src/main/java/com/xmomen/module/base/service/CouponCategoryService.java new file mode 100644 index 0000000..72835c4 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/CouponCategoryService.java @@ -0,0 +1,18 @@ +package com.xmomen.module.base.service; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.base.entity.CdCouponCategory; +import com.xmomen.module.base.model.CreateCouponCategory; +import com.xmomen.module.base.model.UpdateCouponCategory; + +public interface CouponCategoryService { + public Page getCouponCategoryList(String keyword,Integer categoryType, Integer limit, Integer offset); + + public CdCouponCategory getCouponCategory(Integer id); + + public CdCouponCategory createCouponCategory(CreateCouponCategory createCouponCategory); + + public CdCouponCategory updateCouponCategory(Integer id,UpdateCouponCategory updateCouponCategory); + + public void delete(Integer id); +} diff --git a/src/main/java/com/xmomen/module/base/service/ExpressMemberService.java b/src/main/java/com/xmomen/module/base/service/ExpressMemberService.java new file mode 100644 index 0000000..1ea58f6 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/ExpressMemberService.java @@ -0,0 +1,14 @@ +package com.xmomen.module.base.service; + +import com.xmomen.module.base.entity.CdExpress; +import com.xmomen.module.base.entity.CdExpressMember; +import com.xmomen.module.base.model.ExpressTask; + +public interface ExpressMemberService { + public void createExpressMember(CdExpressMember createExpress); + + public void updateExpressMember(Integer id,CdExpressMember updateExpress); + + public void delete(Integer id); + +} diff --git a/src/main/java/com/xmomen/module/base/service/ExpressService.java b/src/main/java/com/xmomen/module/base/service/ExpressService.java new file mode 100644 index 0000000..a742c45 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/ExpressService.java @@ -0,0 +1,37 @@ +package com.xmomen.module.base.service; + +import java.util.List; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.base.entity.CdExpress; +import com.xmomen.module.base.model.ExpressTask; +import com.xmomen.module.order.model.OrderModel; +import com.xmomen.module.order.model.OrderQuery; +import com.xmomen.module.report.model.ExpressReport; +import com.xmomen.module.report.model.OrderDeliveryReport; + +public interface ExpressService { + public void createExpress(CdExpress createExpress); + + public void updateExpress(Integer id,CdExpress updateExpress); + + public void delete(Integer id); + + public void dispatchExpress(ExpressTask expressTask); + + public void cancelExpress(String[] orderNoList); + + public void takeDelivery(String orderNo); + + public void unTakeDelivery(String orderNo); + + public Page getTakeDeliveryList(OrderQuery orderQuery, Integer limit, Integer offset); + + public List getTakeDeliveryList(OrderQuery query); + + public List getTakeDeliveryReportList(OrderQuery query); + + public List getOrderNoDespatchReportList(OrderQuery query); + + public Page getOrderNoDespatchReportList(OrderQuery orderQuery, Integer limit, Integer offset); +} diff --git a/src/main/java/com/xmomen/module/base/service/ItemCategoryService.java b/src/main/java/com/xmomen/module/base/service/ItemCategoryService.java new file mode 100644 index 0000000..09ee597 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/ItemCategoryService.java @@ -0,0 +1,87 @@ +package com.xmomen.module.base.service; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.module.base.entity.CdCategory; +import com.xmomen.module.base.entity.CdCategoryExample; +import com.xmomen.module.base.mapper.ItemCategoryMapper; +import com.xmomen.module.base.model.ItemCategoryModel; + +/** + * Created by Jeng on 16/3/25. + */ +@Service +public class ItemCategoryService { + + @Autowired + MybatisDao mybatisDao; + + @Autowired + ItemCategoryMapper itemCategoryMapper; + + public List getItemCategoryTree(Integer id){ + CdCategoryExample itemCategoryExample = new CdCategoryExample(); + List result = new ArrayList(); + if(id == null){ + itemCategoryExample.createCriteria().andParentIdIsNull(); + List itemCategoryList = mybatisDao.selectByExample(itemCategoryExample); + for (CdCategory itemCategory : itemCategoryList) { + List itemCategoryModels = itemCategoryMapper.getItemCategoryTree(itemCategory.getId()); + result.add(getTree(itemCategoryModels, id)); + } + } + return result; + } + + private ItemCategoryModel getTree(List list, Integer id){ + ItemCategoryModel root = new ItemCategoryModel(); + for (ItemCategoryModel itemCategory : list) { + if(itemCategory.getParentId() == id){ + root = itemCategory; + }else{ + getTreeNode(itemCategory, root); + } + } + return root; + } + + private void getTreeNode(ItemCategoryModel child, ItemCategoryModel parent){ + if(child.getParentId() != null && child.getParentId().equals(parent.getId())){ + if(parent.getNodes() == null){ + List childes = new ArrayList(); + childes.add(child); + parent.setNodes(childes); + }else{ + parent.getNodes().add(child); + } + }else{ + if(parent.getNodes() != null && parent.getNodes().size() > 0){ + for (int i = 0; i < parent.getNodes().size(); i++) { + ItemCategoryModel childTree = parent.getNodes().get(i); + getTreeNode(child, childTree); + } + } + } + } + + @Transactional + public CdCategory createItemCategory(CdCategory cdCategory){ + return mybatisDao.saveByModel(cdCategory); + } + + @Transactional + public void updateItemCategory(CdCategory cdCategory){ + mybatisDao.save(cdCategory); + } + + @Transactional + public void delete(Integer id){ + mybatisDao.deleteByPrimaryKey(CdCategory.class, id); + } +} diff --git a/src/main/java/com/xmomen/module/base/service/ItemDetailService.java b/src/main/java/com/xmomen/module/base/service/ItemDetailService.java new file mode 100644 index 0000000..85363ed --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/ItemDetailService.java @@ -0,0 +1,20 @@ +package com.xmomen.module.base.service; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.base.model.*; + +import java.util.List; + +public interface ItemDetailService { + + public List queryItemDetailList(ItemDetailQuery itemDetailQuery); + + public Page queryItemDetailList(ItemDetailQuery itemDetailQuery, Integer offset, Integer limit); + + public void createItemDetail(CreateItemDetail createItemDetail); + + public void updateItemDetail(Integer id, UpdateItemDetail updateItemDetail); + + public void delete(Integer id); + +} diff --git a/src/main/java/com/xmomen/module/base/service/impl/ActivityServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ActivityServiceImpl.java new file mode 100644 index 0000000..3290bad --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/impl/ActivityServiceImpl.java @@ -0,0 +1,98 @@ +package com.xmomen.module.base.service.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.module.base.entity.CdActivity; +import com.xmomen.module.base.entity.CdActivityRef; +import com.xmomen.module.base.entity.CdActivityRefExample; +import com.xmomen.module.base.model.ActivityRefModel; +import com.xmomen.module.base.model.CreateActivity; +import com.xmomen.module.base.model.UpdateActivity; +import com.xmomen.module.base.service.ActivityService; +@Service +public class ActivityServiceImpl implements ActivityService { + @Autowired + MybatisDao mybatisDao; + @Override + @Transactional + public void createActivity(CreateActivity createActivity) { + CdActivity activity = new CdActivity(); + activity.setActivityName(createActivity.getActivityName()); + activity.setActivityType(createActivity.getActivityType()); + activity.setActivityBeginTime(createActivity.getActivityBeginTime()); + activity.setActivityEndTime(createActivity.getActivityEndTime()); + activity.setLowestPrice(createActivity.getLowestPrice()); + activity.setActivityDescribe(createActivity.getActivityDescribe()); + activity.setAvailable(createActivity.getAvailable()); + activity = mybatisDao.saveByModel(activity); + if(1 == createActivity.getActivityType()){//固定卡 + CdActivityRef cdActivityRef = new CdActivityRef(); + cdActivityRef.setCdActivityId(activity.getId()); + cdActivityRef.setRefType("COUPON"); + cdActivityRef.setRefValue(createActivity.getCouponCategory()+""); + cdActivityRef.setRefName("按卡类型"); + mybatisDao.save(cdActivityRef); + } + if(createActivity.getActivityRefList() != null){ + for(ActivityRefModel activityRef : createActivity.getActivityRefList()){ + CdActivityRef cdActivityRef = new CdActivityRef(); + cdActivityRef.setCdActivityId(activity.getId()); + cdActivityRef.setRefType("GIFT_ITEM"); + cdActivityRef.setRefValue(activityRef.getCdItemId()+""); + cdActivityRef.setRefName("赠送产品"); + cdActivityRef.setRefCount(activityRef.getCount()); + mybatisDao.save(cdActivityRef); + } + } + } + @Transactional + public void updateActivity(Integer id, UpdateActivity updateActivity) { + CdActivity activity = new CdActivity(); + activity.setId(id); + activity.setActivityName(updateActivity.getActivityName()); + activity.setActivityType(updateActivity.getActivityType()); + activity.setActivityBeginTime(updateActivity.getActivityBeginTime()); + activity.setActivityEndTime(updateActivity.getActivityEndTime()); + activity.setActivityDescribe(updateActivity.getActivityDescribe()); + activity.setAvailable(updateActivity.getAvailable()); + activity.setLowestPrice(updateActivity.getLowestPrice()); + activity = mybatisDao.saveByModel(activity); + //先删除再添加 + CdActivityRefExample activityRefExample = new CdActivityRefExample(); + activityRefExample.createCriteria().andCdActivityIdEqualTo(id) + .andRefTypeEqualTo("COUPON"); + mybatisDao.deleteByExample(activityRefExample); + if(1 == updateActivity.getActivityType()){//固定卡类型 + CdActivityRef cdActivityRef = new CdActivityRef(); + cdActivityRef.setCdActivityId(activity.getId()); + cdActivityRef.setRefType("COUPON"); + cdActivityRef.setRefValue(updateActivity.getCouponCategory()+""); + cdActivityRef.setRefName("按卡类型"); + mybatisDao.save(cdActivityRef); + } + if(updateActivity.getActivityRefList() != null){ + //先删除再添加 + CdActivityRefExample activityRefItemExample = new CdActivityRefExample(); + activityRefItemExample.createCriteria().andCdActivityIdEqualTo(id) + .andRefTypeEqualTo("GIFT_ITEM"); + mybatisDao.deleteByExample(activityRefItemExample); + for(ActivityRefModel activityRef : updateActivity.getActivityRefList()){ + CdActivityRef cdActivityRef = new CdActivityRef(); + cdActivityRef.setCdActivityId(activity.getId()); + cdActivityRef.setRefType("GIFT_ITEM"); + cdActivityRef.setRefValue(activityRef.getCdItemId()+""); + cdActivityRef.setRefName("赠送产品"); + cdActivityRef.setRefCount(activityRef.getCount()); + mybatisDao.save(cdActivityRef); + } + } + } + @Transactional + public void delete(Integer id) { + mybatisDao.deleteByPrimaryKey(CdActivity.class, id); + } + +} diff --git a/src/main/java/com/xmomen/module/base/service/impl/BasePlanServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/BasePlanServiceImpl.java new file mode 100644 index 0000000..3fc4bf2 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/impl/BasePlanServiceImpl.java @@ -0,0 +1,111 @@ +package com.xmomen.module.base.service.impl; + +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.framework.utils.DateUtils; +import com.xmomen.module.base.entity.CdManagerCompanyExample; +import com.xmomen.module.base.entity.CdPlan; +import com.xmomen.module.base.entity.CdPlanExample; +import com.xmomen.module.base.entity.CdPlanItem; +import com.xmomen.module.base.entity.CdPlanItemExample; +import com.xmomen.module.base.mapper.BasePlanMapper; +import com.xmomen.module.base.model.CreatePlan; +import com.xmomen.module.base.model.PlanItemModel; +import com.xmomen.module.base.model.PlanModel; +import com.xmomen.module.base.model.UpdatePlan; +import com.xmomen.module.base.service.BasePlanService; +import com.xmomen.module.order.mapper.OrderMapper; +import com.xmomen.module.order.model.OrderModel; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@Service +public class BasePlanServiceImpl implements BasePlanService { + @Autowired + MybatisDao mybatisDao; + + @SuppressWarnings("unchecked") + @Override + public Page getPlanList(String keyword, Integer limit, Integer offset){ + Map map = new HashMap(); + map.put("keyword" , keyword); + return (Page) mybatisDao.selectPage(BasePlanMapper.BasePlanMapperNameSpace + "getBasePlanList", map, limit, offset); + } + + @Override + public CdPlan getPlan(Integer id){ + return mybatisDao.selectByPrimaryKey(CdPlan.class, id); + } + + @Override + @Transactional + public CdPlan createPlan(CreatePlan createPlan) { + CdPlan plan = new CdPlan(); + plan.setCreateTime(mybatisDao.getGMTDate()); + String username = (String) SecurityUtils.getSubject().getPrincipal(); + plan.setCreateUser(username); + plan.setDeliverCount(createPlan.getDeliverCount()); + plan.setDeliveryTime(createPlan.getDeliveryTime()); + plan.setDeliveryType(createPlan.getDeliveryType()); + plan.setPlanName(createPlan.getPlanName()); + plan.setPrice(createPlan.getPrice()); + plan.setBeginTime(createPlan.getBeginTime()); + plan.setIsRandom(createPlan.getIsRandom()); + plan.setRandomNum(createPlan.getRandomNum()); + plan.setCdCategoryId(createPlan.getCdCategoryId()); + plan = mybatisDao.saveByModel(plan); + if(plan.getIsRandom() == 0){ + for(PlanItemModel planItemModel : createPlan.getPlanItems()){ + CdPlanItem planItem = new CdPlanItem(); + planItem.setCdItemId(planItemModel.getCdItemId()); + planItem.setCdPlanId(plan.getId()); + planItem.setCountValue(planItemModel.getCount()); + mybatisDao.save(planItem); + } + } + return plan; + } + @Override + @Transactional + public CdPlan updatePlan(Integer id, UpdatePlan updatePlan) { + CdPlan plan = new CdPlan(); + plan.setId(id); + plan.setDeliverCount(updatePlan.getDeliverCount()); + plan.setDeliveryTime(updatePlan.getDeliveryTime()); + plan.setDeliveryType(updatePlan.getDeliveryType()); + plan.setPlanName(updatePlan.getPlanName()); + plan.setPrice(updatePlan.getPrice()); + plan.setBeginTime(updatePlan.getBeginTime()); + plan.setIsRandom(updatePlan.getIsRandom()); + plan.setRandomNum(updatePlan.getRandomNum()); + plan.setCdCategoryId(updatePlan.getCdCategoryId()); + plan = mybatisDao.updateByModel(plan); + CdPlanItemExample planItemExample = new CdPlanItemExample(); + planItemExample.createCriteria().andCdPlanIdEqualTo(id); + mybatisDao.deleteByExample(planItemExample); + if(plan.getIsRandom() == 0){ + for(PlanItemModel planItemModel : updatePlan.getPlanItems()){ + CdPlanItem planItem = new CdPlanItem(); + planItem.setCdItemId(planItemModel.getCdItemId()); + planItem.setCdPlanId(plan.getId()); + planItem.setCountValue(planItemModel.getCount()); + mybatisDao.save(planItem); + } + } + return plan; + } + @Override + @Transactional + public void delete(Integer id) { + mybatisDao.deleteByPrimaryKey(CdPlan.class, id); + } + +} diff --git a/src/main/java/com/xmomen/module/base/service/impl/CompanyServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/CompanyServiceImpl.java new file mode 100644 index 0000000..bfc273d --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/impl/CompanyServiceImpl.java @@ -0,0 +1,64 @@ +package com.xmomen.module.base.service.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.module.base.model.CreateCompany; +import com.xmomen.module.base.model.UpdateCompany; +import com.xmomen.module.base.service.CompanyService; +import com.xmomen.module.base.entity.CdCompany; +import com.xmomen.module.base.entity.CdManagerCompany; +import com.xmomen.module.base.entity.CdManagerCompanyExample; + +@Service +public class CompanyServiceImpl implements CompanyService { + @Autowired + MybatisDao mybatisDao; + @Override + @Transactional + public void createCompany(CreateCompany createCompany) { + CdCompany company = new CdCompany(); + company.setCompanyCode(createCompany.getCompanyCode()); + company.setCompanyName(createCompany.getCompanyName()); + company.setCompanyLeader(createCompany.getCompanyLeader()); + company.setCompanyLeaderTel(createCompany.getCompanyLeaderTel()); + company.setCompanyAddress(createCompany.getCompanyAddress()); + //客服经理单位 + company = mybatisDao.saveByModel(company); + for(Integer customerManagerId : createCompany.getCustomerManagerIds()){ + CdManagerCompany managerCompany = new CdManagerCompany(); + managerCompany.setCdCompanyId(company.getId()); + managerCompany.setCdManagerId(customerManagerId); + mybatisDao.save(managerCompany); + } + } + @Transactional + public void updateCompany(Integer id, UpdateCompany updateCompany) { + CdCompany company = new CdCompany(); + company.setId(id); + company.setCompanyCode(updateCompany.getCompanyCode()); + company.setCompanyName(updateCompany.getCompanyName()); + company.setCompanyLeader(updateCompany.getCompanyLeader()); + company.setCompanyLeaderTel(updateCompany.getCompanyLeaderTel()); + company.setCompanyAddress(updateCompany.getCompanyAddress()); + //客服经理单位 + company = mybatisDao.saveByModel(company); + CdManagerCompanyExample managerCompanyExample = new CdManagerCompanyExample(); + managerCompanyExample.createCriteria().andCdCompanyIdEqualTo(id); + mybatisDao.deleteByExample(managerCompanyExample); + for(Integer customerManagerId : updateCompany.getCustomerManagerIds()){ + CdManagerCompany managerCompany = new CdManagerCompany(); + managerCompany.setCdCompanyId(company.getId()); + managerCompany.setCdManagerId(customerManagerId); + mybatisDao.save(managerCompany); + } + mybatisDao.update(company); + } + @Transactional + public void delete(Integer id) { + mybatisDao.deleteByPrimaryKey(CdCompany.class, id); + } + +} diff --git a/src/main/java/com/xmomen/module/base/service/impl/ContractItemServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ContractItemServiceImpl.java new file mode 100644 index 0000000..dd0f1f3 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/impl/ContractItemServiceImpl.java @@ -0,0 +1,67 @@ +package com.xmomen.module.base.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.module.base.entity.CdContractItem; +import com.xmomen.module.base.entity.CdItem; +import com.xmomen.module.base.model.CreateContractItem; +import com.xmomen.module.base.model.UpdateContractItem; +import com.xmomen.module.base.service.ContractItemService; +@Service +public class ContractItemServiceImpl implements ContractItemService { + @Autowired + MybatisDao mybatisDao; + @Override + @Transactional + public void createContractItem(CreateContractItem createContractItem) { + if(1 == createContractItem.getAddType()){ + CdItem item = new CdItem(); + item.setCdCategoryId(createContractItem.getCdCategoryId()); + List items = mybatisDao.selectByModel(item); + for(CdItem itemDb : items){ + saveContractItem(createContractItem,itemDb); + } + }else if(2 == createContractItem.getAddType()){ + CdItem item = new CdItem(); + item.setItemCode(createContractItem.getItemCode()); + item = mybatisDao.selectOneByModel(item); + if(item != null){ + saveContractItem(createContractItem,item); + } + } + + } + @Transactional + private void saveContractItem(CreateContractItem createContractItem,CdItem item){ + //先查询item是否存在，存在则更新 + CdContractItem contractItem = new CdContractItem(); + contractItem.setCdItemId(item.getId()); + contractItem.setCdContractId(createContractItem.getCdContractId()); + contractItem = mybatisDao.selectOneByModel(contractItem); + if(contractItem == null){ + contractItem = new CdContractItem(); + contractItem.setCdItemId(item.getId()); + contractItem.setCdContractId(createContractItem.getCdContractId()); + contractItem.setContractType(createContractItem.getContractType()); + contractItem.setContractValue(createContractItem.getContractValue()); + mybatisDao.save(contractItem); + }else{ + contractItem.setContractType(createContractItem.getContractType()); + contractItem.setContractValue(createContractItem.getContractValue()); + mybatisDao.update(contractItem); + } + } + + @Transactional + public void updateContractItem(Integer id, UpdateContractItem updateContractItem) { + } + @Transactional + public void delete(Integer id) { + mybatisDao.deleteByPrimaryKey(CdContractItem.class, id); + } +} diff --git a/src/main/java/com/xmomen/module/base/service/impl/ExpressServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ExpressServiceImpl.java new file mode 100644 index 0000000..512e1c8 --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/impl/ExpressServiceImpl.java @@ -0,0 +1,215 @@ +package com.xmomen.module.base.service.impl; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.framework.utils.AssertExt; +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.order.entity.TbOrder; +import com.xmomen.module.order.entity.TbOrderRef; +import com.xmomen.module.order.entity.TbOrderRefExample; +import com.xmomen.module.order.entity.TbOrderRelation; +import com.xmomen.module.order.mapper.OrderMapper; +import com.xmomen.module.order.model.OrderModel; +import com.xmomen.module.order.model.OrderQuery; +import com.xmomen.module.report.model.ExpressReport; +import com.xmomen.module.report.model.OrderDeliveryReport; +import com.xmomen.module.wx.util.DateUtils; +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.util.List; + +@Service +public class ExpressServiceImpl implements ExpressService { + @Autowired + MybatisDao mybatisDao; + @Override + @Transactional + public void createExpress(CdExpress createExpress) { + mybatisDao.save(createExpress); + } + @Transactional + public void updateExpress(Integer id, CdExpress updateExpress) { + updateExpress.setId(id); + mybatisDao.update(updateExpress); + } + @Transactional + public void delete(Integer id) { + mybatisDao.deleteByPrimaryKey(CdExpress.class, id); + } + @Override + @Transactional + public void dispatchExpress(ExpressTask expressTask) { + for (String orderNo : expressTask.getOrderNos()) { + TbOrder order = new TbOrder(); + order.setOrderNo(orderNo); + order = mybatisDao.selectOneByModel(order); + + order.setDespatchExpressId(expressTask.getExpressId()); + mybatisDao.update(order); + } + + } + @Override + @Transactional + public void cancelExpress(String[] orderNoList) { + for (String orderNo : orderNoList) { + mybatisDao.getSqlSessionTemplate().update(ExpressMapper.ExpressMapperNameSpace + "cancelDespatch", orderNo); + } + } + + + /** + * 查询已扫描的订单 + * @param orderQuery + * @param limit + * @param offset + * @return + */ + public Page getTakeDeliveryList(OrderQuery orderQuery, Integer limit, Integer offset){ + return (Page) mybatisDao.selectPage(ExpressMapper.ExpressMapperNameSpace + "getOrderList", orderQuery, limit, offset); + } + + /** + * 查询已扫描的订单(导出) + * @param orderQuery + * @param limit + * @param offset + * @return + */ + public List getTakeDeliveryReportList(OrderQuery orderQuery){ + return mybatisDao.getSqlSessionTemplate().selectList(ExpressMapper.ExpressMapperNameSpace + "getOrderReportList", orderQuery); + } + + /** + * 查询已分配未提货的订单 + * @param orderQuery + * @param limit + * @param offset + * @return + */ + public Page getOrderNoDespatchReportList(OrderQuery orderQuery, Integer limit, Integer offset){ + return (Page) mybatisDao.selectPage(ExpressMapper.ExpressMapperNameSpace + "getOrderNoDespatchReportList", orderQuery, limit, offset); + } + + /** + * 查询分配未提货的订单(导出) + * @param orderQuery + * @param limit + * @param offset + * @return + */ + public List getOrderNoDespatchReportList(OrderQuery orderQuery){ + return mybatisDao.getSqlSessionTemplate().selectList(ExpressMapper.ExpressMapperNameSpace + "getOrderNoDespatchReportList", orderQuery); + } + + /** + * 发运操作 + * + * @param boxNo 箱号 + */ + @Transactional + public void takeDelivery(String boxNo){ + //查找箱子是否扫描过 + TbOrderRef orderRefBoxNo = new TbOrderRef(); + orderRefBoxNo.setRefType("TAKE_DELIVERY_BOXNO"); + orderRefBoxNo.setRefValue(boxNo); + orderRefBoxNo = mybatisDao.selectOneByModel(orderRefBoxNo); + AssertExt.isNull(orderRefBoxNo, "该包裹已经提货，不能重复提货！"); + + //通过箱号查找订单号 + TbOrderRelation tbOrderRelation = new TbOrderRelation(); + tbOrderRelation.setRefType(OrderMapper.ORDER_PACKING_RELATION_CODE); + tbOrderRelation.setRefValue(boxNo); + tbOrderRelation = mybatisDao.selectOneByModel(tbOrderRelation); + AssertExt.notNull(tbOrderRelation, "扫描的箱号不存在！请确认。"); + TbOrder order = new TbOrder(); + order.setOrderNo(tbOrderRelation.getOrderNo()); + order = mybatisDao.selectOneByModel(order); + AssertExt.notNull(order, "订单不存在！"); + AssertExt.notNull(order.getDespatchExpressId(), "订单未分配不能提货！"); + String orderStatus = order.getOrderStatus(); + AssertExt.isTrue(orderStatus.equals("4"), "订单状态不是待出库，不能提货！"); + //判断是否是快递商的货 + CdExpress express = mybatisDao.selectByPrimaryKey(CdExpress.class,order.getDespatchExpressId()); + AssertExt.notNull(express,"分配的快递商不存在了，请确认！"); + String username = (String) SecurityUtils.getSubject().getPrincipal(); + AssertExt.isTrue(username.equals(express.getExpressCode()), "该包裹分配的快递商不符合，不能提货！"); + int totalBoxNum = order.getTotalBoxNum() ; + int scanBoxNum = order.getExpressScanBoxNum() + 1; + order.setExpressScanBoxNum(scanBoxNum); + //箱号加入order_ref 记录下扫描的箱子编号 + orderRefBoxNo = new TbOrderRef(); + orderRefBoxNo.setOrderNo(tbOrderRelation.getOrderNo()); + orderRefBoxNo.setRefType("TAKE_DELIVERY_BOXNO"); + orderRefBoxNo.setRefValue(boxNo); + mybatisDao.insert(orderRefBoxNo); + + if(totalBoxNum == scanBoxNum){ + //更新订单为待配送 + order.setOrderStatus("12"); + //更新出库时间 + order.setOutDate(DateUtils.getNowDate()); + //订单加入order_ref 表示整个订单的箱子全部扫描 + TbOrderRef orderRef = new TbOrderRef(); + orderRef.setOrderNo(tbOrderRelation.getOrderNo()); + orderRef.setRefType("TAKE_DELIVERY"); + orderRef.setRefValue(express.getExpressCode()); + TbOrderRef orderRefDB = mybatisDao.selectOneByModel(orderRef); + AssertExt.isTrue(orderRefDB == null, "该包裹已经提货，不能重复提货！"); + mybatisDao.insert(orderRef); + } + mybatisDao.update(order); + } + + /** + * 发运操作 + */ + @Transactional + public void unTakeDelivery(String orderNo){ + TbOrder order = new TbOrder(); + order.setOrderNo(orderNo); + order = mybatisDao.selectOneByModel(order); + AssertExt.notNull(order.getDespatchExpressId(), "订单未分配不能取消提货！"); + + //判断是否是快递商的货 + CdExpress express = mybatisDao.selectByPrimaryKey(CdExpress.class,order.getDespatchExpressId()); + AssertExt.notNull(express,"分配的快递商不存在了，请确认！"); + String username = (String) SecurityUtils.getSubject().getPrincipal(); + AssertExt.isTrue(username.equals(express.getExpressCode()), "该包裹分配的快递商不符合，不能取消提货！"); + + //更新订单为待出库 + order.setOrderStatus("4"); + order.setExpressScanBoxNum(0); + mybatisDao.update(order); + //删除关系ref + TbOrderRef orderRef = new TbOrderRef(); + orderRef.setOrderNo(orderNo); + orderRef.setRefType("TAKE_DELIVERY"); + orderRef.setRefValue(express.getExpressCode()); + TbOrderRef orderRefDB = mybatisDao.selectOneByModel(orderRef); + if(orderRefDB != null){ + mybatisDao.delete(orderRefDB); + } + //删除扫描的箱子 + TbOrderRefExample orderRefBoxNo = new TbOrderRefExample(); + orderRefBoxNo.createCriteria().andOrderNoEqualTo(orderNo) + .andRefTypeEqualTo("TAKE_DELIVERY_BOXNO"); + mybatisDao.deleteByExample(orderRefBoxNo); + } + + /** + * 获取快递商提货的订单 + */ + @Override + public List getTakeDeliveryList(OrderQuery query) { + // TODO Auto-generated method stub + return mybatisDao.getSqlSessionTemplate().selectList(ExpressMapper.ExpressMapperNameSpace + "getOrderList", query); + } + +} diff --git a/src/main/java/com/xmomen/module/base/service/impl/ItemServiceImpl.java b/src/main/java/com/xmomen/module/base/service/impl/ItemServiceImpl.java new file mode 100644 index 0000000..ea9c31a --- /dev/null +++ b/src/main/java/com/xmomen/module/base/service/impl/ItemServiceImpl.java @@ -0,0 +1,149 @@ +package com.xmomen.module.base.service.impl; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.base.mapper.ItemMapper; +import com.xmomen.module.base.model.*; + +import com.xmomen.module.resource.entity.Resource; +import com.xmomen.module.resource.mapper.ResourceMapperExt; +import com.xmomen.module.resource.service.ResourceService; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.module.base.entity.CdCouponCategoryRef; +import com.xmomen.module.base.entity.CdItem; +import com.xmomen.module.base.entity.CdItemRef; +import com.xmomen.module.base.entity.CdItemRefExample; +import com.xmomen.module.base.service.ItemService; + +import java.util.List; + +@Service +public class ItemServiceImpl implements ItemService { + @Autowired + MybatisDao mybatisDao; + + @Autowired + ResourceService resourceService; + + @Override + public List queryItemList(ItemQuery itemQuery) { + return mybatisDao.getSqlSessionTemplate().selectList(ItemMapper.ItemMapperNameSpace + "getItemList", itemQuery); + } + + @Override + public Page queryItemList(ItemQuery itemQuery, Integer offset, Integer limit) { + return (Page) mybatisDao.selectPage(ItemMapper.ItemMapperNameSpace + "getItemList", itemQuery, limit, offset); + } + + @Override + @Transactional + public void createItem(CreateItem createItem) { + CdItem item = new CdItem(); + item.setBasePrice(createItem.getBasePrice()); + item.setCdCategoryId(createItem.getCdCategoryId()); + item.setIsAudit(createItem.getIsAudit()); + item.setItemCode(createItem.getItemCode()); + item.setItemDescribe(createItem.getItemDescribe()); + item.setItemName(createItem.getItemName()); + item.setItemType(createItem.getItemType()); + item.setMemberPrice(createItem.getMemberPrice()); + item.setPricingManner(createItem.getPricingManner()); + item.setSellPrice(createItem.getSellPrice()); + item.setSellStatus(createItem.getSellStatus()); + item.setSpec(createItem.getSpec()); + item.setSellUnit(createItem.getSellUnit()); + item.setYieldly(createItem.getYieldly()); + String username = (String) SecurityUtils.getSubject().getPrincipal(); + item.setCreateUserCode(username); + item.setCaizaiUser(createItem.getCaizaiUser()); + item.setJianceUser(createItem.getJianceUser()); + item.setNongCanLv(createItem.getNongCanLv()); + item.setBaoZhiQi(createItem.getBaoZhiQi()); + item.setYiYangChenFen(createItem.getYiYangChenFen()); + item.setShiYiRenQun(createItem.getShiYiRenQun()); + item.setReMaiTuiJian(createItem.getReMaiTuiJian()); + item.setXinPinChangXian(createItem.getXinPinChangXian()); + item.setXianShiQiangGou(createItem.getXianShiQiangGou()); + item = mybatisDao.saveByModel(item); + if (createItem.getChildItems() != null) { + for (ItemChildModel childItem : createItem.getChildItems()) { + CdItemRef itemRef = new CdItemRef(); + itemRef.setCdItemId(item.getId()); + itemRef.setRefType("CHILD_ITEM"); + itemRef.setRefValue(childItem.getId() + ""); + itemRef.setRefName("组合子商品"); + itemRef.setRefCount(childItem.getCount()); + mybatisDao.save(itemRef); + } + } + } + + @Transactional + public void updateItem(Integer id, UpdateItem updateItem) { + CdItem item = new CdItem(); + item.setId(id); + item.setBasePrice(updateItem.getBasePrice()); + item.setCdCategoryId(updateItem.getCdCategoryId()); + item.setIsAudit(updateItem.getIsAudit()); + item.setItemCode(updateItem.getItemCode()); + item.setItemDescribe(updateItem.getItemDescribe()); + item.setItemName(updateItem.getItemName()); + item.setItemType(updateItem.getItemType()); + item.setMemberPrice(updateItem.getMemberPrice()); + item.setPricingManner(updateItem.getPricingManner()); + item.setSellPrice(updateItem.getSellPrice()); + item.setSellStatus(updateItem.getSellStatus()); + item.setSpec(updateItem.getSpec()); + item.setSellUnit(updateItem.getSellUnit()); + item.setYieldly(updateItem.getYieldly()); + item.setCaizaiUser(updateItem.getCaizaiUser()); + item.setJianceUser(updateItem.getJianceUser()); + item.setNongCanLv(updateItem.getNongCanLv()); + item.setBaoZhiQi(updateItem.getBaoZhiQi()); + item.setYiYangChenFen(updateItem.getYiYangChenFen()); + item.setShiYiRenQun(updateItem.getShiYiRenQun()); + item.setReMaiTuiJian(updateItem.getReMaiTuiJian()); + item.setXinPinChangXian(updateItem.getXinPinChangXian()); + item.setXianShiQiangGou(updateItem.getXianShiQiangGou()); + if (updateItem.getChildItems() != null) { + //先删除再添加 + CdItemRefExample itemRefDel = new CdItemRefExample(); + itemRefDel.createCriteria().andCdItemIdEqualTo(id); + mybatisDao.deleteByExample(itemRefDel); + for (ItemChildModel childItem : updateItem.getChildItems()) { + CdItemRef itemRef = new CdItemRef(); + itemRef.setCdItemId(item.getId()); + itemRef.setRefType("CHILD_ITEM"); + itemRef.setRefValue(childItem.getId() + ""); + itemRef.setRefName("组合子商品"); + itemRef.setRefCount(childItem.getCount()); + mybatisDao.save(itemRef); + } + } + mybatisDao.update(item); + } + + @Transactional + public void delete(Integer id) { + mybatisDao.deleteByPrimaryKey(CdItem.class, id); + } + + /** + * 设置封面图片 + * + * @param resourceId + */ + @Transactional + public void defaultImage(String resourceId) { + Resource resource = this.resourceService.getOneResource(resourceId); + //将商品的图片全部更新为非默认 + mybatisDao.getSqlSessionTemplate().update(ResourceMapperExt.ResourceMapperNameSpace + "updateDefaultByEntityId", resource.getEntityId()); + resource.setIsDefault(1); + this.mybatisDao.updateByModel(resource); + } + +} diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java new file mode 100644 index 0000000..53a5b2d --- /dev/null +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/controller/BeforehandPackageRecordController.java @@ -0,0 +1,130 @@ +package com.xmomen.module.beforehandpackagerecord.controller; + +import com.xmomen.framework.exception.BusinessException; +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.logger.Log; +import com.xmomen.module.beforehandpackagerecord.model.BeforehandPackageRecordQuery; +import com.xmomen.module.beforehandpackagerecord.model.BeforehandPackageRecordModel; +import com.xmomen.module.beforehandpackagerecord.service.BeforehandPackageRecordService; + +import org.apache.commons.io.IOUtils; +import org.apache.shiro.SecurityUtils; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.entity.result.ExcelImportResult; +import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; +import org.jeecgframework.poi.exception.excel.ExcelImportException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ui.ModelMap; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.ModelAndView; + +import javax.validation.Valid; +import java.io.Serializable; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; + +/** + * @author tanxinzheng + * @version 1.0.0 + * @date 2017-5-18 23:36:38 + */ +@RestController +@RequestMapping(value = "/beforehandPackageRecord") +public class BeforehandPackageRecordController { + + @Autowired + BeforehandPackageRecordService beforehandPackageRecordService; + + /** + * 预包装记录表列表 + * + * @param limit 每页结果数 + * @param offset 页码 + * @param id 主键 + * @param ids 主键数组 + * @param excludeIds 不包含主键数组 + * @return Page 预包装记录表领域分页对象 + */ + @RequestMapping(method = RequestMethod.GET) + @Log(actionName = "查询预包装记录表列表") + public Page getBeforehandPackageRecordList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "id", required = false) String id, + @RequestParam(value = "ids", required = false) String[] ids, + @RequestParam(value = "excludeIds", required = false) String[] excludeIds) { + BeforehandPackageRecordQuery beforehandPackageRecordQuery = new BeforehandPackageRecordQuery(); + beforehandPackageRecordQuery.setId(id); + beforehandPackageRecordQuery.setExcludeIds(excludeIds); + Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + beforehandPackageRecordQuery.setInsertUserId(userId); + beforehandPackageRecordQuery.setIds(ids); + return beforehandPackageRecordService.getBeforehandPackageRecordModelPage(limit, offset, beforehandPackageRecordQuery); + } + + /** + * 查询单个预包装记录表 + * + * @param id 主键 + * @return BeforehandPackageRecordModel 预包装记录表领域对象 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + @Log(actionName = "查询预包装记录表") + public BeforehandPackageRecordModel getBeforehandPackageRecordById(@PathVariable(value = "id") String id) { + return beforehandPackageRecordService.getOneBeforehandPackageRecordModel(id); + } + + /** + * 新增预包装记录表 + * + * @param beforehandPackageRecordModel 新增对象参数 + * @return BeforehandPackageRecordModel 预包装记录表领域对象 + */ + @RequestMapping(method = RequestMethod.POST) + @Log(actionName = "新增预包装记录表") + public BeforehandPackageRecordModel createBeforehandPackageRecord(@RequestBody @Valid BeforehandPackageRecordModel beforehandPackageRecordModel) { + return beforehandPackageRecordService.createBeforehandPackageRecord(beforehandPackageRecordModel); + } + + /** + * 更新预包装记录表 + * + * @param id 主键 + * @param beforehandPackageRecordModel 更新对象参数 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.PUT) + @Log(actionName = "更新预包装记录表") + public void updateBeforehandPackageRecord(@PathVariable(value = "id") String id, + @RequestBody @Valid BeforehandPackageRecordModel beforehandPackageRecordModel) { + beforehandPackageRecordService.updateBeforehandPackageRecord(beforehandPackageRecordModel); + } + + /** + * 删除预包装记录表 + * + * @param id 主键 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除单个预包装记录表") + public void deleteBeforehandPackageRecord(@PathVariable(value = "id") String id) { + beforehandPackageRecordService.deleteBeforehandPackageRecord(id); + } + + /** + * 删除预包装记录表 + * + * @param ids 主键 + */ + @RequestMapping(method = RequestMethod.DELETE) + @Log(actionName = "批量删除预包装记录表") + public void deleteBeforehandPackageRecords(@RequestParam(value = "ids") String[] ids) { + beforehandPackageRecordService.deleteBeforehandPackageRecord(ids); + } + + +} diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecordExample.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecordExample.java new file mode 100644 index 0000000..50acfde --- /dev/null +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/entity/BeforehandPackageRecordExample.java @@ -0,0 +1,632 @@ +package com.xmomen.module.beforehandpackagerecord.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class BeforehandPackageRecordExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public BeforehandPackageRecordExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + 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 values) { + addCriterion("cd_item_id in", values, "cdItemId"); + return (Criteria) this; + } + + public Criteria andCdItemIdNotIn(List 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 andPackageNumIsNull() { + addCriterion("package_num is null"); + return (Criteria) this; + } + + public Criteria andPackageNumIsNotNull() { + addCriterion("package_num is not null"); + return (Criteria) this; + } + + public Criteria andPackageNumEqualTo(Integer value) { + addCriterion("package_num =", value, "packageNum"); + return (Criteria) this; + } + + public Criteria andPackageNumNotEqualTo(Integer value) { + addCriterion("package_num <>", value, "packageNum"); + return (Criteria) this; + } + + public Criteria andPackageNumGreaterThan(Integer value) { + addCriterion("package_num >", value, "packageNum"); + return (Criteria) this; + } + + public Criteria andPackageNumGreaterThanOrEqualTo(Integer value) { + addCriterion("package_num >=", value, "packageNum"); + return (Criteria) this; + } + + public Criteria andPackageNumLessThan(Integer value) { + addCriterion("package_num <", value, "packageNum"); + return (Criteria) this; + } + + public Criteria andPackageNumLessThanOrEqualTo(Integer value) { + addCriterion("package_num <=", value, "packageNum"); + return (Criteria) this; + } + + public Criteria andPackageNumIn(List values) { + addCriterion("package_num in", values, "packageNum"); + return (Criteria) this; + } + + public Criteria andPackageNumNotIn(List values) { + addCriterion("package_num not in", values, "packageNum"); + return (Criteria) this; + } + + public Criteria andPackageNumBetween(Integer value1, Integer value2) { + addCriterion("package_num between", value1, value2, "packageNum"); + return (Criteria) this; + } + + public Criteria andPackageNumNotBetween(Integer value1, Integer value2) { + addCriterion("package_num not between", value1, value2, "packageNum"); + return (Criteria) this; + } + + public Criteria andInsertDateIsNull() { + addCriterion("insert_date is null"); + return (Criteria) this; + } + + public Criteria andInsertDateIsNotNull() { + addCriterion("insert_date is not null"); + return (Criteria) this; + } + + public Criteria andInsertDateEqualTo(Date value) { + addCriterion("insert_date =", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateNotEqualTo(Date value) { + addCriterion("insert_date <>", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateGreaterThan(Date value) { + addCriterion("insert_date >", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateGreaterThanOrEqualTo(Date value) { + addCriterion("insert_date >=", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateLessThan(Date value) { + addCriterion("insert_date <", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateLessThanOrEqualTo(Date value) { + addCriterion("insert_date <=", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateIn(List values) { + addCriterion("insert_date in", values, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateNotIn(List values) { + addCriterion("insert_date not in", values, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateBetween(Date value1, Date value2) { + addCriterion("insert_date between", value1, value2, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateNotBetween(Date value1, Date value2) { + addCriterion("insert_date not between", value1, value2, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertUserIdIsNull() { + addCriterion("insert_user_id is null"); + return (Criteria) this; + } + + public Criteria andInsertUserIdIsNotNull() { + addCriterion("insert_user_id is not null"); + return (Criteria) this; + } + + public Criteria andInsertUserIdEqualTo(Integer value) { + addCriterion("insert_user_id =", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdNotEqualTo(Integer value) { + addCriterion("insert_user_id <>", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdGreaterThan(Integer value) { + addCriterion("insert_user_id >", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdGreaterThanOrEqualTo(Integer value) { + addCriterion("insert_user_id >=", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdLessThan(Integer value) { + addCriterion("insert_user_id <", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdLessThanOrEqualTo(Integer value) { + addCriterion("insert_user_id <=", value, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdIn(List values) { + addCriterion("insert_user_id in", values, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdNotIn(List values) { + addCriterion("insert_user_id not in", values, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdBetween(Integer value1, Integer value2) { + addCriterion("insert_user_id between", value1, value2, "insertUserId"); + return (Criteria) this; + } + + public Criteria andInsertUserIdNotBetween(Integer value1, Integer value2) { + addCriterion("insert_user_id not between", value1, value2, "insertUserId"); + return (Criteria) this; + } + + public Criteria andUpdateDateIsNull() { + addCriterion("update_date is null"); + return (Criteria) this; + } + + public Criteria andUpdateDateIsNotNull() { + addCriterion("update_date is not null"); + return (Criteria) this; + } + + public Criteria andUpdateDateEqualTo(Date value) { + addCriterion("update_date =", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateNotEqualTo(Date value) { + addCriterion("update_date <>", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateGreaterThan(Date value) { + addCriterion("update_date >", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateGreaterThanOrEqualTo(Date value) { + addCriterion("update_date >=", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateLessThan(Date value) { + addCriterion("update_date <", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateLessThanOrEqualTo(Date value) { + addCriterion("update_date <=", value, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateIn(List values) { + addCriterion("update_date in", values, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateNotIn(List values) { + addCriterion("update_date not in", values, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateBetween(Date value1, Date value2) { + addCriterion("update_date between", value1, value2, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateDateNotBetween(Date value1, Date value2) { + addCriterion("update_date not between", value1, value2, "updateDate"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdIsNull() { + addCriterion("update_user_id is null"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdIsNotNull() { + addCriterion("update_user_id is not null"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdEqualTo(Integer value) { + addCriterion("update_user_id =", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdNotEqualTo(Integer value) { + addCriterion("update_user_id <>", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdGreaterThan(Integer value) { + addCriterion("update_user_id >", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdGreaterThanOrEqualTo(Integer value) { + addCriterion("update_user_id >=", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdLessThan(Integer value) { + addCriterion("update_user_id <", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdLessThanOrEqualTo(Integer value) { + addCriterion("update_user_id <=", value, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdIn(List values) { + addCriterion("update_user_id in", values, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdNotIn(List values) { + addCriterion("update_user_id not in", values, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdBetween(Integer value1, Integer value2) { + addCriterion("update_user_id between", value1, value2, "updateUserId"); + return (Criteria) this; + } + + public Criteria andUpdateUserIdNotBetween(Integer value1, Integer value2) { + addCriterion("update_user_id not between", value1, value2, "updateUserId"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/mapper/BeforehandPackageRecordMapperExt.xml b/src/main/java/com/xmomen/module/beforehandpackagerecord/mapper/BeforehandPackageRecordMapperExt.xml new file mode 100644 index 0000000..4d128e4 --- /dev/null +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/mapper/BeforehandPackageRecordMapperExt.xml @@ -0,0 +1,40 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java new file mode 100644 index 0000000..3725aed --- /dev/null +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordCreate.java @@ -0,0 +1,39 @@ +package com.xmomen.module.beforehandpackagerecord.model; + +import lombok.Data; +import com.xmomen.module.beforehandpackagerecord.entity.BeforehandPackageRecord; +import org.springframework.beans.BeanUtils; + + import java.lang.String; + import java.lang.Integer; + import java.util.Date; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-5-18 23:36:38 + * @version 1.0.0 + */ +public @Data class BeforehandPackageRecordCreate implements Serializable { + + /** */ + private String id; + /** 包装商品 */ + private Integer cdItemId; + /** 包装商品数 */ + private Integer packageNum; + /** 创建时间 */ + private Date insertDate; + /** 创建人 */ + private Integer insertUserId; + /** 更新时间 */ + private Date updateDate; + /** 更新人 */ + private Integer updateUserId; + + public BeforehandPackageRecord getEntity(){ + BeforehandPackageRecord beforehandPackageRecord = new BeforehandPackageRecord(); + BeanUtils.copyProperties(this, beforehandPackageRecord); + return beforehandPackageRecord; + } +} diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java new file mode 100644 index 0000000..aaac5b5 --- /dev/null +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/model/BeforehandPackageRecordModel.java @@ -0,0 +1,91 @@ +package com.xmomen.module.beforehandpackagerecord.model; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.xmomen.module.beforehandpackagerecord.entity.BeforehandPackageRecord; +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-18 23:36:38 + */ +@ExcelTarget(value = "BeforehandPackageRecordModel") +public +@Data +class BeforehandPackageRecordModel implements Serializable { + + /** */ + @NotBlank(message = "为必填项") + @Length(max = 32, message = "字符长度限制[0,32]") + private String id; + /** + * 包装商品 + */ + @Excel(name = "包装商品") + @NotBlank(message = "包装商品为必填项") + @Range(max = 999999999, min = -999999999, message = "包装商品数值范围[999999999,-999999999]") + private Integer cdItemId; + /** + * 包装商品数 + */ + @Excel(name = "包装商品数") + @NotBlank(message = "包装商品数为必填项") + @Range(max = 999999999, min = -999999999, message = "包装商品数数值范围[999999999,-999999999]") + private Integer packageNum; + /** + * 创建时间 + */ + @Excel(name = "创建时间") + @NotBlank(message = "创建时间为必填项") + private Date insertDate; + /** + * 创建人 + */ + @Excel(name = "创建人") + @NotBlank(message = "创建人为必填项") + @Range(max = 999999999, min = -999999999, message = "创建人数值范围[999999999,-999999999]") + private Integer insertUserId; + /** + * 更新时间 + */ + @Excel(name = "更新时间") + private Date updateDate; + /** + * 更新人 + */ + @Excel(name = "更新人") + @Range(max = 999999999, min = -999999999, message = "更新人数值范围[999999999,-999999999]") + private Integer updateUserId; + + private String itemCode; + + private String itemName; + + private String packageUserName; + + /** + * Get BeforehandPackageRecord Entity Object + * + * @return + */ + @JsonIgnore + public BeforehandPackageRecord getEntity() { + BeforehandPackageRecord beforehandPackageRecord = new BeforehandPackageRecord(); + BeanUtils.copyProperties(this, beforehandPackageRecord); + return beforehandPackageRecord; + } + + +} diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/service/BeforehandPackageRecordService.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/service/BeforehandPackageRecordService.java new file mode 100644 index 0000000..d56c57a --- /dev/null +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/service/BeforehandPackageRecordService.java @@ -0,0 +1,115 @@ +package com.xmomen.module.beforehandpackagerecord.service; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.beforehandpackagerecord.model.BeforehandPackageRecordQuery; +import com.xmomen.module.beforehandpackagerecord.model.BeforehandPackageRecordModel; +import com.xmomen.module.beforehandpackagerecord.entity.BeforehandPackageRecord; +import org.apache.ibatis.exceptions.TooManyResultsException; + +import java.io.Serializable; +import java.util.List; + +/** + * @author tanxinzheng + * @date 2017-5-18 23:36:38 + * @version 1.0.0 + */ +public interface BeforehandPackageRecordService { + + /** + * 新增预包装记录表 + * @param beforehandPackageRecordModel 新增预包装记录表对象参数 + * @return BeforehandPackageRecordModel 预包装记录表领域对象 + */ + public BeforehandPackageRecordModel createBeforehandPackageRecord(BeforehandPackageRecordModel beforehandPackageRecordModel); + + /** + * 新增预包装记录表实体对象 + * @param beforehandPackageRecord 新增预包装记录表实体对象参数 + * @return BeforehandPackageRecord 预包装记录表实体对象 + */ + public BeforehandPackageRecord createBeforehandPackageRecord(BeforehandPackageRecord beforehandPackageRecord); + + /** + * 批量新增预包装记录表 + * @param BeforehandPackageRecordModel 新增预包装记录表对象集合参数 + * @return List 预包装记录表领域对象集合 + */ + List createBeforehandPackageRecords(List beforehandPackageRecordModels); + + /** + * 更新预包装记录表 + * @param beforehandPackageRecordModel 更新预包装记录表对象参数 + */ + public void updateBeforehandPackageRecord(BeforehandPackageRecordModel beforehandPackageRecordModel); + + /** + * 更新预包装记录表实体对象 + * @param beforehandPackageRecord 新增预包装记录表实体对象参数 + * @return BeforehandPackageRecord 预包装记录表实体对象 + */ + public void updateBeforehandPackageRecord(BeforehandPackageRecord beforehandPackageRecord); + + /** + * 批量删除预包装记录表 + * @param ids 主键数组 + */ + public void deleteBeforehandPackageRecord(String[] ids); + + /** + * 删除预包装记录表 + * @param id 主键 + */ + public void deleteBeforehandPackageRecord(String id); + + /** + * 查询预包装记录表领域分页对象（带参数条件） + * @param beforehandPackageRecordQuery 查询参数 + * @param limit 每页最大数 + * @param offset 页码 + * @return Page 预包装记录表参数对象 + */ + public Page getBeforehandPackageRecordModelPage(int limit, int offset, BeforehandPackageRecordQuery beforehandPackageRecordQuery); + + /** + * 查询预包装记录表领域分页对象（无参数条件） + * @param limit 每页最大数 + * @param offset 页码 + * @return Page 预包装记录表领域对象 + */ + public Page getBeforehandPackageRecordModelPage(int limit, int offset); + + /** + * 查询预包装记录表领域集合对象（带参数条件） + * @param beforehandPackageRecordQuery 查询参数对象 + * @return List 预包装记录表领域集合对象 + */ + public List getBeforehandPackageRecordModelList(BeforehandPackageRecordQuery beforehandPackageRecordQuery); + + /** + * 查询预包装记录表领域集合对象（无参数条件） + * @return List 预包装记录表领域集合对象 + */ + public List getBeforehandPackageRecordModelList(); + + /** + * 查询预包装记录表实体对象 + * @param id 主键 + * @return BeforehandPackageRecord 预包装记录表实体对象 + */ + public BeforehandPackageRecord getOneBeforehandPackageRecord(String id); + + /** + * 根据主键查询单个对象 + * @param id 主键 + * @return BeforehandPackageRecordModel 预包装记录表领域对象 + */ + public BeforehandPackageRecordModel getOneBeforehandPackageRecordModel(String id); + + /** + * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错） + * @param beforehandPackageRecordQuery 预包装记录表查询参数对象 + * @return BeforehandPackageRecordModel 预包装记录表领域对象 + */ + public BeforehandPackageRecordModel getOneBeforehandPackageRecordModel(BeforehandPackageRecordQuery beforehandPackageRecordQuery) throws TooManyResultsException; +} diff --git a/src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java b/src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java new file mode 100644 index 0000000..24ec927 --- /dev/null +++ b/src/main/java/com/xmomen/module/beforehandpackagerecord/service/impl/BeforehandPackageRecordServiceImpl.java @@ -0,0 +1,211 @@ +package com.xmomen.module.beforehandpackagerecord.service.impl; + +import com.xmomen.module.beforehandpackagerecord.entity.BeforehandPackageRecord; +import com.xmomen.module.beforehandpackagerecord.entity.BeforehandPackageRecordExample; +import com.xmomen.module.beforehandpackagerecord.mapper.BeforehandPackageRecordMapperExt; +import com.xmomen.module.beforehandpackagerecord.model.BeforehandPackageRecordCreate; +import com.xmomen.module.beforehandpackagerecord.model.BeforehandPackageRecordQuery; +import com.xmomen.module.beforehandpackagerecord.model.BeforehandPackageRecordUpdate; +import com.xmomen.module.beforehandpackagerecord.model.BeforehandPackageRecordModel; +import com.xmomen.module.beforehandpackagerecord.service.BeforehandPackageRecordService; +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.framework.mybatis.page.Page; +import org.apache.ibatis.exceptions.TooManyResultsException; +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-18 23:36:38 + * @version 1.0.0 + */ +@Service +public class BeforehandPackageRecordServiceImpl implements BeforehandPackageRecordService { + + @Autowired + MybatisDao mybatisDao; + + /** + * 新增预包装记录表 + * + * @param beforehandPackageRecordModel 新增预包装记录表对象参数 + * @return BeforehandPackageRecordModel 预包装记录表领域对象 + */ + @Override + @Transactional + public BeforehandPackageRecordModel createBeforehandPackageRecord(BeforehandPackageRecordModel beforehandPackageRecordModel) { + BeforehandPackageRecord beforehandPackageRecord = createBeforehandPackageRecord(beforehandPackageRecordModel.getEntity()); + if(beforehandPackageRecord != null){ + return getOneBeforehandPackageRecordModel(beforehandPackageRecord.getId()); + } + return null; + } + + /** + * 新增预包装记录表实体对象 + * + * @param beforehandPackageRecord 新增预包装记录表实体对象参数 + * @return BeforehandPackageRecord 预包装记录表实体对象 + */ + @Override + @Transactional + public BeforehandPackageRecord createBeforehandPackageRecord(BeforehandPackageRecord beforehandPackageRecord) { + return mybatisDao.insertByModel(beforehandPackageRecord); + } + + /** + * 批量新增预包装记录表 + * + * @param beforehandPackageRecordModels 新增预包装记录表对象集合参数 + * @return List 预包装记录表领域对象集合 + */ + @Override + @Transactional + public List createBeforehandPackageRecords(List beforehandPackageRecordModels) { + List beforehandPackageRecordModelList = null; + for (BeforehandPackageRecordModel beforehandPackageRecordModel : beforehandPackageRecordModels) { + beforehandPackageRecordModel = createBeforehandPackageRecord(beforehandPackageRecordModel); + if(beforehandPackageRecordModel != null){ + if(beforehandPackageRecordModelList == null){ + beforehandPackageRecordModelList = new ArrayList<>(); + } + beforehandPackageRecordModelList.add(beforehandPackageRecordModel); + } + } + return beforehandPackageRecordModelList; + } + + /** + * 更新预包装记录表 + * + * @param beforehandPackageRecordModel 更新预包装记录表对象参数 + */ + @Override + @Transactional + public void updateBeforehandPackageRecord(BeforehandPackageRecordModel beforehandPackageRecordModel) { + mybatisDao.update(beforehandPackageRecordModel.getEntity()); + } + + /** + * 更新预包装记录表实体对象 + * + * @param beforehandPackageRecord 新增预包装记录表实体对象参数 + * @return BeforehandPackageRecord 预包装记录表实体对象 + */ + @Override + @Transactional + public void updateBeforehandPackageRecord(BeforehandPackageRecord beforehandPackageRecord) { + mybatisDao.update(beforehandPackageRecord); + } + + /** + * 删除预包装记录表 + * + * @param ids 主键数组 + */ + @Override + @Transactional + public void deleteBeforehandPackageRecord(String[] ids) { + BeforehandPackageRecordExample beforehandPackageRecordExample = new BeforehandPackageRecordExample(); + beforehandPackageRecordExample.createCriteria().andIdIn(Arrays.asList((String[]) ids)); + mybatisDao.deleteByExample(beforehandPackageRecordExample); + } + + /** + * 删除预包装记录表 + * + * @param id 主键 + */ + @Override + @Transactional + public void deleteBeforehandPackageRecord(String id) { + mybatisDao.deleteByPrimaryKey(BeforehandPackageRecord.class, id); + } + + /** + * 查询预包装记录表领域分页对象（带参数条件） + * + * @param limit 每页最大数 + * @param offset 页码 + * @param beforehandPackageRecordQuery 查询参数 + * @return Page 预包装记录表参数对象 + */ + @Override + public Page getBeforehandPackageRecordModelPage(int limit, int offset, BeforehandPackageRecordQuery beforehandPackageRecordQuery) { + return (Page) mybatisDao.selectPage(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery, limit, offset); + } + + /** + * 查询预包装记录表领域分页对象（无参数条件） + * + * @param limit 每页最大数 + * @param offset 页码 + * @return Page 预包装记录表领域对象 + */ + @Override + public Page getBeforehandPackageRecordModelPage(int limit, int offset) { + return (Page) mybatisDao.selectPage(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", null, limit, offset); + } + + /** + * 查询预包装记录表领域集合对象（带参数条件） + * + * @param beforehandPackageRecordQuery 查询参数对象 + * @return List 预包装记录表领域集合对象 + */ + @Override + public List getBeforehandPackageRecordModelList(BeforehandPackageRecordQuery beforehandPackageRecordQuery) { + return mybatisDao.getSqlSessionTemplate().selectList(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery); + } + + /** + * 查询预包装记录表领域集合对象（无参数条件） + * + * @return List 预包装记录表领域集合对象 + */ + @Override + public List getBeforehandPackageRecordModelList() { + return mybatisDao.getSqlSessionTemplate().selectList(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel"); + } + + /** + * 查询预包装记录表实体对象 + * + * @param id 主键 + * @return BeforehandPackageRecord 预包装记录表实体对象 + */ + @Override + public BeforehandPackageRecord getOneBeforehandPackageRecord(String id) { + return mybatisDao.selectByPrimaryKey(BeforehandPackageRecord.class, id); + } + + /** + * 根据主键查询单个对象 + * + * @param id 主键 + * @return BeforehandPackageRecordModel 预包装记录表领域对象 + */ + @Override + public BeforehandPackageRecordModel getOneBeforehandPackageRecordModel(String id) { + BeforehandPackageRecordQuery beforehandPackageRecordQuery = new BeforehandPackageRecordQuery(); + beforehandPackageRecordQuery.setId(id); + return mybatisDao.getSqlSessionTemplate().selectOne(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery); + } + + /** + * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错） + * + * @param beforehandPackageRecordQuery 预包装记录表查询参数对象 + * @return BeforehandPackageRecordModel 预包装记录表领域对象 + */ + @Override + public BeforehandPackageRecordModel getOneBeforehandPackageRecordModel(BeforehandPackageRecordQuery beforehandPackageRecordQuery) throws TooManyResultsException { + return mybatisDao.getSqlSessionTemplate().selectOne(BeforehandPackageRecordMapperExt.BeforehandPackageRecordMapperNameSpace + "getBeforehandPackageRecordModel", beforehandPackageRecordQuery); + } +} diff --git a/src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java b/src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java new file mode 100644 index 0000000..771f119 --- /dev/null +++ b/src/main/java/com/xmomen/module/core/web/JSONResponseBodyAdvice.java @@ -0,0 +1,57 @@ +package com.xmomen.module.core.web; + +import com.xmomen.framework.mybatis.page.Page; +import org.springframework.core.MethodParameter; +import org.springframework.core.annotation.Order; +import org.springframework.http.MediaType; +import org.springframework.http.server.ServerHttpRequest; +import org.springframework.http.server.ServerHttpResponse; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; + +import java.util.HashMap; +import java.util.Map; + +/** + * Created by Jeng on 2016/1/21. + */ +@Order(1) +@ControllerAdvice +public class JSONResponseBodyAdvice implements ResponseBodyAdvice { + /** + * Whether this component supports the given controller method return type + * and the selected {@code HttpMessageConverter} type. + * + * @param returnType the return type + * @param converterType the selected converter type + * @return {@code true} if {@link #beforeBodyWrite} should be invoked, {@code false} otherwise + */ + @Override + public boolean supports(MethodParameter returnType, Class converterType) { + return returnType.getMethod().getReturnType().isAssignableFrom(Page.class); + } + + /** + * Invoked after an {@code HttpMessageConverter} is selected and just before + * its write method is invoked. + * + * @param body the body to be written + * @param returnType the return type of the controller method + * @param selectedContentType the content type selected through content negotiation + * @param selectedConverterType the converter type selected to write to the response + * @param request the current request + * @param response the current response + * @return the body that was passed in or a modified, possibly new instance + */ + @Override + public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) { + if(body instanceof Page){ + Page page = (Page) body; + Map map = new HashMap(); + map.put("pageInfo", page.getPageInfo()); + map.put("data", page.getResult()); + return map; + } + return body; + } +} diff --git a/src/main/java/com/xmomen/module/core/web/WebCommonUtils.java b/src/main/java/com/xmomen/module/core/web/WebCommonUtils.java new file mode 100644 index 0000000..71b7b45 --- /dev/null +++ b/src/main/java/com/xmomen/module/core/web/WebCommonUtils.java @@ -0,0 +1,18 @@ +package com.xmomen.module.core.web; + +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; + +/** + * Created by Jeng on 2016/3/1. + */ +public class WebCommonUtils { + + public static boolean isJSON(ServletRequest request){ + if("XMLHttpRequest".equalsIgnoreCase(((HttpServletRequest) request).getHeader("X-Requested-With")) + || "application/json".equalsIgnoreCase(request.getContentType())){ + return true; + } + return false; + } +} diff --git a/src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java b/src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java new file mode 100644 index 0000000..cb59e94 --- /dev/null +++ b/src/main/java/com/xmomen/module/core/web/controller/DmsBaseController.java @@ -0,0 +1,17 @@ +package com.xmomen.module.core.web.controller; + +import com.xmomen.module.base.constant.AppConstants; +import org.apache.shiro.SecurityUtils; +import org.springframework.web.bind.annotation.RestController; + +/** + * Created by tanxinzheng on 17/5/13. + */ +@RestController +public class DmsBaseController { + + protected Integer getCurrentUserId(){ + Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + return userId; + } +} diff --git a/src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java b/src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java new file mode 100644 index 0000000..b6213e8 --- /dev/null +++ b/src/main/java/com/xmomen/module/core/web/controller/dto/AccountSettingDto.java @@ -0,0 +1,102 @@ +package com.xmomen.module.core.web.controller.dto; + +import java.io.Serializable; +import java.util.List; + +/** + * Created by Jeng on 16/1/7. + */ +public class AccountSettingDto implements Serializable { + + private String username; +// private String + private List navItems; + private List roles; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public List getNavItems() { + return navItems; + } + + public void setNavItems(List navItems) { + this.navItems = navItems; + } + + public List getRoles() { + return roles; + } + + public void setRoles(List roles) { + this.roles = roles; + } + + public class NavItem { + private String url; + private String name; + private String title; + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + } + + public class Role { + private String role; + private String description; + private Boolean available; + + public Role() { + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Boolean isAvailable() { + return available; + } + + public void setAvailable(Boolean available) { + this.available = available; + } + } +} diff --git a/src/main/java/com/xmomen/module/core/web/filter/PcFormAuthenticationFilter.java b/src/main/java/com/xmomen/module/core/web/filter/PcFormAuthenticationFilter.java new file mode 100644 index 0000000..25ab08c --- /dev/null +++ b/src/main/java/com/xmomen/module/core/web/filter/PcFormAuthenticationFilter.java @@ -0,0 +1,188 @@ +package com.xmomen.module.core.web.filter; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletOutputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authc.AuthenticationToken; +import org.apache.shiro.authc.IncorrectCredentialsException; +import org.apache.shiro.authc.UnknownAccountException; +import org.apache.shiro.subject.Subject; +import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; +import org.apache.shiro.web.util.WebUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; + +import com.alibaba.fastjson.JSONObject; +import com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.base.entity.CdMember; +import com.xmomen.module.base.service.MemberService; +import com.xmomen.module.core.web.WebCommonUtils; +import com.xmomen.module.core.web.token.MemberUserToken; + +public class PcFormAuthenticationFilter extends FormAuthenticationFilter { + + private static Logger logger = LoggerFactory.getLogger(PcFormAuthenticationFilter.class); + + public static final String DEFAULT_ERROR_EXCEPTION_KEY_ATTRIBUTE_NAME = "shiroLoginFailureException"; + + @Autowired + private MemberService memberService; + + private void initUserContext(String phoneNumber, Subject subject){ + CdMember query = new CdMember(); + query.setPhoneNumber(phoneNumber); + if(phoneNumber == null){ + return; + } + CdMember member = memberService.findMember(query); + subject.getSession().setAttribute(AppConstants.SESSION_USER_ID_KEY, member.getId()); + } + + private void buildJSONMessage(String message, ServletRequest request, ServletResponse response){ + try { + Map map = new HashMap(); + map.put("code", HttpStatus.UNAUTHORIZED.value()); + map.put("message", message); + map.put("timestamp", new Date()); + HttpServletResponse httpServletResponse = WebUtils.toHttp(response); + httpServletResponse.setCharacterEncoding("UTF-8"); + httpServletResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + ServletOutputStream servletOutputStream = httpServletResponse.getOutputStream(); + servletOutputStream.print(JSONObject.toJSONString(map)); + servletOutputStream.flush(); + servletOutputStream.close(); + } catch (IOException e) { + logger.error(e.getMessage(), e.getCause()); + e.printStackTrace(); + } + } + + @Override + protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception { + if (isLoginRequest(request, response)) { + if (isLoginSubmission(request, response)) { + if (logger.isTraceEnabled()) { + logger.trace("Login submission detected. Attempting to execute login."); + } + return executeLogin(request, response); + } else { + if (logger.isTraceEnabled()) { + logger.trace("Login page view."); + } + if (!WebCommonUtils.isJSON(request)) {// 不是ajax请求 + //allow them to see the login page ;) + return true; + } else { + buildJSONMessage("Requires authentication", request, response); + } + return false; + } + } else { + if (logger.isTraceEnabled()) { + logger.trace("Attempting to access a path which requires authentication. Forwarding to the " + + "Authentication url [" + getLoginUrl() + "]"); + } + if (!WebCommonUtils.isJSON(request)) {// 不是ajax请求 + saveRequestAndRedirectToLogin(request, response); + } else { + buildJSONMessage("Requires authentication", request, response); + } + return false; + } + } + + /** + * 登录成功处理（兼容自动识别异步请求，json请求及页面请求） + * @param token + * @param subject + * @param request + * @param response + * @return + * @throws Exception + */ + @Override + protected boolean onLoginSuccess(AuthenticationToken token, Subject subject, + ServletRequest request, ServletResponse response) throws Exception { + HttpServletRequest httpServletRequest = (HttpServletRequest) request; + HttpServletResponse httpServletResponse = (HttpServletResponse) response; + String phoneNumber = (String) subject.getPrincipal(); + initUserContext(phoneNumber, subject); +// if (!WebCommonUtils.isJSON(request)) {// 不是ajax请求 +// issueSuccessRedirect(request, response); +// } else { + httpServletResponse.setCharacterEncoding("UTF-8"); + PrintWriter out = httpServletResponse.getWriter(); + Map result = new HashMap<>(); + result.put("status", 200); + result.put("username", phoneNumber); + out.println(JSONObject.toJSONString(result)); + out.flush(); + out.close(); +// } + return false; + } + + /** + * 登录失败处理（兼容自动识别异步请求，json请求及页面请求） + * @param token + * @param e + * @param request + * @param response + * @return + */ + @Override + protected boolean onLoginFailure(AuthenticationToken token, AuthenticationException e, + ServletRequest request, ServletResponse response) { +// if (!WebCommonUtils.isJSON(request)) {// 不是ajax请求 +// setFailureAttribute(request, e); +// return true; +// } + try { + response.setCharacterEncoding("UTF-8"); + PrintWriter out = response.getWriter(); + String message = e.getClass().getSimpleName(); + String error = null; + if (IncorrectCredentialsException.class.getSimpleName().equals(message)) { + error = "账号或密码错误"; + } else if (UnknownAccountException.class.getSimpleName().equals(message)) { + error = "账号不存在"; + } else { + error = "未知错误"; + } + Map result = new HashMap<>(); + result.put("status", 401); + result.put("message", error); + out.println(JSONObject.toJSONString(result)); + out.flush(); + out.close(); + } catch (IOException e1) { + logger.error(e1.getMessage(), e1.getCause()); + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return false; + } + + protected void setFailureAttribute(ServletRequest request, AuthenticationException ae) { + String className = ae.getClass().getName(); + request.setAttribute(getFailureKeyAttribute(), className); + request.setAttribute(DEFAULT_ERROR_EXCEPTION_KEY_ATTRIBUTE_NAME, ae); + } + + @Override + protected AuthenticationToken createToken(String username, String password, boolean rememberMe, String host) { + return new MemberUserToken(username, password, rememberMe, host); + } +} diff --git a/src/main/java/com/xmomen/module/core/web/token/SysUserToken.java b/src/main/java/com/xmomen/module/core/web/token/SysUserToken.java new file mode 100644 index 0000000..b372262 --- /dev/null +++ b/src/main/java/com/xmomen/module/core/web/token/SysUserToken.java @@ -0,0 +1,19 @@ +package com.xmomen.module.core.web.token; + +import org.apache.shiro.authc.UsernamePasswordToken; + +public class SysUserToken extends UsernamePasswordToken { + + private static final long serialVersionUID = 1L; + + private final String realmKey = "UserRealm"; + + public SysUserToken(final String username, final String password, + final boolean rememberMe, final String host) { + super(username, password != null ? password.toCharArray() : null, rememberMe, host); + } + + public String getRealmKey() { + return this.realmKey; + } +} diff --git a/src/main/java/com/xmomen/module/export/controller/ExportController.java b/src/main/java/com/xmomen/module/export/controller/ExportController.java new file mode 100644 index 0000000..f817a1a --- /dev/null +++ b/src/main/java/com/xmomen/module/export/controller/ExportController.java @@ -0,0 +1,113 @@ +package com.xmomen.module.export.controller; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.xmomen.module.report.model.OrderDeliveryReport; +import org.apache.shiro.SecurityUtils; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.xmomen.framework.utils.StringUtilsExt; +import com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.base.service.ExpressService; +import com.xmomen.module.export.service.ExportService; +import com.xmomen.module.order.model.OrderQuery; +import com.xmomen.module.order.model.PurchaseModel; +import com.xmomen.module.order.service.PurchaseService; +import com.xmomen.module.report.model.ExpressReport; + +@Controller +public class ExportController { + + @Autowired + ExportService exportService; + @Autowired + ExpressService expressService; + + @Autowired + PurchaseService purchaseService; + + /** + * 导出未采购的采购物料 + * + * @param request + * @param response + * @throws IOException + */ + @RequestMapping(value = "/export/exportPurchaseExcel") + public String exportPurchaseExcel(HttpServletRequest request, + HttpServletResponse response, ModelMap modelMap) throws IOException { + Map param = new HashMap(); + param.put("purchaseStatus", 0); + List purchaseModels = purchaseService + .getPurchaseList(param); + modelMap.put(NormalExcelConstants.FILE_NAME, "未采购商品信息"); + modelMap.put(NormalExcelConstants.PARAMS, new ExportParams()); + modelMap.put(NormalExcelConstants.CLASS, PurchaseModel.class); + modelMap.put(NormalExcelConstants.DATA_LIST, purchaseModels); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + + /** + * 快递商导出订单信息 + * + * @param request + * @param response + * @param startTime + * @param endTime + * @throws IOException + */ + @RequestMapping(value = "/export/exportTakeDeliveryExcel") + public String exportTakeDeliveryExcel( + HttpServletRequest request, + HttpServletResponse response, + @RequestParam(value = "startTime", required = false) String startTime, + @RequestParam(value = "endTime", required = false) String endTime, + @RequestParam(value = "type") int type, ModelMap modelMap) + throws IOException { + 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); + } + if (type == 1) { + List takeDeliverys = expressService + .getTakeDeliveryReportList(orderQuery); + modelMap.put(NormalExcelConstants.FILE_NAME, "已提货订单信息"); + modelMap.put(NormalExcelConstants.DATA_LIST, takeDeliverys); + } + else { + List takeDeliverys = expressService + .getOrderNoDespatchReportList(orderQuery); + modelMap.put(NormalExcelConstants.FILE_NAME, "已分配未提货订单信息"); + modelMap.put(NormalExcelConstants.DATA_LIST, takeDeliverys); + } + + modelMap.put(NormalExcelConstants.PARAMS, new ExportParams()); + modelMap.put(NormalExcelConstants.CLASS, OrderDeliveryReport.class); + + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } +} diff --git a/src/main/java/com/xmomen/module/job/controller/PackageTaskController.java b/src/main/java/com/xmomen/module/job/controller/PackageTaskController.java new file mode 100644 index 0000000..ef08165 --- /dev/null +++ b/src/main/java/com/xmomen/module/job/controller/PackageTaskController.java @@ -0,0 +1,114 @@ +package com.xmomen.module.job.controller; + +import java.sql.Date; +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.job.mapper.PackageTaskMapper; +import com.xmomen.module.job.model.CreatePackageTask; +import com.xmomen.module.job.model.PackageTaskModel; +import com.xmomen.module.job.service.PackageTaskService; +import com.xmomen.module.logger.Log; + +/** + */ +@RestController +public class PackageTaskController { + + @Autowired + PackageTaskService packageTaskService; + + @Autowired + MybatisDao mybatisDao; + + /** + * 包装任务 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/packageTask", method = RequestMethod.GET) + @Log(actionName = "查询包装任务") + public Page getUserList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "viewType", required = false) String viewType, + @RequestParam(value = "packageTaskId", required = false) Integer packageTaskId, + @RequestParam(value = "nextPackageTaskId", required = false) Integer nextPackageTaskId, + @RequestParam(value = "packageTaskCreateTimeStart",required = false) String packageTaskCreateTimeStart, + @RequestParam(value = "packageTaskCreateTimeEnd",required = false) String packageTaskCreateTimeEnd){ + Map param = new HashMap(); + param.put("keyword", keyword); + param.put("packageTaskId", packageTaskId); + param.put("viewType",viewType); + if(StringUtilsExt.isNotBlank(packageTaskCreateTimeStart)){ + param.put("packageTaskCreateTimeStart",packageTaskCreateTimeStart.substring(0, 10)); + } + if(StringUtilsExt.isNotBlank(packageTaskCreateTimeEnd)){ + param.put("packageTaskCreateTimeEnd",packageTaskCreateTimeEnd.substring(0, 10)); + } + if(SecurityUtils.getSubject().hasRole(AppConstants.PACKAGE_PERMISSION_CODE)){ + Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + param.put("userId", userId); + } + param.put("nextPackageTaskId",nextPackageTaskId); + Page packageTasks = (Page) mybatisDao.selectPage(PackageTaskMapper.PackageTaskMapperNameSpace + "getPackageTaskList", param, limit, offset); + if(packageTasks.getResult().size() == 0 && nextPackageTaskId !=null){ + param.put("nextPackageTaskId",null); + param.put("nextPackageTaskIdZero",1); + packageTasks = (Page) mybatisDao.selectPage(PackageTaskMapper.PackageTaskMapperNameSpace + "getPackageTaskList", param, limit, offset); + } + return packageTasks; + } + + /** + * 新增包装任务 + * @param createPurchase + * @param bindingResult + * @return + */ + @RequestMapping(value = "/packageTask", method = RequestMethod.POST) + @Log(actionName = "新增包装任务") + public void packageTask(@RequestBody @Valid CreatePackageTask createPackageTask, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + packageTaskService.createPackageTask(createPackageTask); + } + + /** + * 开始包装 + */ + /** + * 新增包装任务 + * @param createPurchase + * @param bindingResult + * @return + */ + @RequestMapping(value = "/packageTask/{id}/packageWorking",method = RequestMethod.PUT) + @Log(actionName = "开始包装") + public void packageWorking( + @PathVariable(value = "id") Integer id, + @RequestParam(value = "barCode") String barCode + ){ + packageTaskService.packageWorking(id,barCode); + } +} diff --git a/src/main/java/com/xmomen/module/job/entity/TbJob.java b/src/main/java/com/xmomen/module/job/entity/TbJob.java new file mode 100644 index 0000000..0eebd6f --- /dev/null +++ b/src/main/java/com/xmomen/module/job/entity/TbJob.java @@ -0,0 +1,263 @@ +package com.xmomen.module.job.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 = "tb_job") +public class TbJob extends BaseMybatisModel { + /** + * + */ + private Integer id; + + /** + * 采购编号 + */ + private String purchaseCode; + + /** + * 采购明细ID + */ + private Integer purchaseId; + + /** + * 1-包装任务，2-装箱任务 + */ + private Integer jobType; + + /** + * 0-未开始，1-包装中，2-包装完成 + */ + private Integer jobStatus; + + /** + * + */ + private Integer jobUser; + + /** + * 任务创建时间 + */ + private Date jobCreateTime; + + /** + * 包装的产品 + */ + private Integer cdItemId; + + /** + * 需要包装的份数 + */ + private Integer countValue; + + /** + * 任务开始时间 + */ + private Date jobBeginTime; + + /** + * 包装完成的份数 + */ + private Integer finishValue; + + /** + * + */ + private Date finishTime; + + /** + * 任务创建人 + */ + private Integer jobCreateUser; + + @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 = "PURCHASE_CODE") + public String getPurchaseCode() { + return purchaseCode; + } + + public void setPurchaseCode(String purchaseCode) { + this.purchaseCode = purchaseCode; + if(purchaseCode == null){ + removeValidField("purchaseCode"); + return; + } + addValidField("purchaseCode"); + } + + @Column(name = "PURCHASE_ID") + public Integer getPurchaseId() { + return purchaseId; + } + + public void setPurchaseId(Integer purchaseId) { + this.purchaseId = purchaseId; + if(purchaseId == null){ + removeValidField("purchaseId"); + return; + } + addValidField("purchaseId"); + } + + @Column(name = "JOB_TYPE") + public Integer getJobType() { + return jobType; + } + + public void setJobType(Integer jobType) { + this.jobType = jobType; + if(jobType == null){ + removeValidField("jobType"); + return; + } + addValidField("jobType"); + } + + @Column(name = "JOB_STATUS") + public Integer getJobStatus() { + return jobStatus; + } + + public void setJobStatus(Integer jobStatus) { + this.jobStatus = jobStatus; + if(jobStatus == null){ + removeValidField("jobStatus"); + return; + } + addValidField("jobStatus"); + } + + @Column(name = "JOB_USER") + public Integer getJobUser() { + return jobUser; + } + + public void setJobUser(Integer jobUser) { + this.jobUser = jobUser; + if(jobUser == null){ + removeValidField("jobUser"); + return; + } + addValidField("jobUser"); + } + + @Column(name = "JOB_CREATE_TIME") + public Date getJobCreateTime() { + return jobCreateTime; + } + + public void setJobCreateTime(Date jobCreateTime) { + this.jobCreateTime = jobCreateTime; + if(jobCreateTime == null){ + removeValidField("jobCreateTime"); + return; + } + addValidField("jobCreateTime"); + } + + @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"); + } + + @Column(name = "JOB_BEGIN_TIME") + public Date getJobBeginTime() { + return jobBeginTime; + } + + public void setJobBeginTime(Date jobBeginTime) { + this.jobBeginTime = jobBeginTime; + if(jobBeginTime == null){ + removeValidField("jobBeginTime"); + return; + } + addValidField("jobBeginTime"); + } + + @Column(name = "FINISH_VALUE") + public Integer getFinishValue() { + return finishValue; + } + + public void setFinishValue(Integer finishValue) { + this.finishValue = finishValue; + if(finishValue == null){ + removeValidField("finishValue"); + return; + } + addValidField("finishValue"); + } + + @Column(name = "FINISH_TIME") + public Date getFinishTime() { + return finishTime; + } + + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + if(finishTime == null){ + removeValidField("finishTime"); + return; + } + addValidField("finishTime"); + } + + @Column(name = "JOB_CREATE_USER") + public Integer getJobCreateUser() { + return jobCreateUser; + } + + public void setJobCreateUser(Integer jobCreateUser) { + this.jobCreateUser = jobCreateUser; + if(jobCreateUser == null){ + removeValidField("jobCreateUser"); + return; + } + addValidField("jobCreateUser"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/job/entity/TbJobExample.java b/src/main/java/com/xmomen/module/job/entity/TbJobExample.java new file mode 100644 index 0000000..ad8cdb0 --- /dev/null +++ b/src/main/java/com/xmomen/module/job/entity/TbJobExample.java @@ -0,0 +1,992 @@ +package com.xmomen.module.job.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TbJobExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbJobExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andPurchaseCodeIsNull() { + addCriterion("PURCHASE_CODE is null"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeIsNotNull() { + addCriterion("PURCHASE_CODE is not null"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeEqualTo(String value) { + addCriterion("PURCHASE_CODE =", value, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeNotEqualTo(String value) { + addCriterion("PURCHASE_CODE <>", value, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeGreaterThan(String value) { + addCriterion("PURCHASE_CODE >", value, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeGreaterThanOrEqualTo(String value) { + addCriterion("PURCHASE_CODE >=", value, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeLessThan(String value) { + addCriterion("PURCHASE_CODE <", value, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeLessThanOrEqualTo(String value) { + addCriterion("PURCHASE_CODE <=", value, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeLike(String value) { + addCriterion("PURCHASE_CODE like", value, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeNotLike(String value) { + addCriterion("PURCHASE_CODE not like", value, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeIn(List values) { + addCriterion("PURCHASE_CODE in", values, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeNotIn(List values) { + addCriterion("PURCHASE_CODE not in", values, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeBetween(String value1, String value2) { + addCriterion("PURCHASE_CODE between", value1, value2, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseCodeNotBetween(String value1, String value2) { + addCriterion("PURCHASE_CODE not between", value1, value2, "purchaseCode"); + return (Criteria) this; + } + + public Criteria andPurchaseIdIsNull() { + addCriterion("PURCHASE_ID is null"); + return (Criteria) this; + } + + public Criteria andPurchaseIdIsNotNull() { + addCriterion("PURCHASE_ID is not null"); + return (Criteria) this; + } + + public Criteria andPurchaseIdEqualTo(Integer value) { + addCriterion("PURCHASE_ID =", value, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdNotEqualTo(Integer value) { + addCriterion("PURCHASE_ID <>", value, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdGreaterThan(Integer value) { + addCriterion("PURCHASE_ID >", value, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdGreaterThanOrEqualTo(Integer value) { + addCriterion("PURCHASE_ID >=", value, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdLessThan(Integer value) { + addCriterion("PURCHASE_ID <", value, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdLessThanOrEqualTo(Integer value) { + addCriterion("PURCHASE_ID <=", value, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdIn(List values) { + addCriterion("PURCHASE_ID in", values, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdNotIn(List values) { + addCriterion("PURCHASE_ID not in", values, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdBetween(Integer value1, Integer value2) { + addCriterion("PURCHASE_ID between", value1, value2, "purchaseId"); + return (Criteria) this; + } + + public Criteria andPurchaseIdNotBetween(Integer value1, Integer value2) { + addCriterion("PURCHASE_ID not between", value1, value2, "purchaseId"); + return (Criteria) this; + } + + public Criteria andJobTypeIsNull() { + addCriterion("JOB_TYPE is null"); + return (Criteria) this; + } + + public Criteria andJobTypeIsNotNull() { + addCriterion("JOB_TYPE is not null"); + return (Criteria) this; + } + + public Criteria andJobTypeEqualTo(Integer value) { + addCriterion("JOB_TYPE =", value, "jobType"); + return (Criteria) this; + } + + public Criteria andJobTypeNotEqualTo(Integer value) { + addCriterion("JOB_TYPE <>", value, "jobType"); + return (Criteria) this; + } + + public Criteria andJobTypeGreaterThan(Integer value) { + addCriterion("JOB_TYPE >", value, "jobType"); + return (Criteria) this; + } + + public Criteria andJobTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("JOB_TYPE >=", value, "jobType"); + return (Criteria) this; + } + + public Criteria andJobTypeLessThan(Integer value) { + addCriterion("JOB_TYPE <", value, "jobType"); + return (Criteria) this; + } + + public Criteria andJobTypeLessThanOrEqualTo(Integer value) { + addCriterion("JOB_TYPE <=", value, "jobType"); + return (Criteria) this; + } + + public Criteria andJobTypeIn(List values) { + addCriterion("JOB_TYPE in", values, "jobType"); + return (Criteria) this; + } + + public Criteria andJobTypeNotIn(List values) { + addCriterion("JOB_TYPE not in", values, "jobType"); + return (Criteria) this; + } + + public Criteria andJobTypeBetween(Integer value1, Integer value2) { + addCriterion("JOB_TYPE between", value1, value2, "jobType"); + return (Criteria) this; + } + + public Criteria andJobTypeNotBetween(Integer value1, Integer value2) { + addCriterion("JOB_TYPE not between", value1, value2, "jobType"); + return (Criteria) this; + } + + public Criteria andJobStatusIsNull() { + addCriterion("JOB_STATUS is null"); + return (Criteria) this; + } + + public Criteria andJobStatusIsNotNull() { + addCriterion("JOB_STATUS is not null"); + return (Criteria) this; + } + + public Criteria andJobStatusEqualTo(Integer value) { + addCriterion("JOB_STATUS =", value, "jobStatus"); + return (Criteria) this; + } + + public Criteria andJobStatusNotEqualTo(Integer value) { + addCriterion("JOB_STATUS <>", value, "jobStatus"); + return (Criteria) this; + } + + public Criteria andJobStatusGreaterThan(Integer value) { + addCriterion("JOB_STATUS >", value, "jobStatus"); + return (Criteria) this; + } + + public Criteria andJobStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("JOB_STATUS >=", value, "jobStatus"); + return (Criteria) this; + } + + public Criteria andJobStatusLessThan(Integer value) { + addCriterion("JOB_STATUS <", value, "jobStatus"); + return (Criteria) this; + } + + public Criteria andJobStatusLessThanOrEqualTo(Integer value) { + addCriterion("JOB_STATUS <=", value, "jobStatus"); + return (Criteria) this; + } + + public Criteria andJobStatusIn(List values) { + addCriterion("JOB_STATUS in", values, "jobStatus"); + return (Criteria) this; + } + + public Criteria andJobStatusNotIn(List values) { + addCriterion("JOB_STATUS not in", values, "jobStatus"); + return (Criteria) this; + } + + public Criteria andJobStatusBetween(Integer value1, Integer value2) { + addCriterion("JOB_STATUS between", value1, value2, "jobStatus"); + return (Criteria) this; + } + + public Criteria andJobStatusNotBetween(Integer value1, Integer value2) { + addCriterion("JOB_STATUS not between", value1, value2, "jobStatus"); + return (Criteria) this; + } + + public Criteria andJobUserIsNull() { + addCriterion("JOB_USER is null"); + return (Criteria) this; + } + + public Criteria andJobUserIsNotNull() { + addCriterion("JOB_USER is not null"); + return (Criteria) this; + } + + public Criteria andJobUserEqualTo(Integer value) { + addCriterion("JOB_USER =", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserNotEqualTo(Integer value) { + addCriterion("JOB_USER <>", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserGreaterThan(Integer value) { + addCriterion("JOB_USER >", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserGreaterThanOrEqualTo(Integer value) { + addCriterion("JOB_USER >=", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserLessThan(Integer value) { + addCriterion("JOB_USER <", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserLessThanOrEqualTo(Integer value) { + addCriterion("JOB_USER <=", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserIn(List values) { + addCriterion("JOB_USER in", values, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserNotIn(List values) { + addCriterion("JOB_USER not in", values, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserBetween(Integer value1, Integer value2) { + addCriterion("JOB_USER between", value1, value2, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserNotBetween(Integer value1, Integer value2) { + addCriterion("JOB_USER not between", value1, value2, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeIsNull() { + addCriterion("JOB_CREATE_TIME is null"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeIsNotNull() { + addCriterion("JOB_CREATE_TIME is not null"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeEqualTo(Date value) { + addCriterion("JOB_CREATE_TIME =", value, "jobCreateTime"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeNotEqualTo(Date value) { + addCriterion("JOB_CREATE_TIME <>", value, "jobCreateTime"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeGreaterThan(Date value) { + addCriterion("JOB_CREATE_TIME >", value, "jobCreateTime"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("JOB_CREATE_TIME >=", value, "jobCreateTime"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeLessThan(Date value) { + addCriterion("JOB_CREATE_TIME <", value, "jobCreateTime"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("JOB_CREATE_TIME <=", value, "jobCreateTime"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeIn(List values) { + addCriterion("JOB_CREATE_TIME in", values, "jobCreateTime"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeNotIn(List values) { + addCriterion("JOB_CREATE_TIME not in", values, "jobCreateTime"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeBetween(Date value1, Date value2) { + addCriterion("JOB_CREATE_TIME between", value1, value2, "jobCreateTime"); + return (Criteria) this; + } + + public Criteria andJobCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("JOB_CREATE_TIME not between", value1, value2, "jobCreateTime"); + 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 values) { + addCriterion("CD_ITEM_ID in", values, "cdItemId"); + return (Criteria) this; + } + + public Criteria andCdItemIdNotIn(List 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 values) { + addCriterion("COUNT_VALUE in", values, "countValue"); + return (Criteria) this; + } + + public Criteria andCountValueNotIn(List 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 Criteria andJobBeginTimeIsNull() { + addCriterion("JOB_BEGIN_TIME is null"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeIsNotNull() { + addCriterion("JOB_BEGIN_TIME is not null"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeEqualTo(Date value) { + addCriterion("JOB_BEGIN_TIME =", value, "jobBeginTime"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeNotEqualTo(Date value) { + addCriterion("JOB_BEGIN_TIME <>", value, "jobBeginTime"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeGreaterThan(Date value) { + addCriterion("JOB_BEGIN_TIME >", value, "jobBeginTime"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeGreaterThanOrEqualTo(Date value) { + addCriterion("JOB_BEGIN_TIME >=", value, "jobBeginTime"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeLessThan(Date value) { + addCriterion("JOB_BEGIN_TIME <", value, "jobBeginTime"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeLessThanOrEqualTo(Date value) { + addCriterion("JOB_BEGIN_TIME <=", value, "jobBeginTime"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeIn(List values) { + addCriterion("JOB_BEGIN_TIME in", values, "jobBeginTime"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeNotIn(List values) { + addCriterion("JOB_BEGIN_TIME not in", values, "jobBeginTime"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeBetween(Date value1, Date value2) { + addCriterion("JOB_BEGIN_TIME between", value1, value2, "jobBeginTime"); + return (Criteria) this; + } + + public Criteria andJobBeginTimeNotBetween(Date value1, Date value2) { + addCriterion("JOB_BEGIN_TIME not between", value1, value2, "jobBeginTime"); + return (Criteria) this; + } + + public Criteria andFinishValueIsNull() { + addCriterion("FINISH_VALUE is null"); + return (Criteria) this; + } + + public Criteria andFinishValueIsNotNull() { + addCriterion("FINISH_VALUE is not null"); + return (Criteria) this; + } + + public Criteria andFinishValueEqualTo(Integer value) { + addCriterion("FINISH_VALUE =", value, "finishValue"); + return (Criteria) this; + } + + public Criteria andFinishValueNotEqualTo(Integer value) { + addCriterion("FINISH_VALUE <>", value, "finishValue"); + return (Criteria) this; + } + + public Criteria andFinishValueGreaterThan(Integer value) { + addCriterion("FINISH_VALUE >", value, "finishValue"); + return (Criteria) this; + } + + public Criteria andFinishValueGreaterThanOrEqualTo(Integer value) { + addCriterion("FINISH_VALUE >=", value, "finishValue"); + return (Criteria) this; + } + + public Criteria andFinishValueLessThan(Integer value) { + addCriterion("FINISH_VALUE <", value, "finishValue"); + return (Criteria) this; + } + + public Criteria andFinishValueLessThanOrEqualTo(Integer value) { + addCriterion("FINISH_VALUE <=", value, "finishValue"); + return (Criteria) this; + } + + public Criteria andFinishValueIn(List values) { + addCriterion("FINISH_VALUE in", values, "finishValue"); + return (Criteria) this; + } + + public Criteria andFinishValueNotIn(List values) { + addCriterion("FINISH_VALUE not in", values, "finishValue"); + return (Criteria) this; + } + + public Criteria andFinishValueBetween(Integer value1, Integer value2) { + addCriterion("FINISH_VALUE between", value1, value2, "finishValue"); + return (Criteria) this; + } + + public Criteria andFinishValueNotBetween(Integer value1, Integer value2) { + addCriterion("FINISH_VALUE not between", value1, value2, "finishValue"); + return (Criteria) this; + } + + public Criteria andFinishTimeIsNull() { + addCriterion("FINISH_TIME is null"); + return (Criteria) this; + } + + public Criteria andFinishTimeIsNotNull() { + addCriterion("FINISH_TIME is not null"); + return (Criteria) this; + } + + public Criteria andFinishTimeEqualTo(Date value) { + addCriterion("FINISH_TIME =", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotEqualTo(Date value) { + addCriterion("FINISH_TIME <>", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeGreaterThan(Date value) { + addCriterion("FINISH_TIME >", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeGreaterThanOrEqualTo(Date value) { + addCriterion("FINISH_TIME >=", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeLessThan(Date value) { + addCriterion("FINISH_TIME <", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeLessThanOrEqualTo(Date value) { + addCriterion("FINISH_TIME <=", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeIn(List values) { + addCriterion("FINISH_TIME in", values, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotIn(List values) { + addCriterion("FINISH_TIME not in", values, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeBetween(Date value1, Date value2) { + addCriterion("FINISH_TIME between", value1, value2, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotBetween(Date value1, Date value2) { + addCriterion("FINISH_TIME not between", value1, value2, "finishTime"); + return (Criteria) this; + } + + public Criteria andJobCreateUserIsNull() { + addCriterion("JOB_CREATE_USER is null"); + return (Criteria) this; + } + + public Criteria andJobCreateUserIsNotNull() { + addCriterion("JOB_CREATE_USER is not null"); + return (Criteria) this; + } + + public Criteria andJobCreateUserEqualTo(Integer value) { + addCriterion("JOB_CREATE_USER =", value, "jobCreateUser"); + return (Criteria) this; + } + + public Criteria andJobCreateUserNotEqualTo(Integer value) { + addCriterion("JOB_CREATE_USER <>", value, "jobCreateUser"); + return (Criteria) this; + } + + public Criteria andJobCreateUserGreaterThan(Integer value) { + addCriterion("JOB_CREATE_USER >", value, "jobCreateUser"); + return (Criteria) this; + } + + public Criteria andJobCreateUserGreaterThanOrEqualTo(Integer value) { + addCriterion("JOB_CREATE_USER >=", value, "jobCreateUser"); + return (Criteria) this; + } + + public Criteria andJobCreateUserLessThan(Integer value) { + addCriterion("JOB_CREATE_USER <", value, "jobCreateUser"); + return (Criteria) this; + } + + public Criteria andJobCreateUserLessThanOrEqualTo(Integer value) { + addCriterion("JOB_CREATE_USER <=", value, "jobCreateUser"); + return (Criteria) this; + } + + public Criteria andJobCreateUserIn(List values) { + addCriterion("JOB_CREATE_USER in", values, "jobCreateUser"); + return (Criteria) this; + } + + public Criteria andJobCreateUserNotIn(List values) { + addCriterion("JOB_CREATE_USER not in", values, "jobCreateUser"); + return (Criteria) this; + } + + public Criteria andJobCreateUserBetween(Integer value1, Integer value2) { + addCriterion("JOB_CREATE_USER between", value1, value2, "jobCreateUser"); + return (Criteria) this; + } + + public Criteria andJobCreateUserNotBetween(Integer value1, Integer value2) { + addCriterion("JOB_CREATE_USER not between", value1, value2, "jobCreateUser"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/job/entity/TbJobOperationLogExample.java b/src/main/java/com/xmomen/module/job/entity/TbJobOperationLogExample.java new file mode 100644 index 0000000..784c63d --- /dev/null +++ b/src/main/java/com/xmomen/module/job/entity/TbJobOperationLogExample.java @@ -0,0 +1,582 @@ +package com.xmomen.module.job.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TbJobOperationLogExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbJobOperationLogExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andJobIdIsNull() { + addCriterion("job_id is null"); + return (Criteria) this; + } + + public Criteria andJobIdIsNotNull() { + addCriterion("job_id is not null"); + return (Criteria) this; + } + + public Criteria andJobIdEqualTo(Integer value) { + addCriterion("job_id =", value, "jobId"); + return (Criteria) this; + } + + public Criteria andJobIdNotEqualTo(Integer value) { + addCriterion("job_id <>", value, "jobId"); + return (Criteria) this; + } + + public Criteria andJobIdGreaterThan(Integer value) { + addCriterion("job_id >", value, "jobId"); + return (Criteria) this; + } + + public Criteria andJobIdGreaterThanOrEqualTo(Integer value) { + addCriterion("job_id >=", value, "jobId"); + return (Criteria) this; + } + + public Criteria andJobIdLessThan(Integer value) { + addCriterion("job_id <", value, "jobId"); + return (Criteria) this; + } + + public Criteria andJobIdLessThanOrEqualTo(Integer value) { + addCriterion("job_id <=", value, "jobId"); + return (Criteria) this; + } + + public Criteria andJobIdIn(List values) { + addCriterion("job_id in", values, "jobId"); + return (Criteria) this; + } + + public Criteria andJobIdNotIn(List values) { + addCriterion("job_id not in", values, "jobId"); + return (Criteria) this; + } + + public Criteria andJobIdBetween(Integer value1, Integer value2) { + addCriterion("job_id between", value1, value2, "jobId"); + return (Criteria) this; + } + + public Criteria andJobIdNotBetween(Integer value1, Integer value2) { + addCriterion("job_id not between", value1, value2, "jobId"); + return (Criteria) this; + } + + public Criteria andJobUserIsNull() { + addCriterion("job_user is null"); + return (Criteria) this; + } + + public Criteria andJobUserIsNotNull() { + addCriterion("job_user is not null"); + return (Criteria) this; + } + + public Criteria andJobUserEqualTo(Integer value) { + addCriterion("job_user =", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserNotEqualTo(Integer value) { + addCriterion("job_user <>", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserGreaterThan(Integer value) { + addCriterion("job_user >", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserGreaterThanOrEqualTo(Integer value) { + addCriterion("job_user >=", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserLessThan(Integer value) { + addCriterion("job_user <", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserLessThanOrEqualTo(Integer value) { + addCriterion("job_user <=", value, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserIn(List values) { + addCriterion("job_user in", values, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserNotIn(List values) { + addCriterion("job_user not in", values, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserBetween(Integer value1, Integer value2) { + addCriterion("job_user between", value1, value2, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobUserNotBetween(Integer value1, Integer value2) { + addCriterion("job_user not between", value1, value2, "jobUser"); + return (Criteria) this; + } + + public Criteria andJobTimeIsNull() { + addCriterion("job_time is null"); + return (Criteria) this; + } + + public Criteria andJobTimeIsNotNull() { + addCriterion("job_time is not null"); + return (Criteria) this; + } + + public Criteria andJobTimeEqualTo(Date value) { + addCriterion("job_time =", value, "jobTime"); + return (Criteria) this; + } + + public Criteria andJobTimeNotEqualTo(Date value) { + addCriterion("job_time <>", value, "jobTime"); + return (Criteria) this; + } + + public Criteria andJobTimeGreaterThan(Date value) { + addCriterion("job_time >", value, "jobTime"); + return (Criteria) this; + } + + public Criteria andJobTimeGreaterThanOrEqualTo(Date value) { + addCriterion("job_time >=", value, "jobTime"); + return (Criteria) this; + } + + public Criteria andJobTimeLessThan(Date value) { + addCriterion("job_time <", value, "jobTime"); + return (Criteria) this; + } + + public Criteria andJobTimeLessThanOrEqualTo(Date value) { + addCriterion("job_time <=", value, "jobTime"); + return (Criteria) this; + } + + public Criteria andJobTimeIn(List values) { + addCriterion("job_time in", values, "jobTime"); + return (Criteria) this; + } + + public Criteria andJobTimeNotIn(List values) { + addCriterion("job_time not in", values, "jobTime"); + return (Criteria) this; + } + + public Criteria andJobTimeBetween(Date value1, Date value2) { + addCriterion("job_time between", value1, value2, "jobTime"); + return (Criteria) this; + } + + public Criteria andJobTimeNotBetween(Date value1, Date value2) { + addCriterion("job_time not between", value1, value2, "jobTime"); + return (Criteria) this; + } + + public Criteria andBarCodeIsNull() { + addCriterion("bar_code is null"); + return (Criteria) this; + } + + public Criteria andBarCodeIsNotNull() { + addCriterion("bar_code is not null"); + return (Criteria) this; + } + + public Criteria andBarCodeEqualTo(String value) { + addCriterion("bar_code =", value, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeNotEqualTo(String value) { + addCriterion("bar_code <>", value, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeGreaterThan(String value) { + addCriterion("bar_code >", value, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeGreaterThanOrEqualTo(String value) { + addCriterion("bar_code >=", value, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeLessThan(String value) { + addCriterion("bar_code <", value, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeLessThanOrEqualTo(String value) { + addCriterion("bar_code <=", value, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeLike(String value) { + addCriterion("bar_code like", value, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeNotLike(String value) { + addCriterion("bar_code not like", value, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeIn(List values) { + addCriterion("bar_code in", values, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeNotIn(List values) { + addCriterion("bar_code not in", values, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeBetween(String value1, String value2) { + addCriterion("bar_code between", value1, value2, "barCode"); + return (Criteria) this; + } + + public Criteria andBarCodeNotBetween(String value1, String value2) { + addCriterion("bar_code not between", value1, value2, "barCode"); + return (Criteria) this; + } + + public Criteria andItemCodeIsNull() { + addCriterion("item_code is null"); + return (Criteria) this; + } + + public Criteria andItemCodeIsNotNull() { + addCriterion("item_code is not null"); + return (Criteria) this; + } + + public Criteria andItemCodeEqualTo(String value) { + addCriterion("item_code =", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeNotEqualTo(String value) { + addCriterion("item_code <>", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeGreaterThan(String value) { + addCriterion("item_code >", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeGreaterThanOrEqualTo(String value) { + addCriterion("item_code >=", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeLessThan(String value) { + addCriterion("item_code <", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeLessThanOrEqualTo(String value) { + addCriterion("item_code <=", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeLike(String value) { + addCriterion("item_code like", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeNotLike(String value) { + addCriterion("item_code not like", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeIn(List values) { + addCriterion("item_code in", values, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeNotIn(List values) { + addCriterion("item_code not in", values, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeBetween(String value1, String value2) { + addCriterion("item_code between", value1, value2, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeNotBetween(String value1, String value2) { + addCriterion("item_code not between", value1, value2, "itemCode"); + return (Criteria) this; + } + } + + public 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/job/entity/mapper/TbJobMapper.java b/src/main/java/com/xmomen/module/job/entity/mapper/TbJobMapper.java new file mode 100644 index 0000000..dedfb70 --- /dev/null +++ b/src/main/java/com/xmomen/module/job/entity/mapper/TbJobMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.job.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.job.entity.TbJob; +import com.xmomen.module.job.entity.TbJobExample; +import org.apache.ibatis.annotations.Param; + +public interface TbJobMapper extends MybatisMapper { + int countByExample(TbJobExample example); + + int deleteByExample(TbJobExample example); + + int insertSelective(TbJob record); + + int updateByExampleSelective(@Param("record") TbJob record, @Param("example") TbJobExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/job/entity/mapper/TbJobOperationLogMapper.java b/src/main/java/com/xmomen/module/job/entity/mapper/TbJobOperationLogMapper.java new file mode 100644 index 0000000..3106de6 --- /dev/null +++ b/src/main/java/com/xmomen/module/job/entity/mapper/TbJobOperationLogMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.job.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.job.entity.TbJobOperationLog; +import com.xmomen.module.job.entity.TbJobOperationLogExample; +import org.apache.ibatis.annotations.Param; + +public interface TbJobOperationLogMapper extends MybatisMapper { + int countByExample(TbJobOperationLogExample example); + + int deleteByExample(TbJobOperationLogExample example); + + int insertSelective(TbJobOperationLog record); + + int updateByExampleSelective(@Param("record") TbJobOperationLog record, @Param("example") TbJobOperationLogExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/job/mapper/JobOperationLogMapper.xml b/src/main/java/com/xmomen/module/job/mapper/JobOperationLogMapper.xml new file mode 100644 index 0000000..e2fbf52 --- /dev/null +++ b/src/main/java/com/xmomen/module/job/mapper/JobOperationLogMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java b/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java new file mode 100644 index 0000000..ee1f99d --- /dev/null +++ b/src/main/java/com/xmomen/module/job/model/CreateJobOperationLog.java @@ -0,0 +1,18 @@ +package com.xmomen.module.job.model; + +import java.io.Serializable; +import java.util.Date; + +import lombok.Data; + +public @Data class CreateJobOperationLog implements Serializable{ + /** + * 操作的条码 + */ + private String barCode; + /** + * 操作的商品条码 + */ + private String itemCode; + +} diff --git a/src/main/java/com/xmomen/module/job/service/JobOperationLogService.java b/src/main/java/com/xmomen/module/job/service/JobOperationLogService.java new file mode 100644 index 0000000..db70634 --- /dev/null +++ b/src/main/java/com/xmomen/module/job/service/JobOperationLogService.java @@ -0,0 +1,6 @@ +package com.xmomen.module.job.service; + + +public interface JobOperationLogService { + public void delete(Integer id); +} diff --git a/src/main/java/com/xmomen/module/job/service/PackageTaskService.java b/src/main/java/com/xmomen/module/job/service/PackageTaskService.java new file mode 100644 index 0000000..2651c9a --- /dev/null +++ b/src/main/java/com/xmomen/module/job/service/PackageTaskService.java @@ -0,0 +1,16 @@ +package com.xmomen.module.job.service; + +import com.xmomen.module.base.model.UpdateItem; +import com.xmomen.module.job.model.CreatePackageTask; + +public interface PackageTaskService { + + + public void createPackageTask(CreatePackageTask createPackageTask); + + public void updatePackageTask(Integer id,UpdateItem updatePackageTask); + + public void delete(Integer id); + + public void packageWorking(Integer id ,String barCode); +} diff --git a/src/main/java/com/xmomen/module/job/service/impl/JobOperationLogServiceImpl.java b/src/main/java/com/xmomen/module/job/service/impl/JobOperationLogServiceImpl.java new file mode 100644 index 0000000..1435209 --- /dev/null +++ b/src/main/java/com/xmomen/module/job/service/impl/JobOperationLogServiceImpl.java @@ -0,0 +1,37 @@ +package com.xmomen.module.job.service.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.job.entity.TbJob; +import com.xmomen.module.job.entity.TbJobOperationLog; +import com.xmomen.module.job.mapper.JobOperationLogMapper; +import com.xmomen.module.job.mapper.PackageTaskMapper; +import com.xmomen.module.job.model.JobOperationLogModel; +import com.xmomen.module.job.service.JobOperationLogService; + +@Service +public class JobOperationLogServiceImpl implements JobOperationLogService { + + @Autowired + MybatisDao mybatisDao; + + @Override + public void delete(Integer id) { + TbJobOperationLog jobOperationLog = mybatisDao.selectByPrimaryKey(TbJobOperationLog.class, id); + TbJob job = mybatisDao.selectByPrimaryKey(TbJob.class, jobOperationLog.getJobId()); + mybatisDao.delete(jobOperationLog); + job.setFinishValue(job.getFinishValue() - 1); + mybatisDao.save(job); + //改变任务状态 + if(job.getFinishValue() == 0){ + mybatisDao.getSqlSessionTemplate().update(PackageTaskMapper.PackageTaskMapperNameSpace + "updateBeginTime",jobOperationLog.getJobId()); + } + if(job.getJobStatus() == 2){ + mybatisDao.getSqlSessionTemplate().update(PackageTaskMapper.PackageTaskMapperNameSpace + "updateFinishTime",jobOperationLog.getJobId()); + } + } + +} diff --git a/src/main/java/com/xmomen/module/member/entity/MemberAddressExample.java b/src/main/java/com/xmomen/module/member/entity/MemberAddressExample.java new file mode 100644 index 0000000..12f7209 --- /dev/null +++ b/src/main/java/com/xmomen/module/member/entity/MemberAddressExample.java @@ -0,0 +1,861 @@ +package com.xmomen.module.member.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class MemberAddressExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public MemberAddressExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIsNull() { + addCriterion("cd_member_id is null"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIsNotNull() { + addCriterion("cd_member_id is not null"); + return (Criteria) this; + } + + public Criteria andCdMemberIdEqualTo(Integer value) { + addCriterion("cd_member_id =", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotEqualTo(Integer value) { + addCriterion("cd_member_id <>", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdGreaterThan(Integer value) { + addCriterion("cd_member_id >", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdGreaterThanOrEqualTo(Integer value) { + addCriterion("cd_member_id >=", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdLessThan(Integer value) { + addCriterion("cd_member_id <", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdLessThanOrEqualTo(Integer value) { + addCriterion("cd_member_id <=", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIn(List values) { + addCriterion("cd_member_id in", values, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotIn(List values) { + addCriterion("cd_member_id not in", values, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdBetween(Integer value1, Integer value2) { + addCriterion("cd_member_id between", value1, value2, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotBetween(Integer value1, Integer value2) { + addCriterion("cd_member_id not between", value1, value2, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andProvinceIsNull() { + addCriterion("province is null"); + return (Criteria) this; + } + + public Criteria andProvinceIsNotNull() { + addCriterion("province is not null"); + return (Criteria) this; + } + + public Criteria andProvinceEqualTo(Integer value) { + addCriterion("province =", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotEqualTo(Integer value) { + addCriterion("province <>", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceGreaterThan(Integer value) { + addCriterion("province >", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceGreaterThanOrEqualTo(Integer value) { + addCriterion("province >=", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceLessThan(Integer value) { + addCriterion("province <", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceLessThanOrEqualTo(Integer value) { + addCriterion("province <=", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceIn(List values) { + addCriterion("province in", values, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotIn(List values) { + addCriterion("province not in", values, "province"); + return (Criteria) this; + } + + public Criteria andProvinceBetween(Integer value1, Integer value2) { + addCriterion("province between", value1, value2, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotBetween(Integer value1, Integer value2) { + addCriterion("province not between", value1, value2, "province"); + return (Criteria) this; + } + + public Criteria andCityIsNull() { + addCriterion("city is null"); + return (Criteria) this; + } + + public Criteria andCityIsNotNull() { + addCriterion("city is not null"); + return (Criteria) this; + } + + public Criteria andCityEqualTo(Integer value) { + addCriterion("city =", value, "city"); + return (Criteria) this; + } + + public Criteria andCityNotEqualTo(Integer value) { + addCriterion("city <>", value, "city"); + return (Criteria) this; + } + + public Criteria andCityGreaterThan(Integer value) { + addCriterion("city >", value, "city"); + return (Criteria) this; + } + + public Criteria andCityGreaterThanOrEqualTo(Integer value) { + addCriterion("city >=", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLessThan(Integer value) { + addCriterion("city <", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLessThanOrEqualTo(Integer value) { + addCriterion("city <=", value, "city"); + return (Criteria) this; + } + + public Criteria andCityIn(List values) { + addCriterion("city in", values, "city"); + return (Criteria) this; + } + + public Criteria andCityNotIn(List values) { + addCriterion("city not in", values, "city"); + return (Criteria) this; + } + + public Criteria andCityBetween(Integer value1, Integer value2) { + addCriterion("city between", value1, value2, "city"); + return (Criteria) this; + } + + public Criteria andCityNotBetween(Integer value1, Integer value2) { + addCriterion("city not between", value1, value2, "city"); + return (Criteria) this; + } + + public Criteria andAreaIsNull() { + addCriterion("area is null"); + return (Criteria) this; + } + + public Criteria andAreaIsNotNull() { + addCriterion("area is not null"); + return (Criteria) this; + } + + public Criteria andAreaEqualTo(Integer value) { + addCriterion("area =", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotEqualTo(Integer value) { + addCriterion("area <>", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaGreaterThan(Integer value) { + addCriterion("area >", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaGreaterThanOrEqualTo(Integer value) { + addCriterion("area >=", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLessThan(Integer value) { + addCriterion("area <", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLessThanOrEqualTo(Integer value) { + addCriterion("area <=", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaIn(List values) { + addCriterion("area in", values, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotIn(List values) { + addCriterion("area not in", values, "area"); + return (Criteria) this; + } + + public Criteria andAreaBetween(Integer value1, Integer value2) { + addCriterion("area between", value1, value2, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotBetween(Integer value1, Integer value2) { + addCriterion("area not between", value1, value2, "area"); + return (Criteria) this; + } + + public Criteria andAddressIsNull() { + addCriterion("address is null"); + return (Criteria) this; + } + + public Criteria andAddressIsNotNull() { + addCriterion("address is not null"); + return (Criteria) this; + } + + public Criteria andAddressEqualTo(String value) { + addCriterion("address =", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotEqualTo(String value) { + addCriterion("address <>", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThan(String value) { + addCriterion("address >", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThanOrEqualTo(String value) { + addCriterion("address >=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThan(String value) { + addCriterion("address <", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThanOrEqualTo(String value) { + addCriterion("address <=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLike(String value) { + addCriterion("address like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotLike(String value) { + addCriterion("address not like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressIn(List values) { + addCriterion("address in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotIn(List values) { + addCriterion("address not in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressBetween(String value1, String value2) { + addCriterion("address between", value1, value2, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotBetween(String value1, String value2) { + addCriterion("address not between", value1, value2, "address"); + return (Criteria) this; + } + + public Criteria andFullAddressIsNull() { + addCriterion("full_address is null"); + return (Criteria) this; + } + + public Criteria andFullAddressIsNotNull() { + addCriterion("full_address is not null"); + return (Criteria) this; + } + + public Criteria andFullAddressEqualTo(String value) { + addCriterion("full_address =", value, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressNotEqualTo(String value) { + addCriterion("full_address <>", value, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressGreaterThan(String value) { + addCriterion("full_address >", value, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressGreaterThanOrEqualTo(String value) { + addCriterion("full_address >=", value, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressLessThan(String value) { + addCriterion("full_address <", value, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressLessThanOrEqualTo(String value) { + addCriterion("full_address <=", value, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressLike(String value) { + addCriterion("full_address like", value, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressNotLike(String value) { + addCriterion("full_address not like", value, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressIn(List values) { + addCriterion("full_address in", values, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressNotIn(List values) { + addCriterion("full_address not in", values, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressBetween(String value1, String value2) { + addCriterion("full_address between", value1, value2, "fullAddress"); + return (Criteria) this; + } + + public Criteria andFullAddressNotBetween(String value1, String value2) { + addCriterion("full_address not between", value1, value2, "fullAddress"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andMobileIsNull() { + addCriterion("mobile is null"); + return (Criteria) this; + } + + public Criteria andMobileIsNotNull() { + addCriterion("mobile is not null"); + return (Criteria) this; + } + + public Criteria andMobileEqualTo(String value) { + addCriterion("mobile =", value, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileNotEqualTo(String value) { + addCriterion("mobile <>", value, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileGreaterThan(String value) { + addCriterion("mobile >", value, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileGreaterThanOrEqualTo(String value) { + addCriterion("mobile >=", value, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileLessThan(String value) { + addCriterion("mobile <", value, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileLessThanOrEqualTo(String value) { + addCriterion("mobile <=", value, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileLike(String value) { + addCriterion("mobile like", value, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileNotLike(String value) { + addCriterion("mobile not like", value, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileIn(List values) { + addCriterion("mobile in", values, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileNotIn(List values) { + addCriterion("mobile not in", values, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileBetween(String value1, String value2) { + addCriterion("mobile between", value1, value2, "mobile"); + return (Criteria) this; + } + + public Criteria andMobileNotBetween(String value1, String value2) { + addCriterion("mobile not between", value1, value2, "mobile"); + return (Criteria) this; + } + + public Criteria andIsDefaultIsNull() { + addCriterion("is_default is null"); + return (Criteria) this; + } + + public Criteria andIsDefaultIsNotNull() { + addCriterion("is_default is not null"); + return (Criteria) this; + } + + public Criteria andIsDefaultEqualTo(Boolean value) { + addCriterion("is_default =", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultNotEqualTo(Boolean value) { + addCriterion("is_default <>", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultGreaterThan(Boolean value) { + addCriterion("is_default >", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultGreaterThanOrEqualTo(Boolean value) { + addCriterion("is_default >=", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultLessThan(Boolean value) { + addCriterion("is_default <", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultLessThanOrEqualTo(Boolean value) { + addCriterion("is_default <=", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultLike(Boolean value) { + addCriterion("is_default like", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultNotLike(Boolean value) { + addCriterion("is_default not like", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultIn(List values) { + addCriterion("is_default in", values, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultNotIn(List values) { + addCriterion("is_default not in", values, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultBetween(Boolean value1, Boolean value2) { + addCriterion("is_default between", value1, value2, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultNotBetween(Boolean value1, Boolean value2) { + addCriterion("is_default not between", value1, value2, "isDefault"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/member/entity/mapper/MemberAddressMapper.java b/src/main/java/com/xmomen/module/member/entity/mapper/MemberAddressMapper.java new file mode 100644 index 0000000..bdc9de0 --- /dev/null +++ b/src/main/java/com/xmomen/module/member/entity/mapper/MemberAddressMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.member.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.member.entity.MemberAddress; +import com.xmomen.module.member.entity.MemberAddressExample; +import org.apache.ibatis.annotations.Param; + +public interface MemberAddressMapper extends MybatisMapper { + int countByExample(MemberAddressExample example); + + int deleteByExample(MemberAddressExample example); + + int insertSelective(MemberAddress record); + + int updateByExampleSelective(@Param("record") MemberAddress record, @Param("example") MemberAddressExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/member/entity/mapper/MemberAddressMapper.xml b/src/main/java/com/xmomen/module/member/entity/mapper/MemberAddressMapper.xml new file mode 100644 index 0000000..50615d9 --- /dev/null +++ b/src/main/java/com/xmomen/module/member/entity/mapper/MemberAddressMapper.xml @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, cd_member_id, province, city, area, address, full_address, name, mobile, is_default + + + + delete from cd_member_address + + + + + + + SELECT replace(UUID(),'-','') + + insert into cd_member_address + + id, + + cd_member_id, + + + province, + + + city, + + + area, + + + address, + + + full_address, + + + name, + + + mobile, + + + is_default, + + + + #{id,jdbcType=VARCHAR}, + + #{cdMemberId,jdbcType=INTEGER}, + + + #{province,jdbcType=INTEGER}, + + + #{city,jdbcType=INTEGER}, + + + #{area,jdbcType=INTEGER}, + + + #{address,jdbcType=VARCHAR}, + + + #{fullAddress,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{mobile,jdbcType=VARCHAR}, + + + #{isDefault,jdbcType=CHAR}, + + + + + + update cd_member_address + + + id = #{record.id,jdbcType=VARCHAR}, + + + cd_member_id = #{record.cdMemberId,jdbcType=INTEGER}, + + + province = #{record.province,jdbcType=INTEGER}, + + + city = #{record.city,jdbcType=INTEGER}, + + + area = #{record.area,jdbcType=INTEGER}, + + + address = #{record.address,jdbcType=VARCHAR}, + + + full_address = #{record.fullAddress,jdbcType=VARCHAR}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + mobile = #{record.mobile,jdbcType=VARCHAR}, + + + is_default = #{record.isDefault,jdbcType=CHAR}, + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/member/mapper/MemberAddressMapperExt.xml b/src/main/java/com/xmomen/module/member/mapper/MemberAddressMapperExt.xml new file mode 100644 index 0000000..33c15ba --- /dev/null +++ b/src/main/java/com/xmomen/module/member/mapper/MemberAddressMapperExt.xml @@ -0,0 +1,41 @@ + + + + + + + + + update + cd_member_address + set + is_default = 0 + where + cd_member_id=#{memberId} + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java b/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java new file mode 100644 index 0000000..09a8b1a --- /dev/null +++ b/src/main/java/com/xmomen/module/member/model/MemberAddressCreate.java @@ -0,0 +1,45 @@ +package com.xmomen.module.member.model; + +import lombok.Data; +import com.xmomen.module.member.entity.MemberAddress; +import org.springframework.beans.BeanUtils; + + import java.lang.Boolean; + import java.lang.String; + import java.lang.Integer; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-4-10 23:05:38 + * @version 1.0.0 + */ +public @Data class MemberAddressCreate implements Serializable { + + /** */ + private String id; + /** 客户ID */ + private Integer cdMemberId; + /** */ + private Integer province; + /** 城市 */ + private Integer city; + /** 区域 */ + private Integer area; + /** 详细地址 */ + private String address; + /** 完整地址 */ + private String fullAddress; + /** */ + private String name; + /** */ + private String mobile; + /** 是否默认地址 */ + private boolean isDefault; + + public MemberAddress getEntity(){ + MemberAddress memberAddress = new MemberAddress(); + BeanUtils.copyProperties(this, memberAddress); + return memberAddress; + } +} diff --git a/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java b/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java new file mode 100644 index 0000000..b847c53 --- /dev/null +++ b/src/main/java/com/xmomen/module/member/model/MemberAddressModel.java @@ -0,0 +1,83 @@ +package com.xmomen.module.member.model; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.xmomen.module.member.entity.MemberAddress; +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.Integer; +import java.lang.String; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-3-28 12:53:37 + * @version 1.0.0 + */ +@ExcelTarget(value = "MemberAddressModel") +public @Data class MemberAddressModel implements Serializable { + + /** */ +// @NotBlank(message = "为必填项") + @Length(max = 32, message = "字符长度限制[0,32]") + private String id; + /** 客户ID */ + @Excel(name = "客户ID") + @NotNull(message = "客户ID为必填项") + @Range(max = 999999999, min = -999999999, message = "客户ID数值范围[999999999,-999999999]") + private Integer cdMemberId; + /** */ + @Excel(name = "") + @Range(max = 999999999, min = -999999999, message = "数值范围[999999999,-999999999]") + private Integer province; + /** 城市 */ + @Excel(name = "城市") + @Range(max = 999999999, min = -999999999, message = "城市数值范围[999999999,-999999999]") + private Integer city; + /** 区域 */ + @Excel(name = "区域") + @Range(max = 999999999, min = -999999999, message = "区域数值范围[999999999,-999999999]") + private Integer area; + /** 详细地址 */ + @Excel(name = "详细地址") + @NotBlank(message = "详细地址为必填项") + @Length(max = 256, message = "详细地址字符长度限制[0,256]") + private String address; + /** 完整地址 */ + @Excel(name = "完整地址") + @NotBlank(message = "完整地址为必填项") + @Length(max = 256, message = "完整地址字符长度限制[0,256]") + private String fullAddress; + /** */ + @Excel(name = "") + @NotBlank(message = "为必填项") + @Length(max = 32, message = "字符长度限制[0,32]") + private String name; + /** */ + @Excel(name = "") + @NotBlank(message = "为必填项") + @Length(max = 32, message = "字符长度限制[0,32]") + private String mobile; + /** 是否默认地址 */ + @Excel(name = "是否默认地址") +// @Range(max = 999999999, min = -999999999, message = "是否默认地址数值范围[999999999,-999999999]") + //@NotBlank(message = "是否默认地址为必填项") + private Boolean isDefault; + + /** + * Get MemberAddress Entity Object + * @return + */ + @JsonIgnore + public MemberAddress getEntity(){ + MemberAddress memberAddress = new MemberAddress(); + BeanUtils.copyProperties(this, memberAddress); + return memberAddress; + } + + +} diff --git a/src/main/java/com/xmomen/module/member/service/MemberAddressService.java b/src/main/java/com/xmomen/module/member/service/MemberAddressService.java new file mode 100644 index 0000000..23d551e --- /dev/null +++ b/src/main/java/com/xmomen/module/member/service/MemberAddressService.java @@ -0,0 +1,138 @@ +package com.xmomen.module.member.service; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.member.model.MemberAddressQuery; +import com.xmomen.module.member.model.MemberAddressModel; +import com.xmomen.module.member.entity.MemberAddress; +import org.apache.ibatis.exceptions.TooManyResultsException; + +import java.io.Serializable; +import java.util.List; + +/** + * @author tanxinzheng + * @version 1.0.0 + * @date 2017-3-29 0:27:52 + */ +public interface MemberAddressService { + + /** + * 新增客户地址 + * + * @param memberAddressModel 新增客户地址对象参数 + * @return MemberAddressModel 客户地址领域对象 + */ + public MemberAddressModel createMemberAddress(MemberAddressModel memberAddressModel); + + /** + * 新增客户地址实体对象 + * + * @param memberAddress 新增客户地址实体对象参数 + * @return MemberAddress 客户地址实体对象 + */ + public MemberAddress createMemberAddress(MemberAddress memberAddress); + + /** + * 批量新增客户地址 + * + * @param MemberAddressModel 新增客户地址对象集合参数 + * @return List 客户地址领域对象集合 + */ + List createMemberAddresss(List memberAddressModels); + + /** + * 更新客户地址 + * + * @param memberAddressModel 更新客户地址对象参数 + */ + public void updateMemberAddress(MemberAddressModel memberAddressModel); + + /** + * 更新客户地址实体对象 + * + * @param memberAddress 新增客户地址实体对象参数 + * @return MemberAddress 客户地址实体对象 + */ + public void updateMemberAddress(MemberAddress memberAddress); + + /** + * 批量删除客户地址 + * + * @param ids 主键数组 + */ + public void deleteMemberAddress(String[] ids); + + /** + * 删除客户地址 + * + * @param id 主键 + */ + public void deleteMemberAddress(String id); + + /** + * 查询客户地址领域分页对象（带参数条件） + * + * @param memberAddressQuery 查询参数 + * @param limit 每页最大数 + * @param offset 页码 + * @return Page 客户地址参数对象 + */ + public Page getMemberAddressModelPage(int limit, int offset, MemberAddressQuery memberAddressQuery); + + /** + * 查询客户地址领域分页对象（无参数条件） + * + * @param limit 每页最大数 + * @param offset 页码 + * @return Page 客户地址领域对象 + */ + public Page getMemberAddressModelPage(int limit, int offset); + + /** + * 查询客户地址领域集合对象（带参数条件） + * + * @param memberAddressQuery 查询参数对象 + * @return List 客户地址领域集合对象 + */ + public List getMemberAddressModelList(MemberAddressQuery memberAddressQuery); + + /** + * 查询客户地址领域集合对象（无参数条件） + * + * @return List 客户地址领域集合对象 + */ + public List getMemberAddressModelList(); + + /** + * 查询客户地址实体对象 + * + * @param id 主键 + * @return MemberAddress 客户地址实体对象 + */ + public MemberAddress getOneMemberAddress(String id); + + /** + * 根据主键查询单个对象 + * + * @param id 主键 + * @return MemberAddressModel 客户地址领域对象 + */ + public MemberAddressModel getOneMemberAddressModel(String id); + + /** + * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错） + * + * @param memberAddressQuery 客户地址查询参数对象 + * @return MemberAddressModel 客户地址领域对象 + */ + public MemberAddressModel getOneMemberAddressModel(MemberAddressQuery memberAddressQuery) throws TooManyResultsException; + + /** + * 设置默认收货地址 + * + * @param addressId + */ + public void defaultAddress(String addressId); + + public List getMemberAddressModels(MemberAddressQuery memberAddressQuery); +} diff --git a/src/main/java/com/xmomen/module/order/controller/OrderController.java b/src/main/java/com/xmomen/module/order/controller/OrderController.java new file mode 100644 index 0000000..6991b3f --- /dev/null +++ b/src/main/java/com/xmomen/module/order/controller/OrderController.java @@ -0,0 +1,242 @@ +package com.xmomen.module.order.controller; + +import java.util.List; + +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.logger.Log; +import com.xmomen.module.order.entity.TbOrder; +import com.xmomen.module.order.entity.TbOrderItem; +import com.xmomen.module.order.model.CreateOrder; +import com.xmomen.module.order.model.OrderModel; +import com.xmomen.module.order.model.OrderQuery; +import com.xmomen.module.order.model.UpdateOrder; +import com.xmomen.module.order.service.OrderService; +import com.xmomen.module.wx.model.AjaxResult; + +/** + * Created by Jeng on 2016/3/30. + */ +@RestController +public class OrderController { + + @Autowired + OrderService orderService; + + @Autowired + MybatisDao mybatisDao; + + /** + * 订单列表 + * + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/order", method = RequestMethod.GET) + @Log(actionName = "查询订单列表") + public Page getUserList(@RequestParam(value = "limit") Integer limit, + @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 = "couponNumber", required = false) String couponNumber, + @RequestParam(value = "managerId", required = false) Integer managerId, + @RequestParam(value = "companyId", required = false) Integer companyId, + @RequestParam(value = "consigneeName", required = false) String consigneeName, + @RequestParam(value = "hasNoShowCancel", required = false) Boolean hasNoShowCancel, + @RequestParam(value = "hasShowDespatch", required = false) Boolean hasShowDespatch, + @RequestParam(value = "appointmentTimeStart", required = false) String appointmentTimeStart, + @RequestParam(value = "appointmentTimeEnd", required = false) String appointmentTimeEnd, + @RequestParam(value = "despatchExpressId", required = false) Integer despatchExpressId, + @RequestParam(value = "isTwoSend", required = false) Integer isTwoSend) { + OrderQuery orderQuery = new OrderQuery(); + orderQuery.setKeyword(keyword); + orderQuery.setOrderStatus(orderStatus); + orderQuery.setManagerId(managerId); + orderQuery.setHasNoShowCancel(hasNoShowCancel == null ? false : hasNoShowCancel); + orderQuery.setConsigneeName(consigneeName); + orderQuery.setDespatchExpressId(despatchExpressId); + orderQuery.setCompanyId(companyId); + orderQuery.setCouponNumber(couponNumber); + orderQuery.setIsTwoSend(isTwoSend); + if (null != hasShowDespatch) { + //0显示未分配快递商 1显示已分配快递商 + orderQuery.setShowDespatch(hasShowDespatch ? 1 : 0); + } + if (StringUtilsExt.isNotBlank(orderCreateTimeStart)) { + orderQuery.setOrderCreateTimeStart(orderCreateTimeStart.substring(0, 10)); + } + if (StringUtilsExt.isNotBlank(orderCreateTimeEnd)) { + orderQuery.setOrderCreateTimeEnd(orderCreateTimeEnd.substring(0, 10)); + } + + if (StringUtilsExt.isNotBlank(appointmentTimeStart)) { + orderQuery.setAppointmentTimeStart(appointmentTimeStart.substring(0, 10)); + } + + if (StringUtilsExt.isNotBlank(appointmentTimeEnd)) { + orderQuery.setAppointmentTimeEnd(appointmentTimeEnd.substring(0, 10)); + } + //客服经理过滤如果有客服组权限则不过滤 + + 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); + orderQuery.setCreateUserId(userId); + } + return orderService.getOrderList(orderQuery, limit, offset); + } + + /** + * 订单明细 + * + * @return + */ + @RequestMapping(value = "/order/{id}", method = RequestMethod.GET) + @Log(actionName = "查询订单列表") + public OrderModel getOrderDetail(@PathVariable(value = "id") Integer id) { + OrderQuery orderQuery = new OrderQuery(); + orderQuery.setId(id); + List orderModelList = orderService.getOrderList(orderQuery); + if (orderModelList != null && !orderModelList.isEmpty() && orderModelList.size() == 1) { + return orderModelList.get(0); + } + return null; + } + + /** + * 新增订单 + * + * @param createOrder + * @param bindingResult + * @return + */ + @RequestMapping(value = "/order", method = RequestMethod.POST) + @Log(actionName = "新增订单") + public TbOrder createOrder(@RequestBody @Valid CreateOrder createOrder, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute("user_id"); + createOrder.setCreateUserId(userId); + return orderService.createOrder(createOrder); + } + + /** + * 批量新增订单 + * + * @param createOrder + * @param bindingResult + * @return + */ + @RequestMapping(value = "/order/batch", method = RequestMethod.POST) + @Log(actionName = "批量新增订单") + public void batchCreateOrder(@RequestBody @Valid CreateOrder createOrder, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute("user_id"); + createOrder.setCreateUserId(userId); + orderService.batchCreateOrder(createOrder); + } + + /** + * 更新订单 + * + * @param updateOrder + * @param bindingResult + * @return + */ + @RequestMapping(value = "/order/{id}", method = RequestMethod.PUT) + @Log(actionName = "更新订单") + public TbOrder updateOrder( + @PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdateOrder updateOrder, BindingResult bindingResult) throws ArgumentValidException { + if (bindingResult != null && bindingResult.hasErrors()) { + throw new ArgumentValidException(bindingResult); + } + Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute("user_id"); + updateOrder.setCreateUserId(userId); + return orderService.updateOrder(updateOrder); + } + + /** + * 订单商品列表 + * + * @param limit + * @param offset + * @param orderNo + * @return + */ + @RequestMapping(value = "/order/{id}/item", method = RequestMethod.GET) + @Log(actionName = "查询订单商品列表") + public Page getUserList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "orderNo", required = false) String orderNo) { + TbOrderItem tbOrderItem = new TbOrderItem(); + tbOrderItem.setOrderNo(orderNo); + return mybatisDao.selectPageByModel(tbOrderItem, limit, offset); + } + + /** + * 取消订单 + * + * @param id + */ + @RequestMapping(value = "/order/{id}", method = RequestMethod.DELETE) + @Log(actionName = "取消订单") + public void cancelOrder(@PathVariable(value = "id") Integer id) { + orderService.cancelOrder(id); + } + + /** + * 更新订单装箱数 + * + * @param createOrder + * @param bindingResult + * @return + */ + @RequestMapping(value = "/order/updateTotalBox", method = RequestMethod.POST) + @Log(actionName = "更新订单装箱数") + public void updateTotalBox(@RequestParam(value = "orderNo") String orderNo, + @RequestParam(value = "totalBox") int totalBox) { + orderService.updateTotalBox(orderNo, totalBox); + } + + /** + * 二次配送审核 + * + * @param id + */ + @RequestMapping(value = "/order/{id}/twoSend", method = RequestMethod.POST) + @Log(actionName = "二次配送审核") + public AjaxResult twoSendOrder(@PathVariable(value = "id") Integer id, @RequestParam(value = "auditStatusCd") Integer auditStatusCd) { + orderService.twoSendOrder(id, auditStatusCd); + AjaxResult ajaxResult = new AjaxResult(); + ajaxResult.setResult(1); + ajaxResult.setMessage("审核成功。"); + return ajaxResult; + } +} diff --git a/src/main/java/com/xmomen/module/order/controller/PackingController.java b/src/main/java/com/xmomen/module/order/controller/PackingController.java new file mode 100644 index 0000000..bbf6796 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/controller/PackingController.java @@ -0,0 +1,302 @@ +package com.xmomen.module.order.controller; + +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.logger.Log; +import com.xmomen.module.order.entity.TbPacking; +import com.xmomen.module.order.model.*; +import com.xmomen.module.order.service.OrderService; +import com.xmomen.module.order.service.PackingService; + +import org.apache.commons.lang3.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.List; + +/** + * Created by Jeng on 2016/3/30. + */ +@RestController +public class PackingController { + + @Autowired + PackingService packingService; + + @Autowired + OrderService orderService; + + @Autowired + MybatisDao mybatisDao; + + /** + * 装箱记录列表 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/packing", method = RequestMethod.GET) + @Log(actionName = "查询装箱记录列表") + public Page getUserList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "orderNo", required = false) String orderNo, + @RequestParam(value = "packingNo", required = false) String packingNo){ + PackingQuery packingQuery = new PackingQuery(); + packingQuery.setKeyword(keyword); + packingQuery.setPackingNo(packingNo); + packingQuery.setOrderNo(orderNo); + return packingService.getPackingList(packingQuery, limit, offset); + } + + /** + * 新增装箱记录 + * @param createPacking + * @param bindingResult + * @return + */ + @RequestMapping(value = "/packing", method = RequestMethod.POST) + @Log(actionName = "新增装箱记录") + public TbPacking createPacking(@RequestBody @Valid CreatePacking createPacking, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + return packingService.create(createPacking); + } + + /** + * 装箱记录列表 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/packing/task", method = RequestMethod.GET) + @Log(actionName = "查询装箱任务统计列表") + public Page getPackingTaskList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "orderNo", required = false) String orderNo, + @RequestParam(value = "packingNo", required = false) String packingNo){ + return packingService.getPackingTaskCountList(null, limit, offset); + } + + /** + * 分配装箱任务 + * @param packingTask + * @param bindingResult + * @return + */ + @RequestMapping(value = "/packing/task/bind", method = RequestMethod.PUT) + @Log(actionName = "分配装箱任务") + public void createPacking(@RequestBody @Valid PackingTask packingTask, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + packingService.dispatchPackingTask(packingTask); + } + + /** + * 分配装箱任务 + * @param orderNoList + * @throws ArgumentValidException + */ + @RequestMapping(value = "/packing/task/unbind", method = RequestMethod.PUT) + @Log(actionName = "取消分配装箱任务") + public void unbind(@RequestParam(value = "orderNos", required = true)String[] orderNoList) throws ArgumentValidException { + if(orderNoList != null && orderNoList.length <= 0){ + return; + } + packingService.cancelPackingTask(orderNoList); + } + + @RequestMapping(value = "/packing/order", method = RequestMethod.GET) + @Log(actionName = "装箱订单列表") + public Page queryPackingOrder(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "orderNo", required = false) String orderNo, + @RequestParam(value = "isHasPackingTaskUserId", required = false) boolean isHasPackingTaskUserId, + @RequestParam(value = "packingTaskCreateTimeStart", required = false) String packingTaskCreateTimeStart, + @RequestParam(value = "packingTaskCreateTimeEnd", required = false) String packingTaskCreateTimeEnd, + @RequestParam(value = "appointmentTimeStart", required = false) String appointmentTimeStart, + @RequestParam(value = "appointmentTimeEnd", required = false) String appointmentTimeEnd, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "packingTaskStatus", required = false) Integer packingTaskStatus, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "managerId", required = false) Integer managerId, + @RequestParam(value = "consigneeName", required = false) String consigneeName, + @RequestParam(value = "isShowPackingAssigns", required = false) Boolean isShowPackingAssigns) { + OrderQuery orderQuery = new OrderQuery(); + orderQuery.setKeyword(keyword); + orderQuery.setOrderNo(orderNo); + orderQuery.setHasPackingTaskUserId(isHasPackingTaskUserId); + orderQuery.setHasNoShowCancel(true); + if(StringUtilsExt.isNotBlank(packingTaskCreateTimeStart)){ + orderQuery.setPackingTaskCreateTimeStart(packingTaskCreateTimeStart); + } + if(StringUtilsExt.isNotBlank(packingTaskCreateTimeEnd)){ + orderQuery.setPackingTaskCreateTimeEnd(packingTaskCreateTimeEnd); + } + + if(StringUtilsExt.isNotBlank(appointmentTimeStart)){ + orderQuery.setAppointmentTimeStart(appointmentTimeStart); + } + + if(StringUtilsExt.isNotBlank(appointmentTimeEnd)){ + orderQuery.setAppointmentTimeEnd(appointmentTimeEnd); + } + + if(isShowPackingAssigns != null){ + //0显示未分配装箱工 1显示已分配装箱工 + orderQuery.setShowPackingAssigns(isShowPackingAssigns ? 1 : 0); + } + orderQuery.setManagerId(managerId); + orderQuery.setConsigneeName(consigneeName); + //orderQuery.setOrderStatus(7);//待装箱 + orderQuery.setPackingTaskStatus(packingTaskStatus); + + if(SecurityUtils.getSubject().hasRole(AppConstants.PACKING_PERMISSION_CODE)){ + Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + orderQuery.setPackingTaskUserId(userId); + } + + Page orderModePage = orderService.getPackageTaskList(orderQuery, limit, offset); + return orderModePage; + } + + /** + * 删除装箱记录 + * @param id + */ + @RequestMapping(value = "/packing/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除装箱记录") + public void deletePacking(@PathVariable(value = "id") Integer id){ + packingService.delete(id); + } + + /** + * 商品装箱汇总 + * @param packingId + * @param orderId + * @param limit + * @param offset + * @return + */ + @RequestMapping(value = "/packing/{id}/order") + public Page queryPackingOrder(@PathVariable(value = "id") Integer packingId, + @RequestParam(value = "orderId") Integer orderId, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "orderNos", required = false) String[] orderNos, + @RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset){ + PackingOrderQuery packingOrderQuery = new PackingOrderQuery(); + packingOrderQuery.setKeyword(keyword); + packingOrderQuery.setOrderId(orderId); + packingOrderQuery.setOrderNos(orderNos); + return packingService.queryPackingOrder(packingOrderQuery, limit, offset); + } + + /** + * 订单打印 + * @param orderId 订单ID + * @return + */ + @RequestMapping(value = "/packing/printOrder") + public OrderModel printOrder(@RequestParam(value = "orderId") Integer orderId){ + OrderModel orderModel = null; + OrderQuery orderQuery = new OrderQuery(); + orderQuery.setId(orderId); + List orderModels = orderService.getOrderList(orderQuery); + //打印传递箱数 + if(orderModels.size() == 1){ + orderModel = orderModels.get(0); + //已完成 + if(orderModel.getPackingTaskStatus() == 2){ + PackingQuery packingQuery = new PackingQuery(); + packingQuery.setOrderNo(orderModel.getOrderNo()); + List packingModels = packingService.getPackingList(packingQuery); + orderModel.setPackingModels(packingModels); + } + } + // + if(StringUtils.isNotEmpty(orderModel.getBatchNo())){ + int batchNum = orderService.getCountBatch(orderModel.getBatchNo()); + orderModel.setBatchNum(batchNum); + }else{ + orderModel.setBatchNum(0); + } + + return orderModel; + } + + + @RequestMapping(value = "/packing/order/item") + public Page queryPackingOrderItem(@RequestParam(value = "orderNos", required = false) String[] orderNos, + @RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset){ + PackingOrderQuery packingOrderQuery = new PackingOrderQuery(); + packingOrderQuery.setOrderNos(orderNos); + return packingService.queryPackingOrderItem(packingOrderQuery, limit, offset); + } + + /** + * 查询装箱记录 + * + * @param packingId + * @param orderItemId + * @param keyword + * @param limit + * @param offset + * @return + */ + @RequestMapping(value = "/packing/{id}/record", method = RequestMethod.GET) + public Page queryPackingRecord(@PathVariable(value = "id") Integer packingId, + @RequestParam(value = "orderItemId") Integer orderItemId, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset){ + PackingRecordQuery packingRecordQuery = new PackingRecordQuery(); + packingRecordQuery.setKeyword(keyword); + packingRecordQuery.setOrderItemId(orderItemId); + //packingRecordQuery.setId(packingId); + return packingService.queryPackingRecord(packingRecordQuery, limit, offset); + } + + /** + * 装箱扫码 + * + * @param createPackingRecord + * @param bindingResult + * @return + * @throws ArgumentValidException + */ + @RequestMapping(value = "/packing/record", method = RequestMethod.POST) + @Log(actionName = "新增装箱记录") + public ScanModel createPackingRecord(@RequestBody @Valid CreatePackingRecord createPackingRecord, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + return packingService.createRecord(createPackingRecord); + } + + @RequestMapping(value = "/packing/{id}/record/{recordId}", method = RequestMethod.DELETE) + @Log(actionName = "删除装箱记录") + public void createPackingRecord(@PathVariable(value = "id") Integer id, + @PathVariable(value = "recordId") Integer recordId){ + packingService.deleteRecord(recordId); + } + + @RequestMapping(value = "/packing/auto", method = RequestMethod.POST) + @Log(actionName = "订单自动装箱") + public List autoPacking(@RequestParam(value = "packingId") Integer packingId, + @RequestParam(value = "orderNo") String orderNo){ + return packingService.autoPacking(orderNo, packingId); + } +} diff --git a/src/main/java/com/xmomen/module/order/controller/PurchaseController.java b/src/main/java/com/xmomen/module/order/controller/PurchaseController.java new file mode 100644 index 0000000..2294f91 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/controller/PurchaseController.java @@ -0,0 +1,110 @@ +package com.xmomen.module.order.controller; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +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 com.xmomen.module.order.model.CreatePurchase; +import com.xmomen.module.order.model.PurchaseModel; +import com.xmomen.module.order.service.PurchaseService; + +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ui.ModelMap; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +/** + * Created by Jeng on 2016/3/30. + */ +@RestController +public class PurchaseController { + + @Autowired + PurchaseService purchaseService; + + @Autowired + MybatisDao mybatisDao; + + /** + * 采购单列表 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/purchase", method = RequestMethod.GET) + @Log(actionName = "查询采购单列表") + public Page getUserList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "purchaseStatus", required = false) Integer purchaseStatus, + @RequestParam(value = "startTime", required = false) String startTime, + @RequestParam(value = "endTime", required = false) String endTime, + @RequestParam(value = "isDistribute", required = false) Integer isDistribute, + @RequestParam(value = "sellUnit", required = false) String sellUnit){ + Map param = new HashMap(); + param.put("keyword", keyword); + param.put("isDistribute", isDistribute); + param.put("sellUnit", sellUnit); + param.put("purchaseStatus", purchaseStatus); + if(startTime != null) { + param.put("startTime", startTime.substring(0, 10)); + } + if(endTime != null){ + param.put("endTime", endTime.substring(0, 10)); + } + return purchaseService.getPurchaseList(param, limit, offset); + } + + /** + * 新增采购单 + * @param createPurchase + * @param bindingResult + * @return + */ + @RequestMapping(value = "/purchase", method = RequestMethod.POST) + @Log(actionName = "新增采购单") + public void createPurchase(@RequestBody @Valid CreatePurchase createPurchase, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + purchaseService.createPurchase(createPurchase); + } + + /** + * 修改采购状态 + * @param id + * @param purchaseStatus + */ + @RequestMapping(value = "/purchase/{id}", method = RequestMethod.PUT) + @Log(actionName = "修改采购状态") + public void createPurchase(@PathVariable(value = "id") Integer id, + @RequestParam(value = "purchaseStatus") Integer purchaseStatus) { + purchaseService.updatePurchaseStatus(id, purchaseStatus); + } + + + + /** + * 删除采购单 + * @param id + */ + + @RequestMapping(value = "/purchase/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除采购单") + public void deletePurchase(@PathVariable(value = "id") Integer id){ + purchaseService.deletePurchase(id); + } +} diff --git a/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java b/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java new file mode 100644 index 0000000..b637ddc --- /dev/null +++ b/src/main/java/com/xmomen/module/order/controller/TradeRecordController.java @@ -0,0 +1,41 @@ +package com.xmomen.module.order.controller; + +import java.util.HashMap; +import java.util.Map; + +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.framework.mybatis.page.Page; +import com.xmomen.module.logger.Log; +import com.xmomen.module.order.mapper.TradeRecordMapper; +import com.xmomen.module.order.model.TradeRecordModel; + +/** + */ +@RestController +public class TradeRecordController { + @Autowired + MybatisDao mybatisDao; + + /** + * 查看交易记录 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/tradeRecord", method = RequestMethod.GET) + @Log(actionName = " 查看交易记录") + public Page getUserList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "keyword", required = false) String keyword){ + Map param = new HashMap(); + param.put("keyword", keyword); + return (Page) mybatisDao.selectPage(TradeRecordMapper.TradeRecordMapperNameSpace + "getTradeRecordList", param, limit, offset); + } +} diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderRefExample.java b/src/main/java/com/xmomen/module/order/entity/TbOrderRefExample.java new file mode 100644 index 0000000..e851fe7 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/TbOrderRefExample.java @@ -0,0 +1,471 @@ +package com.xmomen.module.order.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class TbOrderRefExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbOrderRefExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 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 values) { + addCriterion("REF_TYPE in", values, "refType"); + return (Criteria) this; + } + + public Criteria andRefTypeNotIn(List 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 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 values) { + addCriterion("REF_VALUE in", values, "refValue"); + return (Criteria) this; + } + + public Criteria andRefValueNotIn(List 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 andOrderNoIsNull() { + addCriterion("ORDER_NO is null"); + return (Criteria) this; + } + + public Criteria andOrderNoIsNotNull() { + addCriterion("ORDER_NO is not null"); + return (Criteria) this; + } + + public Criteria andOrderNoEqualTo(String value) { + addCriterion("ORDER_NO =", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotEqualTo(String value) { + addCriterion("ORDER_NO <>", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThan(String value) { + addCriterion("ORDER_NO >", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("ORDER_NO >=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThan(String value) { + addCriterion("ORDER_NO <", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThanOrEqualTo(String value) { + addCriterion("ORDER_NO <=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLike(String value) { + addCriterion("ORDER_NO like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotLike(String value) { + addCriterion("ORDER_NO not like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoIn(List values) { + addCriterion("ORDER_NO in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotIn(List values) { + addCriterion("ORDER_NO not in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoBetween(String value1, String value2) { + addCriterion("ORDER_NO between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotBetween(String value1, String value2) { + addCriterion("ORDER_NO not between", value1, value2, "orderNo"); + return (Criteria) this; + } + } + + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/TbOrderRelationExample.java b/src/main/java/com/xmomen/module/order/entity/TbOrderRelationExample.java new file mode 100644 index 0000000..5dad5a2 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/TbOrderRelationExample.java @@ -0,0 +1,471 @@ +package com.xmomen.module.order.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class TbOrderRelationExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbOrderRelationExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 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 values) { + addCriterion("REF_TYPE in", values, "refType"); + return (Criteria) this; + } + + public Criteria andRefTypeNotIn(List 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 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 values) { + addCriterion("REF_VALUE in", values, "refValue"); + return (Criteria) this; + } + + public Criteria andRefValueNotIn(List 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 andOrderNoIsNull() { + addCriterion("ORDER_NO is null"); + return (Criteria) this; + } + + public Criteria andOrderNoIsNotNull() { + addCriterion("ORDER_NO is not null"); + return (Criteria) this; + } + + public Criteria andOrderNoEqualTo(String value) { + addCriterion("ORDER_NO =", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotEqualTo(String value) { + addCriterion("ORDER_NO <>", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThan(String value) { + addCriterion("ORDER_NO >", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("ORDER_NO >=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThan(String value) { + addCriterion("ORDER_NO <", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThanOrEqualTo(String value) { + addCriterion("ORDER_NO <=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLike(String value) { + addCriterion("ORDER_NO like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotLike(String value) { + addCriterion("ORDER_NO not like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoIn(List values) { + addCriterion("ORDER_NO in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotIn(List values) { + addCriterion("ORDER_NO not in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoBetween(String value1, String value2) { + addCriterion("ORDER_NO between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotBetween(String value1, String value2) { + addCriterion("ORDER_NO not between", value1, value2, "orderNo"); + return (Criteria) this; + } + } + + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/TbPackingExample.java b/src/main/java/com/xmomen/module/order/entity/TbPackingExample.java new file mode 100644 index 0000000..d94d9ab --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/TbPackingExample.java @@ -0,0 +1,452 @@ +package com.xmomen.module.order.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TbPackingExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbPackingExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andPackingNoIsNull() { + addCriterion("PACKING_NO is null"); + return (Criteria) this; + } + + public Criteria andPackingNoIsNotNull() { + addCriterion("PACKING_NO is not null"); + return (Criteria) this; + } + + public Criteria andPackingNoEqualTo(String value) { + addCriterion("PACKING_NO =", value, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoNotEqualTo(String value) { + addCriterion("PACKING_NO <>", value, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoGreaterThan(String value) { + addCriterion("PACKING_NO >", value, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoGreaterThanOrEqualTo(String value) { + addCriterion("PACKING_NO >=", value, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoLessThan(String value) { + addCriterion("PACKING_NO <", value, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoLessThanOrEqualTo(String value) { + addCriterion("PACKING_NO <=", value, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoLike(String value) { + addCriterion("PACKING_NO like", value, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoNotLike(String value) { + addCriterion("PACKING_NO not like", value, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoIn(List values) { + addCriterion("PACKING_NO in", values, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoNotIn(List values) { + addCriterion("PACKING_NO not in", values, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoBetween(String value1, String value2) { + addCriterion("PACKING_NO between", value1, value2, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingNoNotBetween(String value1, String value2) { + addCriterion("PACKING_NO not between", value1, value2, "packingNo"); + return (Criteria) this; + } + + public Criteria andPackingTimeIsNull() { + addCriterion("PACKING_TIME is null"); + return (Criteria) this; + } + + public Criteria andPackingTimeIsNotNull() { + addCriterion("PACKING_TIME is not null"); + return (Criteria) this; + } + + public Criteria andPackingTimeEqualTo(Date value) { + addCriterion("PACKING_TIME =", value, "packingTime"); + return (Criteria) this; + } + + public Criteria andPackingTimeNotEqualTo(Date value) { + addCriterion("PACKING_TIME <>", value, "packingTime"); + return (Criteria) this; + } + + public Criteria andPackingTimeGreaterThan(Date value) { + addCriterion("PACKING_TIME >", value, "packingTime"); + return (Criteria) this; + } + + public Criteria andPackingTimeGreaterThanOrEqualTo(Date value) { + addCriterion("PACKING_TIME >=", value, "packingTime"); + return (Criteria) this; + } + + public Criteria andPackingTimeLessThan(Date value) { + addCriterion("PACKING_TIME <", value, "packingTime"); + return (Criteria) this; + } + + public Criteria andPackingTimeLessThanOrEqualTo(Date value) { + addCriterion("PACKING_TIME <=", value, "packingTime"); + return (Criteria) this; + } + + public Criteria andPackingTimeIn(List values) { + addCriterion("PACKING_TIME in", values, "packingTime"); + return (Criteria) this; + } + + public Criteria andPackingTimeNotIn(List values) { + addCriterion("PACKING_TIME not in", values, "packingTime"); + return (Criteria) this; + } + + public Criteria andPackingTimeBetween(Date value1, Date value2) { + addCriterion("PACKING_TIME between", value1, value2, "packingTime"); + return (Criteria) this; + } + + public Criteria andPackingTimeNotBetween(Date value1, Date value2) { + addCriterion("PACKING_TIME not between", value1, value2, "packingTime"); + return (Criteria) this; + } + + public Criteria andPackingStatusIsNull() { + addCriterion("PACKING_STATUS is null"); + return (Criteria) this; + } + + public Criteria andPackingStatusIsNotNull() { + addCriterion("PACKING_STATUS is not null"); + return (Criteria) this; + } + + public Criteria andPackingStatusEqualTo(Integer value) { + addCriterion("PACKING_STATUS =", value, "packingStatus"); + return (Criteria) this; + } + + public Criteria andPackingStatusNotEqualTo(Integer value) { + addCriterion("PACKING_STATUS <>", value, "packingStatus"); + return (Criteria) this; + } + + public Criteria andPackingStatusGreaterThan(Integer value) { + addCriterion("PACKING_STATUS >", value, "packingStatus"); + return (Criteria) this; + } + + public Criteria andPackingStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("PACKING_STATUS >=", value, "packingStatus"); + return (Criteria) this; + } + + public Criteria andPackingStatusLessThan(Integer value) { + addCriterion("PACKING_STATUS <", value, "packingStatus"); + return (Criteria) this; + } + + public Criteria andPackingStatusLessThanOrEqualTo(Integer value) { + addCriterion("PACKING_STATUS <=", value, "packingStatus"); + return (Criteria) this; + } + + public Criteria andPackingStatusIn(List values) { + addCriterion("PACKING_STATUS in", values, "packingStatus"); + return (Criteria) this; + } + + public Criteria andPackingStatusNotIn(List values) { + addCriterion("PACKING_STATUS not in", values, "packingStatus"); + return (Criteria) this; + } + + public Criteria andPackingStatusBetween(Integer value1, Integer value2) { + addCriterion("PACKING_STATUS between", value1, value2, "packingStatus"); + return (Criteria) this; + } + + public Criteria andPackingStatusNotBetween(Integer value1, Integer value2) { + addCriterion("PACKING_STATUS not between", value1, value2, "packingStatus"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/TbPackingRecordExample.java b/src/main/java/com/xmomen/module/order/entity/TbPackingRecordExample.java new file mode 100644 index 0000000..fdee8c2 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/TbPackingRecordExample.java @@ -0,0 +1,512 @@ +package com.xmomen.module.order.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TbPackingRecordExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbPackingRecordExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andUpcIsNull() { + addCriterion("UPC is null"); + return (Criteria) this; + } + + public Criteria andUpcIsNotNull() { + addCriterion("UPC is not null"); + return (Criteria) this; + } + + public Criteria andUpcEqualTo(String value) { + addCriterion("UPC =", value, "upc"); + return (Criteria) this; + } + + public Criteria andUpcNotEqualTo(String value) { + addCriterion("UPC <>", value, "upc"); + return (Criteria) this; + } + + public Criteria andUpcGreaterThan(String value) { + addCriterion("UPC >", value, "upc"); + return (Criteria) this; + } + + public Criteria andUpcGreaterThanOrEqualTo(String value) { + addCriterion("UPC >=", value, "upc"); + return (Criteria) this; + } + + public Criteria andUpcLessThan(String value) { + addCriterion("UPC <", value, "upc"); + return (Criteria) this; + } + + public Criteria andUpcLessThanOrEqualTo(String value) { + addCriterion("UPC <=", value, "upc"); + return (Criteria) this; + } + + public Criteria andUpcLike(String value) { + addCriterion("UPC like", value, "upc"); + return (Criteria) this; + } + + public Criteria andUpcNotLike(String value) { + addCriterion("UPC not like", value, "upc"); + return (Criteria) this; + } + + public Criteria andUpcIn(List values) { + addCriterion("UPC in", values, "upc"); + return (Criteria) this; + } + + public Criteria andUpcNotIn(List values) { + addCriterion("UPC not in", values, "upc"); + return (Criteria) this; + } + + public Criteria andUpcBetween(String value1, String value2) { + addCriterion("UPC between", value1, value2, "upc"); + return (Criteria) this; + } + + public Criteria andUpcNotBetween(String value1, String value2) { + addCriterion("UPC not between", value1, value2, "upc"); + return (Criteria) this; + } + + public Criteria andOrderItemIdIsNull() { + addCriterion("ORDER_ITEM_ID is null"); + return (Criteria) this; + } + + public Criteria andOrderItemIdIsNotNull() { + addCriterion("ORDER_ITEM_ID is not null"); + return (Criteria) this; + } + + public Criteria andOrderItemIdEqualTo(Integer value) { + addCriterion("ORDER_ITEM_ID =", value, "orderItemId"); + return (Criteria) this; + } + + public Criteria andOrderItemIdNotEqualTo(Integer value) { + addCriterion("ORDER_ITEM_ID <>", value, "orderItemId"); + return (Criteria) this; + } + + public Criteria andOrderItemIdGreaterThan(Integer value) { + addCriterion("ORDER_ITEM_ID >", value, "orderItemId"); + return (Criteria) this; + } + + public Criteria andOrderItemIdGreaterThanOrEqualTo(Integer value) { + addCriterion("ORDER_ITEM_ID >=", value, "orderItemId"); + return (Criteria) this; + } + + public Criteria andOrderItemIdLessThan(Integer value) { + addCriterion("ORDER_ITEM_ID <", value, "orderItemId"); + return (Criteria) this; + } + + public Criteria andOrderItemIdLessThanOrEqualTo(Integer value) { + addCriterion("ORDER_ITEM_ID <=", value, "orderItemId"); + return (Criteria) this; + } + + public Criteria andOrderItemIdIn(List values) { + addCriterion("ORDER_ITEM_ID in", values, "orderItemId"); + return (Criteria) this; + } + + public Criteria andOrderItemIdNotIn(List values) { + addCriterion("ORDER_ITEM_ID not in", values, "orderItemId"); + return (Criteria) this; + } + + public Criteria andOrderItemIdBetween(Integer value1, Integer value2) { + addCriterion("ORDER_ITEM_ID between", value1, value2, "orderItemId"); + return (Criteria) this; + } + + public Criteria andOrderItemIdNotBetween(Integer value1, Integer value2) { + addCriterion("ORDER_ITEM_ID not between", value1, value2, "orderItemId"); + return (Criteria) this; + } + + public Criteria andScanTimeIsNull() { + addCriterion("SCAN_TIME is null"); + return (Criteria) this; + } + + public Criteria andScanTimeIsNotNull() { + addCriterion("SCAN_TIME is not null"); + return (Criteria) this; + } + + public Criteria andScanTimeEqualTo(Date value) { + addCriterion("SCAN_TIME =", value, "scanTime"); + return (Criteria) this; + } + + public Criteria andScanTimeNotEqualTo(Date value) { + addCriterion("SCAN_TIME <>", value, "scanTime"); + return (Criteria) this; + } + + public Criteria andScanTimeGreaterThan(Date value) { + addCriterion("SCAN_TIME >", value, "scanTime"); + return (Criteria) this; + } + + public Criteria andScanTimeGreaterThanOrEqualTo(Date value) { + addCriterion("SCAN_TIME >=", value, "scanTime"); + return (Criteria) this; + } + + public Criteria andScanTimeLessThan(Date value) { + addCriterion("SCAN_TIME <", value, "scanTime"); + return (Criteria) this; + } + + public Criteria andScanTimeLessThanOrEqualTo(Date value) { + addCriterion("SCAN_TIME <=", value, "scanTime"); + return (Criteria) this; + } + + public Criteria andScanTimeIn(List values) { + addCriterion("SCAN_TIME in", values, "scanTime"); + return (Criteria) this; + } + + public Criteria andScanTimeNotIn(List values) { + addCriterion("SCAN_TIME not in", values, "scanTime"); + return (Criteria) this; + } + + public Criteria andScanTimeBetween(Date value1, Date value2) { + addCriterion("SCAN_TIME between", value1, value2, "scanTime"); + return (Criteria) this; + } + + public Criteria andScanTimeNotBetween(Date value1, Date value2) { + addCriterion("SCAN_TIME not between", value1, value2, "scanTime"); + return (Criteria) this; + } + + public Criteria andPackingIdIsNull() { + addCriterion("PACKING_ID is null"); + return (Criteria) this; + } + + public Criteria andPackingIdIsNotNull() { + addCriterion("PACKING_ID is not null"); + return (Criteria) this; + } + + public Criteria andPackingIdEqualTo(Integer value) { + addCriterion("PACKING_ID =", value, "packingId"); + return (Criteria) this; + } + + public Criteria andPackingIdNotEqualTo(Integer value) { + addCriterion("PACKING_ID <>", value, "packingId"); + return (Criteria) this; + } + + public Criteria andPackingIdGreaterThan(Integer value) { + addCriterion("PACKING_ID >", value, "packingId"); + return (Criteria) this; + } + + public Criteria andPackingIdGreaterThanOrEqualTo(Integer value) { + addCriterion("PACKING_ID >=", value, "packingId"); + return (Criteria) this; + } + + public Criteria andPackingIdLessThan(Integer value) { + addCriterion("PACKING_ID <", value, "packingId"); + return (Criteria) this; + } + + public Criteria andPackingIdLessThanOrEqualTo(Integer value) { + addCriterion("PACKING_ID <=", value, "packingId"); + return (Criteria) this; + } + + public Criteria andPackingIdIn(List values) { + addCriterion("PACKING_ID in", values, "packingId"); + return (Criteria) this; + } + + public Criteria andPackingIdNotIn(List values) { + addCriterion("PACKING_ID not in", values, "packingId"); + return (Criteria) this; + } + + public Criteria andPackingIdBetween(Integer value1, Integer value2) { + addCriterion("PACKING_ID between", value1, value2, "packingId"); + return (Criteria) this; + } + + public Criteria andPackingIdNotBetween(Integer value1, Integer value2) { + addCriterion("PACKING_ID not between", value1, value2, "packingId"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/TbReturnOrderExample.java b/src/main/java/com/xmomen/module/order/entity/TbReturnOrderExample.java new file mode 100644 index 0000000..3193964 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/TbReturnOrderExample.java @@ -0,0 +1,943 @@ +package com.xmomen.module.order.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 TbReturnOrderExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbReturnOrderExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andOrderNoIsNull() { + addCriterion("ORDER_NO is null"); + return (Criteria) this; + } + + public Criteria andOrderNoIsNotNull() { + addCriterion("ORDER_NO is not null"); + return (Criteria) this; + } + + public Criteria andOrderNoEqualTo(String value) { + addCriterion("ORDER_NO =", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotEqualTo(String value) { + addCriterion("ORDER_NO <>", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThan(String value) { + addCriterion("ORDER_NO >", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("ORDER_NO >=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThan(String value) { + addCriterion("ORDER_NO <", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThanOrEqualTo(String value) { + addCriterion("ORDER_NO <=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLike(String value) { + addCriterion("ORDER_NO like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotLike(String value) { + addCriterion("ORDER_NO not like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoIn(List values) { + addCriterion("ORDER_NO in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotIn(List values) { + addCriterion("ORDER_NO not in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoBetween(String value1, String value2) { + addCriterion("ORDER_NO between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotBetween(String value1, String value2) { + addCriterion("ORDER_NO not between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andReturnTimeIsNull() { + addCriterion("RETURN_TIME is null"); + return (Criteria) this; + } + + public Criteria andReturnTimeIsNotNull() { + addCriterion("RETURN_TIME is not null"); + return (Criteria) this; + } + + public Criteria andReturnTimeEqualTo(Date value) { + addCriterion("RETURN_TIME =", value, "returnTime"); + return (Criteria) this; + } + + public Criteria andReturnTimeNotEqualTo(Date value) { + addCriterion("RETURN_TIME <>", value, "returnTime"); + return (Criteria) this; + } + + public Criteria andReturnTimeGreaterThan(Date value) { + addCriterion("RETURN_TIME >", value, "returnTime"); + return (Criteria) this; + } + + public Criteria andReturnTimeGreaterThanOrEqualTo(Date value) { + addCriterion("RETURN_TIME >=", value, "returnTime"); + return (Criteria) this; + } + + public Criteria andReturnTimeLessThan(Date value) { + addCriterion("RETURN_TIME <", value, "returnTime"); + return (Criteria) this; + } + + public Criteria andReturnTimeLessThanOrEqualTo(Date value) { + addCriterion("RETURN_TIME <=", value, "returnTime"); + return (Criteria) this; + } + + public Criteria andReturnTimeIn(List values) { + addCriterion("RETURN_TIME in", values, "returnTime"); + return (Criteria) this; + } + + public Criteria andReturnTimeNotIn(List values) { + addCriterion("RETURN_TIME not in", values, "returnTime"); + return (Criteria) this; + } + + public Criteria andReturnTimeBetween(Date value1, Date value2) { + addCriterion("RETURN_TIME between", value1, value2, "returnTime"); + return (Criteria) this; + } + + public Criteria andReturnTimeNotBetween(Date value1, Date value2) { + addCriterion("RETURN_TIME not between", value1, value2, "returnTime"); + return (Criteria) this; + } + + public Criteria andReturnStatusIsNull() { + addCriterion("RETURN_STATUS is null"); + return (Criteria) this; + } + + public Criteria andReturnStatusIsNotNull() { + addCriterion("RETURN_STATUS is not null"); + return (Criteria) this; + } + + public Criteria andReturnStatusEqualTo(Integer value) { + addCriterion("RETURN_STATUS =", value, "returnStatus"); + return (Criteria) this; + } + + public Criteria andReturnStatusNotEqualTo(Integer value) { + addCriterion("RETURN_STATUS <>", value, "returnStatus"); + return (Criteria) this; + } + + public Criteria andReturnStatusGreaterThan(Integer value) { + addCriterion("RETURN_STATUS >", value, "returnStatus"); + return (Criteria) this; + } + + public Criteria andReturnStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("RETURN_STATUS >=", value, "returnStatus"); + return (Criteria) this; + } + + public Criteria andReturnStatusLessThan(Integer value) { + addCriterion("RETURN_STATUS <", value, "returnStatus"); + return (Criteria) this; + } + + public Criteria andReturnStatusLessThanOrEqualTo(Integer value) { + addCriterion("RETURN_STATUS <=", value, "returnStatus"); + return (Criteria) this; + } + + public Criteria andReturnStatusIn(List values) { + addCriterion("RETURN_STATUS in", values, "returnStatus"); + return (Criteria) this; + } + + public Criteria andReturnStatusNotIn(List values) { + addCriterion("RETURN_STATUS not in", values, "returnStatus"); + return (Criteria) this; + } + + public Criteria andReturnStatusBetween(Integer value1, Integer value2) { + addCriterion("RETURN_STATUS between", value1, value2, "returnStatus"); + return (Criteria) this; + } + + public Criteria andReturnStatusNotBetween(Integer value1, Integer value2) { + addCriterion("RETURN_STATUS not between", value1, value2, "returnStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusIsNull() { + addCriterion("AUDIT_STATUS is null"); + return (Criteria) this; + } + + public Criteria andAuditStatusIsNotNull() { + addCriterion("AUDIT_STATUS is not null"); + return (Criteria) this; + } + + public Criteria andAuditStatusEqualTo(Integer value) { + addCriterion("AUDIT_STATUS =", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusNotEqualTo(Integer value) { + addCriterion("AUDIT_STATUS <>", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusGreaterThan(Integer value) { + addCriterion("AUDIT_STATUS >", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("AUDIT_STATUS >=", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusLessThan(Integer value) { + addCriterion("AUDIT_STATUS <", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusLessThanOrEqualTo(Integer value) { + addCriterion("AUDIT_STATUS <=", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusIn(List values) { + addCriterion("AUDIT_STATUS in", values, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusNotIn(List values) { + addCriterion("AUDIT_STATUS not in", values, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusBetween(Integer value1, Integer value2) { + addCriterion("AUDIT_STATUS between", value1, value2, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusNotBetween(Integer value1, Integer value2) { + addCriterion("AUDIT_STATUS not between", value1, value2, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditDateIsNull() { + addCriterion("AUDIT_DATE is null"); + return (Criteria) this; + } + + public Criteria andAuditDateIsNotNull() { + addCriterion("AUDIT_DATE is not null"); + return (Criteria) this; + } + + public Criteria andAuditDateEqualTo(Date value) { + addCriterion("AUDIT_DATE =", value, "auditDate"); + return (Criteria) this; + } + + public Criteria andAuditDateNotEqualTo(Date value) { + addCriterion("AUDIT_DATE <>", value, "auditDate"); + return (Criteria) this; + } + + public Criteria andAuditDateGreaterThan(Date value) { + addCriterion("AUDIT_DATE >", value, "auditDate"); + return (Criteria) this; + } + + public Criteria andAuditDateGreaterThanOrEqualTo(Date value) { + addCriterion("AUDIT_DATE >=", value, "auditDate"); + return (Criteria) this; + } + + public Criteria andAuditDateLessThan(Date value) { + addCriterion("AUDIT_DATE <", value, "auditDate"); + return (Criteria) this; + } + + public Criteria andAuditDateLessThanOrEqualTo(Date value) { + addCriterion("AUDIT_DATE <=", value, "auditDate"); + return (Criteria) this; + } + + public Criteria andAuditDateIn(List values) { + addCriterion("AUDIT_DATE in", values, "auditDate"); + return (Criteria) this; + } + + public Criteria andAuditDateNotIn(List values) { + addCriterion("AUDIT_DATE not in", values, "auditDate"); + return (Criteria) this; + } + + public Criteria andAuditDateBetween(Date value1, Date value2) { + addCriterion("AUDIT_DATE between", value1, value2, "auditDate"); + return (Criteria) this; + } + + public Criteria andAuditDateNotBetween(Date value1, Date value2) { + addCriterion("AUDIT_DATE not between", value1, value2, "auditDate"); + return (Criteria) this; + } + + public Criteria andAuditUserIdIsNull() { + addCriterion("AUDIT_USER_ID is null"); + return (Criteria) this; + } + + public Criteria andAuditUserIdIsNotNull() { + addCriterion("AUDIT_USER_ID is not null"); + return (Criteria) this; + } + + public Criteria andAuditUserIdEqualTo(Integer value) { + addCriterion("AUDIT_USER_ID =", value, "auditUserId"); + return (Criteria) this; + } + + public Criteria andAuditUserIdNotEqualTo(Integer value) { + addCriterion("AUDIT_USER_ID <>", value, "auditUserId"); + return (Criteria) this; + } + + public Criteria andAuditUserIdGreaterThan(Integer value) { + addCriterion("AUDIT_USER_ID >", value, "auditUserId"); + return (Criteria) this; + } + + public Criteria andAuditUserIdGreaterThanOrEqualTo(Integer value) { + addCriterion("AUDIT_USER_ID >=", value, "auditUserId"); + return (Criteria) this; + } + + public Criteria andAuditUserIdLessThan(Integer value) { + addCriterion("AUDIT_USER_ID <", value, "auditUserId"); + return (Criteria) this; + } + + public Criteria andAuditUserIdLessThanOrEqualTo(Integer value) { + addCriterion("AUDIT_USER_ID <=", value, "auditUserId"); + return (Criteria) this; + } + + public Criteria andAuditUserIdIn(List values) { + addCriterion("AUDIT_USER_ID in", values, "auditUserId"); + return (Criteria) this; + } + + public Criteria andAuditUserIdNotIn(List values) { + addCriterion("AUDIT_USER_ID not in", values, "auditUserId"); + return (Criteria) this; + } + + public Criteria andAuditUserIdBetween(Integer value1, Integer value2) { + addCriterion("AUDIT_USER_ID between", value1, value2, "auditUserId"); + return (Criteria) this; + } + + public Criteria andAuditUserIdNotBetween(Integer value1, Integer value2) { + addCriterion("AUDIT_USER_ID not between", value1, value2, "auditUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateIsNull() { + addCriterion("TAKE_GOODS_DATE is null"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateIsNotNull() { + addCriterion("TAKE_GOODS_DATE is not null"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateEqualTo(Date value) { + addCriterion("TAKE_GOODS_DATE =", value, "takeGoodsDate"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateNotEqualTo(Date value) { + addCriterion("TAKE_GOODS_DATE <>", value, "takeGoodsDate"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateGreaterThan(Date value) { + addCriterion("TAKE_GOODS_DATE >", value, "takeGoodsDate"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateGreaterThanOrEqualTo(Date value) { + addCriterion("TAKE_GOODS_DATE >=", value, "takeGoodsDate"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateLessThan(Date value) { + addCriterion("TAKE_GOODS_DATE <", value, "takeGoodsDate"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateLessThanOrEqualTo(Date value) { + addCriterion("TAKE_GOODS_DATE <=", value, "takeGoodsDate"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateIn(List values) { + addCriterion("TAKE_GOODS_DATE in", values, "takeGoodsDate"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateNotIn(List values) { + addCriterion("TAKE_GOODS_DATE not in", values, "takeGoodsDate"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateBetween(Date value1, Date value2) { + addCriterion("TAKE_GOODS_DATE between", value1, value2, "takeGoodsDate"); + return (Criteria) this; + } + + public Criteria andTakeGoodsDateNotBetween(Date value1, Date value2) { + addCriterion("TAKE_GOODS_DATE not between", value1, value2, "takeGoodsDate"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdIsNull() { + addCriterion("TAKE_GOODS_USER_ID is null"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdIsNotNull() { + addCriterion("TAKE_GOODS_USER_ID is not null"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdEqualTo(Integer value) { + addCriterion("TAKE_GOODS_USER_ID =", value, "takeGoodsUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdNotEqualTo(Integer value) { + addCriterion("TAKE_GOODS_USER_ID <>", value, "takeGoodsUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdGreaterThan(Integer value) { + addCriterion("TAKE_GOODS_USER_ID >", value, "takeGoodsUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdGreaterThanOrEqualTo(Integer value) { + addCriterion("TAKE_GOODS_USER_ID >=", value, "takeGoodsUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdLessThan(Integer value) { + addCriterion("TAKE_GOODS_USER_ID <", value, "takeGoodsUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdLessThanOrEqualTo(Integer value) { + addCriterion("TAKE_GOODS_USER_ID <=", value, "takeGoodsUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdIn(List values) { + addCriterion("TAKE_GOODS_USER_ID in", values, "takeGoodsUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdNotIn(List values) { + addCriterion("TAKE_GOODS_USER_ID not in", values, "takeGoodsUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdBetween(Integer value1, Integer value2) { + addCriterion("TAKE_GOODS_USER_ID between", value1, value2, "takeGoodsUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsUserIdNotBetween(Integer value1, Integer value2) { + addCriterion("TAKE_GOODS_USER_ID not between", value1, value2, "takeGoodsUserId"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneIsNull() { + addCriterion("TAKE_GOODS_PHONE is null"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneIsNotNull() { + addCriterion("TAKE_GOODS_PHONE is not null"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneEqualTo(String value) { + addCriterion("TAKE_GOODS_PHONE =", value, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneNotEqualTo(String value) { + addCriterion("TAKE_GOODS_PHONE <>", value, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneGreaterThan(String value) { + addCriterion("TAKE_GOODS_PHONE >", value, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneGreaterThanOrEqualTo(String value) { + addCriterion("TAKE_GOODS_PHONE >=", value, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneLessThan(String value) { + addCriterion("TAKE_GOODS_PHONE <", value, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneLessThanOrEqualTo(String value) { + addCriterion("TAKE_GOODS_PHONE <=", value, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneLike(String value) { + addCriterion("TAKE_GOODS_PHONE like", value, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneNotLike(String value) { + addCriterion("TAKE_GOODS_PHONE not like", value, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneIn(List values) { + addCriterion("TAKE_GOODS_PHONE in", values, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneNotIn(List values) { + addCriterion("TAKE_GOODS_PHONE not in", values, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneBetween(String value1, String value2) { + addCriterion("TAKE_GOODS_PHONE between", value1, value2, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andTakeGoodsPhoneNotBetween(String value1, String value2) { + addCriterion("TAKE_GOODS_PHONE not between", value1, value2, "takeGoodsPhone"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountIsNull() { + addCriterion("RETURN_TOTAL_AMOUNT is null"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountIsNotNull() { + addCriterion("RETURN_TOTAL_AMOUNT is not null"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountEqualTo(BigDecimal value) { + addCriterion("RETURN_TOTAL_AMOUNT =", value, "returnTotalAmount"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountNotEqualTo(BigDecimal value) { + addCriterion("RETURN_TOTAL_AMOUNT <>", value, "returnTotalAmount"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountGreaterThan(BigDecimal value) { + addCriterion("RETURN_TOTAL_AMOUNT >", value, "returnTotalAmount"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("RETURN_TOTAL_AMOUNT >=", value, "returnTotalAmount"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountLessThan(BigDecimal value) { + addCriterion("RETURN_TOTAL_AMOUNT <", value, "returnTotalAmount"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("RETURN_TOTAL_AMOUNT <=", value, "returnTotalAmount"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountIn(List values) { + addCriterion("RETURN_TOTAL_AMOUNT in", values, "returnTotalAmount"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountNotIn(List values) { + addCriterion("RETURN_TOTAL_AMOUNT not in", values, "returnTotalAmount"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("RETURN_TOTAL_AMOUNT between", value1, value2, "returnTotalAmount"); + return (Criteria) this; + } + + public Criteria andReturnTotalAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("RETURN_TOTAL_AMOUNT not between", value1, value2, "returnTotalAmount"); + return (Criteria) this; + } + + public Criteria andIsNormalIsNull() { + addCriterion("IS_NORMAL is null"); + return (Criteria) this; + } + + public Criteria andIsNormalIsNotNull() { + addCriterion("IS_NORMAL is not null"); + return (Criteria) this; + } + + public Criteria andIsNormalEqualTo(Integer value) { + addCriterion("IS_NORMAL =", value, "isNormal"); + return (Criteria) this; + } + + public Criteria andIsNormalNotEqualTo(Integer value) { + addCriterion("IS_NORMAL <>", value, "isNormal"); + return (Criteria) this; + } + + public Criteria andIsNormalGreaterThan(Integer value) { + addCriterion("IS_NORMAL >", value, "isNormal"); + return (Criteria) this; + } + + public Criteria andIsNormalGreaterThanOrEqualTo(Integer value) { + addCriterion("IS_NORMAL >=", value, "isNormal"); + return (Criteria) this; + } + + public Criteria andIsNormalLessThan(Integer value) { + addCriterion("IS_NORMAL <", value, "isNormal"); + return (Criteria) this; + } + + public Criteria andIsNormalLessThanOrEqualTo(Integer value) { + addCriterion("IS_NORMAL <=", value, "isNormal"); + return (Criteria) this; + } + + public Criteria andIsNormalIn(List values) { + addCriterion("IS_NORMAL in", values, "isNormal"); + return (Criteria) this; + } + + public Criteria andIsNormalNotIn(List values) { + addCriterion("IS_NORMAL not in", values, "isNormal"); + return (Criteria) this; + } + + public Criteria andIsNormalBetween(Integer value1, Integer value2) { + addCriterion("IS_NORMAL between", value1, value2, "isNormal"); + return (Criteria) this; + } + + public Criteria andIsNormalNotBetween(Integer value1, Integer value2) { + addCriterion("IS_NORMAL not between", value1, value2, "isNormal"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/TbReturnOrderItem.java b/src/main/java/com/xmomen/module/order/entity/TbReturnOrderItem.java new file mode 100644 index 0000000..935b368 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/TbReturnOrderItem.java @@ -0,0 +1,129 @@ +package com.xmomen.module.order.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 = "tb_return_order_item") +public class TbReturnOrderItem extends BaseMybatisModel { + /** + * + */ + private Integer id; + + /** + * 退货订单表主键 + */ + private Integer returnOrderId; + + /** + * 商品代码 + */ + private String itemCode; + + /** + * 商品退货数量 + */ + private Integer itemNumber; + + /** + * 商品名称 + */ + private String itemName; + + /** + * 0-不需要 1-需要 + */ + private Integer isNeed; + + @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 = "RETURN_ORDER_ID") + public Integer getReturnOrderId() { + return returnOrderId; + } + + public void setReturnOrderId(Integer returnOrderId) { + this.returnOrderId = returnOrderId; + if(returnOrderId == null){ + removeValidField("returnOrderId"); + return; + } + addValidField("returnOrderId"); + } + + @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 = "ITEM_NUMBER") + public Integer getItemNumber() { + return itemNumber; + } + + public void setItemNumber(Integer itemNumber) { + this.itemNumber = itemNumber; + if(itemNumber == null){ + removeValidField("itemNumber"); + return; + } + addValidField("itemNumber"); + } + + @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 = "IS_NEED") + public Integer getIsNeed() { + return isNeed; + } + + public void setIsNeed(Integer isNeed) { + this.isNeed = isNeed; + if(isNeed == null){ + removeValidField("isNeed"); + return; + } + addValidField("isNeed"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/TbReturnOrderItemExample.java b/src/main/java/com/xmomen/module/order/entity/TbReturnOrderItemExample.java new file mode 100644 index 0000000..6ea3f82 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/TbReturnOrderItemExample.java @@ -0,0 +1,581 @@ +package com.xmomen.module.order.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class TbReturnOrderItemExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbReturnOrderItemExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andReturnOrderIdIsNull() { + addCriterion("RETURN_ORDER_ID is null"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdIsNotNull() { + addCriterion("RETURN_ORDER_ID is not null"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdEqualTo(Integer value) { + addCriterion("RETURN_ORDER_ID =", value, "returnOrderId"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdNotEqualTo(Integer value) { + addCriterion("RETURN_ORDER_ID <>", value, "returnOrderId"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdGreaterThan(Integer value) { + addCriterion("RETURN_ORDER_ID >", value, "returnOrderId"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdGreaterThanOrEqualTo(Integer value) { + addCriterion("RETURN_ORDER_ID >=", value, "returnOrderId"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdLessThan(Integer value) { + addCriterion("RETURN_ORDER_ID <", value, "returnOrderId"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdLessThanOrEqualTo(Integer value) { + addCriterion("RETURN_ORDER_ID <=", value, "returnOrderId"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdIn(List values) { + addCriterion("RETURN_ORDER_ID in", values, "returnOrderId"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdNotIn(List values) { + addCriterion("RETURN_ORDER_ID not in", values, "returnOrderId"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdBetween(Integer value1, Integer value2) { + addCriterion("RETURN_ORDER_ID between", value1, value2, "returnOrderId"); + return (Criteria) this; + } + + public Criteria andReturnOrderIdNotBetween(Integer value1, Integer value2) { + addCriterion("RETURN_ORDER_ID not between", value1, value2, "returnOrderId"); + return (Criteria) this; + } + + public Criteria andItemCodeIsNull() { + addCriterion("ITEM_CODE is null"); + return (Criteria) this; + } + + public Criteria andItemCodeIsNotNull() { + addCriterion("ITEM_CODE is not null"); + return (Criteria) this; + } + + public Criteria andItemCodeEqualTo(String value) { + addCriterion("ITEM_CODE =", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeNotEqualTo(String value) { + addCriterion("ITEM_CODE <>", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeGreaterThan(String value) { + addCriterion("ITEM_CODE >", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeGreaterThanOrEqualTo(String value) { + addCriterion("ITEM_CODE >=", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeLessThan(String value) { + addCriterion("ITEM_CODE <", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeLessThanOrEqualTo(String value) { + addCriterion("ITEM_CODE <=", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeLike(String value) { + addCriterion("ITEM_CODE like", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeNotLike(String value) { + addCriterion("ITEM_CODE not like", value, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeIn(List values) { + addCriterion("ITEM_CODE in", values, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeNotIn(List values) { + addCriterion("ITEM_CODE not in", values, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeBetween(String value1, String value2) { + addCriterion("ITEM_CODE between", value1, value2, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemCodeNotBetween(String value1, String value2) { + addCriterion("ITEM_CODE not between", value1, value2, "itemCode"); + return (Criteria) this; + } + + public Criteria andItemNumberIsNull() { + addCriterion("ITEM_NUMBER is null"); + return (Criteria) this; + } + + public Criteria andItemNumberIsNotNull() { + addCriterion("ITEM_NUMBER is not null"); + return (Criteria) this; + } + + public Criteria andItemNumberEqualTo(Integer value) { + addCriterion("ITEM_NUMBER =", value, "itemNumber"); + return (Criteria) this; + } + + public Criteria andItemNumberNotEqualTo(Integer value) { + addCriterion("ITEM_NUMBER <>", value, "itemNumber"); + return (Criteria) this; + } + + public Criteria andItemNumberGreaterThan(Integer value) { + addCriterion("ITEM_NUMBER >", value, "itemNumber"); + return (Criteria) this; + } + + public Criteria andItemNumberGreaterThanOrEqualTo(Integer value) { + addCriterion("ITEM_NUMBER >=", value, "itemNumber"); + return (Criteria) this; + } + + public Criteria andItemNumberLessThan(Integer value) { + addCriterion("ITEM_NUMBER <", value, "itemNumber"); + return (Criteria) this; + } + + public Criteria andItemNumberLessThanOrEqualTo(Integer value) { + addCriterion("ITEM_NUMBER <=", value, "itemNumber"); + return (Criteria) this; + } + + public Criteria andItemNumberIn(List values) { + addCriterion("ITEM_NUMBER in", values, "itemNumber"); + return (Criteria) this; + } + + public Criteria andItemNumberNotIn(List values) { + addCriterion("ITEM_NUMBER not in", values, "itemNumber"); + return (Criteria) this; + } + + public Criteria andItemNumberBetween(Integer value1, Integer value2) { + addCriterion("ITEM_NUMBER between", value1, value2, "itemNumber"); + return (Criteria) this; + } + + public Criteria andItemNumberNotBetween(Integer value1, Integer value2) { + addCriterion("ITEM_NUMBER not between", value1, value2, "itemNumber"); + return (Criteria) this; + } + + public Criteria andItemNameIsNull() { + addCriterion("ITEM_NAME is null"); + return (Criteria) this; + } + + public Criteria andItemNameIsNotNull() { + addCriterion("ITEM_NAME is not null"); + return (Criteria) this; + } + + public Criteria andItemNameEqualTo(String value) { + addCriterion("ITEM_NAME =", value, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameNotEqualTo(String value) { + addCriterion("ITEM_NAME <>", value, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameGreaterThan(String value) { + addCriterion("ITEM_NAME >", value, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameGreaterThanOrEqualTo(String value) { + addCriterion("ITEM_NAME >=", value, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameLessThan(String value) { + addCriterion("ITEM_NAME <", value, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameLessThanOrEqualTo(String value) { + addCriterion("ITEM_NAME <=", value, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameLike(String value) { + addCriterion("ITEM_NAME like", value, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameNotLike(String value) { + addCriterion("ITEM_NAME not like", value, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameIn(List values) { + addCriterion("ITEM_NAME in", values, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameNotIn(List values) { + addCriterion("ITEM_NAME not in", values, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameBetween(String value1, String value2) { + addCriterion("ITEM_NAME between", value1, value2, "itemName"); + return (Criteria) this; + } + + public Criteria andItemNameNotBetween(String value1, String value2) { + addCriterion("ITEM_NAME not between", value1, value2, "itemName"); + return (Criteria) this; + } + + public Criteria andIsNeedIsNull() { + addCriterion("IS_NEED is null"); + return (Criteria) this; + } + + public Criteria andIsNeedIsNotNull() { + addCriterion("IS_NEED is not null"); + return (Criteria) this; + } + + public Criteria andIsNeedEqualTo(Integer value) { + addCriterion("IS_NEED =", value, "isNeed"); + return (Criteria) this; + } + + public Criteria andIsNeedNotEqualTo(Integer value) { + addCriterion("IS_NEED <>", value, "isNeed"); + return (Criteria) this; + } + + public Criteria andIsNeedGreaterThan(Integer value) { + addCriterion("IS_NEED >", value, "isNeed"); + return (Criteria) this; + } + + public Criteria andIsNeedGreaterThanOrEqualTo(Integer value) { + addCriterion("IS_NEED >=", value, "isNeed"); + return (Criteria) this; + } + + public Criteria andIsNeedLessThan(Integer value) { + addCriterion("IS_NEED <", value, "isNeed"); + return (Criteria) this; + } + + public Criteria andIsNeedLessThanOrEqualTo(Integer value) { + addCriterion("IS_NEED <=", value, "isNeed"); + return (Criteria) this; + } + + public Criteria andIsNeedIn(List values) { + addCriterion("IS_NEED in", values, "isNeed"); + return (Criteria) this; + } + + public Criteria andIsNeedNotIn(List values) { + addCriterion("IS_NEED not in", values, "isNeed"); + return (Criteria) this; + } + + public Criteria andIsNeedBetween(Integer value1, Integer value2) { + addCriterion("IS_NEED between", value1, value2, "isNeed"); + return (Criteria) this; + } + + public Criteria andIsNeedNotBetween(Integer value1, Integer value2) { + addCriterion("IS_NEED not between", value1, value2, "isNeed"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/TbTradeRecord.java b/src/main/java/com/xmomen/module/order/entity/TbTradeRecord.java new file mode 100644 index 0000000..22c17b6 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/TbTradeRecord.java @@ -0,0 +1,150 @@ +package com.xmomen.module.order.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 = "tb_trade_record") +public class TbTradeRecord extends BaseMybatisModel { + /** + * 主键 + */ + private Integer id; + + /** + * 交易金额 + */ + private BigDecimal amount; + + /** + * 交易单号 + */ + private String tradeNo; + + /** + * 交易时间 + */ + private Date createTime; + + /** + * 交易类型：cash-现金，card-卡券,recharge-充值，adjustment-卡余额调整 + */ + private String tradeType; + + /** + * 备注 + */ + private String remark; + + /** + * 记录人 + */ + private Integer recordUser; + + @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 = "AMOUNT") + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + if(amount == null){ + removeValidField("amount"); + return; + } + addValidField("amount"); + } + + @Column(name = "TRADE_NO") + public String getTradeNo() { + return tradeNo; + } + + public void setTradeNo(String tradeNo) { + this.tradeNo = tradeNo; + if(tradeNo == null){ + removeValidField("tradeNo"); + return; + } + addValidField("tradeNo"); + } + + @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 = "TRADE_TYPE") + public String getTradeType() { + return tradeType; + } + + public void setTradeType(String tradeType) { + this.tradeType = tradeType; + if(tradeType == null){ + removeValidField("tradeType"); + return; + } + addValidField("tradeType"); + } + + @Column(name = "REMARK") + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + if(remark == null){ + removeValidField("remark"); + return; + } + addValidField("remark"); + } + + @Column(name = "RECORD_USER") + public Integer getRecordUser() { + return recordUser; + } + + public void setRecordUser(Integer recordUser) { + this.recordUser = recordUser; + if(recordUser == null){ + removeValidField("recordUser"); + return; + } + addValidField("recordUser"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/mapper/TbOrderMapper.java b/src/main/java/com/xmomen/module/order/entity/mapper/TbOrderMapper.java new file mode 100644 index 0000000..7d2af4e --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/mapper/TbOrderMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.order.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.order.entity.TbOrder; +import com.xmomen.module.order.entity.TbOrderExample; +import org.apache.ibatis.annotations.Param; + +public interface TbOrderMapper extends MybatisMapper { + int countByExample(TbOrderExample example); + + int deleteByExample(TbOrderExample example); + + int insertSelective(TbOrder record); + + int updateByExampleSelective(@Param("record") TbOrder record, @Param("example") TbOrderExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/mapper/TbOrderRefMapper.java b/src/main/java/com/xmomen/module/order/entity/mapper/TbOrderRefMapper.java new file mode 100644 index 0000000..73ec002 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/mapper/TbOrderRefMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.order.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.order.entity.TbOrderRef; +import com.xmomen.module.order.entity.TbOrderRefExample; +import org.apache.ibatis.annotations.Param; + +public interface TbOrderRefMapper extends MybatisMapper { + int countByExample(TbOrderRefExample example); + + int deleteByExample(TbOrderRefExample example); + + int insertSelective(TbOrderRef record); + + int updateByExampleSelective(@Param("record") TbOrderRef record, @Param("example") TbOrderRefExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/mapper/TbOrderRelationMapper.java b/src/main/java/com/xmomen/module/order/entity/mapper/TbOrderRelationMapper.java new file mode 100644 index 0000000..9c79bf9 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/mapper/TbOrderRelationMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.order.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.order.entity.TbOrderRelation; +import com.xmomen.module.order.entity.TbOrderRelationExample; +import org.apache.ibatis.annotations.Param; + +public interface TbOrderRelationMapper extends MybatisMapper { + int countByExample(TbOrderRelationExample example); + + int deleteByExample(TbOrderRelationExample example); + + int insertSelective(TbOrderRelation record); + + int updateByExampleSelective(@Param("record") TbOrderRelation record, @Param("example") TbOrderRelationExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/mapper/TbPackingMapper.java b/src/main/java/com/xmomen/module/order/entity/mapper/TbPackingMapper.java new file mode 100644 index 0000000..1888125 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/mapper/TbPackingMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.order.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.order.entity.TbPacking; +import com.xmomen.module.order.entity.TbPackingExample; +import org.apache.ibatis.annotations.Param; + +public interface TbPackingMapper extends MybatisMapper { + int countByExample(TbPackingExample example); + + int deleteByExample(TbPackingExample example); + + int insertSelective(TbPacking record); + + int updateByExampleSelective(@Param("record") TbPacking record, @Param("example") TbPackingExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/mapper/TbPackingRecordMapper.java b/src/main/java/com/xmomen/module/order/entity/mapper/TbPackingRecordMapper.java new file mode 100644 index 0000000..256184f --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/mapper/TbPackingRecordMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.order.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.order.entity.TbPackingRecord; +import com.xmomen.module.order.entity.TbPackingRecordExample; +import org.apache.ibatis.annotations.Param; + +public interface TbPackingRecordMapper extends MybatisMapper { + int countByExample(TbPackingRecordExample example); + + int deleteByExample(TbPackingRecordExample example); + + int insertSelective(TbPackingRecord record); + + int updateByExampleSelective(@Param("record") TbPackingRecord record, @Param("example") TbPackingRecordExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/mapper/TbPurchaseMapper.java b/src/main/java/com/xmomen/module/order/entity/mapper/TbPurchaseMapper.java new file mode 100644 index 0000000..9fb7feb --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/mapper/TbPurchaseMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.order.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.order.entity.TbPurchase; +import com.xmomen.module.order.entity.TbPurchaseExample; +import org.apache.ibatis.annotations.Param; + +public interface TbPurchaseMapper extends MybatisMapper { + int countByExample(TbPurchaseExample example); + + int deleteByExample(TbPurchaseExample example); + + int insertSelective(TbPurchase record); + + int updateByExampleSelective(@Param("record") TbPurchase record, @Param("example") TbPurchaseExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/mapper/TbReturnOrderItemMapper.java b/src/main/java/com/xmomen/module/order/entity/mapper/TbReturnOrderItemMapper.java new file mode 100644 index 0000000..f89635b --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/mapper/TbReturnOrderItemMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.order.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.order.entity.TbReturnOrderItem; +import com.xmomen.module.order.entity.TbReturnOrderItemExample; +import org.apache.ibatis.annotations.Param; + +public interface TbReturnOrderItemMapper extends MybatisMapper { + int countByExample(TbReturnOrderItemExample example); + + int deleteByExample(TbReturnOrderItemExample example); + + int insertSelective(TbReturnOrderItem record); + + int updateByExampleSelective(@Param("record") TbReturnOrderItem record, @Param("example") TbReturnOrderItemExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/entity/mapper/TbReturnOrderMapper.java b/src/main/java/com/xmomen/module/order/entity/mapper/TbReturnOrderMapper.java new file mode 100644 index 0000000..de562d9 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/entity/mapper/TbReturnOrderMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.order.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.order.entity.TbReturnOrder; +import com.xmomen.module.order.entity.TbReturnOrderExample; +import org.apache.ibatis.annotations.Param; + +public interface TbReturnOrderMapper extends MybatisMapper { + int countByExample(TbReturnOrderExample example); + + int deleteByExample(TbReturnOrderExample example); + + int insertSelective(TbReturnOrder record); + + int updateByExampleSelective(@Param("record") TbReturnOrder record, @Param("example") TbReturnOrderExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/order/mapper/OrderMapper.java b/src/main/java/com/xmomen/module/order/mapper/OrderMapper.java new file mode 100644 index 0000000..d27b683 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/mapper/OrderMapper.java @@ -0,0 +1,13 @@ +package com.xmomen.module.order.mapper; + +/** + * Created by Jeng on 16/4/13. + */ +public interface OrderMapper { + + public static final String ORDER_MAPPER_NAMESPACE = "com.xmomen.module.order.mapper.OrderMapper."; + + public static final String ORDER_PAY_RELATION_CODE = "ORDER_PAY_RELATION"; + public static final String ORDER_PACKING_RELATION_CODE = "ORDER_PACKING_RELATION"; + public static final String ORDER_PACKING_TASK_RELATION_CODE = "ORDER_PACKING_TASK_RELATION"; +} diff --git a/src/main/java/com/xmomen/module/order/mapper/TradeRecordMapper.java b/src/main/java/com/xmomen/module/order/mapper/TradeRecordMapper.java new file mode 100644 index 0000000..47e1e8c --- /dev/null +++ b/src/main/java/com/xmomen/module/order/mapper/TradeRecordMapper.java @@ -0,0 +1,6 @@ +package com.xmomen.module.order.mapper; + +public interface TradeRecordMapper { + public static final String TradeRecordMapperNameSpace = "com.xmomen.module.order.mapper.TradeRecordMapper."; + +} diff --git a/src/main/java/com/xmomen/module/order/model/CreatePackingRecord.java b/src/main/java/com/xmomen/module/order/model/CreatePackingRecord.java new file mode 100644 index 0000000..6a32c07 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/CreatePackingRecord.java @@ -0,0 +1,21 @@ +package com.xmomen.module.order.model; + +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Map; + +/** + * Created by Jeng on 2016/5/21. + */ +public @Data class CreatePackingRecord implements Serializable { + @NotNull + @Length(min = 5, max = 50) + private String upc; + @NotNull + private Map packingInfo;// key=orderNo，value=packingId + +} diff --git a/src/main/java/com/xmomen/module/order/model/CreatePurchase.java b/src/main/java/com/xmomen/module/order/model/CreatePurchase.java new file mode 100644 index 0000000..53953c5 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/CreatePurchase.java @@ -0,0 +1,15 @@ +package com.xmomen.module.order.model; + +import java.io.Serializable; +import java.util.Date; + +import lombok.Data; + +/** + * Created by Jeng on 2016/4/25. + */ +public @Data class CreatePurchase implements Serializable { + private Date orderDate; + private Date appointmentTimeStart; + private Date appointmentTimeEnd; +} diff --git a/src/main/java/com/xmomen/module/order/model/OrderItemModel.java b/src/main/java/com/xmomen/module/order/model/OrderItemModel.java new file mode 100644 index 0000000..efc7967 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/OrderItemModel.java @@ -0,0 +1,38 @@ +package com.xmomen.module.order.model; + +import lombok.Data; + +import java.io.Serializable; + +/** + * Created by Jeng on 16/4/6. + */ +public @Data class OrderItemModel implements Serializable { + + + /** + * 订单编码 + */ + private String orderNo; + + /** + * 商品名称 + */ + private String itemName; + + /** + * 商品编号 + */ + private String itemCode; + + /** + * 订单商品数量 + */ + private String itemQty; + + /** + * 已装箱数量 + */ + private Integer packedQty; + +} diff --git a/src/main/java/com/xmomen/module/order/model/OrderModel.java b/src/main/java/com/xmomen/module/order/model/OrderModel.java new file mode 100644 index 0000000..9faf5d7 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/OrderModel.java @@ -0,0 +1,200 @@ +package com.xmomen.module.order.model; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import lombok.Data; + +/** + * Created by Jeng on 16/4/6. + */ +public +@Data +class OrderModel implements Serializable { + + /** + * 订单ID + */ + private Integer id; + + /** + * 订单类型 + */ + private Integer orderType; + + /** + * 订单类型描述 + */ + private String orderTypeDesc; + + /** + * 下单人客户ID + */ + private String memberCode; + + /** + * 订单来源：1-微信订单，2-商城订单，3-客服下单，4-采摘订单 + */ + private Integer orderSource; + + /** + * 订单来源描述 + */ + private String orderSourceDesc; + + /** + * 付款方式 + */ + private Integer paymentMode; + + /** + * 付款方式描述 + */ + private String paymentModeDesc; + + /** + * 订单编码 + */ + private String orderNo; + + /** + * 订单状态 + */ + private String orderStatus; + + /** + * 装箱任务负责人名称 + */ + private String packingTaskUsername; + /** + * 装箱任务负责人ID + */ + private Integer packingTaskUserId; + + /** + * 订单装箱任务状态 + */ + private Integer packingTaskStatus; + /** + * 装箱任务状态描述 + */ + private String packingTaskStatusDesc; + + /** + * 装箱任务分配时间 + */ + private Date packingTaskCreateTime; + + /** + * 装箱任务开始时间 + */ + private Date packingTaskStartTime; + + /** + * 装箱任务完成时间 + */ + private Date packingTaskEndTime; + + /** + * 订单状态描述 + */ + private String orderStatusDesc; + + /** + * 收货人手机 + */ + private String consigneePhone; + + /** + * 收货人姓名 + */ + private String consigneeName; + + /** + * 收货人地址 + */ + private String consigneeAddress; + + /** + * 运送方式 1-快递，2-自提 + */ + private Integer transportMode; + + /** + * 订单备注 + */ + private String remark; + + /** + * 折扣价 + */ + private BigDecimal discountPrice; + + /** + * 订单总金额 + */ + private BigDecimal totalAmount; + + /** + * 订单创建时间 + */ + private Date createTime; + + /** + * 订单创建人ID + */ + private Integer createUserId; + + private String createUser; + + /** + * 配送时间 + */ + private Date appointmentTime; + + /** + * 支付卡（券）号 + */ + private String couponNumber; + + /** + * 快递商 + */ + private String expressName; + + private Integer despatchExpressId; + + /** + * 项目经理 + */ + private String managerName; + /** + * 单位 + */ + private String companyName; + + /** + * 总箱数 + */ + private List packingModels; + + private String batchNo; + + //每批次的订单数 + private int batchNum; + + private int xiajia; + /** + * 付款方式 + */ + private Integer otherPaymentMode; + + private String otherPaymentModeDesc; + + private BigDecimal otherPayAmount; + + private String receivingCode; + +} diff --git a/src/main/java/com/xmomen/module/order/model/OrderPurchaseModel.java b/src/main/java/com/xmomen/module/order/model/OrderPurchaseModel.java new file mode 100644 index 0000000..62274a1 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/OrderPurchaseModel.java @@ -0,0 +1,65 @@ +package com.xmomen.module.order.model; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * Created by Jeng on 2016/4/25. + */ +public class OrderPurchaseModel implements Serializable { + + private String orderNo; + private Integer itemId; + private String itemCode; + private String itemUnit; + private BigDecimal totalItemQty; + private BigDecimal totalWeight; + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public Integer getItemId() { + return itemId; + } + + public void setItemId(Integer itemId) { + this.itemId = itemId; + } + + public String getItemCode() { + return itemCode; + } + + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemUnit() { + return itemUnit; + } + + public void setItemUnit(String itemUnit) { + this.itemUnit = itemUnit; + } + + public BigDecimal getTotalItemQty() { + return totalItemQty; + } + + public void setTotalItemQty(BigDecimal totalItemQty) { + this.totalItemQty = totalItemQty; + } + + public BigDecimal getTotalWeight() { + return totalWeight; + } + + public void setTotalWeight(BigDecimal totalWeight) { + this.totalWeight = totalWeight; + } +} diff --git a/src/main/java/com/xmomen/module/order/model/PackingQuery.java b/src/main/java/com/xmomen/module/order/model/PackingQuery.java new file mode 100644 index 0000000..bb2e865 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/PackingQuery.java @@ -0,0 +1,20 @@ +package com.xmomen.module.order.model; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * Created by Jeng on 16/4/6. + */ +public @Data +class PackingQuery implements Serializable { + + private String orderNo; + private String keyword; + private String packingStatus; + private String packingNo; + +} diff --git a/src/main/java/com/xmomen/module/order/model/PackingRecordModel.java b/src/main/java/com/xmomen/module/order/model/PackingRecordModel.java new file mode 100644 index 0000000..ebca723 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/PackingRecordModel.java @@ -0,0 +1,44 @@ +package com.xmomen.module.order.model; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * Created by Jeng on 2016/5/21. + */ +public @Data +class PackingRecordModel implements Serializable { + /** + * ID + */ + private Integer id; + + /** + * 商品条码 + */ + private String upc; + + /** + * 扫描时间 + */ + private Date scanTime; + + /** + * 装箱ID + */ + private Integer packingId; + + /** + * 装箱编号 + */ + private String packingNo; + + /** + * 商品名称 + */ + private String itemName; + + +} diff --git a/src/main/java/com/xmomen/module/order/model/PackingTaskCount.java b/src/main/java/com/xmomen/module/order/model/PackingTaskCount.java new file mode 100644 index 0000000..eb74c54 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/PackingTaskCount.java @@ -0,0 +1,20 @@ +package com.xmomen.module.order.model; + +import lombok.Data; + +import java.io.Serializable; + +/** + * Created by tanxinzheng on 16/6/13. + */ +public @Data +class PackingTaskCount implements Serializable { + + private Integer actorId; + private String actorName; + private Integer totalCount; + private Integer readyCount; + private Integer executingCount; + private Integer finishedCount; + +} diff --git a/src/main/java/com/xmomen/module/order/model/PayOrder.java b/src/main/java/com/xmomen/module/order/model/PayOrder.java new file mode 100644 index 0000000..91a5197 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/PayOrder.java @@ -0,0 +1,17 @@ +package com.xmomen.module.order.model; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * Created by Jeng on 2016/5/18. + */ +public @Data +class PayOrder implements Serializable { + + private String orderNo; + private BigDecimal amount; + +} diff --git a/src/main/java/com/xmomen/module/order/model/RefundOrder.java b/src/main/java/com/xmomen/module/order/model/RefundOrder.java new file mode 100644 index 0000000..3876c02 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/RefundOrder.java @@ -0,0 +1,22 @@ +package com.xmomen.module.order.model; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * Created by tanxinzheng on 16/6/27. + */ +public @Data +class RefundOrder implements Serializable{ + + //订单号 + private String orderNo; + //付款方式 + private Integer paymentMode; + //其他付款方式 + private Integer otherPaymentMode; + private String remark; + +} diff --git a/src/main/java/com/xmomen/module/order/model/ScanModel.java b/src/main/java/com/xmomen/module/order/model/ScanModel.java new file mode 100644 index 0000000..8a2a7e1 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/ScanModel.java @@ -0,0 +1,41 @@ +package com.xmomen.module.order.model; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * Created by tanxinzheng on 16/8/8. + */ +@Data +public class ScanModel implements Serializable { + + private String orderNo; + private Integer taskStatus; + /** + * + */ + private Integer id; + + /** + * 商品条码 + */ + private String upc; + + /** + * 订单商品ID + */ + private Integer orderItemId; + + /** + * 扫描时间 + */ + private Date scanTime; + + /** + * 装箱ID + */ + private Integer packingId; + +} diff --git a/src/main/java/com/xmomen/module/order/model/TradeRecordModel.java b/src/main/java/com/xmomen/module/order/model/TradeRecordModel.java new file mode 100644 index 0000000..ecd3cf5 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/TradeRecordModel.java @@ -0,0 +1,46 @@ +package com.xmomen.module.order.model; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import lombok.Data; + +public @Data class TradeRecordModel implements Serializable{ + /** + * 主键 + */ + private Integer id; + + /** + * 交易金额 + */ + private BigDecimal amount; + + /** + * 交易单号 + */ + private String tradeNo; + + /** + * 交易时间 + */ + private Date createTime; + + /** + * 交易类型：cash-现金，card-卡券,recharge-充值，adjustment-卡余额调整 + */ + private String tradeType; + + /** + * 备注 + */ + private String remark; + + /** + * 记录人 + */ + private Integer recordUser; + + private String recordUserName; +} diff --git a/src/main/java/com/xmomen/module/order/model/WxCreateOrder.java b/src/main/java/com/xmomen/module/order/model/WxCreateOrder.java new file mode 100644 index 0000000..0722ce5 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/model/WxCreateOrder.java @@ -0,0 +1,137 @@ +package com.xmomen.module.order.model; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import javax.validation.constraints.NotNull; + +import org.hibernate.validator.constraints.NotBlank; +import org.hibernate.validator.constraints.NotEmpty; + +import com.xmomen.module.order.model.CreateOrder.OrderItem; + +import lombok.Data; + +public @Data class WxCreateOrder implements Serializable { + /** + * 0-常规订单，1-卡，2-劵，3-餐桌计划订单 + */ + @NotNull + private Integer orderType = 0; + + /** + * 订单编号 + */ + private String orderNo; + + /** + * 1-微信订单，2-商城订单，3-客服下单，4-采摘订单 + */ + private Integer orderSource = 1; + + /** + * 客户名称 + */ + private String name; + + /** + * 客户代码 + */ + private String memberCode; + + /** + * 客户联系方式 + */ + private String phone; + + /** + * 付款方式 + */ + private Integer paymentMode; + + /** + * 附加付款方式 + */ + private Integer otherPaymentMode; + + /** + * 支付关系编号（卡号/券号） + */ + private String paymentRelationNo; + + /** + * 收货人手机 + */ + @NotNull + @NotBlank + private String consigneePhone; + + /** + * 收货人姓名 + */ + @NotNull + @NotBlank + private String consigneeName; + + /** + * 收货人地址 + */ + @NotNull + @NotBlank + private String consigneeAddress; + + /** + * 订单备注 + */ + private String remark; + + /** + * 折扣 + */ + private Integer discount; + + /** + * 操作人 + */ + private Integer createUserId; + + private Date appointmentTime; + /** + * 折扣金额 + */ + private BigDecimal discountPrice; + /** + * 订单总金额（劵直接取,卡、常规订单后台在计算金额） + */ + private BigDecimal totalPrice; + + /** + * 券的物品直接从后台获取 + */ + private List orderItemList; + + public static class OrderItem implements Serializable { + @NotNull + private Integer orderItemId; + @NotNull + private BigDecimal itemQty; + + public Integer getOrderItemId() { + return orderItemId; + } + + public void setOrderItemId(Integer orderItemId) { + this.orderItemId = orderItemId; + } + + public BigDecimal getItemQty() { + return itemQty; + } + + public void setItemQty(BigDecimal itemQty) { + this.itemQty = itemQty; + } + } +} diff --git a/src/main/java/com/xmomen/module/order/service/OrderService.java b/src/main/java/com/xmomen/module/order/service/OrderService.java new file mode 100644 index 0000000..08c33e5 --- /dev/null +++ b/src/main/java/com/xmomen/module/order/service/OrderService.java @@ -0,0 +1,1100 @@ +package com.xmomen.module.order.service; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.xmomen.module.stock.service.StockService; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.util.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.xmomen.framework.exception.BusinessException; +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.framework.utils.DateUtils; +import com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.base.entity.CdCoupon; +import com.xmomen.module.base.entity.CdCouponExample; +import com.xmomen.module.base.entity.CdMember; +import com.xmomen.module.base.model.CouponModel; +import com.xmomen.module.base.model.CouponRelationItem; +import com.xmomen.module.base.model.ItemModel; +import com.xmomen.module.base.model.ItemQuery; +import com.xmomen.module.base.service.CouponService; +import com.xmomen.module.base.service.ItemService; +import com.xmomen.module.member.model.MemberAddressModel; +import com.xmomen.module.member.model.MemberAddressQuery; +import com.xmomen.module.member.service.MemberAddressService; +import com.xmomen.module.order.entity.TbOrder; +import com.xmomen.module.order.entity.TbOrderExample; +import com.xmomen.module.order.entity.TbOrderItem; +import com.xmomen.module.order.entity.TbOrderItemExample; +import com.xmomen.module.order.entity.TbOrderRef; +import com.xmomen.module.order.entity.TbOrderRefExample; +import com.xmomen.module.order.entity.TbOrderRelation; +import com.xmomen.module.order.entity.TbOrderRelationExample; +import com.xmomen.module.order.entity.TbPurchase; +import com.xmomen.module.order.entity.TbTradeRecord; +import com.xmomen.module.order.entity.TbTradeRecordExample; +import com.xmomen.module.order.mapper.OrderMapper; +import com.xmomen.module.order.model.CreateOrder; +import com.xmomen.module.order.model.OrderModel; +import com.xmomen.module.order.model.OrderQuery; +import com.xmomen.module.order.model.PayOrder; +import com.xmomen.module.order.model.RefundOrder; +import com.xmomen.module.order.model.UpdateOrder; +import com.xmomen.module.order.model.WxCreateOrder; +import com.xmomen.module.plan.entity.TbTablePlan; +import com.xmomen.module.product.model.ProductModel; +import com.xmomen.module.product.service.ProductService; +import com.xmomen.module.report.model.OrderReport; +import com.xmomen.module.wx.module.cart.service.CartService; +import com.xmomen.module.wx.module.order.model.MyOrderQuery; +import com.xmomen.module.wx.module.order.model.OrderDetailModel; +import com.xmomen.module.wx.module.order.model.OrderProductItem; +import com.xmomen.module.wx.module.order.model.PayOrderModel; +import com.xmomen.module.wx.module.order.service.MyOrderService; + +/** + * Created by Jeng on 16/4/5. + */ +@Service +public class OrderService { + + @Autowired + MybatisDao mybatisDao; + + @Autowired + ItemService itemService; + + @Autowired + CouponService couponService; + + @Autowired + MyOrderService myOrderService; + + @Autowired + ProductService productService; + + @Autowired + CartService cartServcie; + + @Autowired + MemberAddressService memberAddressService; + + @Autowired + StockService stockService; + + /** + * 查询订单 + * + * @param orderQuery + * @param limit + * @param offset + * @return + */ + public Page getOrderList(OrderQuery orderQuery, Integer limit, Integer offset) { + return (Page) mybatisDao.selectPage(OrderMapper.ORDER_MAPPER_NAMESPACE + "getOrderList", orderQuery, limit, offset); + } + + /** + * 查询装箱任务 + * + * @param orderQuery + * @param limit + * @param offset + * @return + */ + public Page getPackageTaskList(OrderQuery orderQuery, Integer limit, Integer offset) { + return (Page) mybatisDao.selectPage(OrderMapper.ORDER_MAPPER_NAMESPACE + "getPackageTaskList", orderQuery, limit, offset); + } + + public int getCountBatch(String btachNo) { + return mybatisDao.getSqlSessionTemplate().selectOne(OrderMapper.ORDER_MAPPER_NAMESPACE + "countBatchOrder", btachNo); + } + + /** + * 查询订单 + * + * @param orderQuery + * @return + */ + public List getOrderList(OrderQuery orderQuery) { + return mybatisDao.getSqlSessionTemplate().selectList(OrderMapper.ORDER_MAPPER_NAMESPACE + "getOrderList", orderQuery); + } + + public List getOrderReportList(OrderQuery orderQuery) { + return mybatisDao.getSqlSessionTemplate().selectList(OrderMapper.ORDER_MAPPER_NAMESPACE + "getOrderReportList", orderQuery); + } + + public OrderModel getOneOrder(OrderQuery orderQuery) { + if (orderQuery == null || (orderQuery.getId() == null && orderQuery.getOrderNo() == null)) { + return null; + } + List orderModelList = getOrderList(orderQuery); + if (orderModelList != null && !orderModelList.isEmpty() && orderModelList.size() == 1) { + return orderModelList.get(0); + } + return null; + } + + /** + * 创建订单 + * + * @param createOrder + * @return + */ + @Transactional + public TbOrder createOrder(CreateOrder createOrder) throws BusinessException { + String orderNo = createOrder.getOrderNo(); + if (StringUtils.isEmpty(orderNo)) { + orderNo = DateUtils.getDateTimeString(); + } + List itemIdList = new ArrayList(); + for (CreateOrder.OrderItem orderItem : createOrder.getOrderItemList()) { + itemIdList.add(orderItem.getOrderItemId()); + } + ItemQuery itemQuery = new ItemQuery(); + Integer[] array = new Integer[itemIdList.size()]; + itemQuery.setIds(itemIdList.toArray(array)); + itemQuery.setCompanyId(createOrder.getCompanyId()); + List itemList = itemService.queryItemList(itemQuery); + BigDecimal totalAmount = BigDecimal.ZERO; + int xiajia = 0; + for (ItemModel cdItem : itemList) { + for (CreateOrder.OrderItem orderItem : createOrder.getOrderItemList()) { + //查看商品是否下架了 + if (cdItem.getSellStatus() == 0) { + xiajia = 1; + } + if (cdItem.getId().equals(orderItem.getOrderItemId())) { + //判断库存是否有 + boolean flag = stockService.checkStock(orderItem.getOrderItemId(), orderItem.getItemQty().intValue()); + //库存不足 + if (!flag) { + throw new BusinessException("商品：" + cdItem.getItemName() + "库存不足。下单失败"); + } + TbOrderItem tbOrderItem = new TbOrderItem(); + tbOrderItem.setOrderNo(orderNo); + tbOrderItem.setItemCode(cdItem.getItemCode()); + tbOrderItem.setItemId(cdItem.getId()); + tbOrderItem.setItemName(cdItem.getItemName()); + tbOrderItem.setItemQty(orderItem.getItemQty()); + tbOrderItem.setItemUnit(cdItem.getPricingManner()); + if (cdItem.getDiscountPrice() != null) { + tbOrderItem.setItemPrice(cdItem.getDiscountPrice()); + } + else { + tbOrderItem.setItemPrice(cdItem.getSellPrice()); + } + totalAmount = totalAmount.add(tbOrderItem.getItemPrice().multiply(orderItem.getItemQty())); + tbOrderItem.setCreateDate(mybatisDao.getSysdate()); + tbOrderItem.setCreateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY)); + tbOrderItem.setUpdateDate(mybatisDao.getSysdate()); + tbOrderItem.setUpdateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY)); + mybatisDao.insert(tbOrderItem); + } + } + } + TbOrder tbOrder = new TbOrder(); + // 订单新建待采购状态 + tbOrder.setOrderStatus("1"); + tbOrder.setPayStatus(0);//待支付 + tbOrder.setTransportMode(1);// 默认快递 + tbOrder.setConsigneeName(createOrder.getConsigneeName()); + tbOrder.setConsigneeAddress(createOrder.getConsigneeAddress()); + tbOrder.setConsigneePhone(createOrder.getConsigneePhone()); + tbOrder.setCreateTime(mybatisDao.getSysdate()); + tbOrder.setPaymentMode(createOrder.getPaymentMode()); + tbOrder.setOtherPaymentMode(createOrder.getOtherPaymentMode()); + tbOrder.setMemberCode(createOrder.getMemberCode()); + tbOrder.setRemark(createOrder.getRemark()); + tbOrder.setOrderType(createOrder.getOrderType()); + tbOrder.setOrderNo(orderNo); + tbOrder.setOrderSource(createOrder.getOrderSource()); + tbOrder.setCreateUserId(createOrder.getCreateUserId()); + tbOrder.setUpdateDate(mybatisDao.getSysdate()); + tbOrder.setUpdateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY)); + tbOrder.setManagerId(createOrder.getManagerId()); + tbOrder.setCompanyId(createOrder.getCompanyId()); + tbOrder.setBatchNo(createOrder.getBatchNo()); + tbOrder.setXiajia(xiajia); + //生成收货码 + TbOrderRef orderRef = new TbOrderRef(); + orderRef.setOrderNo(orderNo); + orderRef.setRefType("SHOU_HUO_NO"); + orderRef.setRefValue(String.valueOf((int) ((Math.random() * 9 + 1) * 100000))); + mybatisDao.insert(orderRef); + totalAmount = totalAmount.subtract(createOrder.getDiscountPrice() == null ? BigDecimal.ZERO : createOrder.getDiscountPrice()); + //订单总金额如果是劵的或者是餐桌计划的则就是劵面金额不用累计商品总金额 + if (tbOrder.getOrderType() == 2 || tbOrder.getOrderType() == 3) { + tbOrder.setTotalAmount(createOrder.getTotalPrice()); + totalAmount = createOrder.getTotalPrice(); + tbOrder.setDiscountPrice(BigDecimal.ZERO); + } + else { + tbOrder.setTotalAmount(totalAmount); + tbOrder.setDiscountPrice(createOrder.getDiscountPrice()); + } + tbOrder.setAppointmentTime(createOrder.getAppointmentTime()); + tbOrder = mybatisDao.insertByModel(tbOrder); + + //扣除订单相应的产品库存 + for (CreateOrder.OrderItem orderItem : createOrder.getOrderItemList()) { + //扣除库存 + stockService.changeStockNum(orderItem.getOrderItemId(), 0 - orderItem.getItemQty().intValue(), tbOrder.getId(), "商品下单：" + orderItem.getItemQty() + "扣除,库存减少", 2); + } + + if (StringUtils.trimToNull(createOrder.getPaymentRelationNo()) != null && createOrder.getOrderType() > 0) { + TbOrderRelation tbOrderRelation = new TbOrderRelation(); + tbOrderRelation.setOrderNo(orderNo); + tbOrderRelation.setRefType(OrderMapper.ORDER_PAY_RELATION_CODE);// 订单支付关系 + tbOrderRelation.setRefValue(createOrder.getPaymentRelationNo()); + mybatisDao.insert(tbOrderRelation); + } + PayOrder payOrder = new PayOrder(); + payOrder.setOrderNo(tbOrder.getOrderNo()); + payOrder.setAmount(totalAmount); + payOrder(payOrder); + return tbOrder; + } + + @Transactional + public void batchCreateOrder(CreateOrder createOrder) throws BusinessException { + if (createOrder.getBatchNumber() == null) { + createOrder(createOrder); + } + else { + //生成一个随机批次号 + createOrder.setBatchNo(String.valueOf((int) ((Math.random() * 9 + 1) * 100000))); + for (int i = 0; i < createOrder.getBatchNumber(); i++) { + createOrder(createOrder); + } + } + } + + /** + * 更新订单 + * + * @param updateOrder + * @return + */ + @Transactional + public TbOrder updateOrder(UpdateOrder updateOrder) throws BusinessException { + String orderNo = updateOrder.getOrderNo(); + TbOrder oldTbOrder = new TbOrder(); + oldTbOrder.setOrderNo(updateOrder.getOrderNo()); + oldTbOrder = mybatisDao.selectOneByModel(oldTbOrder); + List itemCodeList = new ArrayList(); + for (UpdateOrder.OrderItem orderItem : updateOrder.getOrderItemList()) { + itemCodeList.add(orderItem.getItemCode()); + } + ItemQuery itemQuery = new ItemQuery(); + String[] array = new String[itemCodeList.size()]; + itemQuery.setItemCodes(itemCodeList.toArray(array)); + itemQuery.setCompanyId(updateOrder.getCompanyId()); + List itemList = itemService.queryItemList(itemQuery); + BigDecimal totalAmount = BigDecimal.ZERO; + //查询订单的原商品信息 + TbOrderItemExample tbOrderItemExample = new TbOrderItemExample(); + tbOrderItemExample.createCriteria().andOrderNoEqualTo(orderNo); + List tbOrderItems = mybatisDao.selectByExample(tbOrderItemExample); +// mybatisDao.deleteByExample(tbOrderItemExample); + Map oldOrderItemMap = new HashMap(); + for (TbOrderItem tbOrderItem : tbOrderItems) { + oldOrderItemMap.put(tbOrderItem.getItemCode(), tbOrderItem); + } + boolean flagExists = false; + //是否有下架商品 0 无 1有 + int xiajia = 0; + List changeOrderItems = new ArrayList<>(); + for (ItemModel cdItem : itemList) { + for (UpdateOrder.OrderItem orderItem : updateOrder.getOrderItemList()) { + if (cdItem.getId().equals(orderItem.getOrderItemId())) { + //查看商品是否下架了 + if (cdItem.getSellStatus() == 0) { + xiajia = 1; + } + //如果订单状态大于等于3则认为是补货或者更换货的需要生成采购计划 + if (Integer.parseInt(oldTbOrder.getOrderStatus()) >= 3) { + //计算是否是新增的商品 + for (TbOrderItem orderItemDb : tbOrderItems) { + if (orderItemDb.getItemId().equals(orderItem.getOrderItemId())) { + flagExists = true; + } + } + if (!flagExists) { + changeOrderItems.add(orderItem); + } + flagExists = false; + } + TbOrderItem tbOrderItem = new TbOrderItem(); + //map存在说明是更新 + if (oldOrderItemMap.containsKey(cdItem.getItemCode())) { + TbOrderItem oldOrderItem = oldOrderItemMap.get(cdItem.getItemCode()); + tbOrderItem.setId(oldOrderItem.getId()); + //map 移除 + oldOrderItemMap.remove(cdItem.getItemCode()); + + //查看是增加还是减少 + Integer oldQty = oldOrderItem.getItemQty().intValue(); + Integer newQty = orderItem.getItemQty().intValue(); + if (newQty != oldQty) { + //增加 + if (newQty > oldQty) { + //校验库存是否够 + stockService.checkStock(oldOrderItem.getItemId(), newQty - oldQty); + //将库存改变 + stockService.changeStockNum(oldOrderItem.getItemId(), oldQty - newQty, updateOrder.getId(), "订单商品" + oldQty + "变更为" + newQty + "，库存减少", 2); + } + else { + //将库存改变 + stockService.changeStockNum(oldOrderItem.getItemId(), oldQty - newQty, updateOrder.getId(), "订单商品" + oldQty + "变更为" + newQty + "，库存增加", 3); + } + } + } + //新增加的商品 + else { + tbOrderItem.setCreateDate(mybatisDao.getSysdate()); + tbOrderItem.setCreateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY)); + //校验库存是否够 + stockService.checkStock(cdItem.getId(), orderItem.getItemQty().intValue()); + //将库存改变 + stockService.changeStockNum(cdItem.getId(), 0 - orderItem.getItemQty().intValue(), updateOrder.getId(), "订单商品下单：" + orderItem.getItemQty().intValue() + "，库存减少", 2); + } + tbOrderItem.setOrderNo(orderNo); + tbOrderItem.setItemCode(cdItem.getItemCode()); + tbOrderItem.setItemId(cdItem.getId()); + tbOrderItem.setItemName(cdItem.getItemName()); + tbOrderItem.setItemQty(orderItem.getItemQty()); + tbOrderItem.setItemUnit(cdItem.getSpec()); + if (cdItem.getDiscountPrice() != null) { + tbOrderItem.setItemPrice(cdItem.getDiscountPrice()); + } + else { + tbOrderItem.setItemPrice(cdItem.getSellPrice()); + } + totalAmount = totalAmount.add(tbOrderItem.getItemPrice().multiply(orderItem.getItemQty())); + tbOrderItem.setUpdateDate(mybatisDao.getSysdate()); + tbOrderItem.setUpdateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY)); + mybatisDao.save(tbOrderItem); + } + } + } + + //将map里面还有的进行删除 + for (String key : oldOrderItemMap.keySet()) { + mybatisDao.delete(oldOrderItemMap.get(key)); + //库存相应的返回 + TbOrderItem tbOrderItem = oldOrderItemMap.get(key); + stockService.changeStockNum(tbOrderItem.getItemId(), tbOrderItem.getItemQty().intValue(), updateOrder.getId(), "商品取消，库存退回", 3); + } + + TbOrder tbOrder = mybatisDao.selectByPrimaryKey(TbOrder.class, updateOrder.getId()); + tbOrder.setConsigneeName(updateOrder.getConsigneeName()); + tbOrder.setConsigneeAddress(updateOrder.getConsigneeAddress()); + tbOrder.setConsigneePhone(updateOrder.getConsigneePhone()); + tbOrder.setOrderSource(updateOrder.getOrderSource()); + tbOrder.setPaymentMode(updateOrder.getPaymentMode()); + tbOrder.setOtherPaymentMode(updateOrder.getOtherPaymentMode()); + tbOrder.setMemberCode(updateOrder.getMemberCode()); + tbOrder.setRemark(updateOrder.getRemark()); + tbOrder.setOrderType(updateOrder.getOrderType()); + tbOrder.setOrderSource(updateOrder.getOrderSource()); + tbOrder.setXiajia(xiajia); + totalAmount = totalAmount.subtract(updateOrder.getDiscountPrice()); + //订单总金额如果是劵的或者是餐桌计划的则就是劵面金额不用累计商品总金额 + if (tbOrder.getOrderType() == 2 || tbOrder.getOrderType() == 3) { + tbOrder.setTotalAmount(updateOrder.getTotalPrice()); + totalAmount = updateOrder.getTotalPrice(); + tbOrder.setDiscountPrice(BigDecimal.ZERO); + } + else { + tbOrder.setTotalAmount(totalAmount); + tbOrder.setDiscountPrice(updateOrder.getDiscountPrice()); + } + tbOrder.setAppointmentTime(updateOrder.getAppointmentTime()); + //订单更新时间 + tbOrder.setUpdateDate(mybatisDao.getSysdate()); + tbOrder.setUpdateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY)); + mybatisDao.update(tbOrder); + + //卡号，劵号，餐桌计划卡号 + if (StringUtils.trimToNull(updateOrder.getPaymentRelationNo()) != null && updateOrder.getOrderType() > 0) { + TbOrderRelationExample tbOrderRelationExample = new TbOrderRelationExample(); + tbOrderRelationExample.createCriteria() + .andOrderNoEqualTo(orderNo) + .andRefTypeEqualTo(OrderMapper.ORDER_PAY_RELATION_CODE); + TbOrderRelation tbOrderRelation = new TbOrderRelation(); + tbOrderRelation.setRefValue(updateOrder.getPaymentRelationNo()); + mybatisDao.updateOneByExampleSelective(tbOrderRelation, tbOrderRelationExample); + } + + //订单类型不是券或餐桌计划，修改订单的金额修改方式去掉之前的付款方式重新生成（卡的钱先退回去） + if (!(tbOrder.getOrderType() == 2 || tbOrder.getOrderType() == 3)) { + RefundOrder refundOrder = new RefundOrder(); + refundOrder.setOrderNo(oldTbOrder.getOrderNo()); + refundOrder.setPaymentMode(oldTbOrder.getPaymentMode()); + refundOrder.setOtherPaymentMode(oldTbOrder.getOtherPaymentMode()); + refundOrder.setRemark("订单更新，金额变更"); + refundOrder(refundOrder); + + PayOrder payOrder = new PayOrder(); + payOrder.setOrderNo(oldTbOrder.getOrderNo()); + payOrder.setAmount(tbOrder.getTotalAmount()); + payOrder(payOrder); + } + + //生成新的采购计划（订单状态不为待采购的才重新生成采购计划） + if (!tbOrder.getOrderStatus().equals("1")) { + String purchaseCode = DateUtils.getDateTimeString(); + for (UpdateOrder.OrderItem orderItem : changeOrderItems) { + BigDecimal totalWeight = BigDecimal.ZERO; + for (ItemModel cdItem : itemList) { + if (cdItem.getId().equals(orderItem.getOrderItemId())) { + totalWeight = new BigDecimal(cdItem.getSpec()).multiply(orderItem.getItemQty()).setScale(0, BigDecimal.ROUND_HALF_UP); + } + } + TbPurchase tbPurchase = new TbPurchase(); + tbPurchase.setPurchaseCode(purchaseCode); + tbPurchase.setCreateDate(mybatisDao.getSysdate()); + tbPurchase.setPurchaseStatus(0); + tbPurchase.setItemCode(orderItem.getItemCode()); + tbPurchase.setTotal(orderItem.getItemQty()); + tbPurchase.setTotalWeight(totalWeight); + mybatisDao.insert(tbPurchase); + } + } + return tbOrder; + } + + /** + * 删除订单 + * + * @param id + */ + @Transactional + public void deleteOrder(Integer id) { + mybatisDao.deleteByPrimaryKey(TbOrder.class, id); + } + + /** + * 取消订单 + * + * @param id + */ + @Transactional + public void cancelOrder(Integer id) throws BusinessException { + TbOrderExample tbOrderExample = new TbOrderExample(); + tbOrderExample.createCriteria().andIdEqualTo(id); + TbOrder tbOrder = mybatisDao.selectOneByExample(tbOrderExample); + //订单取消状态 + tbOrder.setOrderStatus("9"); + mybatisDao.updateByModel(tbOrder); + + //查询订单的原商品信息 + TbOrderItemExample tbOrderItemExample = new TbOrderItemExample(); + tbOrderItemExample.createCriteria().andOrderNoEqualTo(tbOrder.getOrderNo()); + List tbOrderItems = mybatisDao.selectByExample(tbOrderItemExample); + for (TbOrderItem tbOrderItem : tbOrderItems) { + stockService.changeStockNum(tbOrderItem.getItemId(), tbOrderItem.getItemQty().intValue(), tbOrder.getId(), "订单取消退回商品", 3); + } + + //如果是卡类订单或者是餐桌计划订单(将钱退回卡里面) + if (tbOrder.getOrderType() == 1) { + RefundOrder refundOrder = new RefundOrder(); + refundOrder.setOrderNo(tbOrder.getOrderNo()); + refundOrder.setPaymentMode(tbOrder.getPaymentMode()); + refundOrder.setOtherPaymentMode(tbOrder.getOtherPaymentMode()); + refundOrder.setRemark("订单更新，金额变更"); + refundOrder(refundOrder); + } + //如果是劵则将劵变为可用状态 + else if (tbOrder.getOrderType() == 2) { + //获取劵号 + TbOrderRelationExample tbOrderRelationExample = new TbOrderRelationExample(); + tbOrderRelationExample.createCriteria() + .andOrderNoEqualTo(tbOrder.getOrderNo()) + .andRefTypeEqualTo(OrderMapper.ORDER_PAY_RELATION_CODE); + TbOrderRelation tbOrderRelation = mybatisDao.selectOneByExample(tbOrderRelationExample); + + CdCouponExample cdCouponExample = new CdCouponExample(); + cdCouponExample.createCriteria().andCouponNumberEqualTo(tbOrderRelation.getRefValue()); + CdCoupon updateCdCoupon = new CdCoupon(); + updateCdCoupon.setIsUsed(0); + mybatisDao.updateOneByExampleSelective(updateCdCoupon, cdCouponExample); + + //删除原来的订单付款记录 + TbTradeRecordExample tradeRecordExample = new TbTradeRecordExample(); + tradeRecordExample.createCriteria().andTradeNoEqualTo(tbOrder.getOrderNo()) + .andTradeTypeEqualTo("COUPON"); + mybatisDao.deleteByExample(tradeRecordExample); + } + //如果是餐桌计划则将已送次数-1 金额回退回去 + else if (tbOrder.getOrderType() == 3) { + //获取餐桌计划卡号 + TbOrderRelationExample tbOrderRelationExample = new TbOrderRelationExample(); + tbOrderRelationExample.createCriteria() + .andOrderNoEqualTo(tbOrder.getOrderNo()) + .andRefTypeEqualTo(OrderMapper.ORDER_PAY_RELATION_CODE); + TbOrderRelation tbOrderRelation = mybatisDao.selectOneByExample(tbOrderRelationExample); + + //删除原来的订单付款记录 + TbTradeRecordExample tradeRecordExample = new TbTradeRecordExample(); + tradeRecordExample.createCriteria().andTradeNoEqualTo(tbOrder.getOrderNo()) + .andTradeTypeEqualTo("PLAN_CARD"); + TbTradeRecord tradeRecord = mybatisDao.selectOneByExample(tradeRecordExample); + mybatisDao.deleteByExample(tradeRecordExample); + + //将餐桌计划卡里面的钱回退回去 + CdCouponExample couponExample = new CdCouponExample(); + couponExample.createCriteria().andCouponNumberEqualTo(tbOrderRelation.getRefValue()); + CdCoupon coupon = mybatisDao.selectOneByExample(couponExample); + coupon.setUserPrice(coupon.getUserPrice().add(tradeRecord.getAmount())); + mybatisDao.update(coupon); + + //餐桌计划已送次数回退一个 + TbOrderRefExample tbOrderRefExample = new TbOrderRefExample(); + tbOrderRefExample.createCriteria() + .andOrderNoEqualTo(tbOrder.getOrderNo()) + .andRefTypeEqualTo("ORDER_TABLE_PLAN"); + List tbOrderRefs = mybatisDao.selectByExample(tbOrderRefExample); + for (TbOrderRef tbOrderRef : tbOrderRefs) { + TbTablePlan tablePlan = mybatisDao.selectByPrimaryKey(TbTablePlan.class, Integer.parseInt(tbOrderRef.getRefValue())); + tablePlan.setSendValue(tablePlan.getSendValue() - 1); + mybatisDao.update(tablePlan); + } + } + } + + @Transactional + public void updateOrderStatus(String orderNo, String orderStatus) { + TbOrderExample tbOrderExample = new TbOrderExample(); + tbOrderExample.createCriteria().andOrderNoEqualTo(orderNo); + TbOrder tbOrder = new TbOrder(); + tbOrder.setOrderStatus(orderStatus); + mybatisDao.updateOneByExampleSelective(tbOrder, tbOrderExample); + } + + @Transactional + public void updateOrderStatus(Integer id, String orderStatus) { + TbOrderExample tbOrderExample = new TbOrderExample(); + tbOrderExample.createCriteria().andIdEqualTo(id); + TbOrder tbOrder = new TbOrder(); + tbOrder.setOrderStatus(orderStatus); + mybatisDao.updateOneByExampleSelective(tbOrder, tbOrderExample); + } + + /** + * 订单退款／冲销 + * + * @param refundOrder + */ + @Transactional + public void refundOrder(RefundOrder refundOrder) { + //删除原来的订单付款记录 + TbTradeRecordExample tradeRecordExample = new TbTradeRecordExample(); + tradeRecordExample.createCriteria().andTradeNoEqualTo(refundOrder.getOrderNo()) + .andTradeTypeEqualTo("CARD"); + TbTradeRecord tradeRecord = mybatisDao.selectOneByExample(tradeRecordExample); + mybatisDao.deleteByExample(tradeRecordExample); + //删除其他的付款方式 + tradeRecordExample.createCriteria().andTradeNoEqualTo(refundOrder.getOrderNo()) + .andTradeTypeEqualTo(String.valueOf(refundOrder.getOtherPaymentMode())); + mybatisDao.deleteByExample(tradeRecordExample); + //如果是卡将金额回退回去 + if (refundOrder.getPaymentMode() == 5) { + //查找卡号 + TbOrderRelationExample tbOrderRelationExample = new TbOrderRelationExample(); + tbOrderRelationExample.createCriteria() + .andOrderNoEqualTo(refundOrder.getOrderNo()) + .andRefTypeEqualTo(OrderMapper.ORDER_PAY_RELATION_CODE); + TbOrderRelation tbOrderRelation = mybatisDao.selectOneByExample(tbOrderRelationExample); + CdCouponExample couponExample = new CdCouponExample(); + couponExample.createCriteria().andCouponNumberEqualTo(tbOrderRelation.getRefValue()); + CdCoupon coupon = mybatisDao.selectOneByExample(couponExample); + //订单的钱回退回去 + coupon.setUserPrice(coupon.getUserPrice().add(tradeRecord.getAmount())); + mybatisDao.update(coupon); + } + } + + /** + * 支付订单 + * + * @param payOrder + */ + @Transactional + public void payOrder(PayOrder payOrder) throws IllegalArgumentException { + TbOrderRelation tbOrderRelation = new TbOrderRelation(); + tbOrderRelation.setRefType(OrderMapper.ORDER_PAY_RELATION_CODE); + tbOrderRelation.setOrderNo(payOrder.getOrderNo()); + tbOrderRelation = mybatisDao.selectOneByModel(tbOrderRelation); + TbOrder tbOrder = new TbOrder(); + tbOrder.setOrderNo(payOrder.getOrderNo()); + tbOrder = mybatisDao.selectOneByModel(tbOrder); + Integer payStatus = 0; + //卡劵订单才记录扣款记录 + if (tbOrder.getOrderType() > 0) { + CdCoupon cdCoupon = new CdCoupon(); + cdCoupon.setCouponNumber(tbOrderRelation.getRefValue()); + cdCoupon = mybatisDao.selectOneByModel(cdCoupon); + //卡类订单 + if (tbOrder.getOrderType() == 1) { + BigDecimal amount = BigDecimal.ZERO; + // 卡内支付 + if (cdCoupon != null && + cdCoupon.getUserPrice() != null && + tbOrder.getTotalAmount() != null && + cdCoupon.getUserPrice().compareTo(tbOrder.getTotalAmount()) < 0) { + if (tbOrder.getOtherPaymentMode() == null) { + throw new IllegalArgumentException("卡内余额不足，请充值或添加附加付款方式"); + } + // 扣除卡内所有金额，其余款项由附加付款方式支付 + amount = cdCoupon.getUserPrice(); + CdCouponExample cdCouponExample = new CdCouponExample(); + cdCouponExample.createCriteria().andCouponNumberEqualTo(tbOrderRelation.getRefValue()); + CdCoupon updateCdCoupon = new CdCoupon(); + updateCdCoupon.setUserPrice(BigDecimal.ZERO); + updateCdCoupon.setIsUsed(1); + mybatisDao.updateOneByExampleSelective(updateCdCoupon, cdCouponExample); + //扣卡金额 + TbTradeRecord tbTradeRecord = new TbTradeRecord(); + tbTradeRecord.setAmount(amount); + tbTradeRecord.setCreateTime(mybatisDao.getSysdate()); + tbTradeRecord.setTradeNo(payOrder.getOrderNo()); + //卡类 + tbTradeRecord.setTradeType("CARD"); + mybatisDao.insert(tbTradeRecord); + // 代付金额 + TbTradeRecord otherPayTbTradeRecord = new TbTradeRecord(); + otherPayTbTradeRecord.setAmount(tbOrder.getTotalAmount().subtract(cdCoupon.getUserPrice()).multiply(new BigDecimal(-1))); + otherPayTbTradeRecord.setCreateTime(mybatisDao.getSysdate()); + otherPayTbTradeRecord.setTradeNo(payOrder.getOrderNo()); + otherPayTbTradeRecord.setTradeType(String.valueOf(tbOrder.getOtherPaymentMode())); + otherPayTbTradeRecord.setRemark("卡内金额不足，由其它支付方式代付"); + mybatisDao.insert(otherPayTbTradeRecord); + payStatus = 2;//待结算 + } + else { + amount = cdCoupon.getUserPrice().subtract(tbOrder.getTotalAmount()); + CdCouponExample cdCouponExample = new CdCouponExample(); + cdCouponExample.createCriteria().andCouponNumberEqualTo(tbOrderRelation.getRefValue()); + CdCoupon updateCdCoupon = new CdCoupon(); + updateCdCoupon.setUserPrice(amount); + updateCdCoupon.setIsUsed(1); + mybatisDao.updateOneByExampleSelective(updateCdCoupon, cdCouponExample); + TbTradeRecord tbTradeRecord = new TbTradeRecord(); + tbTradeRecord.setAmount(payOrder.getAmount()); + tbTradeRecord.setCreateTime(mybatisDao.getSysdate()); + tbTradeRecord.setTradeNo(payOrder.getOrderNo()); + //卡类 + tbTradeRecord.setTradeType("CARD"); + mybatisDao.insert(tbTradeRecord); + payStatus = 1;//已支付 + } + } + //劵类订单 + else if (tbOrder.getOrderType() == 2) { + Date now = mybatisDao.getSysdate(); + if (cdCoupon.getBeginTime() != null && now.before(cdCoupon.getBeginTime())) { + throw new IllegalArgumentException("未到此优惠券的使用日期，请在优惠券使用期限内使用此优惠券"); + } + if (cdCoupon.getEndTime() != null && now.after(cdCoupon.getEndTime())) { + throw new IllegalArgumentException("此优惠券已过期"); + } + if (cdCoupon.getIsUseful() == 0) { + throw new IllegalArgumentException("无效的优惠券"); + } + if (cdCoupon.getIsUsed() == 1) { + throw new IllegalArgumentException("此优惠券已被使用，请选择其它优惠券"); + } + CdCouponExample cdCouponExample = new CdCouponExample(); + cdCouponExample.createCriteria().andCouponNumberEqualTo(tbOrderRelation.getRefValue()); + CdCoupon updateCdCoupon = new CdCoupon(); + updateCdCoupon.setIsUsed(1); + //添加劵使用时间 + updateCdCoupon.setUsefulDate(com.xmomen.module.wx.util.DateUtils.getNowDate()); + mybatisDao.updateOneByExampleSelective(updateCdCoupon, cdCouponExample); + TbTradeRecord tbTradeRecord = new TbTradeRecord(); + tbTradeRecord.setAmount(payOrder.getAmount()); + tbTradeRecord.setCreateTime(mybatisDao.getSysdate()); + tbTradeRecord.setTradeNo(payOrder.getOrderNo()); + //劵类 + tbTradeRecord.setTradeType("COUPON"); + mybatisDao.insert(tbTradeRecord); + payStatus = 1;//已支付 + } + //餐桌计划订单 + else if (tbOrder.getOrderType() == 3) { + BigDecimal amount = cdCoupon.getUserPrice().subtract(tbOrder.getTotalAmount()); + CdCouponExample cdCouponExample = new CdCouponExample(); + cdCouponExample.createCriteria().andCouponNumberEqualTo(tbOrderRelation.getRefValue()); + CdCoupon updateCdCoupon = new CdCoupon(); + updateCdCoupon.setUserPrice(amount); + mybatisDao.updateOneByExampleSelective(updateCdCoupon, cdCouponExample); + + TbTradeRecord tbTradeRecord = new TbTradeRecord(); + tbTradeRecord.setAmount(payOrder.getAmount()); + tbTradeRecord.setCreateTime(mybatisDao.getSysdate()); + tbTradeRecord.setTradeNo(payOrder.getOrderNo()); + //餐桌计划卡 + tbTradeRecord.setTradeType("PLAN_CARD"); + mybatisDao.insert(tbTradeRecord); + //已支付 + payStatus = 1; + } + } + TbOrderExample tbOrderExample = new TbOrderExample(); + tbOrderExample.createCriteria().andOrderNoEqualTo(payOrder.getOrderNo()); + TbOrder tbOrder1 = new TbOrder(); + tbOrder1.setPayStatus(payStatus); + mybatisDao.updateOneByExampleSelective(tbOrder1, tbOrderExample); + } + + /** + * 更新订单总箱数 + * + * @param orderNo + * @param totalBox + */ + @Transactional + public void updateTotalBox(String orderNo, int totalBox) { + TbOrderExample orderExample = new TbOrderExample(); + orderExample.createCriteria() + .andOrderNoEqualTo(orderNo); + TbOrder order = new TbOrder(); + order.setTotalBoxNum(totalBox); + mybatisDao.updateOneByExampleSelective(order, orderExample); + } + + /** + * 二次配送审核 + * + * @param id + * @param auditStatusCd + */ + @Transactional + public void twoSendOrder(int id, int auditStatusCd) { + TbOrder order = this.mybatisDao.selectByPrimaryKey(TbOrder.class, id); + order.setIsTwoSend(auditStatusCd); + order.setTwoSendAuditDate(mybatisDao.getSysdate()); + Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + order.setTwoSendAuditUserId(userId); + //审核通过 + if (auditStatusCd == 1) { + //将订单状态改为待配送同时清空快递员的配送信息 + order.setExpressMemberId(0); + order.setOrderStatus("12"); + } + //审核不通过 + else { + + } + this.mybatisDao.save(order); + } + + @Transactional + public TbOrder createWxOrder(WxCreateOrder createOrder) throws Exception { + String orderNo = createOrder.getOrderNo(); + if (StringUtils.isEmpty(orderNo)) { + orderNo = DateUtils.getDateTimeString(); + } + createOrder.setPaymentMode(null); + createOrder.setOrderSource(1); + + TbOrder tbOrder = new TbOrder(); + // 订单新建未支付状态 + tbOrder.setOrderStatus("0"); + tbOrder.setPayStatus(0);//待支付 + tbOrder.setTransportMode(1);// 默认快递 + + List itemIdList = new ArrayList(); + boolean normalOrder = true; + if (createOrder.getOrderType() == 2 && StringUtils.trimToNull(createOrder.getPaymentRelationNo()) != null) { + normalOrder = false; + CouponModel couponModel = couponService.getCouponModel(createOrder.getPaymentRelationNo()); + if (couponModel == null || couponModel.getCouponType() != 2) { + throw new BusinessException("无效的券!"); + } + tbOrder.setCompanyId(couponModel.getCompanyId()); + tbOrder.setManagerId(couponModel.getManagerId()); + List items = couponModel.getRelationItemList(); + List orderList = new ArrayList(); + for (CouponRelationItem item : items) { + WxCreateOrder.OrderItem orderItem = new WxCreateOrder.OrderItem(); + orderItem.setOrderItemId(item.getItemId()); + orderItem.setItemQty(item.getItemNumber()); + orderList.add(orderItem); + } + createOrder.setOrderItemList(orderList); + //券下单的总价格就是券的价格 + createOrder.setTotalPrice(couponModel.getCouponValue()); + } + if (CollectionUtils.isEmpty(createOrder.getOrderItemList())) { + throw new IllegalArgumentException("订单不能为空!"); + } + for (WxCreateOrder.OrderItem orderItem : createOrder.getOrderItemList()) { + itemIdList.add(orderItem.getOrderItemId()); + } + ItemQuery itemQuery = new ItemQuery(); + Integer[] array = new Integer[itemIdList.size()]; + itemQuery.setIds(itemIdList.toArray(array)); + List itemList = itemService.queryItemList(itemQuery); + BigDecimal totalAmount = BigDecimal.ZERO; + int xiajia = 0; + for (ItemModel cdItem : itemList) { + for (WxCreateOrder.OrderItem orderItem : createOrder.getOrderItemList()) { + //查看商品是否下架了 + if (cdItem.getSellStatus() == 0) { + xiajia = 1; + } + if (cdItem.getId().equals(orderItem.getOrderItemId())) { + //判断库存是否有 + boolean flag = stockService.checkStock(orderItem.getOrderItemId(), orderItem.getItemQty().intValue()); + //库存不足 + if (!flag) { + throw new BusinessException("商品：" + cdItem.getItemName() + "库存不足。下单失败"); + } + TbOrderItem tbOrderItem = new TbOrderItem(); + tbOrderItem.setOrderNo(orderNo); + tbOrderItem.setItemCode(cdItem.getItemCode()); + tbOrderItem.setItemId(cdItem.getId()); + tbOrderItem.setItemName(cdItem.getItemName()); + tbOrderItem.setItemQty(orderItem.getItemQty()); + tbOrderItem.setItemUnit(cdItem.getPricingManner()); + if (cdItem.getDiscountPrice() != null) { + tbOrderItem.setItemPrice(cdItem.getDiscountPrice()); + } + else { + tbOrderItem.setItemPrice(cdItem.getSellPrice()); + } + totalAmount = totalAmount.add(tbOrderItem.getItemPrice().multiply(orderItem.getItemQty())); + tbOrderItem.setCreateDate(mybatisDao.getSysdate()); + tbOrderItem.setCreateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY)); + tbOrderItem.setUpdateDate(mybatisDao.getSysdate()); + tbOrderItem.setUpdateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY)); + mybatisDao.insert(tbOrderItem); + } + } + } + + if (createOrder.getAppointmentTime() != null) { + tbOrder.setAppointmentTime(createOrder.getAppointmentTime()); + } + else { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + calendar.add(Calendar.DAY_OF_MONTH, 1); + Date appointmentTime = calendar.getTime(); + tbOrder.setAppointmentTime(appointmentTime); + } + tbOrder.setConsigneeName(createOrder.getConsigneeName()); + tbOrder.setConsigneeAddress(createOrder.getConsigneeAddress()); + tbOrder.setConsigneePhone(createOrder.getConsigneePhone()); + + MemberAddressQuery memberAddressQuery = new MemberAddressQuery(); + memberAddressQuery.setCdMemberId(String.valueOf(createOrder.getCreateUserId())); + if (StringUtils.isEmpty(createOrder.getConsigneeName()) || StringUtils.isEmpty(createOrder.getConsigneeAddress()) + || StringUtils.isEmpty(createOrder.getConsigneePhone())) { + List addresses = memberAddressService.getMemberAddressModels(memberAddressQuery); + if (addresses != null) { + int size = addresses.size(); + for (int i = 0; i < size; i++) { + MemberAddressModel address = addresses.get(i); + if (i == 0) { + tbOrder.setConsigneeName(address.getName()); + tbOrder.setConsigneeAddress(address.getFullAddress()); + tbOrder.setConsigneePhone(address.getMobile()); + } + if (address.getIsDefault()) { + tbOrder.setConsigneeName(address.getName()); + tbOrder.setConsigneeAddress(address.getFullAddress()); + tbOrder.setConsigneePhone(address.getMobile()); + break; + } + } + } + } + + tbOrder.setCreateTime(mybatisDao.getSysdate()); + tbOrder.setPaymentMode(null); + tbOrder.setOrderType(createOrder.getOrderType()); + if (StringUtils.trimToNull(createOrder.getPaymentRelationNo()) != null && createOrder.getOrderType() == 2) { + tbOrder.setPaymentMode(7); + //券订单代采购状态 + tbOrder.setOrderStatus("1"); + } + else { + tbOrder.setOrderType(0);//设置为常规订单 + } + tbOrder.setOtherPaymentMode(createOrder.getOtherPaymentMode()); + + tbOrder.setMemberCode(String.valueOf(createOrder.getCreateUserId())); + tbOrder.setRemark(createOrder.getRemark()); + + tbOrder.setOrderNo(orderNo); + tbOrder.setOrderSource(createOrder.getOrderSource()); + tbOrder.setCreateUserId(createOrder.getCreateUserId()); + tbOrder.setXiajia(xiajia); + + + totalAmount = totalAmount.subtract(createOrder.getDiscountPrice() == null ? BigDecimal.ZERO : createOrder.getDiscountPrice()); + //订单总金额如果是劵的则就是劵面金额不用累计商品总金额 + if ((tbOrder.getOrderType() == 2 && StringUtils.trimToNull(createOrder.getPaymentRelationNo()) != null)) { + tbOrder.setTotalAmount(createOrder.getTotalPrice()); + totalAmount = createOrder.getTotalPrice(); + tbOrder.setDiscountPrice(BigDecimal.ZERO); + //生成收货码 + TbOrderRef orderRef = new TbOrderRef(); + orderRef.setOrderNo(orderNo); + orderRef.setRefType("SHOU_HUO_NO"); + orderRef.setRefValue(String.valueOf((int) ((Math.random() * 9 + 1) * 100000))); + mybatisDao.insert(orderRef); + } + else { + tbOrder.setTotalAmount(totalAmount); + tbOrder.setDiscountPrice(createOrder.getDiscountPrice()); + } + tbOrder.setUpdateDate(mybatisDao.getSysdate()); + tbOrder.setUpdateUserId((Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY)); + tbOrder = mybatisDao.insertByModel(tbOrder); + + //扣除订单相应的产品库存 + for (WxCreateOrder.OrderItem orderItem : createOrder.getOrderItemList()) { + //扣除库存 + stockService.changeStockNum(orderItem.getOrderItemId(), 0 - orderItem.getItemQty().intValue(), tbOrder.getId(), "微信订单扣除商品", 2); + } + + // tbOrderNo validation + /*if (StringUtils.trimToNull(createOrder.getPaymentRelationNo()) != null && createOrder.getOrderType() > 0) { + TbOrderRelation tbOrderRelation = new TbOrderRelation(); + tbOrderRelation.setOrderNo(orderNo); + tbOrderRelation.setRefType(OrderMapper.ORDER_PAY_RELATION_CODE);// 订单支付关系 + tbOrderRelation.setRefValue(createOrder.getPaymentRelationNo()); + mybatisDao.insert(tbOrderRelation); + }*/ + if ((tbOrder.getOrderType() == 2 && StringUtils.trimToNull(createOrder.getPaymentRelationNo()) != null)) { + //支付的时候再建立支付关系 + TbOrderRelation tbOrderRelation = new TbOrderRelation(); + tbOrderRelation.setOrderNo(orderNo); + tbOrderRelation.setRefType(OrderMapper.ORDER_PAY_RELATION_CODE);// 订单支付关系 + tbOrderRelation.setRefValue(createOrder.getPaymentRelationNo()); + mybatisDao.insert(tbOrderRelation); + + PayOrder payOrder = new PayOrder(); + payOrder.setOrderNo(tbOrder.getOrderNo()); + payOrder.setAmount(totalAmount); + payOrder(payOrder); + } + // 非券类订单则要将对应的物品从购物车只移除 + String userToken = String.valueOf(createOrder.getCreateUserId()); + if (normalOrder) { + cartServcie.removeItems(userToken, itemIdList); + } + return tbOrder; + } + + @Transactional + public Boolean payWxOrder(PayOrderModel payOrderModel) throws Exception { + + Integer orderId = payOrderModel.getOrderId(); + + TbOrder tbOrder = mybatisDao.selectByPrimaryKey(TbOrder.class, orderId); + Integer orderType = payOrderModel.getOrderType(); + if (orderType == null || (orderType != 1)) { + //货到付款订单 + tbOrder.setOrderStatus("1"); + tbOrder.setPayStatus(1); + tbOrder.setOrderType(0);//常规订单,货到付款类型 + tbOrder.setPaymentMode(4);//支付类型为物流公司代收 + + Integer userId = null; + try { + userId = Integer.valueOf(tbOrder.getMemberCode()); + } catch (Exception e) { + userId = tbOrder.getCreateUserId(); + } + CdMember member = mybatisDao.selectByPrimaryKey(CdMember.class, userId); + if (member != null) { + tbOrder.setCompanyId(member.getCdCompanyId()); + tbOrder.setManagerId(member.getCdUserId()); + } + mybatisDao.update(tbOrder); + return Boolean.TRUE; + } + String paymentNo = payOrderModel.getPaymentNo(); + if (StringUtils.isEmpty(paymentNo)) { + throw new BusinessException("卡号不能为空!"); + } + CdCoupon cdCouponQuery = new CdCoupon(); + cdCouponQuery.setCouponNumber(paymentNo); + CdCoupon cdCoupon = mybatisDao.selectOneByModel(cdCouponQuery); + if (cdCoupon == null || cdCoupon.getCouponType() != 1) { + throw new BusinessException("该卡不存在!"); + } + + MyOrderQuery myOrderQuery = new MyOrderQuery(); + myOrderQuery.setOrderId(orderId); + OrderDetailModel orderDetailModel = myOrderService.getOrderDetail(myOrderQuery); + List itemList = orderDetailModel.getProducts(); + BigDecimal totalAmount = BigDecimal.ZERO; + for (OrderProductItem cdItem : itemList) { + BigDecimal price = cdItem.getItemPrice(); + totalAmount = totalAmount.add(price.multiply(cdItem.getItemQty())); + + } + if (cdCoupon.getUserPrice().compareTo(totalAmount) < 0) { + throw new BusinessException("卡内余额不足，请充值或选用其他付款方式!"); + } + //设置为卡支付订单 + tbOrder.setPaymentMode(5); + tbOrder.setOrderType(1); + tbOrder.setOrderStatus("1"); + + tbOrder.setCompanyId(cdCoupon.getCdCompanyId()); + tbOrder.setManagerId(cdCoupon.getCdUserId()); + mybatisDao.update(tbOrder); + + TbOrderRelation tbOrderRelation = new TbOrderRelation(); + tbOrderRelation.setOrderNo(tbOrder.getOrderNo()); + tbOrderRelation.setRefType(OrderMapper.ORDER_PAY_RELATION_CODE);// 订单支付关系 + tbOrderRelation.setRefValue(payOrderModel.getPaymentNo()); + mybatisDao.insert(tbOrderRelation); + + PayOrder payOrder = new PayOrder(); + payOrder.setOrderNo(orderDetailModel.getOrderNo()); + payOrder.setAmount(totalAmount); + payOrder(payOrder); + + + return true; + } + + public List getCouponItems(String couponNo) { + CouponModel couponModel = couponService.getCouponModel(couponNo); + if (couponModel == null || couponModel.getCouponType() != 2) { + throw new IllegalArgumentException("无效的券!"); + } + List items = couponModel.getRelationItemList(); + Map itemInfoMap = new HashMap(); + List itemIds = new ArrayList(); + for (CouponRelationItem item : items) { + itemInfoMap.put(item.getItemId(), item.getItemNumber().intValue()); + itemIds.add(item.getItemId()); + } + List productModels = productService.getProducts(itemIds); + for (ProductModel productModel : productModels) { + productModel.setItemQty(itemInfoMap.get(productModel.getId())); + } + return productModels; + } +} diff --git a/src/main/java/com/xmomen/module/pick/entity/mapper/TbPickMapper.java b/src/main/java/com/xmomen/module/pick/entity/mapper/TbPickMapper.java new file mode 100644 index 0000000..aff4776 --- /dev/null +++ b/src/main/java/com/xmomen/module/pick/entity/mapper/TbPickMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.pick.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.pick.entity.TbPick; +import com.xmomen.module.pick.entity.TbPickExample; +import org.apache.ibatis.annotations.Param; + +public interface TbPickMapper extends MybatisMapper { + int countByExample(TbPickExample example); + + int deleteByExample(TbPickExample example); + + int insertSelective(TbPick record); + + int updateByExampleSelective(@Param("record") TbPick record, @Param("example") TbPickExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/pick/model/CreateMember.java b/src/main/java/com/xmomen/module/pick/model/CreateMember.java new file mode 100644 index 0000000..72860b2 --- /dev/null +++ b/src/main/java/com/xmomen/module/pick/model/CreateMember.java @@ -0,0 +1,234 @@ +package com.xmomen.module.pick.model; + +import java.io.Serializable; +import java.math.BigDecimal; + +import javax.validation.constraints.NotNull; + +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 spareName; + + private String spareName2; + + /** + * 备用手机号1 + */ + private String spareTel; + + /** + * 备用手机号2 + */ + private String spareTel2; + + /** + * 家庭固话 + */ + private String telNumber; + + /** + * 办公室电话 + */ + private String officeTel; + + /** + * 收货地址 + */ + @NotNull + @NotBlank + private String address; + + /** + * 备用地址1 + */ + private String spareAddress; + + /** + * 备用地址2 + */ + private String spareAddress2; + + /** + * 1-潜在客户，2-普通客户，3-优质客户 + */ + private Integer memberType; + + /** + * 所属单位 + */ + private Integer cdCompanyId; + + /** + * 所属客服经理 + */ + private Integer cdUserId; + + private String newCouponNo; + + private String newPassword; + + private BigDecimal userPrice; + + 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 getSpareTel() { + return spareTel; + } + + public void setSpareTel(String spareTel) { + this.spareTel = spareTel; + } + + public String getSpareTel2() { + return spareTel2; + } + + public void setSpareTel2(String spareTel2) { + this.spareTel2 = spareTel2; + } + + 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 String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getSpareAddress() { + return spareAddress; + } + + public void setSpareAddress(String spareAddress) { + this.spareAddress = spareAddress; + } + + public String getSpareAddress2() { + return spareAddress2; + } + + public void setSpareAddress2(String spareAddress2) { + this.spareAddress2 = spareAddress2; + } + + 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 getSpareName() { + return spareName; + } + + public void setSpareName(String spareName) { + this.spareName = spareName; + } + + public String getSpareName2() { + return spareName2; + } + + public void setSpareName2(String spareName2) { + this.spareName2 = spareName2; + } + + public String getNewCouponNo() { + return newCouponNo; + } + + public void setNewCouponNo(String newCouponNo) { + this.newCouponNo = newCouponNo; + } + + public String getNewPassword() { + return newPassword; + } + + public void setNewPassword(String newPassword) { + this.newPassword = newPassword; + } + + public BigDecimal getUserPrice() { + return userPrice; + } + + public void setUserPrice(BigDecimal userPrice) { + this.userPrice = userPrice; + } +} diff --git a/src/main/java/com/xmomen/module/pick/service/impl/PickServiceImpl.java b/src/main/java/com/xmomen/module/pick/service/impl/PickServiceImpl.java new file mode 100644 index 0000000..0a1f3e7 --- /dev/null +++ b/src/main/java/com/xmomen/module/pick/service/impl/PickServiceImpl.java @@ -0,0 +1,115 @@ +package com.xmomen.module.pick.service.impl; + +import java.math.BigDecimal; + +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.framework.utils.AssertExt; +import com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.base.entity.CdCoupon; +import com.xmomen.module.base.entity.CdMember; +import com.xmomen.module.base.entity.CdMemberCouponRelation; +import com.xmomen.module.pick.entity.TbPick; +import com.xmomen.module.pick.entity.TbRechargeLog; +import com.xmomen.module.pick.model.CreateMember; +import com.xmomen.module.pick.model.PickVo; +import com.xmomen.module.pick.service.PickService; +import com.xmomen.module.system.entity.SysUserOrganization; +@Service +public class PickServiceImpl implements PickService { + + @Autowired + private MybatisDao mybatisDao; + @Override + @Transactional + public void pick(PickVo pickVo) { + CdCoupon coupon = new CdCoupon(); + coupon.setCouponNumber(pickVo.getCouponNo()); + coupon = mybatisDao.selectOneByModel(coupon); + AssertExt.notNull(coupon,"卡号不存在！"); + int pickPayType = pickVo.getPickPayType().intValue(); + BigDecimal pickPrice = pickVo.getPickPrice(); + BigDecimal casePrice = pickVo.getPickCasePrice() == null ? BigDecimal.ZERO : pickVo.getPickCasePrice(); + BigDecimal cradPrice = pickPrice.subtract(casePrice); + if(pickPayType == 1 || pickPayType == 2){//刷卡 || 现金+刷卡 + BigDecimal usePrice = coupon.getUserPrice(); + BigDecimal diffPrice = usePrice.subtract(cradPrice); + AssertExt.isTrue(diffPrice.doubleValue() >= 0.00,"余额不足"); + coupon.setUserPrice(diffPrice); + mybatisDao.update(coupon); + }else if(pickPayType == 3){//现金 + AssertExt.isTrue(casePrice.compareTo(pickPrice) != 0,"付款金额错误"); + } + Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + SysUserOrganization userOrganization = new SysUserOrganization(); + userOrganization.setUserId(userId); + userOrganization = mybatisDao.selectOneByModel(userOrganization); + TbPick pick = new TbPick(); + pick.setCouponNo(pickVo.getCouponNo()); + pick.setPickCasePrice(casePrice); + pick.setPickCradPrice(cradPrice); + pick.setPickDate(mybatisDao.getSysdate()); + pick.setPickPlaceUser(userId); + pick.setPickPlace(userOrganization.getOrganizationId()); + pick.setPickTotalPrice(pickPrice); + pick.setPickWeight(pickVo.getPickWeight()); + mybatisDao.save(pick); + } + @Override + public void pickCard(CreateMember createMember) { + CdCoupon coupon = new CdCoupon(); + coupon.setCouponNumber(createMember.getNewCouponNo()); + coupon.setCouponPassword(createMember.getNewPassword()); + coupon = mybatisDao.selectOneByModel(coupon); + AssertExt.notNull(coupon,"卡号不存在！"); + + CdMemberCouponRelation cdMemberCouponRelation = new CdMemberCouponRelation(); + cdMemberCouponRelation.setCouponNumber(coupon.getCouponNumber()); + cdMemberCouponRelation = mybatisDao.selectOneByModel(cdMemberCouponRelation); + AssertExt.isNull(cdMemberCouponRelation,"该卡已绑定客户，不能再绑定"); + + + CdMember member = new CdMember(); + member.setMemberType(createMember.getMemberType()); + member.setName(createMember.getName()); + member.setPhoneNumber(createMember.getPhoneNumber()); + member.setSpareName(createMember.getSpareName()); + member.setSpareName2(createMember.getSpareName2()); + member.setSpareTel(createMember.getSpareTel()); + member.setSpareTel2(createMember.getSpareTel2()); + member.setTelNumber(createMember.getTelNumber()); + member.setOfficeTel(createMember.getOfficeTel()); + member.setAddress(createMember.getAddress()); + member.setSpareAddress(createMember.getSpareAddress()); + member.setSpareAddress2(createMember.getSpareAddress2()); + member.setCdCompanyId(createMember.getCdCompanyId()); + member.setCdUserId(createMember.getCdUserId()); + member = mybatisDao.insertByModel(member); + CdMemberCouponRelation cdMemberCouponRelation2 = new CdMemberCouponRelation(); + cdMemberCouponRelation2.setCdMemberId(member.getId()); + cdMemberCouponRelation2.setCouponNumber(coupon.getCouponNumber()); + mybatisDao.insert(cdMemberCouponRelation2); + //记录充值记录 + BigDecimal userPrice = coupon.getUserPrice()==null?BigDecimal.ZERO:coupon.getUserPrice(); + coupon.setUserPrice(userPrice.add(createMember.getUserPrice())); + mybatisDao.update(coupon); + + Integer userId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + SysUserOrganization userOrganization = new SysUserOrganization(); + userOrganization.setUserId(userId); + userOrganization = mybatisDao.selectOneByModel(userOrganization); + TbRechargeLog rechargeLog = new TbRechargeLog(); + rechargeLog.setCouponNo(coupon.getCouponNumber()); + rechargeLog.setRechargeDate(mybatisDao.getSysdate()); + rechargeLog.setRechargePlace(userOrganization.getOrganizationId()); + rechargeLog.setRechargePrice(createMember.getUserPrice()); + rechargeLog.setRechargeUser(userId); + mybatisDao.save(rechargeLog); + } + +} diff --git a/src/main/java/com/xmomen/module/plan/entity/TbTablePlanExample.java b/src/main/java/com/xmomen/module/plan/entity/TbTablePlanExample.java new file mode 100644 index 0000000..72761a1 --- /dev/null +++ b/src/main/java/com/xmomen/module/plan/entity/TbTablePlanExample.java @@ -0,0 +1,1319 @@ +package com.xmomen.module.plan.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 TbTablePlanExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbTablePlanExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values, String property) { + if (values == null || values.size() == 0) { + throw new RuntimeException("Value list for " + property + " cannot be null or empty"); + } + List dateList = new ArrayList(); + Iterator 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("CD_PLAN_ID in", values, "cdPlanId"); + return (Criteria) this; + } + + public Criteria andCdPlanIdNotIn(List 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 andAuditStatusIsNull() { + addCriterion("AUDIT_STATUS is null"); + return (Criteria) this; + } + + public Criteria andAuditStatusIsNotNull() { + addCriterion("AUDIT_STATUS is not null"); + return (Criteria) this; + } + + public Criteria andAuditStatusEqualTo(Integer value) { + addCriterion("AUDIT_STATUS =", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusNotEqualTo(Integer value) { + addCriterion("AUDIT_STATUS <>", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusGreaterThan(Integer value) { + addCriterion("AUDIT_STATUS >", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("AUDIT_STATUS >=", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusLessThan(Integer value) { + addCriterion("AUDIT_STATUS <", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusLessThanOrEqualTo(Integer value) { + addCriterion("AUDIT_STATUS <=", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusIn(List values) { + addCriterion("AUDIT_STATUS in", values, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusNotIn(List values) { + addCriterion("AUDIT_STATUS not in", values, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusBetween(Integer value1, Integer value2) { + addCriterion("AUDIT_STATUS between", value1, value2, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusNotBetween(Integer value1, Integer value2) { + addCriterion("AUDIT_STATUS not between", value1, value2, "auditStatus"); + return (Criteria) this; + } + + public Criteria andIsStopIsNull() { + addCriterion("IS_STOP is null"); + return (Criteria) this; + } + + public Criteria andIsStopIsNotNull() { + addCriterion("IS_STOP is not null"); + return (Criteria) this; + } + + public Criteria andIsStopEqualTo(Integer value) { + addCriterion("IS_STOP =", value, "isStop"); + return (Criteria) this; + } + + public Criteria andIsStopNotEqualTo(Integer value) { + addCriterion("IS_STOP <>", value, "isStop"); + return (Criteria) this; + } + + public Criteria andIsStopGreaterThan(Integer value) { + addCriterion("IS_STOP >", value, "isStop"); + return (Criteria) this; + } + + public Criteria andIsStopGreaterThanOrEqualTo(Integer value) { + addCriterion("IS_STOP >=", value, "isStop"); + return (Criteria) this; + } + + public Criteria andIsStopLessThan(Integer value) { + addCriterion("IS_STOP <", value, "isStop"); + return (Criteria) this; + } + + public Criteria andIsStopLessThanOrEqualTo(Integer value) { + addCriterion("IS_STOP <=", value, "isStop"); + return (Criteria) this; + } + + public Criteria andIsStopIn(List values) { + addCriterion("IS_STOP in", values, "isStop"); + return (Criteria) this; + } + + public Criteria andIsStopNotIn(List values) { + addCriterion("IS_STOP not in", values, "isStop"); + return (Criteria) this; + } + + public Criteria andIsStopBetween(Integer value1, Integer value2) { + addCriterion("IS_STOP between", value1, value2, "isStop"); + return (Criteria) this; + } + + public Criteria andIsStopNotBetween(Integer value1, Integer value2) { + addCriterion("IS_STOP not between", value1, value2, "isStop"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIsNull() { + addCriterion("CD_MEMBER_ID is null"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIsNotNull() { + addCriterion("CD_MEMBER_ID is not null"); + return (Criteria) this; + } + + public Criteria andCdMemberIdEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID =", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID <>", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdGreaterThan(Integer value) { + addCriterion("CD_MEMBER_ID >", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdGreaterThanOrEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID >=", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdLessThan(Integer value) { + addCriterion("CD_MEMBER_ID <", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdLessThanOrEqualTo(Integer value) { + addCriterion("CD_MEMBER_ID <=", value, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdIn(List values) { + addCriterion("CD_MEMBER_ID in", values, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotIn(List values) { + addCriterion("CD_MEMBER_ID not in", values, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdBetween(Integer value1, Integer value2) { + addCriterion("CD_MEMBER_ID between", value1, value2, "cdMemberId"); + return (Criteria) this; + } + + public Criteria andCdMemberIdNotBetween(Integer value1, Integer value2) { + addCriterion("CD_MEMBER_ID not between", value1, value2, "cdMemberId"); + 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 values) { + addCriterion("COUPON_NUMBER in", values, "couponNumber"); + return (Criteria) this; + } + + public Criteria andCouponNumberNotIn(List 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 andMemberCodeIsNull() { + addCriterion("MEMBER_CODE is null"); + return (Criteria) this; + } + + public Criteria andMemberCodeIsNotNull() { + addCriterion("MEMBER_CODE is not null"); + return (Criteria) this; + } + + public Criteria andMemberCodeEqualTo(String value) { + addCriterion("MEMBER_CODE =", value, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeNotEqualTo(String value) { + addCriterion("MEMBER_CODE <>", value, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeGreaterThan(String value) { + addCriterion("MEMBER_CODE >", value, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeGreaterThanOrEqualTo(String value) { + addCriterion("MEMBER_CODE >=", value, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeLessThan(String value) { + addCriterion("MEMBER_CODE <", value, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeLessThanOrEqualTo(String value) { + addCriterion("MEMBER_CODE <=", value, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeLike(String value) { + addCriterion("MEMBER_CODE like", value, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeNotLike(String value) { + addCriterion("MEMBER_CODE not like", value, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeIn(List values) { + addCriterion("MEMBER_CODE in", values, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeNotIn(List values) { + addCriterion("MEMBER_CODE not in", values, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeBetween(String value1, String value2) { + addCriterion("MEMBER_CODE between", value1, value2, "memberCode"); + return (Criteria) this; + } + + public Criteria andMemberCodeNotBetween(String value1, String value2) { + addCriterion("MEMBER_CODE not between", value1, value2, "memberCode"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneIsNull() { + addCriterion("CONSIGNEE_PHONE is null"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneIsNotNull() { + addCriterion("CONSIGNEE_PHONE is not null"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneEqualTo(String value) { + addCriterion("CONSIGNEE_PHONE =", value, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneNotEqualTo(String value) { + addCriterion("CONSIGNEE_PHONE <>", value, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneGreaterThan(String value) { + addCriterion("CONSIGNEE_PHONE >", value, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneGreaterThanOrEqualTo(String value) { + addCriterion("CONSIGNEE_PHONE >=", value, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneLessThan(String value) { + addCriterion("CONSIGNEE_PHONE <", value, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneLessThanOrEqualTo(String value) { + addCriterion("CONSIGNEE_PHONE <=", value, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneLike(String value) { + addCriterion("CONSIGNEE_PHONE like", value, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneNotLike(String value) { + addCriterion("CONSIGNEE_PHONE not like", value, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneIn(List values) { + addCriterion("CONSIGNEE_PHONE in", values, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneNotIn(List values) { + addCriterion("CONSIGNEE_PHONE not in", values, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneBetween(String value1, String value2) { + addCriterion("CONSIGNEE_PHONE between", value1, value2, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneePhoneNotBetween(String value1, String value2) { + addCriterion("CONSIGNEE_PHONE not between", value1, value2, "consigneePhone"); + return (Criteria) this; + } + + public Criteria andConsigneeNameIsNull() { + addCriterion("CONSIGNEE_NAME is null"); + return (Criteria) this; + } + + public Criteria andConsigneeNameIsNotNull() { + addCriterion("CONSIGNEE_NAME is not null"); + return (Criteria) this; + } + + public Criteria andConsigneeNameEqualTo(String value) { + addCriterion("CONSIGNEE_NAME =", value, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameNotEqualTo(String value) { + addCriterion("CONSIGNEE_NAME <>", value, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameGreaterThan(String value) { + addCriterion("CONSIGNEE_NAME >", value, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameGreaterThanOrEqualTo(String value) { + addCriterion("CONSIGNEE_NAME >=", value, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameLessThan(String value) { + addCriterion("CONSIGNEE_NAME <", value, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameLessThanOrEqualTo(String value) { + addCriterion("CONSIGNEE_NAME <=", value, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameLike(String value) { + addCriterion("CONSIGNEE_NAME like", value, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameNotLike(String value) { + addCriterion("CONSIGNEE_NAME not like", value, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameIn(List values) { + addCriterion("CONSIGNEE_NAME in", values, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameNotIn(List values) { + addCriterion("CONSIGNEE_NAME not in", values, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameBetween(String value1, String value2) { + addCriterion("CONSIGNEE_NAME between", value1, value2, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeNameNotBetween(String value1, String value2) { + addCriterion("CONSIGNEE_NAME not between", value1, value2, "consigneeName"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressIsNull() { + addCriterion("CONSIGNEE_ADDRESS is null"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressIsNotNull() { + addCriterion("CONSIGNEE_ADDRESS is not null"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressEqualTo(String value) { + addCriterion("CONSIGNEE_ADDRESS =", value, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressNotEqualTo(String value) { + addCriterion("CONSIGNEE_ADDRESS <>", value, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressGreaterThan(String value) { + addCriterion("CONSIGNEE_ADDRESS >", value, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressGreaterThanOrEqualTo(String value) { + addCriterion("CONSIGNEE_ADDRESS >=", value, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressLessThan(String value) { + addCriterion("CONSIGNEE_ADDRESS <", value, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressLessThanOrEqualTo(String value) { + addCriterion("CONSIGNEE_ADDRESS <=", value, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressLike(String value) { + addCriterion("CONSIGNEE_ADDRESS like", value, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressNotLike(String value) { + addCriterion("CONSIGNEE_ADDRESS not like", value, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressIn(List values) { + addCriterion("CONSIGNEE_ADDRESS in", values, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressNotIn(List values) { + addCriterion("CONSIGNEE_ADDRESS not in", values, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressBetween(String value1, String value2) { + addCriterion("CONSIGNEE_ADDRESS between", value1, value2, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andConsigneeAddressNotBetween(String value1, String value2) { + addCriterion("CONSIGNEE_ADDRESS not between", value1, value2, "consigneeAddress"); + return (Criteria) this; + } + + public Criteria andPostcodeIsNull() { + addCriterion("POSTCODE is null"); + return (Criteria) this; + } + + public Criteria andPostcodeIsNotNull() { + addCriterion("POSTCODE is not null"); + return (Criteria) this; + } + + public Criteria andPostcodeEqualTo(String value) { + addCriterion("POSTCODE =", value, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeNotEqualTo(String value) { + addCriterion("POSTCODE <>", value, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeGreaterThan(String value) { + addCriterion("POSTCODE >", value, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeGreaterThanOrEqualTo(String value) { + addCriterion("POSTCODE >=", value, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeLessThan(String value) { + addCriterion("POSTCODE <", value, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeLessThanOrEqualTo(String value) { + addCriterion("POSTCODE <=", value, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeLike(String value) { + addCriterion("POSTCODE like", value, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeNotLike(String value) { + addCriterion("POSTCODE not like", value, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeIn(List values) { + addCriterion("POSTCODE in", values, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeNotIn(List values) { + addCriterion("POSTCODE not in", values, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeBetween(String value1, String value2) { + addCriterion("POSTCODE between", value1, value2, "postcode"); + return (Criteria) this; + } + + public Criteria andPostcodeNotBetween(String value1, String value2) { + addCriterion("POSTCODE not between", value1, value2, "postcode"); + return (Criteria) this; + } + + public Criteria andSendWeekDayIsNull() { + addCriterion("SEND_WEEK_DAY is null"); + return (Criteria) this; + } + + public Criteria andSendWeekDayIsNotNull() { + addCriterion("SEND_WEEK_DAY is not null"); + return (Criteria) this; + } + + public Criteria andSendWeekDayEqualTo(String value) { + addCriterion("SEND_WEEK_DAY =", value, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayNotEqualTo(String value) { + addCriterion("SEND_WEEK_DAY <>", value, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayGreaterThan(String value) { + addCriterion("SEND_WEEK_DAY >", value, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayGreaterThanOrEqualTo(String value) { + addCriterion("SEND_WEEK_DAY >=", value, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayLessThan(String value) { + addCriterion("SEND_WEEK_DAY <", value, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayLessThanOrEqualTo(String value) { + addCriterion("SEND_WEEK_DAY <=", value, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayLike(String value) { + addCriterion("SEND_WEEK_DAY like", value, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayNotLike(String value) { + addCriterion("SEND_WEEK_DAY not like", value, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayIn(List values) { + addCriterion("SEND_WEEK_DAY in", values, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayNotIn(List values) { + addCriterion("SEND_WEEK_DAY not in", values, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayBetween(String value1, String value2) { + addCriterion("SEND_WEEK_DAY between", value1, value2, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andSendWeekDayNotBetween(String value1, String value2) { + addCriterion("SEND_WEEK_DAY not between", value1, value2, "sendWeekDay"); + return (Criteria) this; + } + + public Criteria andTotalSendValueIsNull() { + addCriterion("TOTAL_SEND_VALUE is null"); + return (Criteria) this; + } + + public Criteria andTotalSendValueIsNotNull() { + addCriterion("TOTAL_SEND_VALUE is not null"); + return (Criteria) this; + } + + public Criteria andTotalSendValueEqualTo(Integer value) { + addCriterion("TOTAL_SEND_VALUE =", value, "totalSendValue"); + return (Criteria) this; + } + + public Criteria andTotalSendValueNotEqualTo(Integer value) { + addCriterion("TOTAL_SEND_VALUE <>", value, "totalSendValue"); + return (Criteria) this; + } + + public Criteria andTotalSendValueGreaterThan(Integer value) { + addCriterion("TOTAL_SEND_VALUE >", value, "totalSendValue"); + return (Criteria) this; + } + + public Criteria andTotalSendValueGreaterThanOrEqualTo(Integer value) { + addCriterion("TOTAL_SEND_VALUE >=", value, "totalSendValue"); + return (Criteria) this; + } + + public Criteria andTotalSendValueLessThan(Integer value) { + addCriterion("TOTAL_SEND_VALUE <", value, "totalSendValue"); + return (Criteria) this; + } + + public Criteria andTotalSendValueLessThanOrEqualTo(Integer value) { + addCriterion("TOTAL_SEND_VALUE <=", value, "totalSendValue"); + return (Criteria) this; + } + + public Criteria andTotalSendValueIn(List values) { + addCriterion("TOTAL_SEND_VALUE in", values, "totalSendValue"); + return (Criteria) this; + } + + public Criteria andTotalSendValueNotIn(List values) { + addCriterion("TOTAL_SEND_VALUE not in", values, "totalSendValue"); + return (Criteria) this; + } + + public Criteria andTotalSendValueBetween(Integer value1, Integer value2) { + addCriterion("TOTAL_SEND_VALUE between", value1, value2, "totalSendValue"); + return (Criteria) this; + } + + public Criteria andTotalSendValueNotBetween(Integer value1, Integer value2) { + addCriterion("TOTAL_SEND_VALUE not between", value1, value2, "totalSendValue"); + return (Criteria) this; + } + + public Criteria andSendValueIsNull() { + addCriterion("SEND_VALUE is null"); + return (Criteria) this; + } + + public Criteria andSendValueIsNotNull() { + addCriterion("SEND_VALUE is not null"); + return (Criteria) this; + } + + public Criteria andSendValueEqualTo(Integer value) { + addCriterion("SEND_VALUE =", value, "sendValue"); + return (Criteria) this; + } + + public Criteria andSendValueNotEqualTo(Integer value) { + addCriterion("SEND_VALUE <>", value, "sendValue"); + return (Criteria) this; + } + + public Criteria andSendValueGreaterThan(Integer value) { + addCriterion("SEND_VALUE >", value, "sendValue"); + return (Criteria) this; + } + + public Criteria andSendValueGreaterThanOrEqualTo(Integer value) { + addCriterion("SEND_VALUE >=", value, "sendValue"); + return (Criteria) this; + } + + public Criteria andSendValueLessThan(Integer value) { + addCriterion("SEND_VALUE <", value, "sendValue"); + return (Criteria) this; + } + + public Criteria andSendValueLessThanOrEqualTo(Integer value) { + addCriterion("SEND_VALUE <=", value, "sendValue"); + return (Criteria) this; + } + + public Criteria andSendValueIn(List values) { + addCriterion("SEND_VALUE in", values, "sendValue"); + return (Criteria) this; + } + + public Criteria andSendValueNotIn(List values) { + addCriterion("SEND_VALUE not in", values, "sendValue"); + return (Criteria) this; + } + + public Criteria andSendValueBetween(Integer value1, Integer value2) { + addCriterion("SEND_VALUE between", value1, value2, "sendValue"); + return (Criteria) this; + } + + public Criteria andSendValueNotBetween(Integer value1, Integer value2) { + addCriterion("SEND_VALUE not between", value1, value2, "sendValue"); + return (Criteria) this; + } + + public Criteria andLastSendDateIsNull() { + addCriterion("LAST_SEND_DATE is null"); + return (Criteria) this; + } + + public Criteria andLastSendDateIsNotNull() { + addCriterion("LAST_SEND_DATE is not null"); + return (Criteria) this; + } + + public Criteria andLastSendDateEqualTo(Date value) { + addCriterionForJDBCDate("LAST_SEND_DATE =", value, "lastSendDate"); + return (Criteria) this; + } + + public Criteria andLastSendDateNotEqualTo(Date value) { + addCriterionForJDBCDate("LAST_SEND_DATE <>", value, "lastSendDate"); + return (Criteria) this; + } + + public Criteria andLastSendDateGreaterThan(Date value) { + addCriterionForJDBCDate("LAST_SEND_DATE >", value, "lastSendDate"); + return (Criteria) this; + } + + public Criteria andLastSendDateGreaterThanOrEqualTo(Date value) { + addCriterionForJDBCDate("LAST_SEND_DATE >=", value, "lastSendDate"); + return (Criteria) this; + } + + public Criteria andLastSendDateLessThan(Date value) { + addCriterionForJDBCDate("LAST_SEND_DATE <", value, "lastSendDate"); + return (Criteria) this; + } + + public Criteria andLastSendDateLessThanOrEqualTo(Date value) { + addCriterionForJDBCDate("LAST_SEND_DATE <=", value, "lastSendDate"); + return (Criteria) this; + } + + public Criteria andLastSendDateIn(List values) { + addCriterionForJDBCDate("LAST_SEND_DATE in", values, "lastSendDate"); + return (Criteria) this; + } + + public Criteria andLastSendDateNotIn(List values) { + addCriterionForJDBCDate("LAST_SEND_DATE not in", values, "lastSendDate"); + return (Criteria) this; + } + + public Criteria andLastSendDateBetween(Date value1, Date value2) { + addCriterionForJDBCDate("LAST_SEND_DATE between", value1, value2, "lastSendDate"); + return (Criteria) this; + } + + public Criteria andLastSendDateNotBetween(Date value1, Date value2) { + addCriterionForJDBCDate("LAST_SEND_DATE not between", value1, value2, "lastSendDate"); + return (Criteria) this; + } + + public Criteria andNextSendDateIsNull() { + addCriterion("NEXT_SEND_DATE is null"); + return (Criteria) this; + } + + public Criteria andNextSendDateIsNotNull() { + addCriterion("NEXT_SEND_DATE is not null"); + return (Criteria) this; + } + + public Criteria andNextSendDateEqualTo(Date value) { + addCriterionForJDBCDate("NEXT_SEND_DATE =", value, "nextSendDate"); + return (Criteria) this; + } + + public Criteria andNextSendDateNotEqualTo(Date value) { + addCriterionForJDBCDate("NEXT_SEND_DATE <>", value, "nextSendDate"); + return (Criteria) this; + } + + public Criteria andNextSendDateGreaterThan(Date value) { + addCriterionForJDBCDate("NEXT_SEND_DATE >", value, "nextSendDate"); + return (Criteria) this; + } + + public Criteria andNextSendDateGreaterThanOrEqualTo(Date value) { + addCriterionForJDBCDate("NEXT_SEND_DATE >=", value, "nextSendDate"); + return (Criteria) this; + } + + public Criteria andNextSendDateLessThan(Date value) { + addCriterionForJDBCDate("NEXT_SEND_DATE <", value, "nextSendDate"); + return (Criteria) this; + } + + public Criteria andNextSendDateLessThanOrEqualTo(Date value) { + addCriterionForJDBCDate("NEXT_SEND_DATE <=", value, "nextSendDate"); + return (Criteria) this; + } + + public Criteria andNextSendDateIn(List values) { + addCriterionForJDBCDate("NEXT_SEND_DATE in", values, "nextSendDate"); + return (Criteria) this; + } + + public Criteria andNextSendDateNotIn(List values) { + addCriterionForJDBCDate("NEXT_SEND_DATE not in", values, "nextSendDate"); + return (Criteria) this; + } + + public Criteria andNextSendDateBetween(Date value1, Date value2) { + addCriterionForJDBCDate("NEXT_SEND_DATE between", value1, value2, "nextSendDate"); + return (Criteria) this; + } + + public Criteria andNextSendDateNotBetween(Date value1, Date value2) { + addCriterionForJDBCDate("NEXT_SEND_DATE not between", value1, value2, "nextSendDate"); + 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) { + addCriterionForJDBCDate("BEGIN_TIME =", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotEqualTo(Date value) { + addCriterionForJDBCDate("BEGIN_TIME <>", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeGreaterThan(Date value) { + addCriterionForJDBCDate("BEGIN_TIME >", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeGreaterThanOrEqualTo(Date value) { + addCriterionForJDBCDate("BEGIN_TIME >=", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeLessThan(Date value) { + addCriterionForJDBCDate("BEGIN_TIME <", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeLessThanOrEqualTo(Date value) { + addCriterionForJDBCDate("BEGIN_TIME <=", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeIn(List values) { + addCriterionForJDBCDate("BEGIN_TIME in", values, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotIn(List values) { + addCriterionForJDBCDate("BEGIN_TIME not in", values, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeBetween(Date value1, Date value2) { + addCriterionForJDBCDate("BEGIN_TIME between", value1, value2, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotBetween(Date value1, Date value2) { + addCriterionForJDBCDate("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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/plan/mapper/TablePlanMapper.java b/src/main/java/com/xmomen/module/plan/mapper/TablePlanMapper.java new file mode 100644 index 0000000..003ae2a --- /dev/null +++ b/src/main/java/com/xmomen/module/plan/mapper/TablePlanMapper.java @@ -0,0 +1,5 @@ +package com.xmomen.module.plan.mapper; + +public interface TablePlanMapper { + public static final String TablePlanMapperNameSpace = "com.xmomen.module.plan.mapper.TablePlanMapper."; +} diff --git a/src/main/java/com/xmomen/module/plan/model/CreateTablePlan.java b/src/main/java/com/xmomen/module/plan/model/CreateTablePlan.java new file mode 100644 index 0000000..df05977 --- /dev/null +++ b/src/main/java/com/xmomen/module/plan/model/CreateTablePlan.java @@ -0,0 +1,55 @@ +package com.xmomen.module.plan.model; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +import com.xmomen.module.plan.entity.TbTablePlan; + +import lombok.Data; + +public @Data class CreateTablePlan implements Serializable{ + /** + * 餐桌计划 + */ + private Integer cdPlanId; + + /** + * 审核状态（0-未审核，1-审核通过） + */ + private Integer auditStatus; + + /** + * 是否暂停 0-不暂停，1-暂停 + */ + private Integer isStop; + + /** + * + */ + private Integer cdMemberId; + + /** + * 卡号 + */ + private String couponNumber; + + /** + * 手机号 + */ + private String consigneePhone; + + /** + * 收货人姓名 + */ + private String consigneeName; + + /** + * 收货人地址 + */ + private String consigneeAddress; + + private List cdPlanIds; + + private List tablePlans; +} diff --git a/src/main/java/com/xmomen/module/plan/model/TablePlanModel.java b/src/main/java/com/xmomen/module/plan/model/TablePlanModel.java new file mode 100644 index 0000000..295a5f3 --- /dev/null +++ b/src/main/java/com/xmomen/module/plan/model/TablePlanModel.java @@ -0,0 +1,120 @@ +package com.xmomen.module.plan.model; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import lombok.Data; + +public @Data class TablePlanModel implements Serializable{ + /** + * + */ + private Integer id; + + /** + * 餐桌计划 + */ + private Integer cdPlanId; + private String planName; + + /** + * 审核状态（0-未审核，1-审核通过） + */ + private Integer auditStatus; + + private Integer isStop; + + /** + * 卡号 + */ + private String couponNumber; + + /** + * 手机号 + */ + private String consigneePhone; + + /** + * 收货人姓名 + */ + private String consigneeName; + + /** + * 收货人地址 + */ + private String consigneeAddress; + + /** + * 邮政编码 + */ + private String postcode; + + + /** + * 单位 + */ + private String companyName; + + private int companyId; + + /** + * 所属客服经理 + */ + private String managerName; + + private int managerId; + + /** + * 总配送次数 + */ + private Integer totalSendValue; + + /** + * 已配送次数 + */ + private Integer sendValue; + + /** + * 生效时间 + */ + private Date beginTime; + + /** + * 配送频率（1周，2周，3周） + */ + private Integer deliveryType; + + /** + * 配送时间(一周的星期几） + */ + private String sendWeekDay; + /** + * 上次配送时间 + */ + private Date lastSendDate; + + /** + * 下次配送时间 + */ + private Date nextSendDate; + /** + * 是否随机 + */ + private Integer isRandom; + + /** + * 产品归属的类别 + */ + private Integer cdCategoryId; + + /** + * 随机数 + */ + private Integer randomNum; + + /** + * 计划的金额 + */ + private BigDecimal price; +} diff --git a/src/main/java/com/xmomen/module/product/controller/CategoryController.java b/src/main/java/com/xmomen/module/product/controller/CategoryController.java new file mode 100644 index 0000000..992cb1b --- /dev/null +++ b/src/main/java/com/xmomen/module/product/controller/CategoryController.java @@ -0,0 +1,26 @@ +package com.xmomen.module.product.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.xmomen.module.product.model.CategoryModel; +import com.xmomen.module.product.service.CategoryService; + +@Controller +@RequestMapping(value = "/wx") +public class CategoryController { + + @Autowired + private CategoryService categoryService; + + @RequestMapping(value = "/category", method = RequestMethod.GET) + @ResponseBody + public List getAllProductCategories() { + return categoryService.getAllProductCategory(); + } +} diff --git a/src/main/java/com/xmomen/module/product/controller/ProductController.java b/src/main/java/com/xmomen/module/product/controller/ProductController.java new file mode 100644 index 0000000..99c2c45 --- /dev/null +++ b/src/main/java/com/xmomen/module/product/controller/ProductController.java @@ -0,0 +1,76 @@ +package com.xmomen.module.product.controller; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +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.ResponseBody; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.product.model.ProductLabel; +import com.xmomen.module.product.model.ProductModel; +import com.xmomen.module.product.model.ProductQuery; +import com.xmomen.module.product.model.ProductQueryFilter; +import com.xmomen.module.product.service.ProductService; + +@Controller +@RequestMapping(value = "/wx") +public class ProductController { + + @Autowired + ProductService productService; + + @RequestMapping(value = "/product", method = RequestMethod.GET) + @ResponseBody + public Page getProducts(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "categoryId", required= false) Integer categoryId, + @RequestParam(value = "productIds", required= false) Integer[] productIds, + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "orderField", required = false) String orderField, + @RequestParam(value = "isAsc", required = false, defaultValue="true") Boolean isAsc, + @RequestParam(value = "labels", required = false) List labels) { + ProductQuery productQuery = new ProductQuery(); + productQuery.setKeyword(keyword); + if(productIds != null && productIds.length > 0){ + productQuery.setProductIds(Arrays.asList(productIds)); + } + if(categoryId != null && categoryId > 0) { + productQuery.setCategoryId(categoryId); + } + List labelEntityFields = new ArrayList(); + if(!CollectionUtils.isEmpty(labels)) { + for(String labelStr: labels) { + ProductLabel label = ProductLabel.enumOf(labelStr); + if(label != null) { + labelEntityFields.add(label.getEntityField()); + } + } + } + if(!labelEntityFields.isEmpty()) { + productQuery.setFilterLabels(labelEntityFields); + } else { + productQuery.setFilterLabels(null); + } + ProductQueryFilter orderFieldType = ProductQueryFilter.enumOf(orderField); + if(orderFieldType != null) { + productQuery.setOrderField(orderFieldType.getFieldName()); + productQuery.setIsAsc(isAsc); + } + return productService.getProductList(productQuery, limit, offset); + } + + @ResponseBody + @RequestMapping(value = "/product/{id}", method = RequestMethod.GET) + public ProductModel detail(@PathVariable(value="id") Integer productId) { + return productService.getDetailById(productId); + } +} diff --git a/src/main/java/com/xmomen/module/product/entity/Category.java b/src/main/java/com/xmomen/module/product/entity/Category.java new file mode 100644 index 0000000..e1f0d78 --- /dev/null +++ b/src/main/java/com/xmomen/module/product/entity/Category.java @@ -0,0 +1,56 @@ +package com.xmomen.module.product.entity; + +import javax.persistence.Entity; +import javax.persistence.Table; + +import com.xmomen.framework.mybatis.model.BaseMybatisModel; + +@Entity +@Table(name="cd_category") +public class Category extends BaseMybatisModel { + + private static final long serialVersionUID = 1L; + + private Integer id; + + private String name; + + private Integer parentId; + + 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; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("Category [id="); + builder.append(id); + builder.append(", name="); + builder.append(name); + builder.append(", parentId="); + builder.append(parentId); + builder.append("]"); + return builder.toString(); + } +} diff --git a/src/main/java/com/xmomen/module/product/mapper/ProductCategoryMapper.java b/src/main/java/com/xmomen/module/product/mapper/ProductCategoryMapper.java new file mode 100644 index 0000000..4408e95 --- /dev/null +++ b/src/main/java/com/xmomen/module/product/mapper/ProductCategoryMapper.java @@ -0,0 +1,6 @@ +package com.xmomen.module.product.mapper; + +public interface ProductCategoryMapper { + + public static final String ProductCategoryMapperNameSpace = "com.xmomen.module.product.mapper.ProductCategoryMapper."; +} diff --git a/src/main/java/com/xmomen/module/product/mapper/ProductMapper.java b/src/main/java/com/xmomen/module/product/mapper/ProductMapper.java new file mode 100644 index 0000000..f34f2e8 --- /dev/null +++ b/src/main/java/com/xmomen/module/product/mapper/ProductMapper.java @@ -0,0 +1,6 @@ +package com.xmomen.module.product.mapper; + +public interface ProductMapper { + + public static final String ProductMapperNameSpace = "com.xmomen.module.product.mapper.ProductMapper."; +} diff --git a/src/main/java/com/xmomen/module/product/mapper/ProductMapper.xml b/src/main/java/com/xmomen/module/product/mapper/ProductMapper.xml new file mode 100644 index 0000000..988ac2c --- /dev/null +++ b/src/main/java/com/xmomen/module/product/mapper/ProductMapper.xml @@ -0,0 +1,162 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/product/model/CategoryModel.java b/src/main/java/com/xmomen/module/product/model/CategoryModel.java new file mode 100644 index 0000000..2d53776 --- /dev/null +++ b/src/main/java/com/xmomen/module/product/model/CategoryModel.java @@ -0,0 +1,18 @@ +package com.xmomen.module.product.model; + +import java.io.Serializable; +import java.util.List; + +import lombok.Data; + +public @Data +class CategoryModel implements Serializable { + + private static final long serialVersionUID = 1L; + private Integer id; + private String name; + private Integer parentId; + private String parentName; + private List nodes; + private boolean leaf = true; +} diff --git a/src/main/java/com/xmomen/module/product/model/ProductQueryFilter.java b/src/main/java/com/xmomen/module/product/model/ProductQueryFilter.java new file mode 100644 index 0000000..5bd749b --- /dev/null +++ b/src/main/java/com/xmomen/module/product/model/ProductQueryFilter.java @@ -0,0 +1,44 @@ +package com.xmomen.module.product.model; + +/** + * The enum is used for filter or order + * @author xiao + * + */ +public enum ProductQueryFilter { + + PRICE("price", "SELL_PRICE"); + + private String desc; + private String fieldName; + // Query condition + private String condition; + + + ProductQueryFilter(String desc, String fieldName) { + this(desc, fieldName, null); + } + ProductQueryFilter(String desc, String fieldName, String condition) { + this.desc = desc; + this.fieldName = fieldName; + this.condition = condition; + } + public String getDesc() { + return this.desc; + } + public String getFieldName() { + return this.fieldName; + } + public String getCondition() { + return this.condition; + } + public static ProductQueryFilter enumOf(String desc) { + ProductQueryFilter[] filters = ProductQueryFilter.values(); + int length = filters.length; + for(int i = 0; i < length; i++) { + ProductQueryFilter filter = filters[i]; + if(filter.desc.equalsIgnoreCase(desc)) return filter; + } + return null; + } +} diff --git a/src/main/java/com/xmomen/module/product/service/CategoryService.java b/src/main/java/com/xmomen/module/product/service/CategoryService.java new file mode 100644 index 0000000..42083ad --- /dev/null +++ b/src/main/java/com/xmomen/module/product/service/CategoryService.java @@ -0,0 +1,9 @@ +package com.xmomen.module.product.service; + +import java.util.List; + +import com.xmomen.module.product.model.CategoryModel; + +public interface CategoryService { + public List getAllProductCategory(); +} diff --git a/src/main/java/com/xmomen/module/product/service/ProductService.java b/src/main/java/com/xmomen/module/product/service/ProductService.java new file mode 100644 index 0000000..e0bba87 --- /dev/null +++ b/src/main/java/com/xmomen/module/product/service/ProductService.java @@ -0,0 +1,15 @@ +package com.xmomen.module.product.service; + +import java.util.List; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.product.model.ProductModel; +import com.xmomen.module.product.model.ProductQuery; + +public interface ProductService { + public Page getProductList(ProductQuery productQuery, Integer limit, Integer offset); + + public ProductModel getDetailById(Integer id); + + public List getProducts(List itemIds); +} diff --git a/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequest.java b/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequest.java new file mode 100644 index 0000000..8e130c3 --- /dev/null +++ b/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequest.java @@ -0,0 +1,130 @@ +package com.xmomen.module.receipt.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 = "tb_receiving_code_request") +public class TbReceivingCodeRequest extends BaseMybatisModel { + /** + * 主键 + */ + private Integer id; + + /** + * 订单号 + */ + private String orderNo; + + /** + * 请求人 + */ + private String requestUser; + + /** + * 请求时间 + */ + private Date requestTime; + + /** + * 请求人手机号 + */ + private String requestPhone; + + /** + * 请求人所属快递商 + */ + private Integer requestExpressId; + + @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 = "order_no") + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + if(orderNo == null){ + removeValidField("orderNo"); + return; + } + addValidField("orderNo"); + } + + @Column(name = "request_user") + public String getRequestUser() { + return requestUser; + } + + public void setRequestUser(String requestUser) { + this.requestUser = requestUser; + if(requestUser == null){ + removeValidField("requestUser"); + return; + } + addValidField("requestUser"); + } + + @Column(name = "request_time") + public Date getRequestTime() { + return requestTime; + } + + public void setRequestTime(Date requestTime) { + this.requestTime = requestTime; + if(requestTime == null){ + removeValidField("requestTime"); + return; + } + addValidField("requestTime"); + } + + @Column(name = "request_phone") + public String getRequestPhone() { + return requestPhone; + } + + public void setRequestPhone(String requestPhone) { + this.requestPhone = requestPhone; + if(requestPhone == null){ + removeValidField("requestPhone"); + return; + } + addValidField("requestPhone"); + } + + @Column(name = "request_express_id") + public Integer getRequestExpressId() { + return requestExpressId; + } + + public void setRequestExpressId(Integer requestExpressId) { + this.requestExpressId = requestExpressId; + if(requestExpressId == null){ + removeValidField("requestExpressId"); + return; + } + addValidField("requestExpressId"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequestExample.java b/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequestExample.java new file mode 100644 index 0000000..1764e7b --- /dev/null +++ b/src/main/java/com/xmomen/module/receipt/entity/TbReceivingCodeRequestExample.java @@ -0,0 +1,592 @@ +package com.xmomen.module.receipt.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TbReceivingCodeRequestExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TbReceivingCodeRequestExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andOrderNoIsNull() { + addCriterion("order_no is null"); + return (Criteria) this; + } + + public Criteria andOrderNoIsNotNull() { + addCriterion("order_no is not null"); + return (Criteria) this; + } + + public Criteria andOrderNoEqualTo(String value) { + addCriterion("order_no =", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotEqualTo(String value) { + addCriterion("order_no <>", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThan(String value) { + addCriterion("order_no >", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("order_no >=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThan(String value) { + addCriterion("order_no <", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLessThanOrEqualTo(String value) { + addCriterion("order_no <=", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoLike(String value) { + addCriterion("order_no like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotLike(String value) { + addCriterion("order_no not like", value, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoIn(List values) { + addCriterion("order_no in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotIn(List values) { + addCriterion("order_no not in", values, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoBetween(String value1, String value2) { + addCriterion("order_no between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andOrderNoNotBetween(String value1, String value2) { + addCriterion("order_no not between", value1, value2, "orderNo"); + return (Criteria) this; + } + + public Criteria andRequestUserIsNull() { + addCriterion("request_user is null"); + return (Criteria) this; + } + + public Criteria andRequestUserIsNotNull() { + addCriterion("request_user is not null"); + return (Criteria) this; + } + + public Criteria andRequestUserEqualTo(String value) { + addCriterion("request_user =", value, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserNotEqualTo(String value) { + addCriterion("request_user <>", value, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserGreaterThan(String value) { + addCriterion("request_user >", value, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserGreaterThanOrEqualTo(String value) { + addCriterion("request_user >=", value, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserLessThan(String value) { + addCriterion("request_user <", value, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserLessThanOrEqualTo(String value) { + addCriterion("request_user <=", value, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserLike(String value) { + addCriterion("request_user like", value, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserNotLike(String value) { + addCriterion("request_user not like", value, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserIn(List values) { + addCriterion("request_user in", values, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserNotIn(List values) { + addCriterion("request_user not in", values, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserBetween(String value1, String value2) { + addCriterion("request_user between", value1, value2, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestUserNotBetween(String value1, String value2) { + addCriterion("request_user not between", value1, value2, "requestUser"); + return (Criteria) this; + } + + public Criteria andRequestTimeIsNull() { + addCriterion("request_time is null"); + return (Criteria) this; + } + + public Criteria andRequestTimeIsNotNull() { + addCriterion("request_time is not null"); + return (Criteria) this; + } + + public Criteria andRequestTimeEqualTo(Date value) { + addCriterion("request_time =", value, "requestTime"); + return (Criteria) this; + } + + public Criteria andRequestTimeNotEqualTo(Date value) { + addCriterion("request_time <>", value, "requestTime"); + return (Criteria) this; + } + + public Criteria andRequestTimeGreaterThan(Date value) { + addCriterion("request_time >", value, "requestTime"); + return (Criteria) this; + } + + public Criteria andRequestTimeGreaterThanOrEqualTo(Date value) { + addCriterion("request_time >=", value, "requestTime"); + return (Criteria) this; + } + + public Criteria andRequestTimeLessThan(Date value) { + addCriterion("request_time <", value, "requestTime"); + return (Criteria) this; + } + + public Criteria andRequestTimeLessThanOrEqualTo(Date value) { + addCriterion("request_time <=", value, "requestTime"); + return (Criteria) this; + } + + public Criteria andRequestTimeIn(List values) { + addCriterion("request_time in", values, "requestTime"); + return (Criteria) this; + } + + public Criteria andRequestTimeNotIn(List values) { + addCriterion("request_time not in", values, "requestTime"); + return (Criteria) this; + } + + public Criteria andRequestTimeBetween(Date value1, Date value2) { + addCriterion("request_time between", value1, value2, "requestTime"); + return (Criteria) this; + } + + public Criteria andRequestTimeNotBetween(Date value1, Date value2) { + addCriterion("request_time not between", value1, value2, "requestTime"); + return (Criteria) this; + } + + public Criteria andRequestPhoneIsNull() { + addCriterion("request_phone is null"); + return (Criteria) this; + } + + public Criteria andRequestPhoneIsNotNull() { + addCriterion("request_phone is not null"); + return (Criteria) this; + } + + public Criteria andRequestPhoneEqualTo(String value) { + addCriterion("request_phone =", value, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneNotEqualTo(String value) { + addCriterion("request_phone <>", value, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneGreaterThan(String value) { + addCriterion("request_phone >", value, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneGreaterThanOrEqualTo(String value) { + addCriterion("request_phone >=", value, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneLessThan(String value) { + addCriterion("request_phone <", value, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneLessThanOrEqualTo(String value) { + addCriterion("request_phone <=", value, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneLike(String value) { + addCriterion("request_phone like", value, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneNotLike(String value) { + addCriterion("request_phone not like", value, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneIn(List values) { + addCriterion("request_phone in", values, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneNotIn(List values) { + addCriterion("request_phone not in", values, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneBetween(String value1, String value2) { + addCriterion("request_phone between", value1, value2, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestPhoneNotBetween(String value1, String value2) { + addCriterion("request_phone not between", value1, value2, "requestPhone"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdIsNull() { + addCriterion("request_express_id is null"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdIsNotNull() { + addCriterion("request_express_id is not null"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdEqualTo(Integer value) { + addCriterion("request_express_id =", value, "requestExpressId"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdNotEqualTo(Integer value) { + addCriterion("request_express_id <>", value, "requestExpressId"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdGreaterThan(Integer value) { + addCriterion("request_express_id >", value, "requestExpressId"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdGreaterThanOrEqualTo(Integer value) { + addCriterion("request_express_id >=", value, "requestExpressId"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdLessThan(Integer value) { + addCriterion("request_express_id <", value, "requestExpressId"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdLessThanOrEqualTo(Integer value) { + addCriterion("request_express_id <=", value, "requestExpressId"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdIn(List values) { + addCriterion("request_express_id in", values, "requestExpressId"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdNotIn(List values) { + addCriterion("request_express_id not in", values, "requestExpressId"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdBetween(Integer value1, Integer value2) { + addCriterion("request_express_id between", value1, value2, "requestExpressId"); + return (Criteria) this; + } + + public Criteria andRequestExpressIdNotBetween(Integer value1, Integer value2) { + addCriterion("request_express_id not between", value1, value2, "requestExpressId"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/receipt/entity/mapper/TbReceivingCodeRequestMapper.java b/src/main/java/com/xmomen/module/receipt/entity/mapper/TbReceivingCodeRequestMapper.java new file mode 100644 index 0000000..c87f627 --- /dev/null +++ b/src/main/java/com/xmomen/module/receipt/entity/mapper/TbReceivingCodeRequestMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.receipt.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.receipt.entity.TbReceivingCodeRequest; +import com.xmomen.module.receipt.entity.TbReceivingCodeRequestExample; +import org.apache.ibatis.annotations.Param; + +public interface TbReceivingCodeRequestMapper extends MybatisMapper { + int countByExample(TbReceivingCodeRequestExample example); + + int deleteByExample(TbReceivingCodeRequestExample example); + + int insertSelective(TbReceivingCodeRequest record); + + int updateByExampleSelective(@Param("record") TbReceivingCodeRequest record, @Param("example") TbReceivingCodeRequestExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.java b/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.java new file mode 100644 index 0000000..9c4fbfb --- /dev/null +++ b/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.java @@ -0,0 +1,6 @@ +package com.xmomen.module.receipt.mapper; + +public interface ReceivingCodeRequestMapper { + public static final String ReceivingCodeRequestMapperNameSpace = "com.xmomen.module.receipt.mapper.ReceivingCodeRequestMapper."; + +} diff --git a/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.xml b/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.xml new file mode 100644 index 0000000..10b75ea --- /dev/null +++ b/src/main/java/com/xmomen/module/receipt/mapper/ReceivingCodeRequestMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + diff --git a/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.java b/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.java new file mode 100644 index 0000000..e383771 --- /dev/null +++ b/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.java @@ -0,0 +1,9 @@ +package com.xmomen.module.receipt.mapper; + +/** + * Created by Jeng on 16/4/13. + */ +public interface ReturnOrderMapper { + + public static final String RETURN_ORDER_MAPPER_NAMESPACE = "com.xmomen.module.receipt.mapper.ReturnOrderMapper."; +} diff --git a/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.xml b/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.xml new file mode 100644 index 0000000..0fe8ea6 --- /dev/null +++ b/src/main/java/com/xmomen/module/receipt/mapper/ReturnOrderMapper.xml @@ -0,0 +1,122 @@ + + + + + + + diff --git a/src/main/java/com/xmomen/module/receipt/model/ReturnItemModel.java b/src/main/java/com/xmomen/module/receipt/model/ReturnItemModel.java new file mode 100644 index 0000000..3523237 --- /dev/null +++ b/src/main/java/com/xmomen/module/receipt/model/ReturnItemModel.java @@ -0,0 +1,12 @@ +package com.xmomen.module.receipt.model; + +import java.io.Serializable; + +import lombok.Data; + +public @Data class ReturnItemModel implements Serializable { + + private String itemCode; + private Integer itemNumber; + private String itemName; +} diff --git a/src/main/java/com/xmomen/module/receipt/model/ReturnOrderModel.java b/src/main/java/com/xmomen/module/receipt/model/ReturnOrderModel.java new file mode 100644 index 0000000..6b0127a --- /dev/null +++ b/src/main/java/com/xmomen/module/receipt/model/ReturnOrderModel.java @@ -0,0 +1,233 @@ +package com.xmomen.module.receipt.model; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import com.xmomen.module.order.entity.TbReturnOrderItem; +import com.xmomen.module.order.model.PackingModel; + +/** + * Created by tanxinzheng on 16/8/17. + */ +public @Data class ReturnOrderModel implements Serializable { + + /** + * 订单ID + */ + private Integer id; + + /** + * 退货订单id + */ + private Integer returnOrderId; + + /** + * 订单类型 + */ + private Integer orderType; + + /** + * 订单类型描述 + */ + private String orderTypeDesc; + + /** + * 订单来源：1-微信订单，2-商城订单，3-客服下单，4-采摘订单 + */ + private Integer orderSource; + + /** + * 订单来源描述 + */ + private String orderSourceDesc; + + /** + * 付款方式 + */ + private Integer paymentMode; + + /** + * 付款方式描述 + */ + private String paymentModeDesc; + + /** + * 订单编码 + */ + private String orderNo; + + /** + * 订单状态 + */ + private String orderStatus; + + /** + * 装箱任务负责人名称 + */ + private String packingTaskUsername; + /** + * 装箱任务负责人ID + */ + private Integer packingTaskUserId; + + /** + * 订单装箱任务状态 + */ + private Integer packingTaskStatus; + /** + * 装箱任务状态描述 + */ + private String packingTaskStatusDesc; + + /** + * 装箱任务分配时间 + */ + private Date packingTaskCreateTime; + + /** + * 装箱任务开始时间 + */ + private Date packingTaskStartTime; + + /** + * 装箱任务完成时间 + */ + private Date packingTaskEndTime; + + /** + * 订单状态描述 + */ + private String orderStatusDesc; + + /** + * 收货人手机 + */ + private String consigneePhone; + + /** + * 收货人姓名 + */ + private String consigneeName; + + /** + * 收货人地址 + */ + private String consigneeAddress; + + /** + * 运送方式 1-快递，2-自提 + */ + private Integer transportMode; + + /** + * 订单备注 + */ + private String remark; + + /** + * 折扣价 + */ + private BigDecimal discountPrice; + + /** + * 订单总金额 + */ + private BigDecimal totalAmount; + + /** + * 订单创建时间 + */ + private Date createTime; + + /** + * 订单创建人ID + */ + private Integer createUserId; + + private String createUser; + + /** + * 配送时间 + */ + private Date appointmentTime; + + /** + * 支付卡（券）号 + */ + private String couponNumber; + + /** + * 快递商 + */ + private String expressName; + + private Integer despatchExpressId; + + /** + * 项目经理 + */ + private String managerName; + /** + * 单位 + */ + private String companyName; + + + private String batchNo; + + /** + * 付款方式 + */ + private Integer otherPaymentMode; + + private String otherPaymentModeDesc; + + private BigDecimal otherPayAmount; + + private String receivingCode; + + private List itemList; + + private Date returnTime; + + private String returnStatus; + + private String returnStatusDesc; + + /** + * 审核状态（0-不同意，1-同意） + */ + private Integer auditStatus; + + /** + * 审核时间 + */ + private Date auditDate; + + /** + * 审核人 + */ + private Integer auditUserId; + + private String auditUserName; + + /** + * 拿货时间 + */ + private Date takeGoodsDate; + + /** + * 拿货人 + */ + private Integer takeGoodsUserId; + + private String takeGoodsUserName; + /** + * 拿货人手机号 + */ + private String takeGoodsPhone; +} diff --git a/src/main/java/com/xmomen/module/receipt/service/ReturnOrderService.java b/src/main/java/com/xmomen/module/receipt/service/ReturnOrderService.java new file mode 100644 index 0000000..206409f --- /dev/null +++ b/src/main/java/com/xmomen/module/receipt/service/ReturnOrderService.java @@ -0,0 +1,352 @@ +package com.xmomen.module.receipt.service; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.xmomen.framework.exception.BusinessException; +import com.xmomen.module.base.entity.CdItem; +import com.xmomen.module.order.entity.*; +import com.xmomen.module.stock.service.StockService; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +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.module.base.constant.AppConstants; +import com.xmomen.module.base.entity.CdExpress; +import com.xmomen.module.base.service.ItemService; +import com.xmomen.module.order.mapper.OrderMapper; +import com.xmomen.module.order.model.ReturnOrder; +import com.xmomen.module.receipt.mapper.ReturnOrderMapper; +import com.xmomen.module.receipt.model.ReturnOrderModel; +import com.xmomen.module.receipt.model.ReturnOrderQuery; +import com.xmomen.module.wx.model.AjaxResult; + +/** + * Created by Jeng on 16/4/5. + */ +@Service +public class ReturnOrderService { + + @Autowired + MybatisDao mybatisDao; + + @Autowired + ItemService itemService; + + @Autowired + StockService stockService; + + /** + * 查询订单 + * + * @param orderQuery + * @param limit + * @param offset + * @return + */ + public Page getReturnOrderList( + ReturnOrderQuery orderQuery, Integer limit, Integer offset) { + return (Page) mybatisDao.selectPage( + ReturnOrderMapper.RETURN_ORDER_MAPPER_NAMESPACE + + "getReturnOrderList", orderQuery, limit, offset); + } + + /** + * 查询订单 + * + * @param orderQuery + * @return + */ + public List getReturnOrderList(ReturnOrderQuery orderQuery) { + return mybatisDao.getSqlSessionTemplate().selectList( + ReturnOrderMapper.RETURN_ORDER_MAPPER_NAMESPACE + + "getReturnOrderList", orderQuery); + } + + /** + * 订单拒绝收货 + * + * @param orderNo + * @param phone + * @return + */ + @Transactional + public AjaxResult noShouhuo(String orderNo, String phone, int expressId) { + AjaxResult ajaxResult = new AjaxResult(); + // 判断订单状态 + TbReturnOrderExample tbOrderExample = new TbReturnOrderExample(); + tbOrderExample.createCriteria().andOrderNoEqualTo(orderNo); + TbReturnOrder tbReturnOrder = mybatisDao + .selectOneByExample(tbOrderExample); + if (tbReturnOrder != null) { + ajaxResult.setMessage("订单不能拒绝，请联系客服人员。"); + ajaxResult.setResult(0); + return ajaxResult; + } + tbReturnOrder = new TbReturnOrder(); + tbReturnOrder.setOrderNo(orderNo); + // 退货运输中 + tbReturnOrder.setReturnStatus(14); + tbReturnOrder.setTakeGoodsDate(mybatisDao.getSysdate()); + tbReturnOrder.setTakeGoodsPhone(phone); + tbReturnOrder.setTakeGoodsUserId(expressId); + tbReturnOrder.setReturnTime(mybatisDao.getSysdate()); + tbReturnOrder = mybatisDao.insertByModel(tbReturnOrder); + TbOrderItem orderItemDb = new TbOrderItem(); + orderItemDb.setOrderNo(orderNo); + List returnOrderItems = mybatisDao + .selectByModel(orderItemDb); + BigDecimal returnTotalAmount = BigDecimal.ZERO; + for (TbOrderItem orderItem : returnOrderItems) { + TbReturnOrderItem returnOrderItem = new TbReturnOrderItem(); + returnOrderItem.setItemCode(orderItem.getItemCode()); + returnOrderItem.setReturnOrderId(tbReturnOrder.getId()); + returnOrderItem.setItemNumber(orderItem.getItemQty().intValue()); + returnOrderItem.setItemName(orderItem.getItemName()); + returnOrderItem.setIsNeed(1); + mybatisDao.insert(returnOrderItem); + //金额相加 + returnTotalAmount = returnTotalAmount.add(orderItem.getItemPrice().multiply(orderItem.getItemQty())); + } + //退款金额 + tbReturnOrder.setReturnTotalAmount(returnTotalAmount); + // 更新原订单状态 + TbOrderExample orderExample = new TbOrderExample(); + orderExample.createCriteria().andOrderNoEqualTo(orderNo); + TbOrder order = new TbOrder(); + //是拒绝收货 + order.setIsReject(1); + // 退货运输中 + order.setOrderStatus("14"); + mybatisDao.updateOneByExampleSelective(order, orderExample); + ajaxResult.setMessage("订单已拒收，请及时送回仓库。"); + ajaxResult.setResult(1); + return ajaxResult; + } + + /** + * 订单退货 + * + * @param orderNo + * @param itemIds + * @return + */ + @Transactional + public AjaxResult returnOrder(String orderNo, String itemIds) { + AjaxResult ajaxResult = new AjaxResult(); + // 判断订单状态 + TbReturnOrderExample tbOrderExample = new TbReturnOrderExample(); + tbOrderExample.createCriteria().andOrderNoEqualTo(orderNo); + TbReturnOrder tbReturnOrder = mybatisDao + .selectOneByExample(tbOrderExample); + if (tbReturnOrder != null) { + ajaxResult.setMessage("订单不能退货，请联系客服人员。"); + ajaxResult.setResult(0); + return ajaxResult; + } + tbReturnOrder = new TbReturnOrder(); + tbReturnOrder.setOrderNo(orderNo); + tbReturnOrder.setReturnStatus(10);// 申请退货 + tbReturnOrder.setReturnTime(mybatisDao.getSysdate()); + tbReturnOrder = mybatisDao.insertByModel(tbReturnOrder); + BigDecimal returnTotalAmount = BigDecimal.ZERO; + for (String itemId : itemIds.split(",")) { + if (StringUtilsExt.isEmpty(itemId)) { + continue; + } + TbReturnOrderItem returnOrderItem = new TbReturnOrderItem(); + TbOrderItem orderItem = this.mybatisDao.selectByPrimaryKey( + TbOrderItem.class, Integer.parseInt(itemId)); + returnOrderItem.setItemCode(orderItem.getItemCode()); + returnOrderItem.setReturnOrderId(tbReturnOrder.getId()); + returnOrderItem.setItemNumber(orderItem.getItemQty().intValue()); + returnOrderItem.setItemName(orderItem.getItemName()); + returnOrderItem.setIsNeed(1); + mybatisDao.insert(returnOrderItem); + //金额相加 + returnTotalAmount = returnTotalAmount.add(orderItem.getItemPrice().multiply(orderItem.getItemQty())); + } + //退款金额 + tbReturnOrder.setReturnTotalAmount(returnTotalAmount); + mybatisDao.update(tbReturnOrder); + // 更新原订单状态 + TbOrderExample orderExample = new TbOrderExample(); + orderExample.createCriteria().andOrderNoEqualTo(orderNo); + TbOrder order = new TbOrder(); + order.setOrderStatus("10");// 申请退货 + mybatisDao.updateOneByExampleSelective(order, orderExample); + ajaxResult.setMessage("退货申请提交成功，请等待客服审核。"); + ajaxResult.setResult(1); + return ajaxResult; + } + + /** + * 退货订单收货 + * + * @param orderNo + * @param phone + * @param expressId + * @return + */ + @Transactional + public AjaxResult shouhuoReturn(String orderNo, String phone, int expressId) { + AjaxResult ajaxResult = new AjaxResult(); + // 判断订单状态 + TbReturnOrderExample tbOrderExample = new TbReturnOrderExample(); + tbOrderExample.createCriteria().andOrderNoEqualTo(orderNo); + TbReturnOrder tbReturnOrder = mybatisDao + .selectOneByExample(tbOrderExample); + if (tbReturnOrder.getReturnStatus() != 11) { + ajaxResult.setMessage("订单状态不为退货中，不能收货，请联系客服人员。"); + ajaxResult.setResult(0); + return ajaxResult; + } + tbReturnOrder.setReturnStatus(14);// 退货运输中 + tbReturnOrder.setTakeGoodsDate(mybatisDao.getSysdate()); + tbReturnOrder.setTakeGoodsPhone(phone); + tbReturnOrder.setTakeGoodsUserId(expressId); + mybatisDao.update(tbReturnOrder); + // 更新原订单状态 + TbOrderExample orderExample = new TbOrderExample(); + orderExample.createCriteria().andOrderNoEqualTo(orderNo); + TbOrder order = new TbOrder(); + order.setOrderStatus("14");// 退货运输中 + mybatisDao.updateOneByExampleSelective(order, orderExample); + ajaxResult.setMessage("退货订单收货成功，请尽快送回仓库。"); + ajaxResult.setResult(0); + return ajaxResult; + } + + /** + * 退货订单审核 + * + * @param id + * @param statusCd + */ + @Transactional + public void auditReturnOrder(int id, int statusCd) { + TbReturnOrder returnOrder = this.mybatisDao.selectByPrimaryKey( + TbReturnOrder.class, id); + returnOrder.setAuditStatus(statusCd); + returnOrder.setAuditDate(mybatisDao.getSysdate()); + if (statusCd == 1) { + // 退货中 + returnOrder.setReturnStatus(11); + Integer userId = (Integer) SecurityUtils.getSubject().getSession() + .getAttribute(AppConstants.SESSION_USER_ID_KEY); + returnOrder.setAuditUserId(userId); + this.mybatisDao.save(returnOrder); + // 更新原订单状态 + TbOrderExample orderExample = new TbOrderExample(); + orderExample.createCriteria().andOrderNoEqualTo( + returnOrder.getOrderNo()); + TbOrder order = new TbOrder(); + // 退货中 + order.setOrderStatus("11"); + mybatisDao.updateOneByExampleSelective(order, orderExample); + } + else { + // 拒绝退货 + returnOrder.setReturnStatus(16); + Integer userId = (Integer) SecurityUtils.getSubject().getSession() + .getAttribute(AppConstants.SESSION_USER_ID_KEY); + returnOrder.setAuditUserId(userId); + this.mybatisDao.save(returnOrder); + // 更新原订单状态 + TbOrderExample orderExample = new TbOrderExample(); + orderExample.createCriteria().andOrderNoEqualTo( + returnOrder.getOrderNo()); + TbOrder order = new TbOrder(); + // 拒绝退货 + order.setOrderStatus("16"); + mybatisDao.updateOneByExampleSelective(order, orderExample); + } + } + + /** + * 退货收货操作 + * + * @param boxNo 箱号 + */ + @Transactional + public ReturnOrderModel returnOrderShouhuo(String boxNo) { + // 通过箱号查找订单号 + TbOrderRelation tbOrderRelation = new TbOrderRelation(); + tbOrderRelation.setRefType(OrderMapper.ORDER_PACKING_RELATION_CODE); + tbOrderRelation.setRefValue(boxNo); + tbOrderRelation = mybatisDao.selectOneByModel(tbOrderRelation); + AssertExt.notNull(tbOrderRelation, "扫描的箱号不存在！请确认。"); + TbOrder order = new TbOrder(); + order.setOrderNo(tbOrderRelation.getOrderNo()); + order = mybatisDao.selectOneByModel(order); + AssertExt.notNull(order, "订单不存在！"); + String orderStatus = order.getOrderStatus(); + AssertExt.isTrue(orderStatus.equals("14"), "订单状态不是退货运输中，不能收货！"); + + TbReturnOrder returnOrder = new TbReturnOrder(); + returnOrder.setOrderNo(order.getOrderNo()); + returnOrder = mybatisDao.selectOneByModel(returnOrder); + + ReturnOrderModel returnOrderModel = new ReturnOrderModel(); + TbReturnOrderItem returnOrderItem = new TbReturnOrderItem(); + returnOrderItem.setReturnOrderId(returnOrder.getId()); + List returnOrderItemList = this.mybatisDao + .selectByModel(returnOrderItem); + returnOrderModel.setItemList(returnOrderItemList); + returnOrderModel.setOrderNo(order.getOrderNo()); + return returnOrderModel; + } + + /** + * 退货收货操作 + * + * @param orderNo 箱号 + */ + @Transactional + public void shouhuo(String orderNo) throws BusinessException { + TbOrder order = new TbOrder(); + order.setOrderNo(orderNo); + order = mybatisDao.selectOneByModel(order); + AssertExt.notNull(order, "订单不存在！"); + String orderStatus = order.getOrderStatus(); + AssertExt.isTrue(orderStatus.equals("14"), "订单状态不是退货运输中，不能收货！"); + + order.setOrderStatus("15"); + mybatisDao.update(order); + + + TbReturnOrder returnOrder = new TbReturnOrder(); + returnOrder.setOrderNo(order.getOrderNo()); + returnOrder = mybatisDao.selectOneByModel(returnOrder); + returnOrder.setReturnStatus(15); + mybatisDao.update(returnOrder); + + //查询订单的退货商品信息 + TbReturnOrderItemExample tbReturnOrderItemExample = new TbReturnOrderItemExample(); + tbReturnOrderItemExample.createCriteria().andReturnOrderIdEqualTo(returnOrder.getId()); + List tbReturnOrderItems = mybatisDao.selectByExample(tbReturnOrderItemExample); + for (TbReturnOrderItem tbReturnOrderItem : tbReturnOrderItems) { + //需要的退回库存 + if (tbReturnOrderItem.getIsNeed() == 1) { + CdItem cdItem = new CdItem(); + cdItem.setItemCode(tbReturnOrderItem.getItemCode()); + cdItem = mybatisDao.selectOneByModel(cdItem); + stockService.changeStockNum(cdItem.getId(), tbReturnOrderItem.getItemNumber().intValue(), returnOrder.getId(), "订单退货退回商品", 3); + } + } + + // 卡类订单进行退款 + if (order.getOrderType() == 1) { + + } + } + +} diff --git a/src/main/java/com/xmomen/module/report/model/ExpressReport.java b/src/main/java/com/xmomen/module/report/model/ExpressReport.java new file mode 100644 index 0000000..9dbb2d4 --- /dev/null +++ b/src/main/java/com/xmomen/module/report/model/ExpressReport.java @@ -0,0 +1,42 @@ +package com.xmomen.module.report.model; + +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecgframework.poi.excel.annotation.ExcelEntity; +import org.jeecgframework.poi.excel.annotation.ExcelTarget; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * Created by tanxinzheng on 16/9/3. + */ +@ExcelTarget(value = "orderReport") +public +@Data +class ExpressReport implements Serializable { + + @Excel(name = "物流公司") + private String expressName; + @Excel(name = "订单号", width = 20) + private String orderNo; + @Excel(name = "总箱数") + private int totalBoxNum; + @Excel(name = "出库时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss") + private Date outDate; + @Excel(name = "收货时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss") + private Date shouHuoDate; + @Excel(name = "二次配送", type = 10) + private int isTwoSend; + @Excel(name = "正常配送", type = 10) + private int isNormal; + @Excel(name = "异常配送", type = 10) + private int isNoNormal; + @Excel(name = "物流代收款", width = 15, type = 10) + private double expressAmount; + @Excel(name = "损失承担", type = 10) + private double returnAmount; + + private int isReject; +} diff --git a/src/main/java/com/xmomen/module/report/model/FinanceReport.java b/src/main/java/com/xmomen/module/report/model/FinanceReport.java new file mode 100644 index 0000000..28d43d2 --- /dev/null +++ b/src/main/java/com/xmomen/module/report/model/FinanceReport.java @@ -0,0 +1,89 @@ +package com.xmomen.module.report.model; + +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; + +/** + * 物流报表实体类 + */ +public +@Data +class FinanceReport implements Serializable { + private int cdCompanyId; + @Excel(name = "客户经理") + private String managerName; + @Excel(name = "单位/个人") + private String companyName; + private int cdUserId; + //总张数 + @Excel(name = "总张数（预付款）", type = 10) + private int beforeCouponCount; + //总金额 + @Excel(name = "总金额（预付款）", type = 10) + private double beforeTotalValue; + //充值金额 + @Excel(name = "充值金额（预付款）", type = 10) + private double beforeTotalRechargeValue; + //已付 + @Excel(name = "已付（预付款）", type = 10) + private double beforeTotalYesValue; + // 未付 + @Excel(name = "未付（预付款）", type = 10) + private double beforeTotalNoValue; + // 余额 + @Excel(name = "余额（预付款）", type = 10) + private double beforeUserTotalValue; + // 回馈总金额 + @Excel(name = "回馈总金额（预付款）", type = 10) + private double beforeGiftTotalValue; + // 回馈剩余金额 + @Excel(name = "回馈剩余金额（预付款）", type = 10) + private double beforeGiftUserTotalValue; + + // 总张数 + @Excel(name = "总张数（后付款）", type = 10) + private int afterCouponCount; + // 总金额 + @Excel(name = "总金额（后付款）", type = 10) + private double afterTotalValue; + // 充值金额 + @Excel(name = "充值金额（后付款）", type = 10) + private double afterTotalRechargeValue; + // 已付 + @Excel(name = "已付（后付款）", type = 10) + private double afterTotalYesValue; + // 未付 + @Excel(name = "未付（后付款）", type = 10) + private double afterTotalNoValue; + // 余额 + @Excel(name = "余额（后付款）", type = 10) + private double afterUserTotalValue; + // 回馈总金额（后付款） + @Excel(name = "回馈总金额（后付款）", type = 10) + private double afterGiftTotalValue; + // 回馈剩余金额（后付款） + @Excel(name = "回馈剩余金额（后付款）", type = 10) + private double after_gift_user_total_value; + //总单数 + @Excel(name = "总单数", type = 10) + private int totalOrder; + // 订单总金额 + @Excel(name = "订单总金额", type = 10) + private double totalOrderAmount; + //优惠总金额 + @Excel(name = "优惠总金额", type = 10) + private double youhuiAmount; + //回馈总金额 + @Excel(name = "回馈总金额", type = 10) + private double giftOrderTotal; + @Excel(name = "客户经理代收", type = 10) + private double managerAmount; + @Excel(name = "POS", type = 10) + private double posAmount; + @Excel(name = "转账", type = 10) + private double zhuanAmount; + @Excel(name = "物流代收", type = 10) + private double expressAmount; +} diff --git a/src/main/java/com/xmomen/module/report/model/OrderDeliveryReport.java b/src/main/java/com/xmomen/module/report/model/OrderDeliveryReport.java new file mode 100644 index 0000000..f8f0a34 --- /dev/null +++ b/src/main/java/com/xmomen/module/report/model/OrderDeliveryReport.java @@ -0,0 +1,48 @@ +package com.xmomen.module.report.model; + +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecgframework.poi.excel.annotation.ExcelEntity; +import org.jeecgframework.poi.excel.annotation.ExcelTarget; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * Created by tanxinzheng on 16/9/3. + */ +@ExcelTarget(value = "orderReport") +public @Data +class OrderDeliveryReport implements Serializable { + + @Excel(name = "下单日期" , exportFormat="yyyy-MM-dd", importFormat = "yyyy-MM-dd") + private Date createTime; + @Excel(name = "订单号",width = 20) + private String orderNo; + @Excel(name="快递商") + private String expressName; + @Excel(name = "收货人姓名",width = 15) + private String consigneeName; + @Excel(name = "收货人电话",width = 15) + private String consigneePhone; + @Excel(name = "收货人地址",width = 30) + private String consigneeAddress; + @Excel(name = "金额") + private double totalAmount; + @Excel(name = "付款方式") + private String paymentModeDesc; + @Excel(name = "付款金额",type = 10) + private double payAmount; + @Excel(name = "附加付款方式") + private String otherPaymentModeDesc; + @Excel(name = "附加付款金额",type = 10) + private double otherPayAmount; + @Excel(name = "送货日期" , exportFormat="yyyy-MM-dd", importFormat = "yyyy-MM-dd") + private Date appointmentTime; + @Excel(name = "备注",width = 30) + private String remark; + private String orderStatusDesc; + private int totalBoxNum; + private int expressScanBoxNum; +} diff --git a/src/main/java/com/xmomen/module/report/model/OrderReport.java b/src/main/java/com/xmomen/module/report/model/OrderReport.java new file mode 100644 index 0000000..6271e64 --- /dev/null +++ b/src/main/java/com/xmomen/module/report/model/OrderReport.java @@ -0,0 +1,61 @@ +package com.xmomen.module.report.model; + +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecgframework.poi.excel.annotation.ExcelEntity; +import org.jeecgframework.poi.excel.annotation.ExcelTarget; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * Created by tanxinzheng on 16/9/3. + */ +@ExcelTarget(value = "orderReport") +public +@Data +class OrderReport implements Serializable { + + private String paymentMode; + private double payAmount; + private String otherPaymentMode; + private double otherPayAmount; + + @Excel(name = "订单类型") + private String orderType; + @Excel(name = "订单号", width = 20) + private String orderNo; + @Excel(name = "客户姓名") + private String consigneeName; + @Excel(name = "电话", width = 15) + private String consigneePhone; + @Excel(name = "单位/个人") + private String companyName; + @Excel(name = "客户经理") + private String managerName; + @Excel(name = "物流公司") + private String expressName; + @Excel(name = "总金额") + private double totalAmount; + @Excel(name = "折扣金额") + private double discountPrice; + @Excel(name = "客户经理代收", width = 15, type = 10) + private double managerAmount; + @Excel(name = "物流代收", type = 10) + private double expressAmount; + @Excel(name = "卡类扣款", type = 10) + private double couponAmount; + @Excel(name = "券类扣款", type = 10) + private double quanAmount; + @Excel(name = "刷POS", type = 10) + private double posAmount; + @Excel(name = "转账", type = 10) + private double zhuanZhanAmount; + @Excel(name = "其它", type = 10) + private double otherAmount; + @Excel(name = "回馈", type = 10) + private double huiKuiAmount; + @Excel(name = "退货金额", type = 10) + private double returnTotalAmount; +} diff --git a/src/main/java/com/xmomen/module/report/model/StockDailyReport.java b/src/main/java/com/xmomen/module/report/model/StockDailyReport.java new file mode 100644 index 0000000..8e65e0f --- /dev/null +++ b/src/main/java/com/xmomen/module/report/model/StockDailyReport.java @@ -0,0 +1,53 @@ +package com.xmomen.module.report.model; + +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; + +/** + * 库存快照报表实体类 + */ +public +@Data +class StockDailyReport implements Serializable { + @Excel(name = "商品名称") + private String itemName; + @Excel(name = "商品编码") + private String itemCode; + /** + * 昨日库存 + */ + @Excel(name = "历史库存") + private Integer oldStockNum; + /** + * 入库库存 + */ + @Excel(name = "入库数") + private Integer inNum; + /** + * 取消退货入库数 + */ + @Excel(name = "取消退货入库数") + private Integer returnInNum; + /** + * 出库库存 + */ + @Excel(name = "出库数") + private Integer outNum; + /** + * 破损数 + */ + @Excel(name = "破损数") + private Integer damagedNum; + /** + * 核销数 + */ + @Excel(name = "核销数") + private Integer verificationNum; + /** + * 现库存 + */ + @Excel(name = "结余库存") + private Integer newStockNum; +} diff --git a/src/main/java/com/xmomen/module/resource/api/DfsException.java b/src/main/java/com/xmomen/module/resource/api/DfsException.java new file mode 100644 index 0000000..2c92a24 --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/api/DfsException.java @@ -0,0 +1,38 @@ +package com.xmomen.module.resource.api; + +public class DfsException extends RuntimeException { + + private static final long serialVersionUID = 1497374765949093902L; + + /** + * IOException 100 + * FileNotFoundException 200 + * Exception from DFS (example: from FastDFS, MyException) 300 + * OtherException 400 + */ + private String code; + + private String message; + + public DfsException(String code, String message) { + this.code = code; + this.message = message; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} diff --git a/src/main/java/com/xmomen/module/resource/api/DfsFile.java b/src/main/java/com/xmomen/module/resource/api/DfsFile.java new file mode 100644 index 0000000..0372790 --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/api/DfsFile.java @@ -0,0 +1,62 @@ +package com.xmomen.module.resource.api; + +import java.util.Map; + +public class DfsFile { + + /** + * file data + */ + private byte[] data; + + /** + * key,not used in FastDfs + */ + private String key; + + /** + * metadata for file + */ + private Map metadata; + + public DfsFile() { + + } + /** + * constructor with data, key and metadata + * + * @param key key,not used in FastDfs + * @param data file data + * @param metadata metadata for file + */ + public DfsFile(String key, byte[] data, Map metadata) { + this.key = key; + this.data = data; + this.metadata = metadata; + } + + public byte[] getData() { + return data; + } + + public void setData(byte[] data) { + this.data = data; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public Map getMetadata() { + return metadata; + } + + public void setMetadata(Map metadata) { + this.metadata = metadata; + } + +} diff --git a/src/main/java/com/xmomen/module/resource/api/DfsService.java b/src/main/java/com/xmomen/module/resource/api/DfsService.java new file mode 100644 index 0000000..3d8b68d --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/api/DfsService.java @@ -0,0 +1,76 @@ +package com.xmomen.module.resource.api; + +import java.io.File; +import java.util.List; +import java.util.Map; + +public interface DfsService { + + /** + * Upload file to file system. + * + * @param filePath local file path + * @param key Key + * @param metadata metadata for the file + * @return DfsPath object or null if fail + */ + public DfsPath putObject(String filePath, String key, Map metadata); + + /** + * Upload file to file system + * + * @param file file + * @param key Key + * @param metadata metadata for the file + * @return DfsPath object or null if fail + */ + public DfsPath putObject(File file, String key, Map metadata); + + /** + * Upload file to file system + * + * @param bytes file + * @param key Key + * @param metadata metadata for the file + * @param extName ext name of file + * @return DfsPath object or null if fail + */ + public DfsPath putObject(byte[] bytes, String key, Map metadata, String extName); + + /** + * Get file from file system with remotePath + * + * @param remotePath remote file path on file system + * @param key Key + * @return DfsPath object or null if fail + */ + public DfsFile getObject(String remotePath, String key); + + /** + * Delete the file on file system + * + * @param remotePath remote file path on file system + * @param key Key + * @return true||false + */ + public boolean deleteObject(String remotePath, String key); + + /** + * Get the list of the file on file system + * + * @return List + */ + public List listObjects(); + + /** + * Get the whole url + * + * @param remotePath + * @return whole url + */ + public String getHttpPath(String remotePath); + + public String getDmsHttpPath(String dmsFilePath); + + public String getDefaultPath(String type); +} diff --git a/src/main/java/com/xmomen/module/resource/entity/ResourceExample.java b/src/main/java/com/xmomen/module/resource/entity/ResourceExample.java new file mode 100644 index 0000000..ae8fbd7 --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/entity/ResourceExample.java @@ -0,0 +1,611 @@ +package com.xmomen.module.resource.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class ResourceExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ResourceExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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(String value) { + addCriterion("ID =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("ID <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("ID >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("ID >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("ID <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("ID <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("ID like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("ID not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("ID not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("ID between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("ID not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andEntityTypeIsNull() { + addCriterion("ENTITY_TYPE is null"); + return (Criteria) this; + } + + public Criteria andEntityTypeIsNotNull() { + addCriterion("ENTITY_TYPE is not null"); + return (Criteria) this; + } + + public Criteria andEntityTypeEqualTo(String value) { + addCriterion("ENTITY_TYPE =", value, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeNotEqualTo(String value) { + addCriterion("ENTITY_TYPE <>", value, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeGreaterThan(String value) { + addCriterion("ENTITY_TYPE >", value, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeGreaterThanOrEqualTo(String value) { + addCriterion("ENTITY_TYPE >=", value, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeLessThan(String value) { + addCriterion("ENTITY_TYPE <", value, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeLessThanOrEqualTo(String value) { + addCriterion("ENTITY_TYPE <=", value, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeLike(String value) { + addCriterion("ENTITY_TYPE like", value, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeNotLike(String value) { + addCriterion("ENTITY_TYPE not like", value, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeIn(List values) { + addCriterion("ENTITY_TYPE in", values, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeNotIn(List values) { + addCriterion("ENTITY_TYPE not in", values, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeBetween(String value1, String value2) { + addCriterion("ENTITY_TYPE between", value1, value2, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityTypeNotBetween(String value1, String value2) { + addCriterion("ENTITY_TYPE not between", value1, value2, "entityType"); + return (Criteria) this; + } + + public Criteria andEntityIdIsNull() { + addCriterion("ENTITY_ID is null"); + return (Criteria) this; + } + + public Criteria andEntityIdIsNotNull() { + addCriterion("ENTITY_ID is not null"); + return (Criteria) this; + } + + public Criteria andEntityIdEqualTo(String value) { + addCriterion("ENTITY_ID =", value, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdNotEqualTo(String value) { + addCriterion("ENTITY_ID <>", value, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdGreaterThan(String value) { + addCriterion("ENTITY_ID >", value, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdGreaterThanOrEqualTo(String value) { + addCriterion("ENTITY_ID >=", value, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdLessThan(String value) { + addCriterion("ENTITY_ID <", value, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdLessThanOrEqualTo(String value) { + addCriterion("ENTITY_ID <=", value, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdLike(String value) { + addCriterion("ENTITY_ID like", value, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdNotLike(String value) { + addCriterion("ENTITY_ID not like", value, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdIn(List values) { + addCriterion("ENTITY_ID in", values, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdNotIn(List values) { + addCriterion("ENTITY_ID not in", values, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdBetween(String value1, String value2) { + addCriterion("ENTITY_ID between", value1, value2, "entityId"); + return (Criteria) this; + } + + public Criteria andEntityIdNotBetween(String value1, String value2) { + addCriterion("ENTITY_ID not between", value1, value2, "entityId"); + return (Criteria) this; + } + + public Criteria andPathIsNull() { + addCriterion("PATH is null"); + return (Criteria) this; + } + + public Criteria andPathIsNotNull() { + addCriterion("PATH is not null"); + return (Criteria) this; + } + + public Criteria andPathEqualTo(String value) { + addCriterion("PATH =", value, "path"); + return (Criteria) this; + } + + public Criteria andPathNotEqualTo(String value) { + addCriterion("PATH <>", value, "path"); + return (Criteria) this; + } + + public Criteria andPathGreaterThan(String value) { + addCriterion("PATH >", value, "path"); + return (Criteria) this; + } + + public Criteria andPathGreaterThanOrEqualTo(String value) { + addCriterion("PATH >=", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLessThan(String value) { + addCriterion("PATH <", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLessThanOrEqualTo(String value) { + addCriterion("PATH <=", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLike(String value) { + addCriterion("PATH like", value, "path"); + return (Criteria) this; + } + + public Criteria andPathNotLike(String value) { + addCriterion("PATH not like", value, "path"); + return (Criteria) this; + } + + public Criteria andPathIn(List values) { + addCriterion("PATH in", values, "path"); + return (Criteria) this; + } + + public Criteria andPathNotIn(List values) { + addCriterion("PATH not in", values, "path"); + return (Criteria) this; + } + + public Criteria andPathBetween(String value1, String value2) { + addCriterion("PATH between", value1, value2, "path"); + return (Criteria) this; + } + + public Criteria andPathNotBetween(String value1, String value2) { + addCriterion("PATH not between", value1, value2, "path"); + return (Criteria) this; + } + + public Criteria andResourceTypeIsNull() { + addCriterion("RESOURCE_TYPE is null"); + return (Criteria) this; + } + + public Criteria andResourceTypeIsNotNull() { + addCriterion("RESOURCE_TYPE is not null"); + return (Criteria) this; + } + + public Criteria andResourceTypeEqualTo(String value) { + addCriterion("RESOURCE_TYPE =", value, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeNotEqualTo(String value) { + addCriterion("RESOURCE_TYPE <>", value, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeGreaterThan(String value) { + addCriterion("RESOURCE_TYPE >", value, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeGreaterThanOrEqualTo(String value) { + addCriterion("RESOURCE_TYPE >=", value, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeLessThan(String value) { + addCriterion("RESOURCE_TYPE <", value, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeLessThanOrEqualTo(String value) { + addCriterion("RESOURCE_TYPE <=", value, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeLike(String value) { + addCriterion("RESOURCE_TYPE like", value, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeNotLike(String value) { + addCriterion("RESOURCE_TYPE not like", value, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeIn(List values) { + addCriterion("RESOURCE_TYPE in", values, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeNotIn(List values) { + addCriterion("RESOURCE_TYPE not in", values, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeBetween(String value1, String value2) { + addCriterion("RESOURCE_TYPE between", value1, value2, "resourceType"); + return (Criteria) this; + } + + public Criteria andResourceTypeNotBetween(String value1, String value2) { + addCriterion("RESOURCE_TYPE not between", value1, value2, "resourceType"); + return (Criteria) this; + } + + public Criteria andIsDefaultIsNull() { + addCriterion("IS_DEFAULT is null"); + return (Criteria) this; + } + + public Criteria andIsDefaultIsNotNull() { + addCriterion("IS_DEFAULT is not null"); + return (Criteria) this; + } + + public Criteria andIsDefaultEqualTo(Integer value) { + addCriterion("IS_DEFAULT =", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultNotEqualTo(Integer value) { + addCriterion("IS_DEFAULT <>", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultGreaterThan(Integer value) { + addCriterion("IS_DEFAULT >", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultGreaterThanOrEqualTo(Integer value) { + addCriterion("IS_DEFAULT >=", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultLessThan(Integer value) { + addCriterion("IS_DEFAULT <", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultLessThanOrEqualTo(Integer value) { + addCriterion("IS_DEFAULT <=", value, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultIn(List values) { + addCriterion("IS_DEFAULT in", values, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultNotIn(List values) { + addCriterion("IS_DEFAULT not in", values, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultBetween(Integer value1, Integer value2) { + addCriterion("IS_DEFAULT between", value1, value2, "isDefault"); + return (Criteria) this; + } + + public Criteria andIsDefaultNotBetween(Integer value1, Integer value2) { + addCriterion("IS_DEFAULT not between", value1, value2, "isDefault"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/resource/entity/mapper/ResourceMapper.xml b/src/main/java/com/xmomen/module/resource/entity/mapper/ResourceMapper.xml new file mode 100644 index 0000000..8c4a34c --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/entity/mapper/ResourceMapper.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + ID, ENTITY_TYPE, ENTITY_ID, PATH, RESOURCE_TYPE, IS_DEFAULT + + + + delete from cd_resource + + + + + + + SELECT replace(UUID(),'-','') + + insert into cd_resource + + ID, + + ENTITY_TYPE, + + + ENTITY_ID, + + + PATH, + + + RESOURCE_TYPE, + + + IS_DEFAULT, + + + + #{id,jdbcType=VARCHAR}, + + #{entityType,jdbcType=VARCHAR}, + + + #{entityId,jdbcType=VARCHAR}, + + + #{path,jdbcType=VARCHAR}, + + + #{resourceType,jdbcType=VARCHAR}, + + + #{isDefault,jdbcType=INTEGER}, + + + + + + update cd_resource + + + ID = #{record.id,jdbcType=VARCHAR}, + + + ENTITY_TYPE = #{record.entityType,jdbcType=VARCHAR}, + + + ENTITY_ID = #{record.entityId,jdbcType=VARCHAR}, + + + PATH = #{record.path,jdbcType=VARCHAR}, + + + RESOURCE_TYPE = #{record.resourceType,jdbcType=VARCHAR}, + + + IS_DEFAULT = #{record.isDefault,jdbcType=INTEGER}, + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/resource/mapper/ResourceMapperExt.xml b/src/main/java/com/xmomen/module/resource/mapper/ResourceMapperExt.xml new file mode 100644 index 0000000..5269041 --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/mapper/ResourceMapperExt.xml @@ -0,0 +1,46 @@ + + + + + + + + + + update + cd_resource + set + is_default = 0 + where + entity_id=#{entityId} + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/resource/model/ResourceCreate.java b/src/main/java/com/xmomen/module/resource/model/ResourceCreate.java new file mode 100644 index 0000000..befbc7a --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/model/ResourceCreate.java @@ -0,0 +1,36 @@ +package com.xmomen.module.resource.model; + +import lombok.Data; +import com.xmomen.module.resource.entity.Resource; +import org.springframework.beans.BeanUtils; + + import java.lang.Integer; + import java.lang.String; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-4-10 23:26:20 + * @version 1.0.0 + */ +public @Data class ResourceCreate implements Serializable { + + /** */ + private String id; + /** */ + private String entityType; + /** */ + private String entityId; + /** */ + private String path; + /** */ + private String resourceType; + /** */ + private Integer isDefault; + + public Resource getEntity(){ + Resource resource = new Resource(); + BeanUtils.copyProperties(this, resource); + return resource; + } +} diff --git a/src/main/java/com/xmomen/module/resource/model/ResourceModel.java b/src/main/java/com/xmomen/module/resource/model/ResourceModel.java new file mode 100644 index 0000000..913e663 --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/model/ResourceModel.java @@ -0,0 +1,111 @@ +package com.xmomen.module.resource.model; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.xmomen.module.resource.entity.Resource; +import com.xmomen.module.resource.service.ResourceUtilsService; +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.Integer; +import java.lang.String; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @version 1.0.0 + * @date 2017-4-10 23:26:20 + */ +@ExcelTarget(value = "ResourceModel") +public class ResourceModel implements Serializable { + + /** */ + @NotBlank(message = "为必填项") + @Length(max = 32, message = "字符长度限制[0,32]") + private String id; + /** */ + @Excel(name = "") + @Length(max = 50, message = "字符长度限制[0,50]") + private String entityType; + /** */ + @Excel(name = "") + @Length(max = 100, message = "字符长度限制[0,100]") + private String entityId; + /** */ + @Excel(name = "") + @Length(max = 255, message = "字符长度限制[0,255]") + private String path; + /** */ + @Excel(name = "") + @Length(max = 30, message = "字符长度限制[0,30]") + private String resourceType; + /** */ + @Excel(name = "") + @Range(max = 999999999, min = -999999999, message = "数值范围[999999999,-999999999]") + private Integer isDefault; + + /** + * Get Resource Entity Object + * + * @return + */ + @JsonIgnore + public Resource getEntity() { + Resource resource = new Resource(); + BeanUtils.copyProperties(this, resource); + return resource; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getEntityType() { + return entityType; + } + + public void setEntityType(String entityType) { + this.entityType = entityType; + } + + public String getEntityId() { + return entityId; + } + + public void setEntityId(String entityId) { + this.entityId = entityId; + } + + public String getPath() { + return ResourceUtilsService.getWholeHttpPath(this.path); + } + + public void setPath(String path) { + this.path = path; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + public Integer getIsDefault() { + return isDefault; + } + + public void setIsDefault(Integer isDefault) { + this.isDefault = isDefault; + } +} diff --git a/src/main/java/com/xmomen/module/resource/model/ResourceUpdate.java b/src/main/java/com/xmomen/module/resource/model/ResourceUpdate.java new file mode 100644 index 0000000..5eea74c --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/model/ResourceUpdate.java @@ -0,0 +1,37 @@ +package com.xmomen.module.resource.model; + +import lombok.Data; +import com.xmomen.module.resource.entity.Resource; +import org.springframework.beans.BeanUtils; + + import java.lang.Integer; + import java.lang.String; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-4-10 23:26:20 + * @version 1.0.0 + */ +public @Data class ResourceUpdate implements Serializable { + + /** */ + private String id; + /** */ + private String entityType; + /** */ + private String entityId; + /** */ + private String path; + /** */ + private String resourceType; + /** */ + private Integer isDefault; + + + public Resource getEntity(){ + Resource resource = new Resource(); + BeanUtils.copyProperties(this, resource); + return resource; + } +} diff --git a/src/main/java/com/xmomen/module/resource/service/ResourceService.java b/src/main/java/com/xmomen/module/resource/service/ResourceService.java new file mode 100644 index 0000000..e75d4f7 --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/service/ResourceService.java @@ -0,0 +1,115 @@ +package com.xmomen.module.resource.service; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.resource.model.ResourceQuery; +import com.xmomen.module.resource.model.ResourceModel; +import com.xmomen.module.resource.entity.Resource; +import org.apache.ibatis.exceptions.TooManyResultsException; + +import java.io.Serializable; +import java.util.List; + +/** + * @author tanxinzheng + * @date 2017-4-10 23:26:20 + * @version 1.0.0 + */ +public interface ResourceService { + + /** + * 新增资源目录 + * @param resourceModel 新增资源目录对象参数 + * @return ResourceModel 资源目录领域对象 + */ + public ResourceModel createResource(ResourceModel resourceModel); + + /** + * 新增资源目录实体对象 + * @param resource 新增资源目录实体对象参数 + * @return Resource 资源目录实体对象 + */ + public Resource createResource(Resource resource); + + /** + * 批量新增资源目录 + * @param ResourceModel 新增资源目录对象集合参数 + * @return List 资源目录领域对象集合 + */ + List createResources(List resourceModels); + + /** + * 更新资源目录 + * @param resourceModel 更新资源目录对象参数 + */ + public void updateResource(ResourceModel resourceModel); + + /** + * 更新资源目录实体对象 + * @param resource 新增资源目录实体对象参数 + * @return Resource 资源目录实体对象 + */ + public void updateResource(Resource resource); + + /** + * 批量删除资源目录 + * @param ids 主键数组 + */ + public void deleteResource(String[] ids); + + /** + * 删除资源目录 + * @param id 主键 + */ + public void deleteResource(String id); + + /** + * 查询资源目录领域分页对象（带参数条件） + * @param resourceQuery 查询参数 + * @param limit 每页最大数 + * @param offset 页码 + * @return Page 资源目录参数对象 + */ + public Page getResourceModelPage(int limit, int offset, ResourceQuery resourceQuery); + + /** + * 查询资源目录领域分页对象（无参数条件） + * @param limit 每页最大数 + * @param offset 页码 + * @return Page 资源目录领域对象 + */ + public Page getResourceModelPage(int limit, int offset); + + /** + * 查询资源目录领域集合对象（带参数条件） + * @param resourceQuery 查询参数对象 + * @return List 资源目录领域集合对象 + */ + public List getResourceModelList(ResourceQuery resourceQuery); + + /** + * 查询资源目录领域集合对象（无参数条件） + * @return List 资源目录领域集合对象 + */ + public List getResourceModelList(); + + /** + * 查询资源目录实体对象 + * @param id 主键 + * @return Resource 资源目录实体对象 + */ + public Resource getOneResource(String id); + + /** + * 根据主键查询单个对象 + * @param id 主键 + * @return ResourceModel 资源目录领域对象 + */ + public ResourceModel getOneResourceModel(String id); + + /** + * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错） + * @param resourceQuery 资源目录查询参数对象 + * @return ResourceModel 资源目录领域对象 + */ + public ResourceModel getOneResourceModel(ResourceQuery resourceQuery) throws TooManyResultsException; +} diff --git a/src/main/java/com/xmomen/module/resource/service/ResourceUtilsService.java b/src/main/java/com/xmomen/module/resource/service/ResourceUtilsService.java new file mode 100644 index 0000000..36d9130 --- /dev/null +++ b/src/main/java/com/xmomen/module/resource/service/ResourceUtilsService.java @@ -0,0 +1,42 @@ +package com.xmomen.module.resource.service; + +import com.xmomen.module.resource.api.DfsPath; +import com.xmomen.module.resource.api.DfsSdk; +import com.xmomen.module.resource.api.DfsService; +import org.springframework.util.StringUtils; + +import java.io.File; + +/** + * @author tanxinzheng + * @version 1.0.0 + * @date 2017-4-10 23:26:20 + */ +public class ResourceUtilsService { + + public static String getWholeHttpPath(String resourcePath) { + if (StringUtils.isEmpty(resourcePath)) { + return ""; + } + DfsService dfsService = DfsSdk.getDfsInstance(); + // M00 是FDFS文件路径的一个标识 + if (resourcePath.indexOf("M00/") > -1) { + return dfsService.getHttpPath(resourcePath); + } + else { + return dfsService.getDmsHttpPath(resourcePath); + } + } + + public static String uploadFile(File file) { + DfsService dfsServcie = DfsSdk.getDfsInstance(); + DfsPath path = dfsServcie.putObject(file, null, null); + if (path == null) return null; + return path.getRemotePath(); + } + + public static String getDefaultPicPath() { + DfsService dfsServcie = DfsSdk.getDfsInstance(); + return dfsServcie.getDefaultPath("PICTURE"); + } +} diff --git a/src/main/java/com/xmomen/module/schedule/PlanJob.java b/src/main/java/com/xmomen/module/schedule/PlanJob.java new file mode 100644 index 0000000..742650b --- /dev/null +++ b/src/main/java/com/xmomen/module/schedule/PlanJob.java @@ -0,0 +1,33 @@ +package com.xmomen.module.schedule; + + +import com.xmomen.framework.support.SpringContextUtil; +import com.xmomen.module.order.model.CreatePurchase; +import com.xmomen.module.order.service.PurchaseService; +import com.xmomen.module.plan.service.TablePlanSercvice; + +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + */ +@Component(value = "planJob") +public class PlanJob implements Job { + + @Autowired + TablePlanSercvice tablePlanSercvice; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + if(tablePlanSercvice == null){ + tablePlanSercvice = (TablePlanSercvice) SpringContextUtil.getApplicationContext().getBean(TablePlanSercvice.class); + tablePlanSercvice.createTablePlanOrder(); + } + } +} diff --git a/src/main/java/com/xmomen/module/schedule/QuartzManager.java b/src/main/java/com/xmomen/module/schedule/QuartzManager.java new file mode 100644 index 0000000..591ca3d --- /dev/null +++ b/src/main/java/com/xmomen/module/schedule/QuartzManager.java @@ -0,0 +1,196 @@ +package com.xmomen.module.schedule; + +import org.quartz.*; +import org.quartz.impl.StdSchedulerFactory; + +import java.text.ParseException; + +/** + * 任务管理器，当前仅支持一个任务对应一个触发器，如需要定义复杂任务，需添加相应方法 + * Created by Jeng on 2016/2/23. + */ +public class QuartzManager { + private static SchedulerFactory gSchedulerFactory = new StdSchedulerFactory(); + + /** + * 添加定时任务 + * @param jobName + * @param jobGroup + * @param cls + * @param time + * @throws SchedulerException + * @throws ParseException + */ + public static void addJob(String jobName, String jobGroup, Class cls, String time) throws SchedulerException, ParseException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + JobDetail jobDetail = scheduler.getJobDetail(jobName, jobGroup); + if(jobDetail != null){ + throw new SchedulerException("exist this jobDetail, jobName: " + jobName +", jobGroup: " + jobGroup +""); + } + jobDetail = new JobDetail(jobName, jobGroup, cls);// 任务名，任务组，任务执行类 + // 触发器 + CronTrigger trigger = new CronTrigger(jobName, jobGroup);// 触发器名,触发器组 + trigger.setCronExpression(time);// 触发器时间设定 + scheduler.scheduleJob(jobDetail, trigger); + // 启动 + if (!scheduler.isShutdown()) { + scheduler.start(); + } + } + + /** + * 修改一个任务的触发时间 + * @param triggerName + * @param triggerGroupName + * @param time + * @throws SchedulerException + * @throws ParseException + */ + public static void modifyJobTime(String triggerName, String triggerGroupName, String time) throws SchedulerException, ParseException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerName,triggerGroupName); + if (trigger == null) { + return; + } + String oldTime = trigger.getCronExpression(); + if (!oldTime.equalsIgnoreCase(time)) { + CronTrigger ct = (CronTrigger) trigger; + // 修改时间 + ct.setCronExpression(time); + // 重启触发器 + scheduler.resumeTrigger(triggerName, triggerGroupName); + } + } + + /** + * 移除一个任务(使用默认的任务组名，触发器名，触发器组名) + * @param jobName + * @throws SchedulerException + */ + public static void removeJob(String jobName, String jobGroup) throws SchedulerException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + if(scheduler.getJobDetail(jobName, jobGroup) == null){ + return; + } + if(Trigger.STATE_PAUSED != scheduler.getTriggerState(jobName, jobGroup)){ + scheduler.pauseTrigger(jobName, jobGroup);// 停止触发器 + } + scheduler.unscheduleJob(jobName, jobGroup);// 移除触发器 + scheduler.deleteJob(jobName, jobGroup);// 删除任务 + } + + /** + * 启动任务调度器中所有定时任务 + * @throws SchedulerException + */ + public static void startJobs() throws SchedulerException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + scheduler.start(); + } + + /** + * 关闭任务调度器 + * @throws SchedulerException + */ + public static void shutdownJobs() throws SchedulerException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + if (!scheduler.isShutdown()) { + scheduler.shutdown(); + } + } + + /** + * 暂停定时任务 + * @param jobName + * @param jobGroup + * @throws SchedulerException + */ + public static void pauseJob(String jobName, String jobGroup) throws SchedulerException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + if(Trigger.STATE_PAUSED != scheduler.getTriggerState(jobName, jobGroup)){ + scheduler.pauseJob(jobName, jobGroup); + } + } + + /** + * 停止任务 + * @param jobName + * @param jobGroup + * @throws SchedulerException + */ + public static void unscheduleJob(String jobName, String jobGroup) throws SchedulerException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + scheduler.unscheduleJob(jobName, jobGroup);// 停止触发器 + } + + /** + * 恢复已暂停的定时任务 + * @param jobName + * @param jobGroup + * @throws SchedulerException + */ + public static void resumeJob(String jobName, String jobGroup) throws SchedulerException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + scheduler.resumeJob(jobName, jobGroup); + } + + /** + * 获取任务触发器状态 + * @param jobName + * @param jobGroup + * @return + * @throws SchedulerException + */ + public static int getJobTriggerState(String jobName,String jobGroup) throws SchedulerException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + return scheduler.getTriggerState(jobName, jobGroup); + } + + /** + * 获取scheduler任务调度器 + * @return + * @throws SchedulerException + */ + public static Scheduler getScheduler() throws SchedulerException { + return gSchedulerFactory.getScheduler(); + } + + /** + * 获取任务明细对象 + * @param jobName + * @param jobGroup + * @return + * @throws SchedulerException + */ + public static JobDetail getJobDetail(String jobName, String jobGroup) throws SchedulerException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + return scheduler.getJobDetail(jobName, jobGroup); + } + + /** + * 获取触发器对象 + * @param jobName + * @param jobGroup + * @return + * @throws SchedulerException + */ + public static Trigger getTrigger(String jobName, String jobGroup) throws SchedulerException { + Scheduler scheduler = gSchedulerFactory.getScheduler(); + return scheduler.getTrigger(jobName, jobGroup); + } + + /** + * 是否正在运行 + * @param jobName + * @param jobGroup + * @return + * @throws SchedulerException + */ + public static boolean isRunning(String jobName, String jobGroup) throws SchedulerException { + if(Trigger.STATE_NORMAL == getJobTriggerState(jobName, jobGroup)){ + return true; + } + return false; + } + +} diff --git a/src/main/java/com/xmomen/module/schedule/StockDailyJob.java b/src/main/java/com/xmomen/module/schedule/StockDailyJob.java new file mode 100644 index 0000000..594b17c --- /dev/null +++ b/src/main/java/com/xmomen/module/schedule/StockDailyJob.java @@ -0,0 +1,31 @@ +package com.xmomen.module.schedule; + + +import com.xmomen.framework.support.SpringContextUtil; +import com.xmomen.module.order.model.CreatePurchase; +import com.xmomen.module.order.service.PurchaseService; +import com.xmomen.module.stockdaily.service.StockDailyService; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * Created by Jeng on 2016/2/23. + */ +@Component(value = "stockDailyJob") +public class StockDailyJob implements Job { + + StockDailyService stockDailyService; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + if (stockDailyService == null) { + stockDailyService = (StockDailyService) SpringContextUtil.getApplicationContext().getBean(StockDailyService.class); + stockDailyService.createStockDaily(); + } + } +} diff --git a/src/main/java/com/xmomen/module/schedule/controller/ScheduleController.java b/src/main/java/com/xmomen/module/schedule/controller/ScheduleController.java new file mode 100644 index 0000000..c084d8d --- /dev/null +++ b/src/main/java/com/xmomen/module/schedule/controller/ScheduleController.java @@ -0,0 +1,129 @@ +package com.xmomen.module.schedule.controller; + +import com.xmomen.module.schedule.QuartzManager; +import com.xmomen.module.schedule.controller.vo.AddQuartzJob; +import com.xmomen.module.schedule.controller.vo.ScheduleJobVo; +import com.xmomen.module.schedule.controller.vo.UpdateQuartzJob; +import com.xmomen.module.schedule.service.ScheduleJobService; +import com.xmomen.module.schedule.entity.ScheduleJob; +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.framework.support.SpringContextUtil; +import com.xmomen.framework.web.exceptions.ArgumentValidException; +import org.quartz.Job; +import org.quartz.SchedulerException; +import org.quartz.Trigger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by Jeng on 2016/2/23. + */ +@RestController +public class ScheduleController { + + public static List data = new ArrayList(); + + @Autowired + ScheduleJobService scheduleJobService; + + /** + * 新增定时任务 + * @param addQuartzJob + */ + @RequestMapping(value = "/schedule", method = RequestMethod.POST) + public void addQuartzJob(@RequestBody @Valid AddQuartzJob addQuartzJob, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + String triggerId = addQuartzJob.getJobTriggerId(); + if(!SpringContextUtil.getApplicationContext().containsBean(triggerId)){ + throw new IllegalArgumentException("所选模板文件错误，此模板不属于Job接口实现类"); + } + Object obj = SpringContextUtil.getApplicationContext().getBean(triggerId); + if(obj == null){ + throw new IllegalArgumentException("所选模板文件错误，此模板不属于Job接口实现类"); + } + if(obj instanceof Job){ + Job job = (Job) obj; + try { + ScheduleJob scheduleJob = new ScheduleJob(); + scheduleJob.setJobName(addQuartzJob.getJobName()); + scheduleJob.setJobGroup(addQuartzJob.getJobGroup()); + scheduleJob.setCronExpression(addQuartzJob.getCronExpression()); + scheduleJob.setJobDescription(addQuartzJob.getDescription()); + scheduleJob.setTriggerId(addQuartzJob.getJobTriggerId()); + scheduleJob.setJobStatus(addQuartzJob.getStarted() ? Trigger.STATE_NORMAL : Trigger.STATE_PAUSED); + scheduleJobService.addScheduleJob(scheduleJob); + QuartzManager.addJob(addQuartzJob.getJobName(), addQuartzJob.getJobGroup(), job.getClass(), addQuartzJob.getCronExpression()); + if(Trigger.STATE_PAUSED == scheduleJob.getJobStatus()){ + QuartzManager.pauseJob(addQuartzJob.getJobName(), addQuartzJob.getJobGroup()); + } + } catch (SchedulerException e) { + e.printStackTrace(); + } catch (ParseException e) { + throw new IllegalArgumentException("错误的cron表达式"); + } + }else{ + throw new IllegalArgumentException("所选模板文件错误，此模板不属于Job接口实现类"); + } + } + + /** + * 获取定时任务列表 + * @return + */ + @RequestMapping(value = "/schedule", method = RequestMethod.GET) + public Page getQuartzJob(@RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset){ + return scheduleJobService.queryScheduleJobs(keyword, limit, offset); + } + + /** + * 修改定时任务 + * @return + */ + @RequestMapping(value = "/schedule/{id}", method = RequestMethod.PUT) + public void updateQuartzJob(@PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdateQuartzJob updateQuartzJob, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + scheduleJobService.updateScheduleJob(id, updateQuartzJob); + } + + /** + * 获取定时任务模板 + * @return + */ + @RequestMapping(value = "/schedule/template", method = RequestMethod.GET) + public List> getQuartzTemplate(){ + Map jobs = SpringContextUtil.getApplicationContext().getBeansOfType(Job.class); + List> strings = new ArrayList>(); + for (Map.Entry stringJobEntry : jobs.entrySet()) { + Map stringMap = new HashMap(); + stringMap.put("triggerName", stringJobEntry.getValue().getClass().getName()); + stringMap.put("triggerKey", stringJobEntry.getKey()); + strings.add(stringMap); + } + return strings; + } + + /** + * 删除定时任务 + * @return + */ + @RequestMapping(value = "/schedule/{id}", method = RequestMethod.DELETE) + public void deleteQuartzJob(@PathVariable(value = "id") Integer id){ + scheduleJobService.deleteScheduleJob(id); + } + +} diff --git a/src/main/java/com/xmomen/module/schedule/controller/vo/ScheduleJobVo.java b/src/main/java/com/xmomen/module/schedule/controller/vo/ScheduleJobVo.java new file mode 100644 index 0000000..17e0941 --- /dev/null +++ b/src/main/java/com/xmomen/module/schedule/controller/vo/ScheduleJobVo.java @@ -0,0 +1,80 @@ +package com.xmomen.module.schedule.controller.vo; + +/** + * Created by Jeng on 2016/2/25. + */ +public class ScheduleJobVo { + + private Integer id; + private String jobName; + private String jobGroup; + private String triggerId; + private Integer jobStatus; + private String jobStatusDesc; + private String cronExpression; + private String jobDescription; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getJobName() { + return jobName; + } + + public void setJobName(String jobName) { + this.jobName = jobName; + } + + public String getJobGroup() { + return jobGroup; + } + + public void setJobGroup(String jobGroup) { + this.jobGroup = jobGroup; + } + + public String getTriggerId() { + return triggerId; + } + + public void setTriggerId(String triggerId) { + this.triggerId = triggerId; + } + + public Integer getJobStatus() { + return jobStatus; + } + + public void setJobStatus(Integer jobStatus) { + this.jobStatus = jobStatus; + } + + public String getJobStatusDesc() { + return jobStatusDesc; + } + + public void setJobStatusDesc(String jobStatusDesc) { + this.jobStatusDesc = jobStatusDesc; + } + + public String getCronExpression() { + return cronExpression; + } + + public void setCronExpression(String cronExpression) { + this.cronExpression = cronExpression; + } + + public String getJobDescription() { + return jobDescription; + } + + public void setJobDescription(String jobDescription) { + this.jobDescription = jobDescription; + } +} diff --git a/src/main/java/com/xmomen/module/schedule/controller/vo/UpdateQuartzJob.java b/src/main/java/com/xmomen/module/schedule/controller/vo/UpdateQuartzJob.java new file mode 100644 index 0000000..1778864 --- /dev/null +++ b/src/main/java/com/xmomen/module/schedule/controller/vo/UpdateQuartzJob.java @@ -0,0 +1,83 @@ +package com.xmomen.module.schedule.controller.vo; + +/** + * Created by Jeng on 2016/2/23. + */ +public class UpdateQuartzJob { + + public static String ACTION_PAUSE = "pause"; + public static String ACTION_START = "start"; + public static String ACTION_RESTART = "restart"; + public static String ACTION_STOP = "stop"; + + // 动作 + private String action; + // 任务名称 + private String jobName; + // 任务分组 + private String jobGroup; + // 任务触发器ID + private String jobTriggerId; + // 任务状态 0-禁用，1-启用，2-删除 + private Integer jobStatus; + // 运行时间表达式 + private String cronExpression; + // 任务描述 + private String description; + + public String getJobName() { + return jobName; + } + + public void setJobName(String jobName) { + this.jobName = jobName; + } + + public String getJobGroup() { + return jobGroup; + } + + public void setJobGroup(String jobGroup) { + this.jobGroup = jobGroup; + } + + public String getJobTriggerId() { + return jobTriggerId; + } + + public void setJobTriggerId(String jobTriggerId) { + this.jobTriggerId = jobTriggerId; + } + + public Integer getJobStatus() { + return jobStatus; + } + + public void setJobStatus(Integer jobStatus) { + this.jobStatus = jobStatus; + } + + public String getCronExpression() { + return cronExpression; + } + + public void setCronExpression(String cronExpression) { + this.cronExpression = cronExpression; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } +} diff --git a/src/main/java/com/xmomen/module/schedule/mapper/ScheduleMapper.java b/src/main/java/com/xmomen/module/schedule/mapper/ScheduleMapper.java new file mode 100644 index 0000000..d6f47ca --- /dev/null +++ b/src/main/java/com/xmomen/module/schedule/mapper/ScheduleMapper.java @@ -0,0 +1,9 @@ +package com.xmomen.module.schedule.mapper; + +/** + * Created by Jeng on 2016/3/24. + */ +public interface ScheduleMapper { + + public static final String ScheduleMapperNameSpace = "com.xmomen.module.schedule.mapper.ScheduleMapper."; +} diff --git a/src/main/java/com/xmomen/module/schedule/mapper/ScheduleMapper.xml b/src/main/java/com/xmomen/module/schedule/mapper/ScheduleMapper.xml new file mode 100644 index 0000000..4652605 --- /dev/null +++ b/src/main/java/com/xmomen/module/schedule/mapper/ScheduleMapper.xml @@ -0,0 +1,34 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/sms/api/Request.java b/src/main/java/com/xmomen/module/sms/api/Request.java new file mode 100644 index 0000000..5d18999 --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/api/Request.java @@ -0,0 +1,197 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.xmomen.module.sms.api; +import java.util.List; +import java.util.Map; + +import com.xmomen.module.sms.enums.Method; + +/** + * Request + */ +public class Request { + + public Request() { + } + + public Request(Method method, String host, String path, String appKey, String appSecret, int timeout) { + this.method = method; + this.host = host; + this.path = path; + this.appKey = appKey; + this.appSecret = appSecret; + this.timeout = timeout; + } + + /** + * （必选）请求方法 + */ + private Method method; + + /** + * （必选）Host + */ + private String host; + + /** + * （必选）Path + */ + private String path; + + /** + * （必选)APP KEY + */ + private String appKey; + + /** + * （必选）APP密钥 + */ + private String appSecret; + + /** + * （必选）超时时间,单位毫秒,设置零默认使用com.aliyun.apigateway.demo.constant.Constants.DEFAULT_TIMEOUT + */ + private int timeout; + + /** + * （可选） HTTP头 + */ + private Map headers; + + /** + * （可选） Querys + */ + private Map querys; + + /** + * （可选）表单参数 + */ + private Map bodys; + + /** + * （可选）字符串Body体 + */ + private String stringBody; + + /** + * （可选）字节数组类型Body体 + */ + private byte[] bytesBody; + + /** + * （可选）自定义参与签名Header前缀 + */ + private List signHeaderPrefixList; + + public Method getMethod() { + return method; + } + + public void setMethod(Method method) { + this.method = method; + } + + public String getHost() { + return host; + } + + public void setPath(String path) { + this.path = path; + } + + public String getPath() { + return path; + } + + public void setHost(String host) { + this.host = host; + } + + public String getAppKey() { + return appKey; + } + + public void setAppKey(String appKey) { + this.appKey = appKey; + } + + public String getAppSecret() { + return appSecret; + } + + public void setAppSecret(String appSecret) { + this.appSecret = appSecret; + } + + public int getTimeout() { + return timeout; + } + + public void setTimeout(int timeout) { + this.timeout = timeout; + } + + public Map getHeaders() { + return headers; + } + + public void setHeaders(Map headers) { + this.headers = headers; + } + + public Map getQuerys() { + return querys; + } + + public void setQuerys(Map querys) { + this.querys = querys; + } + + public Map getBodys() { + return bodys; + } + + public void setBodys(Map bodys) { + this.bodys = bodys; + } + + public String getStringBody() { + return stringBody; + } + + public void setStringBody(String stringBody) { + this.stringBody = stringBody; + } + + public byte[] getBytesBody() { + return bytesBody; + } + + public void setBytesBody(byte[] bytesBody) { + this.bytesBody = bytesBody; + } + + public List getSignHeaderPrefixList() { + return signHeaderPrefixList; + } + + public void setSignHeaderPrefixList(List signHeaderPrefixList) { + this.signHeaderPrefixList = signHeaderPrefixList; + } +} diff --git a/src/main/java/com/xmomen/module/sms/api/Response.java b/src/main/java/com/xmomen/module/sms/api/Response.java new file mode 100644 index 0000000..828e865 --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/api/Response.java @@ -0,0 +1,82 @@ +package com.xmomen.module.sms.api; + +import java.util.HashMap; +import java.util.Map; + +public class Response { + private int statusCode; + private String contentType; + private String requestId; + private String errorMessage; + private Map headers; + private String body; + + public Response() { + + } + + public int getStatusCode() { + return statusCode; + } + + public void setStatusCode(int statusCode) { + this.statusCode = statusCode; + } + + public String getContentType() { + return contentType; + } + + public void setContentType(String contentType) { + this.contentType = contentType; + } + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + + public Map getHeaders() { + return headers; + } + + public String getHeader(String key) { + if (null != headers) { + return headers.get(key); + } else { + return null; + } + } + + public void setHeaders(Map headers) { + this.headers = headers; + } + + public void setHeader(String key, String value) { + if (null == this.headers) { + this.headers = new HashMap(); + } + this.headers.put(key, value); + } + + public String getBody() { + return body; + } + + public void setBody(String body) { + this.body = body; + } + + +} diff --git a/src/main/java/com/xmomen/module/sms/api/SmsResponse.java b/src/main/java/com/xmomen/module/sms/api/SmsResponse.java new file mode 100644 index 0000000..c6884b4 --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/api/SmsResponse.java @@ -0,0 +1,22 @@ +package com.xmomen.module.sms.api; + +public class SmsResponse { + + private boolean success; + private String message; + public SmsResponse() {} + + public void setSuccess(boolean success) { + this.success = success; + } + public boolean getSuccess() { + return success; + } + + public void setMessage(String message) { + this.message = message; + } + public String getMessage() { + return message; + } +} diff --git a/src/main/java/com/xmomen/module/sms/api/SmsService.java b/src/main/java/com/xmomen/module/sms/api/SmsService.java new file mode 100644 index 0000000..533cf32 --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/api/SmsService.java @@ -0,0 +1,123 @@ +package com.xmomen.module.sms.api; + +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.http.HttpResponse; +import org.apache.http.util.EntityUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.xmomen.framework.exception.BusinessException; +import com.xmomen.framework.utils.StringUtilsExt; +import com.xmomen.module.sms.constant.Constants; +import com.xmomen.module.sms.constant.HttpSchema; +import com.xmomen.module.sms.enums.Method; +import com.xmomen.module.sms.util.GlobalIdentifyCodeManager; +import com.xmomen.module.sms.util.HttpUtil; +import com.xmomen.module.wx.pay.common.RandomStringGenerator; +import com.xmomen.module.wx.util.JsonUtils; + +public class SmsService { + + static Logger log = LoggerFactory.getLogger(SmsService.class); + + private String signName; + private String templateCode; + private String appKey; + private String appSecret; + + private final static String ERRORKEY = "errorMessage"; //返回错误的key + + /** + * + * @param phoneNumber + * @return 如果为空代表调用API返回失败 + */ + public SmsResponse sendSingleRequest(String phoneNumber) { + String host = "sms.market.alicloudapi.com"; + String path = "/singleSendSms"; + System.out.println("appKey is:" + appKey); + System.out.println("appSecret is:" + appSecret); + Request request = new Request(Method.GET, HttpSchema.HTTP + host, path, appKey, appSecret, Constants.DEFAULT_TIMEOUT); + + Map querys = new HashMap(); + // 生成identifyCode + String identifyCode = RandomStringGenerator.getRandomNumberStrByLength(4); + // ParamString = {"no":"123456"} + String paramString = "{'code': '" + identifyCode + "'}"; + querys.put("ParamString", paramString); + querys.put("RecNum", phoneNumber); + //签名的名字 + querys.put("SignName", signName); + //模板Code + querys.put("TemplateCode", templateCode); + request.setQuerys(querys); + try { + Map bodymap = new HashMap(); + Response response = Client.execute(request); + if(response == null) { + log.error("未收到response"); + return null; + } else { + int statusCode = response.getStatusCode(); + String result = response.getBody(); + log.error("收到的回复:" + result); + if(200 == statusCode) { + bodymap = readResponseBodyContent(result); + if(null != bodymap.get(ERRORKEY)) { + throw new BusinessException(bodymap.get(ERRORKEY)); + } else { + SmsResponse smsResponse = new SmsResponse(); + if ("true".equals(bodymap.get("success"))) { + smsResponse.setSuccess(true); + log.info("identifyCode is:" + identifyCode); + GlobalIdentifyCodeManager.updateIdenfifyCode(phoneNumber, identifyCode); + return smsResponse; + } + } + } else { + throw new BusinessException("返回状态码:" + statusCode + ",错误信息:" + response.getErrorMessage()); + } + } + } catch (Exception e) { + log.error("调用SMS API失败", e); + return null; + } + return null; + } + private Map readResponseBodyContent(String body) { + Map map = new HashMap(); + try { + JSONObject jsonObject = JSON.parseObject(body); + if (null != jsonObject) { + for(Entry entry : jsonObject.entrySet()){ + map.put(entry.getKey(), entry.getValue().toString()); + } + } + if ("false".equals(map.get("success"))) { + map.put(ERRORKEY, map.get("message")); + } + } catch (Exception e) { + map.put(ERRORKEY, body); + } + return map; + } + + public void setAppKey(String appKey) { + this.appKey = appKey; + } + public void setAppSecret(String appSecret) { + this.appSecret = appSecret; + } + public void setSignName(String signName) { + this.signName = signName; + } + public void setTemplateCode(String templateCode) { + this.templateCode = templateCode; + } +} diff --git a/src/main/java/com/xmomen/module/sms/constant/ContentType.java b/src/main/java/com/xmomen/module/sms/constant/ContentType.java new file mode 100644 index 0000000..7253ecd --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/constant/ContentType.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.xmomen.module.sms.constant; + +/** + * 常用HTTP Content-Type常量 + */ +public class ContentType { + //表单类型Content-Type + public static final String CONTENT_TYPE_FORM = "application/x-www-form-urlencoded; charset=UTF-8"; + // 流类型Content-Type + public static final String CONTENT_TYPE_STREAM = "application/octet-stream; charset=UTF-8"; + //JSON类型Content-Type + public static final String CONTENT_TYPE_JSON = "application/json; charset=UTF-8"; + //XML类型Content-Type + public static final String CONTENT_TYPE_XML = "application/xml; charset=UTF-8"; + //文本类型Content-Type + public static final String CONTENT_TYPE_TEXT = "application/text; charset=UTF-8"; +} diff --git a/src/main/java/com/xmomen/module/sms/constant/HttpHeader.java b/src/main/java/com/xmomen/module/sms/constant/HttpHeader.java new file mode 100644 index 0000000..50fee36 --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/constant/HttpHeader.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.xmomen.module.sms.constant; + +/** + * HTTP头常量 + */ +public class HttpHeader { + //请求Header Accept + public static final String HTTP_HEADER_ACCEPT = "Accept"; + //请求Body内容MD5 Header + public static final String HTTP_HEADER_CONTENT_MD5 = "Content-MD5"; + //请求Header Content-Type + public static final String HTTP_HEADER_CONTENT_TYPE = "Content-Type"; + //请求Header UserAgent + public static final String HTTP_HEADER_USER_AGENT = "User-Agent"; + //请求Header Date + public static final String HTTP_HEADER_DATE = "Date"; +} diff --git a/src/main/java/com/xmomen/module/sms/constant/HttpSchema.java b/src/main/java/com/xmomen/module/sms/constant/HttpSchema.java new file mode 100644 index 0000000..2a1f896 --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/constant/HttpSchema.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.xmomen.module.sms.constant; + +/** + * HTTP Schema常量 + */ +public class HttpSchema { + //HTTP + public static final String HTTP = "http://"; + //HTTPS + public static final String HTTPS = "https://"; + +} diff --git a/src/main/java/com/xmomen/module/sms/constant/SystemHeader.java b/src/main/java/com/xmomen/module/sms/constant/SystemHeader.java new file mode 100644 index 0000000..89f52b0 --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/constant/SystemHeader.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.xmomen.module.sms.constant; + +/** + * 系统HTTP头常量 + */ +public class SystemHeader { + //签名Header + public static final String X_CA_SIGNATURE = "X-Ca-Signature"; + //所有参与签名的Header + public static final String X_CA_SIGNATURE_HEADERS = "X-Ca-Signature-Headers"; + //请求时间戳 + public static final String X_CA_TIMESTAMP = "X-Ca-Timestamp"; + //请求放重放Nonce,15分钟内保持唯一,建议使用UUID + public static final String X_CA_NONCE = "X-Ca-Nonce"; + //APP KEY + public static final String X_CA_KEY = "X-Ca-Key"; +} diff --git a/src/main/java/com/xmomen/module/sms/util/GlobalIdentifyCodeManager.java b/src/main/java/com/xmomen/module/sms/util/GlobalIdentifyCodeManager.java new file mode 100644 index 0000000..6605799 --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/util/GlobalIdentifyCodeManager.java @@ -0,0 +1,34 @@ +package com.xmomen.module.sms.util; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; + +import com.xmomen.module.sms.model.IdentifyCodeModel; + +public class GlobalIdentifyCodeManager { + + static Map identifyCodeCache = new ConcurrentHashMap(); + //static Map operationCodeCache = new ConcurrentHashMap(); + + public static IdentifyCodeModel getIdentifyCode(String identifyCodeKey) { + return identifyCodeCache.get(identifyCodeKey); + } + + public static IdentifyCodeModel updateIdenfifyCode(String identifyCodeKey, String identifyCode) { + IdentifyCodeModel identifyCodeModel = new IdentifyCodeModel(identifyCode, 15L, TimeUnit.MINUTES); + identifyCodeCache.put(identifyCodeKey, identifyCodeModel); + return identifyCodeModel; + } + + + /*public static IdentifyCodeModel getOperationCode(String operationCodeKey) { + return operationCodeCache.get(operationCodeKey); + } + + public static IdentifyCodeModel updateOperationCode(String operationCodeKey, String identifyCode) { + IdentifyCodeModel identifyCodeModel = new IdentifyCodeModel(identifyCode, 15L, TimeUnit.MINUTES); + operationCodeCache.put(operationCodeKey, identifyCodeModel); + return identifyCodeModel; + }*/ +} diff --git a/src/main/java/com/xmomen/module/sms/util/HttpUtils.java b/src/main/java/com/xmomen/module/sms/util/HttpUtils.java new file mode 100644 index 0000000..4f9ef3f --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/util/HttpUtils.java @@ -0,0 +1,312 @@ +package com.xmomen.module.sms.util; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.security.KeyManagementException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +import org.apache.commons.lang.StringUtils; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.HttpClient; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.conn.ClientConnectionManager; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.ssl.SSLSocketFactory; +import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; + +public class HttpUtils { + + /** + * get + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @return + * @throws Exception + */ + public static HttpResponse doGet(String host, String path, String method, + Map headers, + Map querys) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpGet request = new HttpGet(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + return httpClient.execute(request); + } + + /** + * post form + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param bodys + * @return + * @throws Exception + */ + public static HttpResponse doPost(String host, String path, String method, + Map headers, + Map querys, + Map bodys) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPost request = new HttpPost(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (bodys != null) { + List nameValuePairList = new ArrayList(); + + for (String key : bodys.keySet()) { + nameValuePairList.add(new BasicNameValuePair(key, bodys.get(key))); + } + UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8"); + formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8"); + request.setEntity(formEntity); + } + + return httpClient.execute(request); + } + + /** + * Post String + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPost(String host, String path, String method, + Map headers, + Map querys, + String body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPost request = new HttpPost(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (StringUtils.isNotBlank(body)) { + request.setEntity(new StringEntity(body, "utf-8")); + } + + return httpClient.execute(request); + } + + /** + * Post stream + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPost(String host, String path, String method, + Map headers, + Map querys, + byte[] body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPost request = new HttpPost(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (body != null) { + request.setEntity(new ByteArrayEntity(body)); + } + + return httpClient.execute(request); + } + + /** + * Put String + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPut(String host, String path, String method, + Map headers, + Map querys, + String body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPut request = new HttpPut(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (StringUtils.isNotBlank(body)) { + request.setEntity(new StringEntity(body, "utf-8")); + } + + return httpClient.execute(request); + } + + /** + * Put stream + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPut(String host, String path, String method, + Map headers, + Map querys, + byte[] body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPut request = new HttpPut(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (body != null) { + request.setEntity(new ByteArrayEntity(body)); + } + + return httpClient.execute(request); + } + + /** + * Delete + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @return + * @throws Exception + */ + public static HttpResponse doDelete(String host, String path, String method, + Map headers, + Map querys) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpDelete request = new HttpDelete(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + return httpClient.execute(request); + } + + private static String buildUrl(String host, String path, Map querys) throws UnsupportedEncodingException { + StringBuilder sbUrl = new StringBuilder(); + sbUrl.append(host); + if (!StringUtils.isBlank(path)) { + sbUrl.append(path); + } + if (null != querys) { + StringBuilder sbQuery = new StringBuilder(); + for (Map.Entry query : querys.entrySet()) { + if (0 < sbQuery.length()) { + sbQuery.append("&"); + } + if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) { + sbQuery.append(query.getValue()); + } + if (!StringUtils.isBlank(query.getKey())) { + sbQuery.append(query.getKey()); + if (!StringUtils.isBlank(query.getValue())) { + sbQuery.append("="); + sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8")); + } + } + } + if (0 < sbQuery.length()) { + sbUrl.append("?").append(sbQuery); + } + } + + return sbUrl.toString(); + } + + private static HttpClient wrapClient(String host) { + HttpClient httpClient = new DefaultHttpClient(); + if (host.startsWith("https://")) { + sslClient(httpClient); + } + + return httpClient; + } + + private static void sslClient(HttpClient httpClient) { + try { + SSLContext ctx = SSLContext.getInstance("TLS"); + X509TrustManager tm = new X509TrustManager() { + public X509Certificate[] getAcceptedIssuers() { + return null; + } + public void checkClientTrusted(X509Certificate[] xcs, String str) { + + } + public void checkServerTrusted(X509Certificate[] xcs, String str) { + + } + }; + ctx.init(null, new TrustManager[] { tm }, null); + SSLSocketFactory ssf = new SSLSocketFactory(ctx); + ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); + ClientConnectionManager ccm = httpClient.getConnectionManager(); + SchemeRegistry registry = ccm.getSchemeRegistry(); + registry.register(new Scheme("https", 443, ssf)); + } catch (KeyManagementException ex) { + throw new RuntimeException(ex); + } catch (NoSuchAlgorithmException ex) { + throw new RuntimeException(ex); + } + } +} diff --git a/src/main/java/com/xmomen/module/sms/util/MessageDigestUtil.java b/src/main/java/com/xmomen/module/sms/util/MessageDigestUtil.java new file mode 100644 index 0000000..693684e --- /dev/null +++ b/src/main/java/com/xmomen/module/sms/util/MessageDigestUtil.java @@ -0,0 +1,119 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.xmomen.module.sms.util; + +import org.apache.commons.codec.binary.Base64; + +import com.xmomen.module.sms.constant.Constants; + +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +/** + * 消息摘要工具 + */ +public class MessageDigestUtil { + /** + * 先进行MD5摘要再进行Base64编码获取摘要字符串 + * + * @param str + * @return + */ + public static String base64AndMD5(String str) { + if (str == null) { + throw new IllegalArgumentException("inStr can not be null"); + } + return base64AndMD5(toBytes(str)); + } + + /** + * 先进行MD5摘要再进行Base64编码获取摘要字符串 + * + * @return + */ + public static String base64AndMD5(byte[] bytes) { + if (bytes == null) { + throw new IllegalArgumentException("bytes can not be null"); + } + try { + final MessageDigest md = MessageDigest.getInstance("MD5"); + md.reset(); + md.update(bytes); + final Base64 base64 = new Base64(); + final byte[] enbytes = base64.encode(md.digest()); + return new String(enbytes); + } catch (final NoSuchAlgorithmException e) { + throw new IllegalArgumentException("unknown algorithm MD5"); + } + } + + /** + * UTF-8编码转换为ISO-9959-1 + * + * @param str + * @return + */ + public static String utf8ToIso88591(String str) { + if (str == null) { + return str; + } + + try { + return new String(str.getBytes("UTF-8"), "ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException(e.getMessage(), e); + } + } + + /** + * ISO-9959-1编码转换为UTF-8 + * + * @param str + * @return + */ + public static String iso88591ToUtf8(String str) { + if (str == null) { + return str; + } + + try { + return new String(str.getBytes("ISO-8859-1"), "UTF-8"); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException(e.getMessage(), e); + } + } + + /** + * String转换为字节数组 + * + * @param str + * @return + */ + private static byte[] toBytes(final String str) { + if (str == null) { + return null; + } + try { + return str.getBytes(Constants.ENCODING); + } catch (final UnsupportedEncodingException e) { + throw new RuntimeException(e.getMessage(), e); + } + } +} diff --git a/src/main/java/com/xmomen/module/stock/entity/StockRecord.java b/src/main/java/com/xmomen/module/stock/entity/StockRecord.java new file mode 100644 index 0000000..4ba0fac --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/entity/StockRecord.java @@ -0,0 +1,206 @@ +package com.xmomen.module.stock.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_stock_record") +public class StockRecord extends BaseMybatisModel { + /** + * 主键 + */ + private String id; + + /** + * 库存id + */ + private String stockId; + + /** + * 变更数量 + */ + private Integer changeNum; + + /** + * 1-增加 2-减少 + */ + private Integer changType; + + /** + * 如果是订单变更，关联订单ID + */ + private Integer refOrderId; + + /** + * 备注(记录变更） + */ + private String remark; + + /** + * 创建人 + */ + private Integer insertUserId; + + /** + * 创建时间 + */ + private Date insertDate; + + /** + * 更新人 + */ + private Integer updateUserId; + + /** + * 更新时间 + */ + private Date updateDate; + + @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 = "stock_id") + public String getStockId() { + return stockId; + } + + public void setStockId(String stockId) { + this.stockId = stockId; + if(stockId == null){ + removeValidField("stockId"); + return; + } + addValidField("stockId"); + } + + @Column(name = "change_num") + public Integer getChangeNum() { + return changeNum; + } + + public void setChangeNum(Integer changeNum) { + this.changeNum = changeNum; + if(changeNum == null){ + removeValidField("changeNum"); + return; + } + addValidField("changeNum"); + } + + @Column(name = "chang_type") + public Integer getChangType() { + return changType; + } + + public void setChangType(Integer changType) { + this.changType = changType; + if(changType == null){ + removeValidField("changType"); + return; + } + addValidField("changType"); + } + + @Column(name = "ref_order_id") + public Integer getRefOrderId() { + return refOrderId; + } + + public void setRefOrderId(Integer refOrderId) { + this.refOrderId = refOrderId; + if(refOrderId == null){ + removeValidField("refOrderId"); + return; + } + addValidField("refOrderId"); + } + + @Column(name = "remark") + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + if(remark == null){ + removeValidField("remark"); + return; + } + addValidField("remark"); + } + + @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 = "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 = "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 = "update_date") + public Date getUpdateDate() { + return updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + if(updateDate == null){ + removeValidField("updateDate"); + return; + } + addValidField("updateDate"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/stock/entity/mapper/StockMapper.java b/src/main/java/com/xmomen/module/stock/entity/mapper/StockMapper.java new file mode 100644 index 0000000..30fe8ac --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/entity/mapper/StockMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.stock.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.stock.entity.Stock; +import com.xmomen.module.stock.entity.StockExample; +import org.apache.ibatis.annotations.Param; + +public interface StockMapper extends MybatisMapper { + int countByExample(StockExample example); + + int deleteByExample(StockExample example); + + int insertSelective(Stock record); + + int updateByExampleSelective(@Param("record") Stock record, @Param("example") StockExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/stock/entity/mapper/StockMapper.xml b/src/main/java/com/xmomen/module/stock/entity/mapper/StockMapper.xml new file mode 100644 index 0000000..813c2db --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/entity/mapper/StockMapper.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, item_id, stock_num, warning_num, insert_date, insert_user_id, update_date, update_user_id + + + + delete from cd_stock + + + + + + + SELECT replace(UUID(),'-','') + + insert into cd_stock + + id, + + item_id, + + + stock_num, + + + warning_num, + + + insert_date, + + + insert_user_id, + + + update_date, + + + update_user_id, + + + + #{id,jdbcType=VARCHAR}, + + #{itemId,jdbcType=INTEGER}, + + + #{stockNum,jdbcType=INTEGER}, + + + #{warningNum,jdbcType=INTEGER}, + + + #{insertDate,jdbcType=TIMESTAMP}, + + + #{insertUserId,jdbcType=INTEGER}, + + + #{updateDate,jdbcType=TIMESTAMP}, + + + #{updateUserId,jdbcType=INTEGER}, + + + + + + update cd_stock + + + id = #{record.id,jdbcType=VARCHAR}, + + + item_id = #{record.itemId,jdbcType=INTEGER}, + + + stock_num = #{record.stockNum,jdbcType=INTEGER}, + + + warning_num = #{record.warningNum,jdbcType=INTEGER}, + + + insert_date = #{record.insertDate,jdbcType=TIMESTAMP}, + + + insert_user_id = #{record.insertUserId,jdbcType=INTEGER}, + + + update_date = #{record.updateDate,jdbcType=TIMESTAMP}, + + + update_user_id = #{record.updateUserId,jdbcType=INTEGER}, + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/stock/mapper/StockMapperExt.java b/src/main/java/com/xmomen/module/stock/mapper/StockMapperExt.java new file mode 100644 index 0000000..e9cc724 --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/mapper/StockMapperExt.java @@ -0,0 +1,12 @@ +package com.xmomen.module.stock.mapper; + +/** + * @author tanxinzheng + * @date 2017-5-13 12:49:20 + * @version 1.0.0 + */ +public interface StockMapperExt { + + public static final String StockMapperNameSpace = "com.xmomen.module.stock.mapper.StockMapperExt."; + +} diff --git a/src/main/java/com/xmomen/module/stock/mapper/StockMapperExt.xml b/src/main/java/com/xmomen/module/stock/mapper/StockMapperExt.xml new file mode 100644 index 0000000..9facadd --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/mapper/StockMapperExt.xml @@ -0,0 +1,45 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/stock/mapper/StockRecordMapperExt.java b/src/main/java/com/xmomen/module/stock/mapper/StockRecordMapperExt.java new file mode 100644 index 0000000..8658e26 --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/mapper/StockRecordMapperExt.java @@ -0,0 +1,12 @@ +package com.xmomen.module.stock.mapper; + +/** + * @author tanxinzheng + * @date 2017-5-13 12:48:23 + * @version 1.0.0 + */ +public interface StockRecordMapperExt { + + public static final String StockRecordMapperNameSpace = "com.xmomen.module.stock.mapper.StockRecordMapperExt."; + +} diff --git a/src/main/java/com/xmomen/module/stock/mapper/StockRecordMapperExt.xml b/src/main/java/com/xmomen/module/stock/mapper/StockRecordMapperExt.xml new file mode 100644 index 0000000..815b221 --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/mapper/StockRecordMapperExt.xml @@ -0,0 +1,50 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/stock/model/StockCreate.java b/src/main/java/com/xmomen/module/stock/model/StockCreate.java new file mode 100644 index 0000000..6015f03 --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/model/StockCreate.java @@ -0,0 +1,41 @@ +package com.xmomen.module.stock.model; + +import lombok.Data; +import com.xmomen.module.stock.entity.Stock; +import org.springframework.beans.BeanUtils; + + import java.lang.String; + import java.lang.Integer; + import java.util.Date; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-5-13 12:49:20 + * @version 1.0.0 + */ +public @Data class StockCreate implements Serializable { + + /** 主键 */ + private String id; + /** 商品ID */ + private Integer itemId; + /** 库存数 */ + private Integer stockNum; + /** 预警数量 */ + private Integer warningNum; + /** 创建时间 */ + private Date insertDate; + /** 创建人 */ + private Integer insertUserId; + /** 更新时间 */ + private Date updateDate; + /** 更新人 */ + private Integer updateUserId; + + public Stock getEntity(){ + Stock stock = new Stock(); + BeanUtils.copyProperties(this, stock); + return stock; + } +} diff --git a/src/main/java/com/xmomen/module/stock/model/StockModel.java b/src/main/java/com/xmomen/module/stock/model/StockModel.java new file mode 100644 index 0000000..be954cd --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/model/StockModel.java @@ -0,0 +1,92 @@ +package com.xmomen.module.stock.model; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.xmomen.module.stock.entity.Stock; +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-13 12:49:20 + */ +@ExcelTarget(value = "StockModel") +public +@Data +class StockModel implements Serializable { + + /** + * 主键 + */ + @Length(max = 32, message = "主键字符长度限制[0,32]") + private String id; + /** + * 商品ID + */ + @Excel(name = "商品ID") + @NotNull(message = "商品ID为必填项") + @Range(max = 999999999, min = -999999999, message = "商品ID数值范围[999999999,-999999999]") + private Integer itemId; + private String itemName; + private String itemCode; + /** + * 库存数 + */ + @Excel(name = "库存数") + @NotNull(message = "库存数为必填项") + @Range(max = 999999999, min = -999999999, message = "库存数数值范围[999999999,-999999999]") + private Integer stockNum; + /** + * 预警数量 + */ + @Excel(name = "预警数量") + @Range(max = 999999999, min = -999999999, message = "预警数量数值范围[999999999,-999999999]") + private Integer warningNum; + /** + * 创建时间 + */ + @Excel(name = "创建时间") + private Date insertDate; + /** + * 创建人 + */ + @Excel(name = "创建人") + @Range(max = 999999999, min = -999999999, message = "创建人数值范围[999999999,-999999999]") + private Integer insertUserId; + /** + * 更新时间 + */ + @Excel(name = "更新时间") + private Date updateDate; + /** + * 更新人 + */ + @Excel(name = "更新人") + @Range(max = 999999999, min = -999999999, message = "更新人数值范围[999999999,-999999999]") + private Integer updateUserId; + + /** + * Get Stock Entity Object + * + * @return + */ + @JsonIgnore + public Stock getEntity() { + Stock stock = new Stock(); + BeanUtils.copyProperties(this, stock); + return stock; + } + + +} diff --git a/src/main/java/com/xmomen/module/stock/model/StockRecordQuery.java b/src/main/java/com/xmomen/module/stock/model/StockRecordQuery.java new file mode 100644 index 0000000..9dc7dc3 --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/model/StockRecordQuery.java @@ -0,0 +1,32 @@ +package com.xmomen.module.stock.model; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author tanxinzheng + * @version 1.0.0 + * @date 2017-5-13 12:48:23 + */ +public +@Data +class StockRecordQuery implements Serializable { + /** + * 主键 + */ + private String id; + /** + * 包含主键集 + */ + private String[] ids; + /** + * 排除主键集 + */ + private String[] excludeIds; + + private String stockId; + private Integer changeType; + + private String dailyDate; +} diff --git a/src/main/java/com/xmomen/module/stock/model/StockRecordUpdate.java b/src/main/java/com/xmomen/module/stock/model/StockRecordUpdate.java new file mode 100644 index 0000000..857957e --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/model/StockRecordUpdate.java @@ -0,0 +1,46 @@ +package com.xmomen.module.stock.model; + +import lombok.Data; +import com.xmomen.module.stock.entity.StockRecord; +import org.springframework.beans.BeanUtils; + + import java.lang.String; + import java.lang.Integer; + import java.util.Date; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-5-13 12:48:23 + * @version 1.0.0 + */ +public @Data class StockRecordUpdate implements Serializable { + + /** 主键 */ + private String id; + /** 库存id */ + private String stockId; + /** 变更数量 */ + private Integer changeNum; + /** 1-增加 2-减少 */ + private Integer changType; + /** 如果是订单变更，关联订单ID */ + private Integer refOrderId; + /** 备注(记录变更） */ + private String remark; + /** 创建人 */ + private Integer insertUserId; + /** 创建时间 */ + private Date insertDate; + /** 更新人 */ + private Integer updateUserId; + /** 更新时间 */ + private Date updateDate; + + + public StockRecord getEntity(){ + StockRecord stockRecord = new StockRecord(); + BeanUtils.copyProperties(this, stockRecord); + return stockRecord; + } +} diff --git a/src/main/java/com/xmomen/module/stock/model/StockUpdate.java b/src/main/java/com/xmomen/module/stock/model/StockUpdate.java new file mode 100644 index 0000000..9c04866 --- /dev/null +++ b/src/main/java/com/xmomen/module/stock/model/StockUpdate.java @@ -0,0 +1,42 @@ +package com.xmomen.module.stock.model; + +import lombok.Data; +import com.xmomen.module.stock.entity.Stock; +import org.springframework.beans.BeanUtils; + + import java.lang.String; + import java.lang.Integer; + import java.util.Date; +import java.io.Serializable; + +/** + * @author tanxinzheng + * @date 2017-5-13 12:49:20 + * @version 1.0.0 + */ +public @Data class StockUpdate implements Serializable { + + /** 主键 */ + private String id; + /** 商品ID */ + private Integer itemId; + /** 库存数 */ + private Integer stockNum; + /** 预警数量 */ + private Integer warningNum; + /** 创建时间 */ + private Date insertDate; + /** 创建人 */ + private Integer insertUserId; + /** 更新时间 */ + private Date updateDate; + /** 更新人 */ + private Integer updateUserId; + + + public Stock getEntity(){ + Stock stock = new Stock(); + BeanUtils.copyProperties(this, stock); + return stock; + } +} diff --git a/src/main/java/com/xmomen/module/stockdaily/entity/StockDaily.java b/src/main/java/com/xmomen/module/stockdaily/entity/StockDaily.java new file mode 100644 index 0000000..6b05af2 --- /dev/null +++ b/src/main/java/com/xmomen/module/stockdaily/entity/StockDaily.java @@ -0,0 +1,244 @@ +package com.xmomen.module.stockdaily.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_stock_daily") +public class StockDaily extends BaseMybatisModel { + /** + * 主键 + */ + private String id; + + /** + * + */ + private String stockId; + + /** + * + */ + private String itemId; + + /** + * 昨日库存 + */ + private Integer oldStockNum; + + /** + * 入库库存 + */ + private Integer inNum; + + /** + * 取消退货入库数 + */ + private Integer returnInNum; + + /** + * 出库库存 + */ + private Integer outNum; + + /** + * 破损数 + */ + private Integer damagedNum; + + /** + * 核销数 + */ + private Integer verificationNum; + + /** + * 现库存 + */ + private Integer newStockNum; + + /** + * 快照时间 + */ + private Date dailyDate; + + /** + * 插入时间 + */ + private Date insertDate; + + @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 = "stock_id") + public String getStockId() { + return stockId; + } + + public void setStockId(String stockId) { + this.stockId = stockId; + if(stockId == null){ + removeValidField("stockId"); + return; + } + addValidField("stockId"); + } + + @Column(name = "item_id") + public String getItemId() { + return itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + if(itemId == null){ + removeValidField("itemId"); + return; + } + addValidField("itemId"); + } + + @Column(name = "old_stock_num") + public Integer getOldStockNum() { + return oldStockNum; + } + + public void setOldStockNum(Integer oldStockNum) { + this.oldStockNum = oldStockNum; + if(oldStockNum == null){ + removeValidField("oldStockNum"); + return; + } + addValidField("oldStockNum"); + } + + @Column(name = "in_num") + public Integer getInNum() { + return inNum; + } + + public void setInNum(Integer inNum) { + this.inNum = inNum; + if(inNum == null){ + removeValidField("inNum"); + return; + } + addValidField("inNum"); + } + + @Column(name = "return_in_num") + public Integer getReturnInNum() { + return returnInNum; + } + + public void setReturnInNum(Integer returnInNum) { + this.returnInNum = returnInNum; + if(returnInNum == null){ + removeValidField("returnInNum"); + return; + } + addValidField("returnInNum"); + } + + @Column(name = "out_num") + public Integer getOutNum() { + return outNum; + } + + public void setOutNum(Integer outNum) { + this.outNum = outNum; + if(outNum == null){ + removeValidField("outNum"); + return; + } + addValidField("outNum"); + } + + @Column(name = "damaged_num") + public Integer getDamagedNum() { + return damagedNum; + } + + public void setDamagedNum(Integer damagedNum) { + this.damagedNum = damagedNum; + if(damagedNum == null){ + removeValidField("damagedNum"); + return; + } + addValidField("damagedNum"); + } + + @Column(name = "verification_num") + public Integer getVerificationNum() { + return verificationNum; + } + + public void setVerificationNum(Integer verificationNum) { + this.verificationNum = verificationNum; + if(verificationNum == null){ + removeValidField("verificationNum"); + return; + } + addValidField("verificationNum"); + } + + @Column(name = "new_stock_num") + public Integer getNewStockNum() { + return newStockNum; + } + + public void setNewStockNum(Integer newStockNum) { + this.newStockNum = newStockNum; + if(newStockNum == null){ + removeValidField("newStockNum"); + return; + } + addValidField("newStockNum"); + } + + @Column(name = "daily_date") + public Date getDailyDate() { + return dailyDate; + } + + public void setDailyDate(Date dailyDate) { + this.dailyDate = dailyDate; + if(dailyDate == null){ + removeValidField("dailyDate"); + return; + } + addValidField("dailyDate"); + } + + @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"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/stockdaily/entity/StockDailyExample.java b/src/main/java/com/xmomen/module/stockdaily/entity/StockDailyExample.java new file mode 100644 index 0000000..bc99e50 --- /dev/null +++ b/src/main/java/com/xmomen/module/stockdaily/entity/StockDailyExample.java @@ -0,0 +1,979 @@ +package com.xmomen.module.stockdaily.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 StockDailyExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public StockDailyExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values, String property) { + if (values == null || values.size() == 0) { + throw new RuntimeException("Value list for " + property + " cannot be null or empty"); + } + List dateList = new ArrayList(); + Iterator 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(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andStockIdIsNull() { + addCriterion("stock_id is null"); + return (Criteria) this; + } + + public Criteria andStockIdIsNotNull() { + addCriterion("stock_id is not null"); + return (Criteria) this; + } + + public Criteria andStockIdEqualTo(String value) { + addCriterion("stock_id =", value, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdNotEqualTo(String value) { + addCriterion("stock_id <>", value, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdGreaterThan(String value) { + addCriterion("stock_id >", value, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdGreaterThanOrEqualTo(String value) { + addCriterion("stock_id >=", value, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdLessThan(String value) { + addCriterion("stock_id <", value, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdLessThanOrEqualTo(String value) { + addCriterion("stock_id <=", value, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdLike(String value) { + addCriterion("stock_id like", value, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdNotLike(String value) { + addCriterion("stock_id not like", value, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdIn(List values) { + addCriterion("stock_id in", values, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdNotIn(List values) { + addCriterion("stock_id not in", values, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdBetween(String value1, String value2) { + addCriterion("stock_id between", value1, value2, "stockId"); + return (Criteria) this; + } + + public Criteria andStockIdNotBetween(String value1, String value2) { + addCriterion("stock_id not between", value1, value2, "stockId"); + return (Criteria) this; + } + + public Criteria andItemIdIsNull() { + addCriterion("item_id is null"); + return (Criteria) this; + } + + public Criteria andItemIdIsNotNull() { + addCriterion("item_id is not null"); + return (Criteria) this; + } + + public Criteria andItemIdEqualTo(String value) { + addCriterion("item_id =", value, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdNotEqualTo(String value) { + addCriterion("item_id <>", value, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdGreaterThan(String value) { + addCriterion("item_id >", value, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdGreaterThanOrEqualTo(String value) { + addCriterion("item_id >=", value, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdLessThan(String value) { + addCriterion("item_id <", value, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdLessThanOrEqualTo(String value) { + addCriterion("item_id <=", value, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdLike(String value) { + addCriterion("item_id like", value, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdNotLike(String value) { + addCriterion("item_id not like", value, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdIn(List values) { + addCriterion("item_id in", values, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdNotIn(List values) { + addCriterion("item_id not in", values, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdBetween(String value1, String value2) { + addCriterion("item_id between", value1, value2, "itemId"); + return (Criteria) this; + } + + public Criteria andItemIdNotBetween(String value1, String value2) { + addCriterion("item_id not between", value1, value2, "itemId"); + return (Criteria) this; + } + + public Criteria andOldStockNumIsNull() { + addCriterion("old_stock_num is null"); + return (Criteria) this; + } + + public Criteria andOldStockNumIsNotNull() { + addCriterion("old_stock_num is not null"); + return (Criteria) this; + } + + public Criteria andOldStockNumEqualTo(Integer value) { + addCriterion("old_stock_num =", value, "oldStockNum"); + return (Criteria) this; + } + + public Criteria andOldStockNumNotEqualTo(Integer value) { + addCriterion("old_stock_num <>", value, "oldStockNum"); + return (Criteria) this; + } + + public Criteria andOldStockNumGreaterThan(Integer value) { + addCriterion("old_stock_num >", value, "oldStockNum"); + return (Criteria) this; + } + + public Criteria andOldStockNumGreaterThanOrEqualTo(Integer value) { + addCriterion("old_stock_num >=", value, "oldStockNum"); + return (Criteria) this; + } + + public Criteria andOldStockNumLessThan(Integer value) { + addCriterion("old_stock_num <", value, "oldStockNum"); + return (Criteria) this; + } + + public Criteria andOldStockNumLessThanOrEqualTo(Integer value) { + addCriterion("old_stock_num <=", value, "oldStockNum"); + return (Criteria) this; + } + + public Criteria andOldStockNumIn(List values) { + addCriterion("old_stock_num in", values, "oldStockNum"); + return (Criteria) this; + } + + public Criteria andOldStockNumNotIn(List values) { + addCriterion("old_stock_num not in", values, "oldStockNum"); + return (Criteria) this; + } + + public Criteria andOldStockNumBetween(Integer value1, Integer value2) { + addCriterion("old_stock_num between", value1, value2, "oldStockNum"); + return (Criteria) this; + } + + public Criteria andOldStockNumNotBetween(Integer value1, Integer value2) { + addCriterion("old_stock_num not between", value1, value2, "oldStockNum"); + return (Criteria) this; + } + + public Criteria andInNumIsNull() { + addCriterion("in_num is null"); + return (Criteria) this; + } + + public Criteria andInNumIsNotNull() { + addCriterion("in_num is not null"); + return (Criteria) this; + } + + public Criteria andInNumEqualTo(Integer value) { + addCriterion("in_num =", value, "inNum"); + return (Criteria) this; + } + + public Criteria andInNumNotEqualTo(Integer value) { + addCriterion("in_num <>", value, "inNum"); + return (Criteria) this; + } + + public Criteria andInNumGreaterThan(Integer value) { + addCriterion("in_num >", value, "inNum"); + return (Criteria) this; + } + + public Criteria andInNumGreaterThanOrEqualTo(Integer value) { + addCriterion("in_num >=", value, "inNum"); + return (Criteria) this; + } + + public Criteria andInNumLessThan(Integer value) { + addCriterion("in_num <", value, "inNum"); + return (Criteria) this; + } + + public Criteria andInNumLessThanOrEqualTo(Integer value) { + addCriterion("in_num <=", value, "inNum"); + return (Criteria) this; + } + + public Criteria andInNumIn(List values) { + addCriterion("in_num in", values, "inNum"); + return (Criteria) this; + } + + public Criteria andInNumNotIn(List values) { + addCriterion("in_num not in", values, "inNum"); + return (Criteria) this; + } + + public Criteria andInNumBetween(Integer value1, Integer value2) { + addCriterion("in_num between", value1, value2, "inNum"); + return (Criteria) this; + } + + public Criteria andInNumNotBetween(Integer value1, Integer value2) { + addCriterion("in_num not between", value1, value2, "inNum"); + return (Criteria) this; + } + + public Criteria andReturnInNumIsNull() { + addCriterion("return_in_num is null"); + return (Criteria) this; + } + + public Criteria andReturnInNumIsNotNull() { + addCriterion("return_in_num is not null"); + return (Criteria) this; + } + + public Criteria andReturnInNumEqualTo(Integer value) { + addCriterion("return_in_num =", value, "returnInNum"); + return (Criteria) this; + } + + public Criteria andReturnInNumNotEqualTo(Integer value) { + addCriterion("return_in_num <>", value, "returnInNum"); + return (Criteria) this; + } + + public Criteria andReturnInNumGreaterThan(Integer value) { + addCriterion("return_in_num >", value, "returnInNum"); + return (Criteria) this; + } + + public Criteria andReturnInNumGreaterThanOrEqualTo(Integer value) { + addCriterion("return_in_num >=", value, "returnInNum"); + return (Criteria) this; + } + + public Criteria andReturnInNumLessThan(Integer value) { + addCriterion("return_in_num <", value, "returnInNum"); + return (Criteria) this; + } + + public Criteria andReturnInNumLessThanOrEqualTo(Integer value) { + addCriterion("return_in_num <=", value, "returnInNum"); + return (Criteria) this; + } + + public Criteria andReturnInNumIn(List values) { + addCriterion("return_in_num in", values, "returnInNum"); + return (Criteria) this; + } + + public Criteria andReturnInNumNotIn(List values) { + addCriterion("return_in_num not in", values, "returnInNum"); + return (Criteria) this; + } + + public Criteria andReturnInNumBetween(Integer value1, Integer value2) { + addCriterion("return_in_num between", value1, value2, "returnInNum"); + return (Criteria) this; + } + + public Criteria andReturnInNumNotBetween(Integer value1, Integer value2) { + addCriterion("return_in_num not between", value1, value2, "returnInNum"); + return (Criteria) this; + } + + public Criteria andOutNumIsNull() { + addCriterion("out_num is null"); + return (Criteria) this; + } + + public Criteria andOutNumIsNotNull() { + addCriterion("out_num is not null"); + return (Criteria) this; + } + + public Criteria andOutNumEqualTo(Integer value) { + addCriterion("out_num =", value, "outNum"); + return (Criteria) this; + } + + public Criteria andOutNumNotEqualTo(Integer value) { + addCriterion("out_num <>", value, "outNum"); + return (Criteria) this; + } + + public Criteria andOutNumGreaterThan(Integer value) { + addCriterion("out_num >", value, "outNum"); + return (Criteria) this; + } + + public Criteria andOutNumGreaterThanOrEqualTo(Integer value) { + addCriterion("out_num >=", value, "outNum"); + return (Criteria) this; + } + + public Criteria andOutNumLessThan(Integer value) { + addCriterion("out_num <", value, "outNum"); + return (Criteria) this; + } + + public Criteria andOutNumLessThanOrEqualTo(Integer value) { + addCriterion("out_num <=", value, "outNum"); + return (Criteria) this; + } + + public Criteria andOutNumIn(List values) { + addCriterion("out_num in", values, "outNum"); + return (Criteria) this; + } + + public Criteria andOutNumNotIn(List values) { + addCriterion("out_num not in", values, "outNum"); + return (Criteria) this; + } + + public Criteria andOutNumBetween(Integer value1, Integer value2) { + addCriterion("out_num between", value1, value2, "outNum"); + return (Criteria) this; + } + + public Criteria andOutNumNotBetween(Integer value1, Integer value2) { + addCriterion("out_num not between", value1, value2, "outNum"); + return (Criteria) this; + } + + public Criteria andDamagedNumIsNull() { + addCriterion("damaged_num is null"); + return (Criteria) this; + } + + public Criteria andDamagedNumIsNotNull() { + addCriterion("damaged_num is not null"); + return (Criteria) this; + } + + public Criteria andDamagedNumEqualTo(Integer value) { + addCriterion("damaged_num =", value, "damagedNum"); + return (Criteria) this; + } + + public Criteria andDamagedNumNotEqualTo(Integer value) { + addCriterion("damaged_num <>", value, "damagedNum"); + return (Criteria) this; + } + + public Criteria andDamagedNumGreaterThan(Integer value) { + addCriterion("damaged_num >", value, "damagedNum"); + return (Criteria) this; + } + + public Criteria andDamagedNumGreaterThanOrEqualTo(Integer value) { + addCriterion("damaged_num >=", value, "damagedNum"); + return (Criteria) this; + } + + public Criteria andDamagedNumLessThan(Integer value) { + addCriterion("damaged_num <", value, "damagedNum"); + return (Criteria) this; + } + + public Criteria andDamagedNumLessThanOrEqualTo(Integer value) { + addCriterion("damaged_num <=", value, "damagedNum"); + return (Criteria) this; + } + + public Criteria andDamagedNumIn(List values) { + addCriterion("damaged_num in", values, "damagedNum"); + return (Criteria) this; + } + + public Criteria andDamagedNumNotIn(List values) { + addCriterion("damaged_num not in", values, "damagedNum"); + return (Criteria) this; + } + + public Criteria andDamagedNumBetween(Integer value1, Integer value2) { + addCriterion("damaged_num between", value1, value2, "damagedNum"); + return (Criteria) this; + } + + public Criteria andDamagedNumNotBetween(Integer value1, Integer value2) { + addCriterion("damaged_num not between", value1, value2, "damagedNum"); + return (Criteria) this; + } + + public Criteria andVerificationNumIsNull() { + addCriterion("verification_num is null"); + return (Criteria) this; + } + + public Criteria andVerificationNumIsNotNull() { + addCriterion("verification_num is not null"); + return (Criteria) this; + } + + public Criteria andVerificationNumEqualTo(Integer value) { + addCriterion("verification_num =", value, "verificationNum"); + return (Criteria) this; + } + + public Criteria andVerificationNumNotEqualTo(Integer value) { + addCriterion("verification_num <>", value, "verificationNum"); + return (Criteria) this; + } + + public Criteria andVerificationNumGreaterThan(Integer value) { + addCriterion("verification_num >", value, "verificationNum"); + return (Criteria) this; + } + + public Criteria andVerificationNumGreaterThanOrEqualTo(Integer value) { + addCriterion("verification_num >=", value, "verificationNum"); + return (Criteria) this; + } + + public Criteria andVerificationNumLessThan(Integer value) { + addCriterion("verification_num <", value, "verificationNum"); + return (Criteria) this; + } + + public Criteria andVerificationNumLessThanOrEqualTo(Integer value) { + addCriterion("verification_num <=", value, "verificationNum"); + return (Criteria) this; + } + + public Criteria andVerificationNumIn(List values) { + addCriterion("verification_num in", values, "verificationNum"); + return (Criteria) this; + } + + public Criteria andVerificationNumNotIn(List values) { + addCriterion("verification_num not in", values, "verificationNum"); + return (Criteria) this; + } + + public Criteria andVerificationNumBetween(Integer value1, Integer value2) { + addCriterion("verification_num between", value1, value2, "verificationNum"); + return (Criteria) this; + } + + public Criteria andVerificationNumNotBetween(Integer value1, Integer value2) { + addCriterion("verification_num not between", value1, value2, "verificationNum"); + return (Criteria) this; + } + + public Criteria andNewStockNumIsNull() { + addCriterion("new_stock_num is null"); + return (Criteria) this; + } + + public Criteria andNewStockNumIsNotNull() { + addCriterion("new_stock_num is not null"); + return (Criteria) this; + } + + public Criteria andNewStockNumEqualTo(Integer value) { + addCriterion("new_stock_num =", value, "newStockNum"); + return (Criteria) this; + } + + public Criteria andNewStockNumNotEqualTo(Integer value) { + addCriterion("new_stock_num <>", value, "newStockNum"); + return (Criteria) this; + } + + public Criteria andNewStockNumGreaterThan(Integer value) { + addCriterion("new_stock_num >", value, "newStockNum"); + return (Criteria) this; + } + + public Criteria andNewStockNumGreaterThanOrEqualTo(Integer value) { + addCriterion("new_stock_num >=", value, "newStockNum"); + return (Criteria) this; + } + + public Criteria andNewStockNumLessThan(Integer value) { + addCriterion("new_stock_num <", value, "newStockNum"); + return (Criteria) this; + } + + public Criteria andNewStockNumLessThanOrEqualTo(Integer value) { + addCriterion("new_stock_num <=", value, "newStockNum"); + return (Criteria) this; + } + + public Criteria andNewStockNumIn(List values) { + addCriterion("new_stock_num in", values, "newStockNum"); + return (Criteria) this; + } + + public Criteria andNewStockNumNotIn(List values) { + addCriterion("new_stock_num not in", values, "newStockNum"); + return (Criteria) this; + } + + public Criteria andNewStockNumBetween(Integer value1, Integer value2) { + addCriterion("new_stock_num between", value1, value2, "newStockNum"); + return (Criteria) this; + } + + public Criteria andNewStockNumNotBetween(Integer value1, Integer value2) { + addCriterion("new_stock_num not between", value1, value2, "newStockNum"); + return (Criteria) this; + } + + public Criteria andDailyDateIsNull() { + addCriterion("daily_date is null"); + return (Criteria) this; + } + + public Criteria andDailyDateIsNotNull() { + addCriterion("daily_date is not null"); + return (Criteria) this; + } + + public Criteria andDailyDateEqualTo(Date value) { + addCriterionForJDBCDate("daily_date =", value, "dailyDate"); + return (Criteria) this; + } + + public Criteria andDailyDateNotEqualTo(Date value) { + addCriterionForJDBCDate("daily_date <>", value, "dailyDate"); + return (Criteria) this; + } + + public Criteria andDailyDateGreaterThan(Date value) { + addCriterionForJDBCDate("daily_date >", value, "dailyDate"); + return (Criteria) this; + } + + public Criteria andDailyDateGreaterThanOrEqualTo(Date value) { + addCriterionForJDBCDate("daily_date >=", value, "dailyDate"); + return (Criteria) this; + } + + public Criteria andDailyDateLessThan(Date value) { + addCriterionForJDBCDate("daily_date <", value, "dailyDate"); + return (Criteria) this; + } + + public Criteria andDailyDateLessThanOrEqualTo(Date value) { + addCriterionForJDBCDate("daily_date <=", value, "dailyDate"); + return (Criteria) this; + } + + public Criteria andDailyDateIn(List values) { + addCriterionForJDBCDate("daily_date in", values, "dailyDate"); + return (Criteria) this; + } + + public Criteria andDailyDateNotIn(List values) { + addCriterionForJDBCDate("daily_date not in", values, "dailyDate"); + return (Criteria) this; + } + + public Criteria andDailyDateBetween(Date value1, Date value2) { + addCriterionForJDBCDate("daily_date between", value1, value2, "dailyDate"); + return (Criteria) this; + } + + public Criteria andDailyDateNotBetween(Date value1, Date value2) { + addCriterionForJDBCDate("daily_date not between", value1, value2, "dailyDate"); + return (Criteria) this; + } + + public Criteria andInsertDateIsNull() { + addCriterion("insert_date is null"); + return (Criteria) this; + } + + public Criteria andInsertDateIsNotNull() { + addCriterion("insert_date is not null"); + return (Criteria) this; + } + + public Criteria andInsertDateEqualTo(Date value) { + addCriterion("insert_date =", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateNotEqualTo(Date value) { + addCriterion("insert_date <>", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateGreaterThan(Date value) { + addCriterion("insert_date >", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateGreaterThanOrEqualTo(Date value) { + addCriterion("insert_date >=", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateLessThan(Date value) { + addCriterion("insert_date <", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateLessThanOrEqualTo(Date value) { + addCriterion("insert_date <=", value, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateIn(List values) { + addCriterion("insert_date in", values, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateNotIn(List values) { + addCriterion("insert_date not in", values, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateBetween(Date value1, Date value2) { + addCriterion("insert_date between", value1, value2, "insertDate"); + return (Criteria) this; + } + + public Criteria andInsertDateNotBetween(Date value1, Date value2) { + addCriterion("insert_date not between", value1, value2, "insertDate"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/stockdaily/mapper/StockDailyMapperExt.xml b/src/main/java/com/xmomen/module/stockdaily/mapper/StockDailyMapperExt.xml new file mode 100644 index 0000000..ccba071 --- /dev/null +++ b/src/main/java/com/xmomen/module/stockdaily/mapper/StockDailyMapperExt.xml @@ -0,0 +1,122 @@ + + + + + + + + + INSERT INTO + cd_stock_daily + SELECT + REPLACE(UUID(),'-','') id + ,stock.id stock_id + ,item_id + ,IFNULL((select new_stock_num from cd_stock_daily stock_daily where stock_daily.daily_date = date_sub(CURDATE(),interval 1 day) and stock_daily.stock_id = stock.id ),0) old_stock_num + ,IFNULL(SUM(CASE when stock_record.chang_type = 1 then stock_record.change_num else null end),0) in_num + ,IFNULL(SUM(CASE when stock_record.chang_type =3 then stock_record.change_num else null end),0) return_in_num + ,IFNULL(0-SUM(CASE when stock_record.chang_type =2 then stock_record.change_num else null end),0) out_num + ,IFNULL(0-SUM(CASE when stock_record.chang_type =4 then stock_record.change_num else null end),0) damaged_num + ,IFNULL(0-SUM(CASE when stock_record.chang_type =5 then stock_record.change_num else null end),0) verification_num + ,stock.stock_num new_stock_num + ,CURDATE() daily_date + ,now() insert_date + FROM + cd_stock stock + LEFT JOIN cd_stock_record stock_record ON stock.id = stock_record.stock_id AND DATE_FORMAT(stock_record.insert_date ,'%Y-%m-%d') = CURDATE() + GROUP BY + stock.item_id + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/stockdaily/service/impl/StockDailyServiceImpl.java b/src/main/java/com/xmomen/module/stockdaily/service/impl/StockDailyServiceImpl.java new file mode 100644 index 0000000..f310b6f --- /dev/null +++ b/src/main/java/com/xmomen/module/stockdaily/service/impl/StockDailyServiceImpl.java @@ -0,0 +1,239 @@ +package com.xmomen.module.stockdaily.service.impl; + +import com.xmomen.module.report.model.FinanceReport; +import com.xmomen.module.report.model.ReportQuery; +import com.xmomen.module.report.model.StockDailyReport; +import com.xmomen.module.stock.entity.Stock; +import com.xmomen.module.stockdaily.entity.StockDaily; +import com.xmomen.module.stockdaily.entity.StockDailyExample; +import com.xmomen.module.stockdaily.mapper.StockDailyMapperExt; +import com.xmomen.module.stockdaily.model.StockDailyCreate; +import com.xmomen.module.stockdaily.model.StockDailyQuery; +import com.xmomen.module.stockdaily.model.StockDailyUpdate; +import com.xmomen.module.stockdaily.model.StockDailyModel; +import com.xmomen.module.stockdaily.service.StockDailyService; +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.wx.util.DateUtils; +import org.apache.ibatis.exceptions.TooManyResultsException; +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 + * @version 1.0.0 + * @date 2017-5-26 21:56:23 + */ +@Service +public class StockDailyServiceImpl implements StockDailyService { + + @Autowired + MybatisDao mybatisDao; + + /** + * 新增库存日报 + * + * @param stockDailyModel 新增库存日报对象参数 + * @return StockDailyModel 库存日报领域对象 + */ + @Override + @Transactional + public StockDailyModel createStockDaily(StockDailyModel stockDailyModel) { + StockDaily stockDaily = createStockDaily(stockDailyModel.getEntity()); + if (stockDaily != null) { + return getOneStockDailyModel(stockDaily.getId()); + } + return null; + } + + /** + * 新增库存日报实体对象 + * + * @param stockDaily 新增库存日报实体对象参数 + * @return StockDaily 库存日报实体对象 + */ + @Override + @Transactional + public StockDaily createStockDaily(StockDaily stockDaily) { + return mybatisDao.insertByModel(stockDaily); + } + + /** + * 批量新增库存日报 + * + * @param stockDailyModels 新增库存日报对象集合参数 + * @return List 库存日报领域对象集合 + */ + @Override + @Transactional + public List createStockDailys(List stockDailyModels) { + List stockDailyModelList = null; + for (StockDailyModel stockDailyModel : stockDailyModels) { + stockDailyModel = createStockDaily(stockDailyModel); + if (stockDailyModel != null) { + if (stockDailyModelList == null) { + stockDailyModelList = new ArrayList<>(); + } + stockDailyModelList.add(stockDailyModel); + } + } + return stockDailyModelList; + } + + /** + * 更新库存日报 + * + * @param stockDailyModel 更新库存日报对象参数 + */ + @Override + @Transactional + public void updateStockDaily(StockDailyModel stockDailyModel) { + mybatisDao.update(stockDailyModel.getEntity()); + } + + /** + * 更新库存日报实体对象 + * + * @param stockDaily 新增库存日报实体对象参数 + * @return StockDaily 库存日报实体对象 + */ + @Override + @Transactional + public void updateStockDaily(StockDaily stockDaily) { + mybatisDao.update(stockDaily); + } + + /** + * 删除库存日报 + * + * @param ids 主键数组 + */ + @Override + @Transactional + public void deleteStockDaily(String[] ids) { + StockDailyExample stockDailyExample = new StockDailyExample(); + stockDailyExample.createCriteria().andIdIn(Arrays.asList((String[]) ids)); + mybatisDao.deleteByExample(stockDailyExample); + } + + /** + * 删除库存日报 + * + * @param id 主键 + */ + @Override + @Transactional + public void deleteStockDaily(String id) { + mybatisDao.deleteByPrimaryKey(StockDaily.class, id); + } + + /** + * 查询库存日报领域分页对象（带参数条件） + * + * @param limit 每页最大数 + * @param offset 页码 + * @param stockDailyQuery 查询参数 + * @return Page 库存日报参数对象 + */ + @Override + public Page getStockDailyModelPage(int limit, int offset, StockDailyQuery stockDailyQuery) { + return (Page) mybatisDao.selectPage(StockDailyMapperExt.StockDailyMapperNameSpace + "getStockDailyModel", stockDailyQuery, limit, offset); + } + + /** + * 查询库存日报领域分页对象（无参数条件） + * + * @param limit 每页最大数 + * @param offset 页码 + * @return Page 库存日报领域对象 + */ + @Override + public Page getStockDailyModelPage(int limit, int offset) { + return (Page) mybatisDao.selectPage(StockDailyMapperExt.StockDailyMapperNameSpace + "getStockDailyModel", null, limit, offset); + } + + /** + * 查询库存日报领域集合对象（带参数条件） + * + * @param stockDailyQuery 查询参数对象 + * @return List 库存日报领域集合对象 + */ + @Override + public List getStockDailyModelList(StockDailyQuery stockDailyQuery) { + return mybatisDao.getSqlSessionTemplate().selectList(StockDailyMapperExt.StockDailyMapperNameSpace + "getStockDailyModel", stockDailyQuery); + } + + /** + * 查询库存日报领域集合对象（无参数条件） + * + * @return List 库存日报领域集合对象 + */ + @Override + public List getStockDailyModelList() { + return mybatisDao.getSqlSessionTemplate().selectList(StockDailyMapperExt.StockDailyMapperNameSpace + "getStockDailyModel"); + } + + /** + * 查询库存日报实体对象 + * + * @param id 主键 + * @return StockDaily 库存日报实体对象 + */ + @Override + public StockDaily getOneStockDaily(String id) { + return mybatisDao.selectByPrimaryKey(StockDaily.class, id); + } + + /** + * 根据主键查询单个对象 + * + * @param id 主键 + * @return StockDailyModel 库存日报领域对象 + */ + @Override + public StockDailyModel getOneStockDailyModel(String id) { + StockDailyQuery stockDailyQuery = new StockDailyQuery(); + stockDailyQuery.setId(id); + return mybatisDao.getSqlSessionTemplate().selectOne(StockDailyMapperExt.StockDailyMapperNameSpace + "getStockDailyModel", stockDailyQuery); + } + + /** + * 根据查询参数查询单个对象（此方法只用于提供精确查询单个对象，若结果数超过1，则会报错） + * + * @param stockDailyQuery 库存日报查询参数对象 + * @return StockDailyModel 库存日报领域对象 + */ + @Override + public StockDailyModel getOneStockDailyModel(StockDailyQuery stockDailyQuery) throws TooManyResultsException { + return mybatisDao.getSqlSessionTemplate().selectOne(StockDailyMapperExt.StockDailyMapperNameSpace + "getStockDailyModel", stockDailyQuery); + } + + /** + * 生成今日库存快报 + */ + public synchronized void createStockDaily() { + //删除当日库存 + StockDailyExample stockDailyExample = new StockDailyExample(); + stockDailyExample.createCriteria().andDailyDateEqualTo(DateUtils.getNowDate()); + this.mybatisDao.deleteByExample(stockDailyExample); + //重新创建今日库存 + mybatisDao.getSqlSessionTemplate().update(StockDailyMapperExt.StockDailyMapperNameSpace + "createStockDaily"); + } + + /** + * 查询库存快照 + * + * @param reportQuery + * @return + */ + public List getStockDailyReport(ReportQuery reportQuery) { + List stockDailyModels = mybatisDao.getSqlSessionTemplate().selectList(StockDailyMapperExt.StockDailyMapperNameSpace + "getStockDailyReport", reportQuery); + return stockDailyModels; + } +} diff --git a/src/main/java/com/xmomen/module/system/LoggerAspect.java b/src/main/java/com/xmomen/module/system/LoggerAspect.java new file mode 100644 index 0000000..76235df --- /dev/null +++ b/src/main/java/com/xmomen/module/system/LoggerAspect.java @@ -0,0 +1,106 @@ +package com.xmomen.module.system; + +import com.xmomen.module.system.model.LogModel; +import com.xmomen.module.system.service.LogService; +import com.xmomen.module.logger.Log; +import org.apache.shiro.SecurityUtils; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.servlet.http.HttpServletRequest; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Date; + +/** + * Created by Jeng on 16/3/20. + */ +@Aspect +public class LoggerAspect { + + @Autowired + LogService logService; + + @Autowired + HttpServletRequest request; + + /** + * 日志逻辑切入点 + */ + @Pointcut("@annotation(com.xmomen.module.logger.Log)") + public void getLogInfo() { } + + /** + * 管理员添加操作日志(后置通知) + * @param joinPoint + * @throws Throwable + */ + @AfterReturning(value = "getLogInfo()") + public void afterReturning(JoinPoint joinPoint) throws Throwable{ + //获取登录用户名 + String username = (String) SecurityUtils.getSubject().getPrincipal(); + if(username == null){//没有管理员登录 + return; + } + //判断参数 + if(joinPoint.getArgs() == null){//没有参数 + return; + } + //获取方法名 + String methodName = joinPoint.getSignature().getName(); + Object target = joinPoint.getTarget(); + Method method = getMethodByClassAndName(target.getClass(), methodName); //得到拦截的方法 + Object[] args = joinPoint.getArgs(); //方法的参数 + Log an = (Log)getAnnotationByMethod(method ,Log.class ); + if(an == null){ + return; + } + String actionName = an.actionName(); + Integer user_id =(Integer) SecurityUtils.getSubject().getSession().getAttribute("user_id"); + //创建日志对象 + LogModel log = new LogModel(); + log.setUserId(user_id);//设置管理员id + log.setActionDate(new Date());//操作时间 + log.setActionResult(null);//操作内容 + log.setClientIp(getRemoteHost(request)); + log.setActionName(actionName);//操作 + logService.insertLog(log);//添加日志 + } + + public Annotation getAnnotationByMethod(Method method , Class annoClass){ + Annotation all[] = method.getAnnotations(); + for (Annotation annotation : all) { + if (annotation.annotationType() == annoClass) { + return annotation; + } + } + return null; + } + + public Method getMethodByClassAndName(Class c , String methodName){ + Method[] methods = c.getDeclaredMethods(); + for (Method method : methods) { + if(method.getName().equals(methodName)){ + return method ; + } + } + return null; + } + + public String getRemoteHost(javax.servlet.http.HttpServletRequest request){ + String ip = request.getHeader("x-forwarded-for"); + if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)){ + ip = request.getHeader("Proxy-Client-IP"); + } + if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)){ + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)){ + ip = request.getRemoteAddr(); + } + return ip.equals("0:0:0:0:0:0:0:1")?"127.0.0.1":ip; + } +} diff --git a/src/main/java/com/xmomen/module/system/controller/DictionaryController.java b/src/main/java/com/xmomen/module/system/controller/DictionaryController.java new file mode 100644 index 0000000..f3fe641 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/controller/DictionaryController.java @@ -0,0 +1,115 @@ +package com.xmomen.module.system.controller; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.framework.web.exceptions.ArgumentValidException; +import com.xmomen.module.logger.Log; +import com.xmomen.module.system.entity.SysDictionary; +import com.xmomen.module.system.entity.SysDictionaryParameter; +import com.xmomen.module.system.model.CreateDictionary; +import com.xmomen.module.system.model.UpdateDictionary; +import com.xmomen.module.system.service.DictionaryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * Created by Jeng on 2016/3/30. + */ +@RestController +public class DictionaryController { + + @Autowired + DictionaryService dictionaryService; + + /** + * 数据字典列表 + * @param group_id + * @param limit + * @param offset + * @return + */ + @RequestMapping(value = "/dictionary/{group_id}/child", method = RequestMethod.GET) + @Log(actionName = "查询数据字典") + public Page getList( + @PathVariable(value = "group_id") Integer group_id, + @RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset){ + return dictionaryService.getDictionaryList(group_id, limit, offset); + } + + /** + * 数据字典列表 + * @param id + */ + @RequestMapping(value = "/dictionary/{group_id}/child/{id}", method = RequestMethod.GET) + @Log(actionName = "查询数据字典") + public SysDictionaryParameter get(@PathVariable(value = "group_id") Integer group_id, + @PathVariable(value = "id") Integer id){ + return dictionaryService.getDictionary(id); + } + + /** + * 新增数据字典 + * @param group_id + * @param createDictionary + * @param bindingResult + * @return + * @throws ArgumentValidException + */ + @RequestMapping(value = "/dictionary/{group_id}/child", method = RequestMethod.POST) + @Log(actionName = "新增数据字典") + public SysDictionaryParameter create(@PathVariable(value = "group_id") Integer group_id, + @RequestBody @Valid CreateDictionary createDictionary, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + SysDictionaryParameter sysDictionaryParameter = new SysDictionaryParameter(); + sysDictionaryParameter.setSysDictionaryId(createDictionary.getSysDictionaryId()); + sysDictionaryParameter.setRealValue(createDictionary.getRealValue()); + sysDictionaryParameter.setShowValue(createDictionary.getShowValue()); + sysDictionaryParameter.setSortValue(createDictionary.getSortValue()); + sysDictionaryParameter.setAvailable(createDictionary.getAvailable()); + return dictionaryService.createDictionary(sysDictionaryParameter); + } + + /** + * 更新数据字典 + * @param group_id + * @param id + * @param updateDictionary + * @param bindingResult + * @throws ArgumentValidException + */ + @RequestMapping(value = "/dictionary/{group_id}/child/{id}", method = RequestMethod.PUT) + @Log(actionName = "更新数据字典") + public void update(@PathVariable(value = "group_id") Integer group_id, + @PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdateDictionary updateDictionary, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + SysDictionaryParameter sysDictionaryParameter = new SysDictionaryParameter(); + sysDictionaryParameter.setId(id); + sysDictionaryParameter.setSysDictionaryId(group_id); + sysDictionaryParameter.setRealValue(updateDictionary.getRealValue()); + sysDictionaryParameter.setShowValue(updateDictionary.getShowValue()); + sysDictionaryParameter.setSortValue(updateDictionary.getSortValue()); + sysDictionaryParameter.setAvailable(updateDictionary.getAvailable()); + dictionaryService.updateDictionary(sysDictionaryParameter); + } + + /** + * 删除数据字典 + * @param group_id + * @param id + */ + @RequestMapping(value = "/dictionary/{group_id}/child/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除数据字典") + public void delete(@PathVariable(value = "group_id") Integer group_id, + @PathVariable(value = "id") Integer id){ + dictionaryService.deleteDictionary(id); + } + +} diff --git a/src/main/java/com/xmomen/module/system/controller/DictionaryGroupController.java b/src/main/java/com/xmomen/module/system/controller/DictionaryGroupController.java new file mode 100644 index 0000000..fd2bccf --- /dev/null +++ b/src/main/java/com/xmomen/module/system/controller/DictionaryGroupController.java @@ -0,0 +1,101 @@ +package com.xmomen.module.system.controller; + +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.framework.web.exceptions.ArgumentValidException; +import com.xmomen.module.logger.Log; +import com.xmomen.module.system.entity.SysDictionary; +import com.xmomen.module.system.model.CreateDictionaryGroup; +import com.xmomen.module.system.model.UpdateDictionaryGroup; +import com.xmomen.module.system.service.DictionaryGroupService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * Created by Jeng on 2016/3/30. + */ +@RestController +public class DictionaryGroupController { + + @Autowired + DictionaryGroupService dictionaryGroupService; + + /** + * 数据字典组列表 + * @param limit + * @param offset + * @param keyword + * @return + */ + @RequestMapping(value = "/dictionary", method = RequestMethod.GET) + @Log(actionName = "查询数据字典组") + public Page getList(@RequestParam(value = "limit") Integer limit, + @RequestParam(value = "offset") Integer offset, + @RequestParam(value = "keyword", required = false) String keyword){ + return dictionaryGroupService.getDictionaryList(keyword, limit, offset); + } + + /** + * 数据字典组列表 + * @param id + */ + @RequestMapping(value = "/dictionary/{id}", method = RequestMethod.GET) + @Log(actionName = "查询数据字典组") + public SysDictionary get(@PathVariable(value = "id") Integer id){ + return dictionaryGroupService.getDictionary(id); + } + + /** + * 新增数据字典组 + * @param createDictionaryGroup + * @param bindingResult + * @return + */ + @RequestMapping(value = "/dictionary", method = RequestMethod.POST) + @Log(actionName = "新增数据字典组") + public SysDictionary create(@RequestBody @Valid CreateDictionaryGroup createDictionaryGroup, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + SysDictionary sysDictionary = new SysDictionary(); + sysDictionary.setDictionaryCode(createDictionaryGroup.getDictionaryCode()); + sysDictionary.setDictionaryDesc(createDictionaryGroup.getDictionaryDesc()); + sysDictionary.setAvailable(createDictionaryGroup.getAvailable()); + return dictionaryGroupService.createDictionary(sysDictionary); + } + + /** + * 更新数据字典组 + * @param id + * @param updateDictionaryGroup + * @param bindingResult + * @throws ArgumentValidException + */ + @RequestMapping(value = "/dictionary/{id}", method = RequestMethod.PUT) + @Log(actionName = "更新数据字典组") + public void update(@PathVariable(value = "id") Integer id, + @RequestBody @Valid UpdateDictionaryGroup updateDictionaryGroup, BindingResult bindingResult) throws ArgumentValidException { + if(bindingResult != null && bindingResult.hasErrors()){ + throw new ArgumentValidException(bindingResult); + } + SysDictionary sysDictionary = new SysDictionary(); + sysDictionary.setId(id); + sysDictionary.setAvailable(updateDictionaryGroup.getAvailable()); + sysDictionary.setDictionaryCode(updateDictionaryGroup.getDictionaryCode()); + sysDictionary.setDictionaryDesc(updateDictionaryGroup.getDictionaryDesc()); + dictionaryGroupService.updateDictionary(sysDictionary); + } + + /** + * 删除数据字典组 + * @param id + */ + @RequestMapping(value = "/dictionary/{id}", method = RequestMethod.DELETE) + @Log(actionName = "删除数据字典组") + public void delete(@PathVariable(value = "id") Integer id){ + dictionaryGroupService.deleteDictionary(id); + } + +} diff --git a/src/main/java/com/xmomen/module/system/entity/SysDictionary.java b/src/main/java/com/xmomen/module/system/entity/SysDictionary.java new file mode 100644 index 0000000..bba0a77 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/SysDictionary.java @@ -0,0 +1,91 @@ +package com.xmomen.module.system.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 = "sys_dictionary") +public class SysDictionary extends BaseMybatisModel { + /** + * + */ + private Integer id; + + /** + * 字典编号 + */ + private String dictionaryCode; + + /** + * 字典描述 + */ + private String dictionaryDesc; + + /** + * 是否启用 + */ + private Integer available; + + @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 = "DICTIONARY_CODE") + public String getDictionaryCode() { + return dictionaryCode; + } + + public void setDictionaryCode(String dictionaryCode) { + this.dictionaryCode = dictionaryCode; + if(dictionaryCode == null){ + removeValidField("dictionaryCode"); + return; + } + addValidField("dictionaryCode"); + } + + @Column(name = "DICTIONARY_DESC") + public String getDictionaryDesc() { + return dictionaryDesc; + } + + public void setDictionaryDesc(String dictionaryDesc) { + this.dictionaryDesc = dictionaryDesc; + if(dictionaryDesc == null){ + removeValidField("dictionaryDesc"); + return; + } + addValidField("dictionaryDesc"); + } + + @Column(name = "AVAILABLE") + public Integer getAvailable() { + return available; + } + + public void setAvailable(Integer available) { + this.available = available; + if(available == null){ + removeValidField("available"); + return; + } + addValidField("available"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/entity/SysDictionaryParameter.java b/src/main/java/com/xmomen/module/system/entity/SysDictionaryParameter.java new file mode 100644 index 0000000..f97a06f --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/SysDictionaryParameter.java @@ -0,0 +1,129 @@ +package com.xmomen.module.system.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 = "sys_dictionary_parameter") +public class SysDictionaryParameter extends BaseMybatisModel { + /** + * + */ + private Integer id; + + /** + * 字典 + */ + private Integer sysDictionaryId; + + /** + * 显示值 + */ + private String showValue; + + /** + * 实际值 + */ + private String realValue; + + /** + * 排位 + */ + private Integer sortValue; + + /** + * 0-禁用，1-启用 + */ + private Integer available; + + @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 = "SYS_DICTIONARY_ID") + public Integer getSysDictionaryId() { + return sysDictionaryId; + } + + public void setSysDictionaryId(Integer sysDictionaryId) { + this.sysDictionaryId = sysDictionaryId; + if(sysDictionaryId == null){ + removeValidField("sysDictionaryId"); + return; + } + addValidField("sysDictionaryId"); + } + + @Column(name = "SHOW_VALUE") + public String getShowValue() { + return showValue; + } + + public void setShowValue(String showValue) { + this.showValue = showValue; + if(showValue == null){ + removeValidField("showValue"); + return; + } + addValidField("showValue"); + } + + @Column(name = "REAL_VALUE") + public String getRealValue() { + return realValue; + } + + public void setRealValue(String realValue) { + this.realValue = realValue; + if(realValue == null){ + removeValidField("realValue"); + return; + } + addValidField("realValue"); + } + + @Column(name = "SORT_VALUE") + public Integer getSortValue() { + return sortValue; + } + + public void setSortValue(Integer sortValue) { + this.sortValue = sortValue; + if(sortValue == null){ + removeValidField("sortValue"); + return; + } + addValidField("sortValue"); + } + + @Column(name = "AVAILABLE") + public Integer getAvailable() { + return available; + } + + public void setAvailable(Integer available) { + this.available = available; + if(available == null){ + removeValidField("available"); + return; + } + addValidField("available"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/entity/SysDictionaryParameterExample.java b/src/main/java/com/xmomen/module/system/entity/SysDictionaryParameterExample.java new file mode 100644 index 0000000..e0d11fa --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/SysDictionaryParameterExample.java @@ -0,0 +1,581 @@ +package com.xmomen.module.system.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class SysDictionaryParameterExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysDictionaryParameterExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andSysDictionaryIdIsNull() { + addCriterion("SYS_DICTIONARY_ID is null"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdIsNotNull() { + addCriterion("SYS_DICTIONARY_ID is not null"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdEqualTo(Integer value) { + addCriterion("SYS_DICTIONARY_ID =", value, "sysDictionaryId"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdNotEqualTo(Integer value) { + addCriterion("SYS_DICTIONARY_ID <>", value, "sysDictionaryId"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdGreaterThan(Integer value) { + addCriterion("SYS_DICTIONARY_ID >", value, "sysDictionaryId"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdGreaterThanOrEqualTo(Integer value) { + addCriterion("SYS_DICTIONARY_ID >=", value, "sysDictionaryId"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdLessThan(Integer value) { + addCriterion("SYS_DICTIONARY_ID <", value, "sysDictionaryId"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdLessThanOrEqualTo(Integer value) { + addCriterion("SYS_DICTIONARY_ID <=", value, "sysDictionaryId"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdIn(List values) { + addCriterion("SYS_DICTIONARY_ID in", values, "sysDictionaryId"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdNotIn(List values) { + addCriterion("SYS_DICTIONARY_ID not in", values, "sysDictionaryId"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdBetween(Integer value1, Integer value2) { + addCriterion("SYS_DICTIONARY_ID between", value1, value2, "sysDictionaryId"); + return (Criteria) this; + } + + public Criteria andSysDictionaryIdNotBetween(Integer value1, Integer value2) { + addCriterion("SYS_DICTIONARY_ID not between", value1, value2, "sysDictionaryId"); + return (Criteria) this; + } + + public Criteria andShowValueIsNull() { + addCriterion("SHOW_VALUE is null"); + return (Criteria) this; + } + + public Criteria andShowValueIsNotNull() { + addCriterion("SHOW_VALUE is not null"); + return (Criteria) this; + } + + public Criteria andShowValueEqualTo(String value) { + addCriterion("SHOW_VALUE =", value, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueNotEqualTo(String value) { + addCriterion("SHOW_VALUE <>", value, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueGreaterThan(String value) { + addCriterion("SHOW_VALUE >", value, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueGreaterThanOrEqualTo(String value) { + addCriterion("SHOW_VALUE >=", value, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueLessThan(String value) { + addCriterion("SHOW_VALUE <", value, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueLessThanOrEqualTo(String value) { + addCriterion("SHOW_VALUE <=", value, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueLike(String value) { + addCriterion("SHOW_VALUE like", value, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueNotLike(String value) { + addCriterion("SHOW_VALUE not like", value, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueIn(List values) { + addCriterion("SHOW_VALUE in", values, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueNotIn(List values) { + addCriterion("SHOW_VALUE not in", values, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueBetween(String value1, String value2) { + addCriterion("SHOW_VALUE between", value1, value2, "showValue"); + return (Criteria) this; + } + + public Criteria andShowValueNotBetween(String value1, String value2) { + addCriterion("SHOW_VALUE not between", value1, value2, "showValue"); + return (Criteria) this; + } + + public Criteria andRealValueIsNull() { + addCriterion("REAL_VALUE is null"); + return (Criteria) this; + } + + public Criteria andRealValueIsNotNull() { + addCriterion("REAL_VALUE is not null"); + return (Criteria) this; + } + + public Criteria andRealValueEqualTo(String value) { + addCriterion("REAL_VALUE =", value, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueNotEqualTo(String value) { + addCriterion("REAL_VALUE <>", value, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueGreaterThan(String value) { + addCriterion("REAL_VALUE >", value, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueGreaterThanOrEqualTo(String value) { + addCriterion("REAL_VALUE >=", value, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueLessThan(String value) { + addCriterion("REAL_VALUE <", value, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueLessThanOrEqualTo(String value) { + addCriterion("REAL_VALUE <=", value, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueLike(String value) { + addCriterion("REAL_VALUE like", value, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueNotLike(String value) { + addCriterion("REAL_VALUE not like", value, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueIn(List values) { + addCriterion("REAL_VALUE in", values, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueNotIn(List values) { + addCriterion("REAL_VALUE not in", values, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueBetween(String value1, String value2) { + addCriterion("REAL_VALUE between", value1, value2, "realValue"); + return (Criteria) this; + } + + public Criteria andRealValueNotBetween(String value1, String value2) { + addCriterion("REAL_VALUE not between", value1, value2, "realValue"); + return (Criteria) this; + } + + public Criteria andSortValueIsNull() { + addCriterion("SORT_VALUE is null"); + return (Criteria) this; + } + + public Criteria andSortValueIsNotNull() { + addCriterion("SORT_VALUE is not null"); + return (Criteria) this; + } + + public Criteria andSortValueEqualTo(Integer value) { + addCriterion("SORT_VALUE =", value, "sortValue"); + return (Criteria) this; + } + + public Criteria andSortValueNotEqualTo(Integer value) { + addCriterion("SORT_VALUE <>", value, "sortValue"); + return (Criteria) this; + } + + public Criteria andSortValueGreaterThan(Integer value) { + addCriterion("SORT_VALUE >", value, "sortValue"); + return (Criteria) this; + } + + public Criteria andSortValueGreaterThanOrEqualTo(Integer value) { + addCriterion("SORT_VALUE >=", value, "sortValue"); + return (Criteria) this; + } + + public Criteria andSortValueLessThan(Integer value) { + addCriterion("SORT_VALUE <", value, "sortValue"); + return (Criteria) this; + } + + public Criteria andSortValueLessThanOrEqualTo(Integer value) { + addCriterion("SORT_VALUE <=", value, "sortValue"); + return (Criteria) this; + } + + public Criteria andSortValueIn(List values) { + addCriterion("SORT_VALUE in", values, "sortValue"); + return (Criteria) this; + } + + public Criteria andSortValueNotIn(List values) { + addCriterion("SORT_VALUE not in", values, "sortValue"); + return (Criteria) this; + } + + public Criteria andSortValueBetween(Integer value1, Integer value2) { + addCriterion("SORT_VALUE between", value1, value2, "sortValue"); + return (Criteria) this; + } + + public Criteria andSortValueNotBetween(Integer value1, Integer value2) { + addCriterion("SORT_VALUE not between", value1, value2, "sortValue"); + return (Criteria) this; + } + + public Criteria andAvailableIsNull() { + addCriterion("AVAILABLE is null"); + return (Criteria) this; + } + + public Criteria andAvailableIsNotNull() { + addCriterion("AVAILABLE is not null"); + return (Criteria) this; + } + + public Criteria andAvailableEqualTo(Integer value) { + addCriterion("AVAILABLE =", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableNotEqualTo(Integer value) { + addCriterion("AVAILABLE <>", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableGreaterThan(Integer value) { + addCriterion("AVAILABLE >", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableGreaterThanOrEqualTo(Integer value) { + addCriterion("AVAILABLE >=", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableLessThan(Integer value) { + addCriterion("AVAILABLE <", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableLessThanOrEqualTo(Integer value) { + addCriterion("AVAILABLE <=", value, "available"); + return (Criteria) this; + } + + public Criteria andAvailableIn(List values) { + addCriterion("AVAILABLE in", values, "available"); + return (Criteria) this; + } + + public Criteria andAvailableNotIn(List values) { + addCriterion("AVAILABLE not in", values, "available"); + return (Criteria) this; + } + + public Criteria andAvailableBetween(Integer value1, Integer value2) { + addCriterion("AVAILABLE between", value1, value2, "available"); + return (Criteria) this; + } + + public Criteria andAvailableNotBetween(Integer value1, Integer value2) { + addCriterion("AVAILABLE not between", value1, value2, "available"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/entity/SysOrganizationExample.java b/src/main/java/com/xmomen/module/system/entity/SysOrganizationExample.java new file mode 100644 index 0000000..551dfa1 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/SysOrganizationExample.java @@ -0,0 +1,461 @@ +package com.xmomen.module.system.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class SysOrganizationExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysOrganizationExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andNameIsNull() { + addCriterion("NAME is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("NAME is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("NAME =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("NAME <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("NAME >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("NAME >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("NAME <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("NAME <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("NAME like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("NAME not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("NAME in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("NAME not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("NAME between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("NAME not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("DESCRIPTION is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("DESCRIPTION is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("DESCRIPTION =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("DESCRIPTION <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("DESCRIPTION >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("DESCRIPTION >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("DESCRIPTION <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("DESCRIPTION <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("DESCRIPTION like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("DESCRIPTION not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("DESCRIPTION in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("DESCRIPTION not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("DESCRIPTION between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("DESCRIPTION not between", value1, value2, "description"); + 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 values) { + addCriterion("PARENT_ID in", values, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/entity/SysTask.java b/src/main/java/com/xmomen/module/system/entity/SysTask.java new file mode 100644 index 0000000..7a8334e --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/SysTask.java @@ -0,0 +1,149 @@ +package com.xmomen.module.system.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 = "sys_task") +public class SysTask extends BaseMybatisModel { + /** + * 主键 + */ + private Integer id; + + /** + * 任务头ID + */ + private Integer taskHeadId; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 开始时间 + */ + private Date startTime; + + /** + * 完成时间 + */ + private Date finishTime; + + /** + * 执行人ID + */ + private Integer executorId; + + /** + * 任务状态：0-待分配，1-待执行，2-执行中，3-已完成，4-已取消 + */ + private Integer taskStatus; + + @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 = "TASK_HEAD_ID") + public Integer getTaskHeadId() { + return taskHeadId; + } + + public void setTaskHeadId(Integer taskHeadId) { + this.taskHeadId = taskHeadId; + if(taskHeadId == null){ + removeValidField("taskHeadId"); + return; + } + addValidField("taskHeadId"); + } + + @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 = "START_TIME") + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + if(startTime == null){ + removeValidField("startTime"); + return; + } + addValidField("startTime"); + } + + @Column(name = "FINISH_TIME") + public Date getFinishTime() { + return finishTime; + } + + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + if(finishTime == null){ + removeValidField("finishTime"); + return; + } + addValidField("finishTime"); + } + + @Column(name = "EXECUTOR_ID") + public Integer getExecutorId() { + return executorId; + } + + public void setExecutorId(Integer executorId) { + this.executorId = executorId; + if(executorId == null){ + removeValidField("executorId"); + return; + } + addValidField("executorId"); + } + + @Column(name = "TASK_STATUS") + public Integer getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(Integer taskStatus) { + this.taskStatus = taskStatus; + if(taskStatus == null){ + removeValidField("taskStatus"); + return; + } + addValidField("taskStatus"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/entity/SysTaskExample.java b/src/main/java/com/xmomen/module/system/entity/SysTaskExample.java new file mode 100644 index 0000000..ee17ece --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/SysTaskExample.java @@ -0,0 +1,622 @@ +package com.xmomen.module.system.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysTaskExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysTaskExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andTaskHeadIdIsNull() { + addCriterion("TASK_HEAD_ID is null"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdIsNotNull() { + addCriterion("TASK_HEAD_ID is not null"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdEqualTo(Integer value) { + addCriterion("TASK_HEAD_ID =", value, "taskHeadId"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdNotEqualTo(Integer value) { + addCriterion("TASK_HEAD_ID <>", value, "taskHeadId"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdGreaterThan(Integer value) { + addCriterion("TASK_HEAD_ID >", value, "taskHeadId"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdGreaterThanOrEqualTo(Integer value) { + addCriterion("TASK_HEAD_ID >=", value, "taskHeadId"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdLessThan(Integer value) { + addCriterion("TASK_HEAD_ID <", value, "taskHeadId"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdLessThanOrEqualTo(Integer value) { + addCriterion("TASK_HEAD_ID <=", value, "taskHeadId"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdIn(List values) { + addCriterion("TASK_HEAD_ID in", values, "taskHeadId"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdNotIn(List values) { + addCriterion("TASK_HEAD_ID not in", values, "taskHeadId"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdBetween(Integer value1, Integer value2) { + addCriterion("TASK_HEAD_ID between", value1, value2, "taskHeadId"); + return (Criteria) this; + } + + public Criteria andTaskHeadIdNotBetween(Integer value1, Integer value2) { + addCriterion("TASK_HEAD_ID not between", value1, value2, "taskHeadId"); + 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 values) { + addCriterion("CREATE_TIME in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List 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 andStartTimeIsNull() { + addCriterion("START_TIME is null"); + return (Criteria) this; + } + + public Criteria andStartTimeIsNotNull() { + addCriterion("START_TIME is not null"); + return (Criteria) this; + } + + public Criteria andStartTimeEqualTo(Date value) { + addCriterion("START_TIME =", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotEqualTo(Date value) { + addCriterion("START_TIME <>", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeGreaterThan(Date value) { + addCriterion("START_TIME >", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeGreaterThanOrEqualTo(Date value) { + addCriterion("START_TIME >=", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeLessThan(Date value) { + addCriterion("START_TIME <", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeLessThanOrEqualTo(Date value) { + addCriterion("START_TIME <=", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeIn(List values) { + addCriterion("START_TIME in", values, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotIn(List values) { + addCriterion("START_TIME not in", values, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeBetween(Date value1, Date value2) { + addCriterion("START_TIME between", value1, value2, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotBetween(Date value1, Date value2) { + addCriterion("START_TIME not between", value1, value2, "startTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeIsNull() { + addCriterion("FINISH_TIME is null"); + return (Criteria) this; + } + + public Criteria andFinishTimeIsNotNull() { + addCriterion("FINISH_TIME is not null"); + return (Criteria) this; + } + + public Criteria andFinishTimeEqualTo(Date value) { + addCriterion("FINISH_TIME =", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotEqualTo(Date value) { + addCriterion("FINISH_TIME <>", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeGreaterThan(Date value) { + addCriterion("FINISH_TIME >", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeGreaterThanOrEqualTo(Date value) { + addCriterion("FINISH_TIME >=", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeLessThan(Date value) { + addCriterion("FINISH_TIME <", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeLessThanOrEqualTo(Date value) { + addCriterion("FINISH_TIME <=", value, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeIn(List values) { + addCriterion("FINISH_TIME in", values, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotIn(List values) { + addCriterion("FINISH_TIME not in", values, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeBetween(Date value1, Date value2) { + addCriterion("FINISH_TIME between", value1, value2, "finishTime"); + return (Criteria) this; + } + + public Criteria andFinishTimeNotBetween(Date value1, Date value2) { + addCriterion("FINISH_TIME not between", value1, value2, "finishTime"); + return (Criteria) this; + } + + public Criteria andExecutorIdIsNull() { + addCriterion("EXECUTOR_ID is null"); + return (Criteria) this; + } + + public Criteria andExecutorIdIsNotNull() { + addCriterion("EXECUTOR_ID is not null"); + return (Criteria) this; + } + + public Criteria andExecutorIdEqualTo(Integer value) { + addCriterion("EXECUTOR_ID =", value, "executorId"); + return (Criteria) this; + } + + public Criteria andExecutorIdNotEqualTo(Integer value) { + addCriterion("EXECUTOR_ID <>", value, "executorId"); + return (Criteria) this; + } + + public Criteria andExecutorIdGreaterThan(Integer value) { + addCriterion("EXECUTOR_ID >", value, "executorId"); + return (Criteria) this; + } + + public Criteria andExecutorIdGreaterThanOrEqualTo(Integer value) { + addCriterion("EXECUTOR_ID >=", value, "executorId"); + return (Criteria) this; + } + + public Criteria andExecutorIdLessThan(Integer value) { + addCriterion("EXECUTOR_ID <", value, "executorId"); + return (Criteria) this; + } + + public Criteria andExecutorIdLessThanOrEqualTo(Integer value) { + addCriterion("EXECUTOR_ID <=", value, "executorId"); + return (Criteria) this; + } + + public Criteria andExecutorIdIn(List values) { + addCriterion("EXECUTOR_ID in", values, "executorId"); + return (Criteria) this; + } + + public Criteria andExecutorIdNotIn(List values) { + addCriterion("EXECUTOR_ID not in", values, "executorId"); + return (Criteria) this; + } + + public Criteria andExecutorIdBetween(Integer value1, Integer value2) { + addCriterion("EXECUTOR_ID between", value1, value2, "executorId"); + return (Criteria) this; + } + + public Criteria andExecutorIdNotBetween(Integer value1, Integer value2) { + addCriterion("EXECUTOR_ID not between", value1, value2, "executorId"); + return (Criteria) this; + } + + public Criteria andTaskStatusIsNull() { + addCriterion("TASK_STATUS is null"); + return (Criteria) this; + } + + public Criteria andTaskStatusIsNotNull() { + addCriterion("TASK_STATUS is not null"); + return (Criteria) this; + } + + public Criteria andTaskStatusEqualTo(Integer value) { + addCriterion("TASK_STATUS =", value, "taskStatus"); + return (Criteria) this; + } + + public Criteria andTaskStatusNotEqualTo(Integer value) { + addCriterion("TASK_STATUS <>", value, "taskStatus"); + return (Criteria) this; + } + + public Criteria andTaskStatusGreaterThan(Integer value) { + addCriterion("TASK_STATUS >", value, "taskStatus"); + return (Criteria) this; + } + + public Criteria andTaskStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("TASK_STATUS >=", value, "taskStatus"); + return (Criteria) this; + } + + public Criteria andTaskStatusLessThan(Integer value) { + addCriterion("TASK_STATUS <", value, "taskStatus"); + return (Criteria) this; + } + + public Criteria andTaskStatusLessThanOrEqualTo(Integer value) { + addCriterion("TASK_STATUS <=", value, "taskStatus"); + return (Criteria) this; + } + + public Criteria andTaskStatusIn(List values) { + addCriterion("TASK_STATUS in", values, "taskStatus"); + return (Criteria) this; + } + + public Criteria andTaskStatusNotIn(List values) { + addCriterion("TASK_STATUS not in", values, "taskStatus"); + return (Criteria) this; + } + + public Criteria andTaskStatusBetween(Integer value1, Integer value2) { + addCriterion("TASK_STATUS between", value1, value2, "taskStatus"); + return (Criteria) this; + } + + public Criteria andTaskStatusNotBetween(Integer value1, Integer value2) { + addCriterion("TASK_STATUS not between", value1, value2, "taskStatus"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/entity/SysTaskHeadExample.java b/src/main/java/com/xmomen/module/system/entity/SysTaskHeadExample.java new file mode 100644 index 0000000..f350a93 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/SysTaskHeadExample.java @@ -0,0 +1,401 @@ +package com.xmomen.module.system.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class SysTaskHeadExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysTaskHeadExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andTaskNameIsNull() { + addCriterion("TASK_NAME is null"); + return (Criteria) this; + } + + public Criteria andTaskNameIsNotNull() { + addCriterion("TASK_NAME is not null"); + return (Criteria) this; + } + + public Criteria andTaskNameEqualTo(String value) { + addCriterion("TASK_NAME =", value, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameNotEqualTo(String value) { + addCriterion("TASK_NAME <>", value, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameGreaterThan(String value) { + addCriterion("TASK_NAME >", value, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameGreaterThanOrEqualTo(String value) { + addCriterion("TASK_NAME >=", value, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameLessThan(String value) { + addCriterion("TASK_NAME <", value, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameLessThanOrEqualTo(String value) { + addCriterion("TASK_NAME <=", value, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameLike(String value) { + addCriterion("TASK_NAME like", value, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameNotLike(String value) { + addCriterion("TASK_NAME not like", value, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameIn(List values) { + addCriterion("TASK_NAME in", values, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameNotIn(List values) { + addCriterion("TASK_NAME not in", values, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameBetween(String value1, String value2) { + addCriterion("TASK_NAME between", value1, value2, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskNameNotBetween(String value1, String value2) { + addCriterion("TASK_NAME not between", value1, value2, "taskName"); + return (Criteria) this; + } + + public Criteria andTaskDescIsNull() { + addCriterion("TASK_DESC is null"); + return (Criteria) this; + } + + public Criteria andTaskDescIsNotNull() { + addCriterion("TASK_DESC is not null"); + return (Criteria) this; + } + + public Criteria andTaskDescEqualTo(String value) { + addCriterion("TASK_DESC =", value, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescNotEqualTo(String value) { + addCriterion("TASK_DESC <>", value, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescGreaterThan(String value) { + addCriterion("TASK_DESC >", value, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescGreaterThanOrEqualTo(String value) { + addCriterion("TASK_DESC >=", value, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescLessThan(String value) { + addCriterion("TASK_DESC <", value, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescLessThanOrEqualTo(String value) { + addCriterion("TASK_DESC <=", value, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescLike(String value) { + addCriterion("TASK_DESC like", value, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescNotLike(String value) { + addCriterion("TASK_DESC not like", value, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescIn(List values) { + addCriterion("TASK_DESC in", values, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescNotIn(List values) { + addCriterion("TASK_DESC not in", values, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescBetween(String value1, String value2) { + addCriterion("TASK_DESC between", value1, value2, "taskDesc"); + return (Criteria) this; + } + + public Criteria andTaskDescNotBetween(String value1, String value2) { + addCriterion("TASK_DESC not between", value1, value2, "taskDesc"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/entity/mapper/SysDictionaryMapper.java b/src/main/java/com/xmomen/module/system/entity/mapper/SysDictionaryMapper.java new file mode 100644 index 0000000..ce93ef4 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/mapper/SysDictionaryMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.system.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.system.entity.SysDictionary; +import com.xmomen.module.system.entity.SysDictionaryExample; +import org.apache.ibatis.annotations.Param; + +public interface SysDictionaryMapper extends MybatisMapper { + int countByExample(SysDictionaryExample example); + + int deleteByExample(SysDictionaryExample example); + + int insertSelective(SysDictionary record); + + int updateByExampleSelective(@Param("record") SysDictionary record, @Param("example") SysDictionaryExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/entity/mapper/SysTaskHeadMapper.java b/src/main/java/com/xmomen/module/system/entity/mapper/SysTaskHeadMapper.java new file mode 100644 index 0000000..aec987a --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/mapper/SysTaskHeadMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.system.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.system.entity.SysTaskHead; +import com.xmomen.module.system.entity.SysTaskHeadExample; +import org.apache.ibatis.annotations.Param; + +public interface SysTaskHeadMapper extends MybatisMapper { + int countByExample(SysTaskHeadExample example); + + int deleteByExample(SysTaskHeadExample example); + + int insertSelective(SysTaskHead record); + + int updateByExampleSelective(@Param("record") SysTaskHead record, @Param("example") SysTaskHeadExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/entity/mapper/SysTaskMapper.java b/src/main/java/com/xmomen/module/system/entity/mapper/SysTaskMapper.java new file mode 100644 index 0000000..bf3c045 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/mapper/SysTaskMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.system.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.system.entity.SysTask; +import com.xmomen.module.system.entity.SysTaskExample; +import org.apache.ibatis.annotations.Param; + +public interface SysTaskMapper extends MybatisMapper { + int countByExample(SysTaskExample example); + + int deleteByExample(SysTaskExample example); + + int insertSelective(SysTask record); + + int updateByExampleSelective(@Param("record") SysTask record, @Param("example") SysTaskExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/entity/mapper/SysUserOrganizationMapper.java b/src/main/java/com/xmomen/module/system/entity/mapper/SysUserOrganizationMapper.java new file mode 100644 index 0000000..baacd28 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/entity/mapper/SysUserOrganizationMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.system.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.system.entity.SysUserOrganization; +import com.xmomen.module.system.entity.SysUserOrganizationExample; +import org.apache.ibatis.annotations.Param; + +public interface SysUserOrganizationMapper extends MybatisMapper { + int countByExample(SysUserOrganizationExample example); + + int deleteByExample(SysUserOrganizationExample example); + + int insertSelective(SysUserOrganization record); + + int updateByExampleSelective(@Param("record") SysUserOrganization record, @Param("example") SysUserOrganizationExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/mapper/LogMapper.java b/src/main/java/com/xmomen/module/system/mapper/LogMapper.java new file mode 100644 index 0000000..a5f0b9d --- /dev/null +++ b/src/main/java/com/xmomen/module/system/mapper/LogMapper.java @@ -0,0 +1,15 @@ +package com.xmomen.module.system.mapper; + +import com.xmomen.module.system.model.LogModel; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Options; + +/** + * Created by Jeng on 16/3/20. + */ +public interface LogMapper { + + @Insert("insert into sys_log(user_id,action_name,action_date,action_params,client_ip,action_result) values(#{userId},#{actionName},#{actionDate},#{actionParams},#{clientIp},#{actionResult}) ") + @Options(useGeneratedKeys = true, keyProperty = "id") + public void insertLog(LogModel logModel); +} diff --git a/src/main/java/com/xmomen/module/system/mapper/LogMapper.xml b/src/main/java/com/xmomen/module/system/mapper/LogMapper.xml new file mode 100644 index 0000000..ed9c261 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/mapper/LogMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/mapper/TaskMapper.xml b/src/main/java/com/xmomen/module/system/mapper/TaskMapper.xml new file mode 100644 index 0000000..a0e81f4 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/mapper/TaskMapper.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/system/model/CreateDictionaryGroup.java b/src/main/java/com/xmomen/module/system/model/CreateDictionaryGroup.java new file mode 100644 index 0000000..deffe24 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/model/CreateDictionaryGroup.java @@ -0,0 +1,54 @@ +package com.xmomen.module.system.model; + +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * Created by Jeng on 16/4/2. + */ +public class CreateDictionaryGroup implements Serializable { + + /** + * 字典编号 + */ + @NotNull + @Length(min = 3, max = 20) + private String dictionaryCode; + + /** + * 字典描述 + */ + @NotNull + private String dictionaryDesc; + + /** + * 是否启用 + */ + private Integer available; + + public String getDictionaryCode() { + return dictionaryCode; + } + + public void setDictionaryCode(String dictionaryCode) { + this.dictionaryCode = dictionaryCode; + } + + public String getDictionaryDesc() { + return dictionaryDesc; + } + + public void setDictionaryDesc(String dictionaryDesc) { + this.dictionaryDesc = dictionaryDesc; + } + + public Integer getAvailable() { + return available; + } + + public void setAvailable(Integer available) { + this.available = available; + } +} diff --git a/src/main/java/com/xmomen/module/system/model/CreateOrganization.java b/src/main/java/com/xmomen/module/system/model/CreateOrganization.java new file mode 100644 index 0000000..0bfa4e7 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/model/CreateOrganization.java @@ -0,0 +1,45 @@ +package com.xmomen.module.system.model; + +import org.hibernate.validator.constraints.NotBlank; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * Created by Jeng on 16/3/26. + */ +public class CreateOrganization implements Serializable { + + @NotNull + @NotBlank + private String name; + @NotNull + @NotBlank + private String description; + + private Integer parentId; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Integer getParentId() { + return parentId; + } + + public void setParentId(Integer parentId) { + this.parentId = parentId; + } +} diff --git a/src/main/java/com/xmomen/module/system/model/LogModel.java b/src/main/java/com/xmomen/module/system/model/LogModel.java new file mode 100644 index 0000000..7bbcc8c --- /dev/null +++ b/src/main/java/com/xmomen/module/system/model/LogModel.java @@ -0,0 +1,74 @@ +package com.xmomen.module.system.model; + +import java.io.Serializable; +import java.util.Date; + +/** + * Created by Jeng on 16/3/20. + */ +public class LogModel implements Serializable{ + + private Integer userId; + private String actionName; + private Date actionDate; + private String clientIp; + private String actionParams; + private String actionResult; + private String remark; + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getActionName() { + return actionName; + } + + public void setActionName(String actionName) { + this.actionName = actionName; + } + + public String getClientIp() { + return clientIp; + } + + public void setClientIp(String clientIp) { + this.clientIp = clientIp; + } + + public Date getActionDate() { + return actionDate; + } + + public void setActionDate(Date actionDate) { + this.actionDate = actionDate; + } + + public String getActionParams() { + return actionParams; + } + + public void setActionParams(String actionParams) { + this.actionParams = actionParams; + } + + public String getActionResult() { + return actionResult; + } + + public void setActionResult(String actionResult) { + this.actionResult = actionResult; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} diff --git a/src/main/java/com/xmomen/module/system/model/OrganizationModel.java b/src/main/java/com/xmomen/module/system/model/OrganizationModel.java new file mode 100644 index 0000000..400a5f3 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/model/OrganizationModel.java @@ -0,0 +1,65 @@ +package com.xmomen.module.system.model; + +import java.io.Serializable; +import java.util.List; + +/** + * Created by Jeng on 16/3/25. + */ +public class OrganizationModel implements Serializable { + + private Integer id; + private String name; + private String description; + private Integer parentId; + private String parentName; + private List 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 String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + 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 getNodes() { + return nodes; + } + + public void setNodes(List nodes) { + this.nodes = nodes; + } +} diff --git a/src/main/java/com/xmomen/module/system/model/TaskModel.java b/src/main/java/com/xmomen/module/system/model/TaskModel.java new file mode 100644 index 0000000..9a707b5 --- /dev/null +++ b/src/main/java/com/xmomen/module/system/model/TaskModel.java @@ -0,0 +1,53 @@ +package com.xmomen.module.system.model; + + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * Created by Jeng on 2016/5/30. + */ +public @Data +class TaskModel implements Serializable{ + /** + * 主键 + */ + private Integer id; + + /** + * 任务名称 + */ + private String taskName; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 开始时间 + */ + private Date startTime; + + /** + * 完成时间 + */ + private Date finishTime; + + /** + * 执行人ID + */ + private Integer executorId; + + /** + * 执行人名称 + */ + private String executorName; + + /** + * 任务状态：0-待分配，1-待执行，2-执行中，3-已完成，4-已取消 + */ + private Integer taskStatus; +} diff --git a/src/main/java/com/xmomen/module/system/model/TaskQuery.java b/src/main/java/com/xmomen/module/system/model/TaskQuery.java new file mode 100644 index 0000000..df0175f --- /dev/null +++ b/src/main/java/com/xmomen/module/system/model/TaskQuery.java @@ -0,0 +1,17 @@ +package com.xmomen.module.system.model; + +import lombok.Data; + +import java.io.Serializable; + +/** + * Created by Jeng on 2016/5/30. + */ +public @Data +class TaskQuery implements Serializable{ + + private String keyword; + private Integer[] taskStatus; + private Integer[] executorIds; + +} diff --git a/src/main/java/com/xmomen/module/system/model/UpdateDictionaryGroup.java b/src/main/java/com/xmomen/module/system/model/UpdateDictionaryGroup.java new file mode 100644 index 0000000..50fabfe --- /dev/null +++ b/src/main/java/com/xmomen/module/system/model/UpdateDictionaryGroup.java @@ -0,0 +1,48 @@ +package com.xmomen.module.system.model; + +import java.io.Serializable; + +/** + * Created by Jeng on 16/4/2. + */ +public class UpdateDictionaryGroup implements Serializable { + + /** + * 字典编号 + */ + private String dictionaryCode; + + /** + * 字典描述 + */ + private String dictionaryDesc; + + /** + * 是否启用 + */ + private Integer available; + + public String getDictionaryCode() { + return dictionaryCode; + } + + public void setDictionaryCode(String dictionaryCode) { + this.dictionaryCode = dictionaryCode; + } + + public String getDictionaryDesc() { + return dictionaryDesc; + } + + public void setDictionaryDesc(String dictionaryDesc) { + this.dictionaryDesc = dictionaryDesc; + } + + public Integer getAvailable() { + return available; + } + + public void setAvailable(Integer available) { + this.available = available; + } +} diff --git a/src/main/java/com/xmomen/module/system/service/LogService.java b/src/main/java/com/xmomen/module/system/service/LogService.java new file mode 100644 index 0000000..464325b --- /dev/null +++ b/src/main/java/com/xmomen/module/system/service/LogService.java @@ -0,0 +1,23 @@ +package com.xmomen.module.system.service; + + +import com.xmomen.module.system.mapper.LogMapper; +import com.xmomen.module.system.model.LogModel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * Created by Jeng on 16/3/20. + */ +@Service +public class LogService { + + @Autowired + LogMapper logMapper; + + @Transactional + public void insertLog(LogModel logModel){ + logMapper.insertLog(logModel); + } +} diff --git a/src/main/java/com/xmomen/module/system/service/TaskService.java b/src/main/java/com/xmomen/module/system/service/TaskService.java new file mode 100644 index 0000000..1e5b34c --- /dev/null +++ b/src/main/java/com/xmomen/module/system/service/TaskService.java @@ -0,0 +1,66 @@ +package com.xmomen.module.system.service; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.framework.mybatis.page.Page; +import com.xmomen.module.system.entity.SysTask; +import com.xmomen.module.system.entity.SysTaskExample; +import com.xmomen.module.system.mapper.TaskMapper; +import com.xmomen.module.system.model.CreateTask; +import com.xmomen.module.system.model.TaskModel; +import com.xmomen.module.system.model.TaskQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +/** + * Created by Jeng on 16/4/2. + */ +@Service +public class TaskService { + + @Autowired + MybatisDao mybatisDao; + + @Transactional + public SysTask createTask(CreateTask createTask){ + SysTask sysTask = new SysTask(); + sysTask.setTaskHeadId(createTask.getTaskHeadId()); + sysTask.setExecutorId(createTask.getExecutorId()); + sysTask.setCreateTime(mybatisDao.getSysdate()); + sysTask.setTaskStatus(0); + return mybatisDao.insertByModel(sysTask); + } + + public Page getTaskList(TaskQuery taskQuery, Integer limit, Integer offset){ + return (Page) mybatisDao.selectPage(TaskMapper.TASK_MAPPER_NAMESPACE + ".", taskQuery, limit, offset); + } + + public SysTask getTask(Integer id){ + return mybatisDao.selectByPrimaryKey(SysTask.class, id); + } + + public void cancelTask(Integer... ids){ + SysTaskExample sysTaskExample = new SysTaskExample(); + sysTaskExample.createCriteria().andIdIn(CollectionUtils.arrayToList(ids)); + SysTask sysTask = new SysTask(); + sysTask.setTaskStatus(4); + mybatisDao.updateByExampleSelective(sysTask, sysTaskExample); + } + + public void updateTask(SysTask sysTask){ + mybatisDao.update(sysTask); + } + + public void deleteTask(Integer id){ + mybatisDao.deleteByPrimaryKey(SysTask.class, id); + } + + public void deleteTask(Integer[] ids){ + SysTaskExample sysTaskExample = new SysTaskExample(); + sysTaskExample.createCriteria().andIdIn(CollectionUtils.arrayToList(ids)); + mybatisDao.deleteByExample(sysTaskExample); + } + + +} diff --git a/src/main/java/com/xmomen/module/user/entity/SysRolesPermissions.java b/src/main/java/com/xmomen/module/user/entity/SysRolesPermissions.java new file mode 100644 index 0000000..8c1f7ca --- /dev/null +++ b/src/main/java/com/xmomen/module/user/entity/SysRolesPermissions.java @@ -0,0 +1,68 @@ +package com.xmomen.module.user.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisModel; + +import javax.persistence.*; + +@Entity +@Table(name = "sys_roles_permissions") +public class SysRolesPermissions extends BaseMybatisModel { + /** + * 物理主键 + */ + private Integer id; + + /** + * 角色表关联主键 + */ + private Integer roleId; + + /** + * 权限表关联主键 + */ + private Integer permissionId; + + @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 = "ROLE_ID") + public Integer getRoleId() { + return roleId; + } + + public void setRoleId(Integer roleId) { + this.roleId = roleId; + if(roleId == null){ + removeValidField("roleId"); + return; + } + addValidField("roleId"); + } + + @Column(name = "PERMISSION_ID") + public Integer getPermissionId() { + return permissionId; + } + + public void setPermissionId(Integer permissionId) { + this.permissionId = permissionId; + if(permissionId == null){ + removeValidField("permissionId"); + return; + } + addValidField("permissionId"); + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/user/entity/SysUsersExample.java b/src/main/java/com/xmomen/module/user/entity/SysUsersExample.java new file mode 100644 index 0000000..a4752b2 --- /dev/null +++ b/src/main/java/com/xmomen/module/user/entity/SysUsersExample.java @@ -0,0 +1,1001 @@ +package com.xmomen.module.user.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.List; + +public class SysUsersExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysUsersExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 values) { + addCriterion("ID in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andUsernameIsNull() { + addCriterion("USERNAME is null"); + return (Criteria) this; + } + + public Criteria andUsernameIsNotNull() { + addCriterion("USERNAME is not null"); + return (Criteria) this; + } + + public Criteria andUsernameEqualTo(String value) { + addCriterion("USERNAME =", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotEqualTo(String value) { + addCriterion("USERNAME <>", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameGreaterThan(String value) { + addCriterion("USERNAME >", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameGreaterThanOrEqualTo(String value) { + addCriterion("USERNAME >=", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLessThan(String value) { + addCriterion("USERNAME <", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLessThanOrEqualTo(String value) { + addCriterion("USERNAME <=", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLike(String value) { + addCriterion("USERNAME like", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotLike(String value) { + addCriterion("USERNAME not like", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameIn(List values) { + addCriterion("USERNAME in", values, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotIn(List values) { + addCriterion("USERNAME not in", values, "username"); + return (Criteria) this; + } + + public Criteria andUsernameBetween(String value1, String value2) { + addCriterion("USERNAME between", value1, value2, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotBetween(String value1, String value2) { + addCriterion("USERNAME not between", value1, value2, "username"); + return (Criteria) this; + } + + public Criteria andRealnameIsNull() { + addCriterion("REALNAME is null"); + return (Criteria) this; + } + + public Criteria andRealnameIsNotNull() { + addCriterion("REALNAME is not null"); + return (Criteria) this; + } + + public Criteria andRealnameEqualTo(String value) { + addCriterion("REALNAME =", value, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameNotEqualTo(String value) { + addCriterion("REALNAME <>", value, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameGreaterThan(String value) { + addCriterion("REALNAME >", value, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameGreaterThanOrEqualTo(String value) { + addCriterion("REALNAME >=", value, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameLessThan(String value) { + addCriterion("REALNAME <", value, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameLessThanOrEqualTo(String value) { + addCriterion("REALNAME <=", value, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameLike(String value) { + addCriterion("REALNAME like", value, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameNotLike(String value) { + addCriterion("REALNAME not like", value, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameIn(List values) { + addCriterion("REALNAME in", values, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameNotIn(List values) { + addCriterion("REALNAME not in", values, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameBetween(String value1, String value2) { + addCriterion("REALNAME between", value1, value2, "realname"); + return (Criteria) this; + } + + public Criteria andRealnameNotBetween(String value1, String value2) { + addCriterion("REALNAME not between", value1, value2, "realname"); + return (Criteria) this; + } + + public Criteria andSaltIsNull() { + addCriterion("SALT is null"); + return (Criteria) this; + } + + public Criteria andSaltIsNotNull() { + addCriterion("SALT is not null"); + return (Criteria) this; + } + + public Criteria andSaltEqualTo(String value) { + addCriterion("SALT =", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltNotEqualTo(String value) { + addCriterion("SALT <>", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltGreaterThan(String value) { + addCriterion("SALT >", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltGreaterThanOrEqualTo(String value) { + addCriterion("SALT >=", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltLessThan(String value) { + addCriterion("SALT <", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltLessThanOrEqualTo(String value) { + addCriterion("SALT <=", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltLike(String value) { + addCriterion("SALT like", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltNotLike(String value) { + addCriterion("SALT not like", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltIn(List values) { + addCriterion("SALT in", values, "salt"); + return (Criteria) this; + } + + public Criteria andSaltNotIn(List values) { + addCriterion("SALT not in", values, "salt"); + return (Criteria) this; + } + + public Criteria andSaltBetween(String value1, String value2) { + addCriterion("SALT between", value1, value2, "salt"); + return (Criteria) this; + } + + public Criteria andSaltNotBetween(String value1, String value2) { + addCriterion("SALT not between", value1, value2, "salt"); + return (Criteria) this; + } + + public Criteria andPasswordIsNull() { + addCriterion("PASSWORD is null"); + return (Criteria) this; + } + + public Criteria andPasswordIsNotNull() { + addCriterion("PASSWORD is not null"); + return (Criteria) this; + } + + public Criteria andPasswordEqualTo(String value) { + addCriterion("PASSWORD =", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotEqualTo(String value) { + addCriterion("PASSWORD <>", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordGreaterThan(String value) { + addCriterion("PASSWORD >", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordGreaterThanOrEqualTo(String value) { + addCriterion("PASSWORD >=", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLessThan(String value) { + addCriterion("PASSWORD <", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLessThanOrEqualTo(String value) { + addCriterion("PASSWORD <=", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLike(String value) { + addCriterion("PASSWORD like", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotLike(String value) { + addCriterion("PASSWORD not like", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordIn(List values) { + addCriterion("PASSWORD in", values, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotIn(List values) { + addCriterion("PASSWORD not in", values, "password"); + return (Criteria) this; + } + + public Criteria andPasswordBetween(String value1, String value2) { + addCriterion("PASSWORD between", value1, value2, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotBetween(String value1, String value2) { + addCriterion("PASSWORD not between", value1, value2, "password"); + return (Criteria) this; + } + + public Criteria andAgeIsNull() { + addCriterion("AGE is null"); + return (Criteria) this; + } + + public Criteria andAgeIsNotNull() { + addCriterion("AGE is not null"); + return (Criteria) this; + } + + public Criteria andAgeEqualTo(Integer value) { + addCriterion("AGE =", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeNotEqualTo(Integer value) { + addCriterion("AGE <>", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeGreaterThan(Integer value) { + addCriterion("AGE >", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeGreaterThanOrEqualTo(Integer value) { + addCriterion("AGE >=", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeLessThan(Integer value) { + addCriterion("AGE <", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeLessThanOrEqualTo(Integer value) { + addCriterion("AGE <=", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeIn(List values) { + addCriterion("AGE in", values, "age"); + return (Criteria) this; + } + + public Criteria andAgeNotIn(List values) { + addCriterion("AGE not in", values, "age"); + return (Criteria) this; + } + + public Criteria andAgeBetween(Integer value1, Integer value2) { + addCriterion("AGE between", value1, value2, "age"); + return (Criteria) this; + } + + public Criteria andAgeNotBetween(Integer value1, Integer value2) { + addCriterion("AGE not between", value1, value2, "age"); + return (Criteria) this; + } + + public Criteria andSexIsNull() { + addCriterion("SEX is null"); + return (Criteria) this; + } + + public Criteria andSexIsNotNull() { + addCriterion("SEX is not null"); + return (Criteria) this; + } + + public Criteria andSexEqualTo(Integer value) { + addCriterion("SEX =", value, "sex"); + return (Criteria) this; + } + + public Criteria andSexNotEqualTo(Integer value) { + addCriterion("SEX <>", value, "sex"); + return (Criteria) this; + } + + public Criteria andSexGreaterThan(Integer value) { + addCriterion("SEX >", value, "sex"); + return (Criteria) this; + } + + public Criteria andSexGreaterThanOrEqualTo(Integer value) { + addCriterion("SEX >=", value, "sex"); + return (Criteria) this; + } + + public Criteria andSexLessThan(Integer value) { + addCriterion("SEX <", value, "sex"); + return (Criteria) this; + } + + public Criteria andSexLessThanOrEqualTo(Integer value) { + addCriterion("SEX <=", value, "sex"); + return (Criteria) this; + } + + public Criteria andSexIn(List values) { + addCriterion("SEX in", values, "sex"); + return (Criteria) this; + } + + public Criteria andSexNotIn(List values) { + addCriterion("SEX not in", values, "sex"); + return (Criteria) this; + } + + public Criteria andSexBetween(Integer value1, Integer value2) { + addCriterion("SEX between", value1, value2, "sex"); + return (Criteria) this; + } + + public Criteria andSexNotBetween(Integer value1, Integer value2) { + addCriterion("SEX not between", value1, value2, "sex"); + return (Criteria) this; + } + + public Criteria andEmailIsNull() { + addCriterion("EMAIL is null"); + return (Criteria) this; + } + + public Criteria andEmailIsNotNull() { + addCriterion("EMAIL is not null"); + return (Criteria) this; + } + + public Criteria andEmailEqualTo(String value) { + addCriterion("EMAIL =", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotEqualTo(String value) { + addCriterion("EMAIL <>", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailGreaterThan(String value) { + addCriterion("EMAIL >", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailGreaterThanOrEqualTo(String value) { + addCriterion("EMAIL >=", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailLessThan(String value) { + addCriterion("EMAIL <", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailLessThanOrEqualTo(String value) { + addCriterion("EMAIL <=", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailLike(String value) { + addCriterion("EMAIL like", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotLike(String value) { + addCriterion("EMAIL not like", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailIn(List values) { + addCriterion("EMAIL in", values, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotIn(List values) { + addCriterion("EMAIL not in", values, "email"); + return (Criteria) this; + } + + public Criteria andEmailBetween(String value1, String value2) { + addCriterion("EMAIL between", value1, value2, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotBetween(String value1, String value2) { + addCriterion("EMAIL not between", value1, value2, "email"); + return (Criteria) this; + } + + public Criteria andQqIsNull() { + addCriterion("QQ is null"); + return (Criteria) this; + } + + public Criteria andQqIsNotNull() { + addCriterion("QQ is not null"); + return (Criteria) this; + } + + public Criteria andQqEqualTo(String value) { + addCriterion("QQ =", value, "qq"); + return (Criteria) this; + } + + public Criteria andQqNotEqualTo(String value) { + addCriterion("QQ <>", value, "qq"); + return (Criteria) this; + } + + public Criteria andQqGreaterThan(String value) { + addCriterion("QQ >", value, "qq"); + return (Criteria) this; + } + + public Criteria andQqGreaterThanOrEqualTo(String value) { + addCriterion("QQ >=", value, "qq"); + return (Criteria) this; + } + + public Criteria andQqLessThan(String value) { + addCriterion("QQ <", value, "qq"); + return (Criteria) this; + } + + public Criteria andQqLessThanOrEqualTo(String value) { + addCriterion("QQ <=", value, "qq"); + return (Criteria) this; + } + + public Criteria andQqLike(String value) { + addCriterion("QQ like", value, "qq"); + return (Criteria) this; + } + + public Criteria andQqNotLike(String value) { + addCriterion("QQ not like", value, "qq"); + return (Criteria) this; + } + + public Criteria andQqIn(List values) { + addCriterion("QQ in", values, "qq"); + return (Criteria) this; + } + + public Criteria andQqNotIn(List values) { + addCriterion("QQ not in", values, "qq"); + return (Criteria) this; + } + + public Criteria andQqBetween(String value1, String value2) { + addCriterion("QQ between", value1, value2, "qq"); + return (Criteria) this; + } + + public Criteria andQqNotBetween(String value1, String value2) { + addCriterion("QQ not between", value1, value2, "qq"); + return (Criteria) this; + } + + public Criteria andPhoneNumberIsNull() { + addCriterion("PHONE_NUMBER is null"); + return (Criteria) this; + } + + public Criteria andPhoneNumberIsNotNull() { + addCriterion("PHONE_NUMBER is not null"); + return (Criteria) this; + } + + public Criteria andPhoneNumberEqualTo(String value) { + addCriterion("PHONE_NUMBER =", value, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberNotEqualTo(String value) { + addCriterion("PHONE_NUMBER <>", value, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberGreaterThan(String value) { + addCriterion("PHONE_NUMBER >", value, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberGreaterThanOrEqualTo(String value) { + addCriterion("PHONE_NUMBER >=", value, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberLessThan(String value) { + addCriterion("PHONE_NUMBER <", value, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberLessThanOrEqualTo(String value) { + addCriterion("PHONE_NUMBER <=", value, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberLike(String value) { + addCriterion("PHONE_NUMBER like", value, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberNotLike(String value) { + addCriterion("PHONE_NUMBER not like", value, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberIn(List values) { + addCriterion("PHONE_NUMBER in", values, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberNotIn(List values) { + addCriterion("PHONE_NUMBER not in", values, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberBetween(String value1, String value2) { + addCriterion("PHONE_NUMBER between", value1, value2, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andPhoneNumberNotBetween(String value1, String value2) { + addCriterion("PHONE_NUMBER not between", value1, value2, "phoneNumber"); + return (Criteria) this; + } + + public Criteria andOfficeTelIsNull() { + addCriterion("OFFICE_TEL is null"); + return (Criteria) this; + } + + public Criteria andOfficeTelIsNotNull() { + addCriterion("OFFICE_TEL is not null"); + return (Criteria) this; + } + + public Criteria andOfficeTelEqualTo(String value) { + addCriterion("OFFICE_TEL =", value, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelNotEqualTo(String value) { + addCriterion("OFFICE_TEL <>", value, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelGreaterThan(String value) { + addCriterion("OFFICE_TEL >", value, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelGreaterThanOrEqualTo(String value) { + addCriterion("OFFICE_TEL >=", value, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelLessThan(String value) { + addCriterion("OFFICE_TEL <", value, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelLessThanOrEqualTo(String value) { + addCriterion("OFFICE_TEL <=", value, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelLike(String value) { + addCriterion("OFFICE_TEL like", value, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelNotLike(String value) { + addCriterion("OFFICE_TEL not like", value, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelIn(List values) { + addCriterion("OFFICE_TEL in", values, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelNotIn(List values) { + addCriterion("OFFICE_TEL not in", values, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelBetween(String value1, String value2) { + addCriterion("OFFICE_TEL between", value1, value2, "officeTel"); + return (Criteria) this; + } + + public Criteria andOfficeTelNotBetween(String value1, String value2) { + addCriterion("OFFICE_TEL not between", value1, value2, "officeTel"); + return (Criteria) this; + } + + public Criteria andLockedIsNull() { + addCriterion("LOCKED is null"); + return (Criteria) this; + } + + public Criteria andLockedIsNotNull() { + addCriterion("LOCKED is not null"); + return (Criteria) this; + } + + public Criteria andLockedEqualTo(Integer value) { + addCriterion("LOCKED =", value, "locked"); + return (Criteria) this; + } + + public Criteria andLockedNotEqualTo(Integer value) { + addCriterion("LOCKED <>", value, "locked"); + return (Criteria) this; + } + + public Criteria andLockedGreaterThan(Integer value) { + addCriterion("LOCKED >", value, "locked"); + return (Criteria) this; + } + + public Criteria andLockedGreaterThanOrEqualTo(Integer value) { + addCriterion("LOCKED >=", value, "locked"); + return (Criteria) this; + } + + public Criteria andLockedLessThan(Integer value) { + addCriterion("LOCKED <", value, "locked"); + return (Criteria) this; + } + + public Criteria andLockedLessThanOrEqualTo(Integer value) { + addCriterion("LOCKED <=", value, "locked"); + return (Criteria) this; + } + + public Criteria andLockedIn(List values) { + addCriterion("LOCKED in", values, "locked"); + return (Criteria) this; + } + + public Criteria andLockedNotIn(List values) { + addCriterion("LOCKED not in", values, "locked"); + return (Criteria) this; + } + + public Criteria andLockedBetween(Integer value1, Integer value2) { + addCriterion("LOCKED between", value1, value2, "locked"); + return (Criteria) this; + } + + public Criteria andLockedNotBetween(Integer value1, Integer value2) { + addCriterion("LOCKED not between", value1, value2, "locked"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/user/entity/mapper/SysRolesMapper.java b/src/main/java/com/xmomen/module/user/entity/mapper/SysRolesMapper.java new file mode 100644 index 0000000..9c2a4f8 --- /dev/null +++ b/src/main/java/com/xmomen/module/user/entity/mapper/SysRolesMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.user.entity.mapper; + +import com.xmomen.module.user.entity.SysRoles; +import com.xmomen.module.user.entity.SysRolesExample; +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import org.apache.ibatis.annotations.Param; + +public interface SysRolesMapper extends MybatisMapper { + int countByExample(SysRolesExample example); + + int deleteByExample(SysRolesExample example); + + int insertSelective(SysRoles record); + + int updateByExampleSelective(@Param("record") SysRoles record, @Param("example") SysRolesExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/user/entity/mapper/SysUsersMapper.java b/src/main/java/com/xmomen/module/user/entity/mapper/SysUsersMapper.java new file mode 100644 index 0000000..d919b58 --- /dev/null +++ b/src/main/java/com/xmomen/module/user/entity/mapper/SysUsersMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.user.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import com.xmomen.module.user.entity.SysUsers; +import com.xmomen.module.user.entity.SysUsersExample; +import org.apache.ibatis.annotations.Param; + +public interface SysUsersMapper extends MybatisMapper { + int countByExample(SysUsersExample example); + + int deleteByExample(SysUsersExample example); + + int insertSelective(SysUsers record); + + int updateByExampleSelective(@Param("record") SysUsers record, @Param("example") SysUsersExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/user/entity/mapper/SysUsersRolesMapper.java b/src/main/java/com/xmomen/module/user/entity/mapper/SysUsersRolesMapper.java new file mode 100644 index 0000000..681aea4 --- /dev/null +++ b/src/main/java/com/xmomen/module/user/entity/mapper/SysUsersRolesMapper.java @@ -0,0 +1,16 @@ +package com.xmomen.module.user.entity.mapper; + +import com.xmomen.module.user.entity.SysUsersRoles; +import com.xmomen.module.user.entity.SysUsersRolesExample; +import com.xmomen.framework.mybatis.mapper.MybatisMapper; +import org.apache.ibatis.annotations.Param; + +public interface SysUsersRolesMapper extends MybatisMapper { + int countByExample(SysUsersRolesExample example); + + int deleteByExample(SysUsersRolesExample example); + + int insertSelective(SysUsersRoles record); + + int updateByExampleSelective(@Param("record") SysUsersRoles record, @Param("example") SysUsersRolesExample example); +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/wb/controller/PcCartController.java b/src/main/java/com/xmomen/module/wb/controller/PcCartController.java new file mode 100644 index 0000000..68df122 --- /dev/null +++ b/src/main/java/com/xmomen/module/wb/controller/PcCartController.java @@ -0,0 +1,52 @@ +package com.xmomen.module.wb.controller; + +import java.util.List; + +import javax.validation.Valid; + +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.product.model.ProductModel; +import com.xmomen.module.product.model.ProductQuery; +import com.xmomen.module.wx.module.cart.model.UpdateCartModel; +import com.xmomen.module.wx.module.cart.service.CartService; + +@RestController +@RequestMapping(value = "/wb") +public class PcCartController { + + @Autowired + private CartService cartService; + + @ResponseBody + @RequestMapping(value ="/cart", method = RequestMethod.GET) + public List getCartProduct() { + Integer memberId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + ProductQuery productQuery = new ProductQuery(); + productQuery.setMemberCode(String.valueOf(memberId)); + return cartService.getProductsInCart(productQuery); + } + + @ResponseBody + @RequestMapping(value ="/cart", method = RequestMethod.POST) + public Boolean updateCart(@RequestBody @Valid UpdateCartModel updateCartModel){ + Integer memberId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + cartService.change(String.valueOf(memberId), updateCartModel.getItemId(), updateCartModel.getItemQty()); + return Boolean.TRUE; + } + + @ResponseBody + @RequestMapping(value = "/cart/sync", method = RequestMethod.GET) + public Boolean syncCart() { + Integer memberId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + cartService.syncToDB(String.valueOf(memberId)); + return Boolean.TRUE; + } +} diff --git a/src/main/java/com/xmomen/module/wb/controller/PcMemberAddressController.java b/src/main/java/com/xmomen/module/wb/controller/PcMemberAddressController.java new file mode 100644 index 0000000..7087627 --- /dev/null +++ b/src/main/java/com/xmomen/module/wb/controller/PcMemberAddressController.java @@ -0,0 +1,142 @@ +package com.xmomen.module.wb.controller; + +import java.util.List; + +import javax.validation.Valid; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.module.member.entity.MemberAddress; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.member.model.MemberAddressModel; +import com.xmomen.module.member.model.MemberAddressQuery; +import com.xmomen.module.member.service.MemberAddressService; +import com.xmomen.module.wb.model.PcMemberAddressModel; + +@RestController +@RequestMapping(value = "/wb/memberAddress") +public class PcMemberAddressController extends PcBaseController { + + @Autowired + MemberAddressService memberAddressService; + + @Autowired + MybatisDao mybatisDao; + + /** + * 客户地址列表 + * + * @param id 主键 + * @param ids 主键数组 + * @param excludeIds 不包含主键数组 + * @return Page 客户地址领域分页对象 + */ + @RequestMapping(method = RequestMethod.GET) + public List getMemberAddressList(@RequestParam(value = "id", required = false) String id, + @RequestParam(value = "ids", required = false) String[] ids, + @RequestParam(value = "excludeIds", required = false) String[] excludeIds) { + MemberAddressQuery memberAddressQuery = new MemberAddressQuery(); + memberAddressQuery.setId(id); + memberAddressQuery.setExcludeIds(excludeIds); + memberAddressQuery.setIds(ids); + memberAddressQuery.setCdMemberId(String.valueOf(getCurrentMemberId())); + return memberAddressService.getMemberAddressModels(memberAddressQuery); + } + + /** + * 查询单个客户地址 + * + * @param id 主键 + * @return MemberAddressModel 客户地址领域对象 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + public MemberAddressModel getMemberAddressById(@PathVariable(value = "id") String id) { + return memberAddressService.getOneMemberAddressModel(id); + } + + /** + * 新增客户地址 + * + * @param memberAddressModel 新增对象参数 + * @return MemberAddressModel 客户地址领域对象 + */ + @RequestMapping(method = RequestMethod.POST) + public MemberAddressModel createMemberAddress(@RequestBody @Valid PcMemberAddressModel pcMemberAddressModel) { + MemberAddressModel memberAddressModel = new MemberAddressModel(); + BeanUtils.copyProperties(pcMemberAddressModel, memberAddressModel); + memberAddressModel.setCdMemberId(getCurrentMemberId()); + return memberAddressService.createMemberAddress(memberAddressModel); + } + + /** + * 更新客户地址 + * + * @param id 主键 + * @param memberAddressModel 更新对象参数 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.PUT) + public void updateMemberAddress(@PathVariable(value = "id") String id, + @RequestBody @Valid PcMemberAddressModel pcMemberAddressModel) { + MemberAddressModel memberAddressModel = new MemberAddressModel(); + BeanUtils.copyProperties(pcMemberAddressModel, memberAddressModel); + memberAddressModel.setCdMemberId(getCurrentMemberId()); + memberAddressService.updateMemberAddress(memberAddressModel); + } + + /** + * 删除客户地址 + * + * @param id 主键 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + public void deleteMemberAddress(@PathVariable(value = "id") String id) { + memberAddressService.deleteMemberAddress(id); + } + + /** + * 删除客户地址 + * + * @param ids 主键 + */ + @RequestMapping(method = RequestMethod.DELETE) + public void deleteMemberAddresss(@RequestParam(value = "ids") String[] ids) { + memberAddressService.deleteMemberAddress(ids); + } + + /** + * 默认收货地址 + * + * @param addressId 收货地址 + * @return + */ + @RequestMapping(value = "/default", method = RequestMethod.PUT) + @ResponseBody + public Boolean defaultAddress( + @RequestParam(value = "addressId") String addressId) { + memberAddressService.defaultAddress(addressId); + return Boolean.TRUE; + } + + + /** + * 获取默认收货地址 + * + * @return + */ + @RequestMapping(value = "/default", method = RequestMethod.GET) + @ResponseBody + public MemberAddress getDefaultAddress() { + MemberAddress memberAddress = new MemberAddress(); + memberAddress.setCdMemberId(getCurrentMemberId()); + memberAddress.setIsDefault(true); + List memberAddresses = this.mybatisDao.selectByModel(memberAddress); + if (memberAddresses.size() > 0) { + return memberAddresses.get(0); + } + return null; + } +} diff --git a/src/main/java/com/xmomen/module/wb/controller/PcMemberController.java b/src/main/java/com/xmomen/module/wb/controller/PcMemberController.java new file mode 100644 index 0000000..bc422a0 --- /dev/null +++ b/src/main/java/com/xmomen/module/wb/controller/PcMemberController.java @@ -0,0 +1,54 @@ +package com.xmomen.module.wb.controller; + +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.base.entity.CdMember; +import com.xmomen.module.base.service.MemberService; + +@RestController +@RequestMapping(value = "/wb/member") +public class PcMemberController { + + @Autowired + MemberService memberSercvice; + + + /** + * 更新客户手机号 + * + * @param mobile 新手机号码 + */ + @RequestMapping(value = "/updateMobile", method = RequestMethod.GET) + public void updateMemberAddress(@RequestParam("mobile") String mobile) { + Integer memberId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + memberSercvice.updateMobile(memberId, mobile); + } + + /** + * 查询单个客户 + * + * @param id 主键 + * @return CdMember 客户领域对象 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + public CdMember getMemberById(@PathVariable(value = "id") String id) { + return memberSercvice.getOneMemberModel(id); + } + + /** + * 查询单个客户 + * + * @param id 主键 + * @return CdMember 客户领域对象 + */ + @RequestMapping(value = "/{id}", method = RequestMethod.PUT) + public CdMember getMemberById(@PathVariable(value = "id") String id, + @RequestBody CdMember cdMember) { + return memberSercvice.updateMember(cdMember); + } + + +} diff --git a/src/main/java/com/xmomen/module/wb/controller/PcOrderController.java b/src/main/java/com/xmomen/module/wb/controller/PcOrderController.java new file mode 100644 index 0000000..d0eaf7f --- /dev/null +++ b/src/main/java/com/xmomen/module/wb/controller/PcOrderController.java @@ -0,0 +1,144 @@ +package com.xmomen.module.wb.controller; + +import java.beans.PropertyEditorSupport; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import javax.validation.Valid; + +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; +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.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import com.xmomen.module.base.constant.AppConstants; +import com.xmomen.module.order.entity.TbOrder; +import com.xmomen.module.order.model.WxCreateOrder; +import com.xmomen.module.order.service.OrderService; +import com.xmomen.module.product.model.ProductModel; +import com.xmomen.module.wx.module.order.model.MyOrderQuery; +import com.xmomen.module.wx.module.order.model.OrderDetailModel; +import com.xmomen.module.wx.module.order.model.OrderModel; +import com.xmomen.module.wx.module.order.model.PayOrderModel; +import com.xmomen.module.wx.module.order.service.MyOrderService; + +@RestController +@RequestMapping(value = "/wb/order") +public class PcOrderController { + + @Autowired + MyOrderService myOrderService; + + @Autowired + OrderService orderService; + + /** + * + * @param memberId + * @param status 0-未支付 1 待收货 + * @param minCreateTime 昨日 + * @param maxCreateTime 今日 + * @return + */ + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public List myOrder(@RequestParam(value = "status", required = false) Integer status, + @RequestParam(value = "minOrderTime", required = false) Date minCreateTime, + @RequestParam(value = "maxOrderTime", required = false) Date maxCreateTime) { + MyOrderQuery myOrderQuery = new MyOrderQuery(); + myOrderQuery.setStatus(status); + myOrderQuery.setMinOrderTime(minCreateTime); + myOrderQuery.setMaxOrderTime(maxCreateTime); + String memberId = String.valueOf(SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY)); + myOrderQuery.setUserId(memberId); + return myOrderService.myOrder(myOrderQuery); + } + + @RequestMapping(value = "/{orderId:[0-9]+}", method = RequestMethod.GET) + @ResponseBody + public OrderDetailModel orderDetail(@PathVariable("orderId") Integer orderId) { + MyOrderQuery myOrderQuery = new MyOrderQuery(); + myOrderQuery.setOrderId(orderId); + Integer memberId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + OrderDetailModel orderDetail = myOrderService.getOrderDetail(myOrderQuery); + if(orderDetail != null) { + String memberCode = orderDetail.getMemberCode(); + //不是自己的订单无权查看 + if(!String.valueOf(memberId).equals(memberCode)) { + return null; + } + } + return orderDetail; + } + + /** + * createUserId 前台可以给任意一个非空的整数值 + * @param createOrder + * @return + */ + @RequestMapping(method = RequestMethod.POST) + @ResponseBody + public TbOrder createModel(@RequestBody @Valid WxCreateOrder createOrder) throws Exception { + Integer memberId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + createOrder.setCreateUserId(memberId); + return orderService.createWxOrder(createOrder); + } + + @RequestMapping(value = "/confirm", method = RequestMethod.POST) + @ResponseBody + public Boolean confirmOrder(@RequestParam("id") Integer orderId) throws Exception { + Integer memberId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + return myOrderService.confirmReceiveOrder(orderId, memberId); + } + + @RequestMapping(value = "/cancel", method = RequestMethod.POST) + @ResponseBody + public Boolean cancelOrder(@RequestParam("id") Integer orderId) throws Exception { + Integer memberId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + return myOrderService.cancelOrder(orderId, memberId); + } + + @RequestMapping(value = "/pay", method = RequestMethod.POST) + @ResponseBody + public Boolean payOrder(@RequestBody PayOrderModel payOrderModel) throws Exception { + return orderService.payWxOrder(payOrderModel); + } + + @RequestMapping(value = "/coupon", method = RequestMethod.GET) + @ResponseBody + public List getCouponItems(@RequestParam("couponNo") String couponNo) { + return orderService.getCouponItems(couponNo); + } + + /** + * + * @param memberId + * @return {"待装箱":7,"待付款":6,"待采购":2,"待配送":2,"配送中":1} + */ + @RequestMapping(value = "/statistic", method = RequestMethod.GET) + @ResponseBody + public Map getOrderStatistic() { + Integer memberId = (Integer) SecurityUtils.getSubject().getSession().getAttribute(AppConstants.SESSION_USER_ID_KEY); + return myOrderService.getOrderStatistic(memberId); + } + + @InitBinder + public void initBinder(WebDataBinder binder) { + binder.registerCustomEditor(Date.class, new PropertyEditorSupport() { + + @Override + public void setAsText(String text) throws IllegalArgumentException { + super.setValue(new Date(Long.valueOf(text))); + } + + }); + } +} diff --git a/src/main/java/com/xmomen/module/wb/model/PcMember.java b/src/main/java/com/xmomen/module/wb/model/PcMember.java new file mode 100644 index 0000000..9cbf84d --- /dev/null +++ b/src/main/java/com/xmomen/module/wb/model/PcMember.java @@ -0,0 +1,31 @@ +package com.xmomen.module.wb.model; + +import javax.validation.constraints.NotNull; + +import org.hibernate.validator.constraints.NotBlank; + +import lombok.Data; + +public @Data class PcMember { + + //昵称,可以为空 + private String name; + + @NotNull(message = "手机号码必填") + @NotBlank(message = "手机号码必填") + private String phoneNumber; + + //主要用于密码重置 + //@NotNull + private String email; + + //客户密码 + @NotNull(message = "密码必填") + @NotBlank(message = "密码必填") + private String password; + + //手机验证码 + @NotNull(message="手机验证码必填") + @NotBlank(message="手机验证码必填") + private String phoneIdentifyCode; +} diff --git a/src/main/java/com/xmomen/module/wb/model/PcMemberAddressModel.java b/src/main/java/com/xmomen/module/wb/model/PcMemberAddressModel.java new file mode 100644 index 0000000..f4680d8 --- /dev/null +++ b/src/main/java/com/xmomen/module/wb/model/PcMemberAddressModel.java @@ -0,0 +1,60 @@ +package com.xmomen.module.wb.model; + +import java.io.Serializable; + +import org.hibernate.validator.constraints.Length; +import org.hibernate.validator.constraints.NotBlank; +import org.hibernate.validator.constraints.Range; +import org.springframework.beans.BeanUtils; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.xmomen.module.member.entity.MemberAddress; + +import lombok.Data; + +public @Data class PcMemberAddressModel implements Serializable { + + @Length(max = 32, message = "字符长度限制[0,32]") + private String id; + /** 客户ID */ + @Range(max = 999999999, min = -999999999, message = "客户ID数值范围[999999999,-999999999]") + private Integer cdMemberId; + /** */ + @Range(max = 999999999, min = -999999999, message = "数值范围[999999999,-999999999]") + private Integer province; + /** 城市 */ + @Range(max = 999999999, min = -999999999, message = "城市数值范围[999999999,-999999999]") + private Integer city; + /** 区域 */ + @Range(max = 999999999, min = -999999999, message = "区域数值范围[999999999,-999999999]") + private Integer area; + /** 详细地址 */ + @NotBlank(message = "详细地址为必填项") + @Length(max = 256, message = "详细地址字符长度限制[0,256]") + private String address; + /** 完整地址 */ + @NotBlank(message = "完整地址为必填项") + @Length(max = 256, message = "完整地址字符长度限制[0,256]") + private String fullAddress; + /** */ + @NotBlank(message = "为必填项") + @Length(max = 32, message = "字符长度限制[0,32]") + private String name; + /** */ + @NotBlank(message = "为必填项") + @Length(max = 32, message = "字符长度限制[0,32]") + private String mobile; + /** 是否默认地址 */ + private Boolean isDefault; + + /** + * Get MemberAddress Entity Object + * @return + */ + @JsonIgnore + public MemberAddress getEntity(){ + MemberAddress memberAddress = new MemberAddress(); + BeanUtils.copyProperties(this, memberAddress); + return memberAddress; + } +} diff --git a/src/main/java/com/xmomen/module/wb/model/PcUpdatePasswordModel.java b/src/main/java/com/xmomen/module/wb/model/PcUpdatePasswordModel.java new file mode 100644 index 0000000..1612f04 --- /dev/null +++ b/src/main/java/com/xmomen/module/wb/model/PcUpdatePasswordModel.java @@ -0,0 +1,22 @@ +package com.xmomen.module.wb.model; + +import javax.validation.constraints.NotNull; + +import org.hibernate.validator.constraints.NotBlank; + +import lombok.Data; + +public @Data class PcUpdatePasswordModel { + + @NotNull(message = "手机号码必填") + @NotBlank(message = "手机号码必填") + private String phoneNumber; + + @NotNull(message = "密码必填") + @NotBlank(message = "密码必填") + private String password; + + @NotNull(message = "旧密码必填") + @NotBlank(message = "旧密码必填") + private String oldPassword; +} diff --git a/src/main/java/com/xmomen/module/wx/Test.java b/src/main/java/com/xmomen/module/wx/Test.java new file mode 100644 index 0000000..d616665 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/Test.java @@ -0,0 +1,24 @@ +package com.xmomen.module.wx; + +import com.alibaba.fastjson.JSONObject; +import com.xmomen.module.wx.model.MessageBase; +import com.xmomen.module.wx.model.requestModel.event.RequestMessageEventScanCode; +import com.xmomen.module.wx.util.XMLUtils; + +public class Test { + + public static void main(String[] args) { + // TODO Auto-generated method stub + String json = "{\"createTime\":1472960471,\"event\":\"scancode_push\",\"eventKey\":\"rselfmenu_0_1\",\"fromUserName\":\"ovH3uwhNwt_Q646pRA43aCCwtSRE\",\"msgType\":\"event\",\"scanCodeInfo\":{\"scanResult\":\"http://weixin.qq.com/r/ajmhuTTE6mmVrXDa92x4\",\"scanType\":\"qrcode\"},\"toUserName\":\"gh_8fce9baef56f\"}"; + try{ + //将请求的消息封装成实体对象 + RequestMessageEventScanCode requestMessageBase = (RequestMessageEventScanCode) JSONObject.parseObject(json, RequestMessageEventScanCode.class); + System.out.println(requestMessageBase.getScanCodeInfo().getScanResult()); + }catch(Exception e){ + e.printStackTrace(); + + } + + } + +} diff --git a/src/main/java/com/xmomen/module/wx/constants/AuthorizeScope.java b/src/main/java/com/xmomen/module/wx/constants/AuthorizeScope.java new file mode 100644 index 0000000..76d4fe9 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/constants/AuthorizeScope.java @@ -0,0 +1,13 @@ +package com.xmomen.module.wx.constants; + +/** + * 授权方式 + */ +public enum AuthorizeScope { + + //不弹出授权页面，直接跳转，只能获取用户openid + snsapi_base, + + //弹出授权页面，可通过openid拿到昵称、性别、所在地、 + snsapi_userinfo; +} diff --git a/src/main/java/com/xmomen/module/wx/constants/ColorConsts.java b/src/main/java/com/xmomen/module/wx/constants/ColorConsts.java new file mode 100644 index 0000000..7399a4d --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/constants/ColorConsts.java @@ -0,0 +1,11 @@ +package com.xmomen.module.wx.constants; + +/** + * + */ +public class ColorConsts { + //模板标题颜色 + public static String TOP_COLOR = "#ce1a48"; + //内容颜色 + public static String CONTENT_COLOR = "#011573"; +} diff --git a/src/main/java/com/xmomen/module/wx/constants/OpenImConsts.java b/src/main/java/com/xmomen/module/wx/constants/OpenImConsts.java new file mode 100644 index 0000000..8ab7770 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/constants/OpenImConsts.java @@ -0,0 +1,9 @@ +package com.xmomen.module.wx.constants; + +/** + * 阿里百川常量类 + */ +public class OpenImConsts { + //阿里百川请求url + public final static String OPEN_API_URL = "http://gw.api.taobao.com/router/rest"; +} diff --git a/src/main/java/com/xmomen/module/wx/constants/RequestMsgTypeEnum.java b/src/main/java/com/xmomen/module/wx/constants/RequestMsgTypeEnum.java new file mode 100644 index 0000000..fb6734b --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/constants/RequestMsgTypeEnum.java @@ -0,0 +1,30 @@ +package com.xmomen.module.wx.constants; + +/** + * 接收到的消息类型 + */ +public enum RequestMsgTypeEnum { + //事件推送 + event, + + //文本 + text, + + //图片 + image, + + //语音 + voice, + + //小视频 + shortvideo, + + //视频 + video, + + //链接 + link, + + //地理位置 + location; +} diff --git a/src/main/java/com/xmomen/module/wx/constants/ResponseMsgTypeEnum.java b/src/main/java/com/xmomen/module/wx/constants/ResponseMsgTypeEnum.java new file mode 100644 index 0000000..7209318 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/constants/ResponseMsgTypeEnum.java @@ -0,0 +1,24 @@ +package com.xmomen.module.wx.constants; + +/** + * 回复消息类型 + */ +public enum ResponseMsgTypeEnum { + //文本 + text, + + //图文 + news, + + //视频 + video, + + //语音 + voice, + + //图片 + image, + + //音乐 + music; +} diff --git a/src/main/java/com/xmomen/module/wx/constants/WeixinConsts.java b/src/main/java/com/xmomen/module/wx/constants/WeixinConsts.java new file mode 100644 index 0000000..5ec9303 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/constants/WeixinConsts.java @@ -0,0 +1,68 @@ +package com.xmomen.module.wx.constants; + +/** + * 微信接口URL + */ +public class WeixinConsts { + /** + * 获得accesstoken + * GET请求 + */ + public static final String GET_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={APPID}&secret={APPSECRET}"; + + /** + * 发送模版消息 + * POST请求 + */ + public static final String SEND_TEMPLATE_MESSAGE = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token={ACCESS_TOKEN}"; + + /** + * 获取jsapi_ticket + */ + public static final String JS_API_TICKET = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token={ACCESS_TOKEN}&type=jsapi"; + + /** + * 创建微信菜单 + * POST请求 + */ + public static final String CREATE_WEIXIN_MENU = "https://api.weixin.qq.com/cgi-bin/menu/create?access_token={ACCESS_TOKEN}"; + + /** + * 获取所有的模板消息 + * GET请求 + */ + public static final String GET_ALL_TEMPLATE = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token={ACCESS_TOKEN}"; + + /** + * 客服发消息接口 + * POST请求 + */ + public static final String CUSTOM_SEND_MESSAGE = "https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token={ACCESS_TOKEN}"; + /** + * 微信授权地址 + * appid 公众号的唯一标识 + * redirect_uri 授权后重定向的回调链接地址 + * scope 应用授权作用域，snsapi_base （不弹出授权页面，直接跳转，只能获取用户openid）， + * snsapi_userinfo （弹出授权页面，可通过openid拿到昵称、性别、所在地。 + * 并且，即使在未关注的情况下，只要用户授权，也能获取其信息） + * state 重定向后会带上state参数，开发者可以填写任意参数值 + * #wechat_redirect 直接在微信打开链接，可以不填此参数。做页面302重定向时候，必须带此参数 + * GET请求 + */ + public static final String OAUTH = "https://open.weixin.qq.com/connect/oauth2/authorize?appid={APPID}&redirect_uri={REDIRECT_URI}&response_type=code&scope={SCOPE}&state=state#wechat_redirect"; + /** + * 获取用户信息 + * GET请求 + */ + public static String GET_WEIXIN_USER_INFO = "https://api.weixin.qq.com/cgi-bin/user/info?access_token={ACCESS_TOKEN}&openid={OPENID}"; + /** + * 下载多媒体文件视频文件不支持下载，调用该接口需http协议 + * GET请求 + */ + public static String GET_MEDIA_FILE = "http://file.api.weixin.qq.com/cgi-bin/media/get?access_token={ACCESS_TOKEN}&media_id={MEDIA_ID}"; + /** + * 获取oauth网页认证的token + * GET请求 + */ + public static String GET_ACCESS_TOKEN_OAUTH = "https://api.weixin.qq.com/sns/oauth2/access_token?appid={APPID}&secret={SECRET}&code={CODE}&grant_type=authorization_code"; +} diff --git a/src/main/java/com/xmomen/module/wx/constants/WxConstants.java b/src/main/java/com/xmomen/module/wx/constants/WxConstants.java new file mode 100644 index 0000000..d3f625e --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/constants/WxConstants.java @@ -0,0 +1,5 @@ +package com.xmomen.module.wx.constants; + +public class WxConstants { + public static String WX_RECEIPT= "http://fygl.ehoyuan.cn:8088/wx/receipt"; +} diff --git a/src/main/java/com/xmomen/module/wx/controller/WeixinController.java b/src/main/java/com/xmomen/module/wx/controller/WeixinController.java new file mode 100644 index 0000000..ab12b4a --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/controller/WeixinController.java @@ -0,0 +1,186 @@ +package com.xmomen.module.wx.controller; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import com.xmomen.framework.utils.StringUtilsExt; +import com.xmomen.module.wx.model.PayModel; +import com.xmomen.module.wx.pay.model.PayResData; +import com.xmomen.module.wx.service.MessageHandlerService; +import com.xmomen.module.wx.service.WeixinApiService; +import com.xmomen.module.wx.util.SignUtil; + +/** + * 微信后端接入控制器 + */ +@RestController +@RequestMapping("/wx/api") +public class WeixinController { + + @Autowired + MessageHandlerService messageHandlerService; + + @Autowired + WeixinApiService weixinApiService; + + private Logger log = LoggerFactory.getLogger(WeixinController.class); + + /** + * 获取js-sdk的config信息 + * + * @param url + * @return + */ + @RequestMapping(value = "/jsapi_ticket") + public Map getJsapiTicket(@RequestParam(value = "url") String url) { + return weixinApiService.getJsSDKConfig("gh_9248df680cef", url); + } + + /** + * 订单支付下单 + * + * @param outTradeNo 订单号 + * @param totalFee 总金额 + * @param openId openId + * @return + */ + @RequestMapping(value = "/payOrder", method = RequestMethod.POST) + @ResponseBody + public PayResData payOrder(@RequestBody @Valid PayModel payOrderModel, HttpServletRequest request) { + return weixinApiService.payOrder(payOrderModel.getOutTradeNo(), payOrderModel.getTotalFee(), payOrderModel.getOpenId(), payOrderModel.getType(), payOrderModel.getMemberId(), request); + } + + /** + * 支付回调方法 + * + * @param request + * @return + */ + @RequestMapping(value = "/notify") + @ResponseBody + public String notify(HttpServletRequest request) { + // 获取微信POST过来反馈信息 + System.out.print("微信支付回调获取数据开始"); + log.info("微信支付回调获取数据开始"); + String inputLine; + String notityXml = ""; + try { + while ((inputLine = request.getReader().readLine()) != null) { + notityXml += inputLine; + } + request.getReader().close(); + } catch (Exception e) { + log.info("xml获取失败：" + e); + } + log.info("收到微信异步回调：" + notityXml); + return this.weixinApiService.notify(notityXml); + } + + /** + * 微信接口接入API主方法 + * + * @param request HttpServletRequest + * @param response HttpServletResponse + */ + @RequestMapping(value = "/weixinApi") + public void weixinApi(HttpServletRequest request, HttpServletResponse response) { + // 随机字符串 + String echostr = request.getParameter("echostr"); + + PrintWriter out = null; + + if (StringUtilsExt.isEmpty(echostr)) { + try { + log.info("请求服务器"); + //设置response字符串格式为UTF-8 + response.setCharacterEncoding("utf-8"); + + //处理请求，并且获取回复消息 + String responseXml = messageHandlerService.execute(request.getInputStream()); + + log.info("回复微信服务器的内容：" + responseXml); + + //将回复消息返回给微信服务器 + out = response.getWriter(); + + out.print(responseXml); + + out.flush(); + } catch (IOException e) { + log.error("接口调用失败：", e); + } finally { + IOUtils.closeQuietly(out); + } + } + //配置验证用，原样返回随机字符串 + else { + log.info("随机字符串(echostr): " + echostr); + try { + out = response.getWriter(); + + //开发者通过检验signature对请求进行校验（下面有校验方式）。 + //若确认此次GET请求来自微信服务器，请原样返回echostr参数内容，则接入生效，否则接入失败。 + if (checkSignature(request)) { + out.print(echostr); + log.info("微信接入验证成功。"); + } + else { + log.error("微信接入验证失败。"); + } + out.flush(); + } catch (IOException e) { + log.error("微信接入验证失败：", e); + } finally { + IOUtils.closeQuietly(out); + } + } + } + + /** + * 效验URL地址是否来自微信 + * + * @param request HttpServletRequest + * @return 校验结果 + */ + private boolean checkSignature(HttpServletRequest request) { + // 微信加密签名 + String msg_signature = request.getParameter("signature"); + + // 时间戳 + String timestamp = request.getParameter("timestamp"); + + // 随机数 + String nonce = request.getParameter("nonce"); + + String publicUid = request.getParameter("publicUid"); + + String token = request.getParameter("token"); + + if (StringUtilsExt.isEmpty(publicUid)) { + log.error("请在微信对接接口地址中设定publicUid参数。"); + return false; + } + if (StringUtilsExt.isEmpty(token)) { + log.error("请在微信对接接口地址中设定token参数。"); + return false; + } + + return SignUtil.checkSignature(token, msg_signature, timestamp, nonce); + } +} diff --git a/src/main/java/com/xmomen/module/wx/entity/WxAppSettingExample.java b/src/main/java/com/xmomen/module/wx/entity/WxAppSettingExample.java new file mode 100644 index 0000000..4f0413e --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/entity/WxAppSettingExample.java @@ -0,0 +1,1212 @@ +package com.xmomen.module.wx.entity; + +import com.xmomen.framework.mybatis.model.BaseMybatisExample; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class WxAppSettingExample extends BaseMybatisExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public WxAppSettingExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + 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 andUidIsNull() { + addCriterion("uid is null"); + return (Criteria) this; + } + + public Criteria andUidIsNotNull() { + addCriterion("uid is not null"); + return (Criteria) this; + } + + public Criteria andUidEqualTo(String value) { + addCriterion("uid =", value, "uid"); + return (Criteria) this; + } + + public Criteria andUidNotEqualTo(String value) { + addCriterion("uid <>", value, "uid"); + return (Criteria) this; + } + + public Criteria andUidGreaterThan(String value) { + addCriterion("uid >", value, "uid"); + return (Criteria) this; + } + + public Criteria andUidGreaterThanOrEqualTo(String value) { + addCriterion("uid >=", value, "uid"); + return (Criteria) this; + } + + public Criteria andUidLessThan(String value) { + addCriterion("uid <", value, "uid"); + return (Criteria) this; + } + + public Criteria andUidLessThanOrEqualTo(String value) { + addCriterion("uid <=", value, "uid"); + return (Criteria) this; + } + + public Criteria andUidLike(String value) { + addCriterion("uid like", value, "uid"); + return (Criteria) this; + } + + public Criteria andUidNotLike(String value) { + addCriterion("uid not like", value, "uid"); + return (Criteria) this; + } + + public Criteria andUidIn(List values) { + addCriterion("uid in", values, "uid"); + return (Criteria) this; + } + + public Criteria andUidNotIn(List values) { + addCriterion("uid not in", values, "uid"); + return (Criteria) this; + } + + public Criteria andUidBetween(String value1, String value2) { + addCriterion("uid between", value1, value2, "uid"); + return (Criteria) this; + } + + public Criteria andUidNotBetween(String value1, String value2) { + addCriterion("uid not between", value1, value2, "uid"); + return (Criteria) this; + } + + public Criteria andPublicUidIsNull() { + addCriterion("public_uid is null"); + return (Criteria) this; + } + + public Criteria andPublicUidIsNotNull() { + addCriterion("public_uid is not null"); + return (Criteria) this; + } + + public Criteria andPublicUidEqualTo(String value) { + addCriterion("public_uid =", value, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidNotEqualTo(String value) { + addCriterion("public_uid <>", value, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidGreaterThan(String value) { + addCriterion("public_uid >", value, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidGreaterThanOrEqualTo(String value) { + addCriterion("public_uid >=", value, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidLessThan(String value) { + addCriterion("public_uid <", value, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidLessThanOrEqualTo(String value) { + addCriterion("public_uid <=", value, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidLike(String value) { + addCriterion("public_uid like", value, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidNotLike(String value) { + addCriterion("public_uid not like", value, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidIn(List values) { + addCriterion("public_uid in", values, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidNotIn(List values) { + addCriterion("public_uid not in", values, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidBetween(String value1, String value2) { + addCriterion("public_uid between", value1, value2, "publicUid"); + return (Criteria) this; + } + + public Criteria andPublicUidNotBetween(String value1, String value2) { + addCriterion("public_uid not between", value1, value2, "publicUid"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountIsNull() { + addCriterion("is_service_account is null"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountIsNotNull() { + addCriterion("is_service_account is not null"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountEqualTo(Integer value) { + addCriterion("is_service_account =", value, "isServiceAccount"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountNotEqualTo(Integer value) { + addCriterion("is_service_account <>", value, "isServiceAccount"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountGreaterThan(Integer value) { + addCriterion("is_service_account >", value, "isServiceAccount"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountGreaterThanOrEqualTo(Integer value) { + addCriterion("is_service_account >=", value, "isServiceAccount"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountLessThan(Integer value) { + addCriterion("is_service_account <", value, "isServiceAccount"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountLessThanOrEqualTo(Integer value) { + addCriterion("is_service_account <=", value, "isServiceAccount"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountIn(List values) { + addCriterion("is_service_account in", values, "isServiceAccount"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountNotIn(List values) { + addCriterion("is_service_account not in", values, "isServiceAccount"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountBetween(Integer value1, Integer value2) { + addCriterion("is_service_account between", value1, value2, "isServiceAccount"); + return (Criteria) this; + } + + public Criteria andIsServiceAccountNotBetween(Integer value1, Integer value2) { + addCriterion("is_service_account not between", value1, value2, "isServiceAccount"); + return (Criteria) this; + } + + public Criteria andAppIdIsNull() { + addCriterion("app_id is null"); + return (Criteria) this; + } + + public Criteria andAppIdIsNotNull() { + addCriterion("app_id is not null"); + return (Criteria) this; + } + + public Criteria andAppIdEqualTo(String value) { + addCriterion("app_id =", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdNotEqualTo(String value) { + addCriterion("app_id <>", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdGreaterThan(String value) { + addCriterion("app_id >", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdGreaterThanOrEqualTo(String value) { + addCriterion("app_id >=", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdLessThan(String value) { + addCriterion("app_id <", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdLessThanOrEqualTo(String value) { + addCriterion("app_id <=", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdLike(String value) { + addCriterion("app_id like", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdNotLike(String value) { + addCriterion("app_id not like", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdIn(List values) { + addCriterion("app_id in", values, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdNotIn(List values) { + addCriterion("app_id not in", values, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdBetween(String value1, String value2) { + addCriterion("app_id between", value1, value2, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdNotBetween(String value1, String value2) { + addCriterion("app_id not between", value1, value2, "appId"); + return (Criteria) this; + } + + public Criteria andAppSecretIsNull() { + addCriterion("app_secret is null"); + return (Criteria) this; + } + + public Criteria andAppSecretIsNotNull() { + addCriterion("app_secret is not null"); + return (Criteria) this; + } + + public Criteria andAppSecretEqualTo(String value) { + addCriterion("app_secret =", value, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretNotEqualTo(String value) { + addCriterion("app_secret <>", value, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretGreaterThan(String value) { + addCriterion("app_secret >", value, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretGreaterThanOrEqualTo(String value) { + addCriterion("app_secret >=", value, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretLessThan(String value) { + addCriterion("app_secret <", value, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretLessThanOrEqualTo(String value) { + addCriterion("app_secret <=", value, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretLike(String value) { + addCriterion("app_secret like", value, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretNotLike(String value) { + addCriterion("app_secret not like", value, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretIn(List values) { + addCriterion("app_secret in", values, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretNotIn(List values) { + addCriterion("app_secret not in", values, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretBetween(String value1, String value2) { + addCriterion("app_secret between", value1, value2, "appSecret"); + return (Criteria) this; + } + + public Criteria andAppSecretNotBetween(String value1, String value2) { + addCriterion("app_secret not between", value1, value2, "appSecret"); + return (Criteria) this; + } + + public Criteria andTokenIsNull() { + addCriterion("token is null"); + return (Criteria) this; + } + + public Criteria andTokenIsNotNull() { + addCriterion("token is not null"); + return (Criteria) this; + } + + public Criteria andTokenEqualTo(String value) { + addCriterion("token =", value, "token"); + return (Criteria) this; + } + + public Criteria andTokenNotEqualTo(String value) { + addCriterion("token <>", value, "token"); + return (Criteria) this; + } + + public Criteria andTokenGreaterThan(String value) { + addCriterion("token >", value, "token"); + return (Criteria) this; + } + + public Criteria andTokenGreaterThanOrEqualTo(String value) { + addCriterion("token >=", value, "token"); + return (Criteria) this; + } + + public Criteria andTokenLessThan(String value) { + addCriterion("token <", value, "token"); + return (Criteria) this; + } + + public Criteria andTokenLessThanOrEqualTo(String value) { + addCriterion("token <=", value, "token"); + return (Criteria) this; + } + + public Criteria andTokenLike(String value) { + addCriterion("token like", value, "token"); + return (Criteria) this; + } + + public Criteria andTokenNotLike(String value) { + addCriterion("token not like", value, "token"); + return (Criteria) this; + } + + public Criteria andTokenIn(List values) { + addCriterion("token in", values, "token"); + return (Criteria) this; + } + + public Criteria andTokenNotIn(List values) { + addCriterion("token not in", values, "token"); + return (Criteria) this; + } + + public Criteria andTokenBetween(String value1, String value2) { + addCriterion("token between", value1, value2, "token"); + return (Criteria) this; + } + + public Criteria andTokenNotBetween(String value1, String value2) { + addCriterion("token not between", value1, value2, "token"); + return (Criteria) this; + } + + public Criteria andCompanyNameIsNull() { + addCriterion("company_name is null"); + return (Criteria) this; + } + + public Criteria andCompanyNameIsNotNull() { + addCriterion("company_name is not null"); + return (Criteria) this; + } + + public Criteria andCompanyNameEqualTo(String value) { + addCriterion("company_name =", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotEqualTo(String value) { + addCriterion("company_name <>", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameGreaterThan(String value) { + addCriterion("company_name >", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameGreaterThanOrEqualTo(String value) { + addCriterion("company_name >=", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLessThan(String value) { + addCriterion("company_name <", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLessThanOrEqualTo(String value) { + addCriterion("company_name <=", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLike(String value) { + addCriterion("company_name like", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotLike(String value) { + addCriterion("company_name not like", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameIn(List values) { + addCriterion("company_name in", values, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotIn(List values) { + addCriterion("company_name not in", values, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameBetween(String value1, String value2) { + addCriterion("company_name between", value1, value2, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotBetween(String value1, String value2) { + addCriterion("company_name not between", value1, value2, "companyName"); + return (Criteria) this; + } + + public Criteria andApplicationNameIsNull() { + addCriterion("application_name is null"); + return (Criteria) this; + } + + public Criteria andApplicationNameIsNotNull() { + addCriterion("application_name is not null"); + return (Criteria) this; + } + + public Criteria andApplicationNameEqualTo(String value) { + addCriterion("application_name =", value, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameNotEqualTo(String value) { + addCriterion("application_name <>", value, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameGreaterThan(String value) { + addCriterion("application_name >", value, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameGreaterThanOrEqualTo(String value) { + addCriterion("application_name >=", value, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameLessThan(String value) { + addCriterion("application_name <", value, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameLessThanOrEqualTo(String value) { + addCriterion("application_name <=", value, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameLike(String value) { + addCriterion("application_name like", value, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameNotLike(String value) { + addCriterion("application_name not like", value, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameIn(List values) { + addCriterion("application_name in", values, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameNotIn(List values) { + addCriterion("application_name not in", values, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameBetween(String value1, String value2) { + addCriterion("application_name between", value1, value2, "applicationName"); + return (Criteria) this; + } + + public Criteria andApplicationNameNotBetween(String value1, String value2) { + addCriterion("application_name not between", value1, value2, "applicationName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameIsNull() { + addCriterion("custom_assembly_name is null"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameIsNotNull() { + addCriterion("custom_assembly_name is not null"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameEqualTo(String value) { + addCriterion("custom_assembly_name =", value, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameNotEqualTo(String value) { + addCriterion("custom_assembly_name <>", value, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameGreaterThan(String value) { + addCriterion("custom_assembly_name >", value, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameGreaterThanOrEqualTo(String value) { + addCriterion("custom_assembly_name >=", value, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameLessThan(String value) { + addCriterion("custom_assembly_name <", value, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameLessThanOrEqualTo(String value) { + addCriterion("custom_assembly_name <=", value, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameLike(String value) { + addCriterion("custom_assembly_name like", value, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameNotLike(String value) { + addCriterion("custom_assembly_name not like", value, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameIn(List values) { + addCriterion("custom_assembly_name in", values, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameNotIn(List values) { + addCriterion("custom_assembly_name not in", values, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameBetween(String value1, String value2) { + addCriterion("custom_assembly_name between", value1, value2, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomAssemblyNameNotBetween(String value1, String value2) { + addCriterion("custom_assembly_name not between", value1, value2, "customAssemblyName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameIsNull() { + addCriterion("custom_class_name is null"); + return (Criteria) this; + } + + public Criteria andCustomClassNameIsNotNull() { + addCriterion("custom_class_name is not null"); + return (Criteria) this; + } + + public Criteria andCustomClassNameEqualTo(String value) { + addCriterion("custom_class_name =", value, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameNotEqualTo(String value) { + addCriterion("custom_class_name <>", value, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameGreaterThan(String value) { + addCriterion("custom_class_name >", value, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameGreaterThanOrEqualTo(String value) { + addCriterion("custom_class_name >=", value, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameLessThan(String value) { + addCriterion("custom_class_name <", value, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameLessThanOrEqualTo(String value) { + addCriterion("custom_class_name <=", value, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameLike(String value) { + addCriterion("custom_class_name like", value, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameNotLike(String value) { + addCriterion("custom_class_name not like", value, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameIn(List values) { + addCriterion("custom_class_name in", values, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameNotIn(List values) { + addCriterion("custom_class_name not in", values, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameBetween(String value1, String value2) { + addCriterion("custom_class_name between", value1, value2, "customClassName"); + return (Criteria) this; + } + + public Criteria andCustomClassNameNotBetween(String value1, String value2) { + addCriterion("custom_class_name not between", value1, value2, "customClassName"); + return (Criteria) this; + } + + public Criteria andDomainNameIsNull() { + addCriterion("domain_name is null"); + return (Criteria) this; + } + + public Criteria andDomainNameIsNotNull() { + addCriterion("domain_name is not null"); + return (Criteria) this; + } + + public Criteria andDomainNameEqualTo(String value) { + addCriterion("domain_name =", value, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameNotEqualTo(String value) { + addCriterion("domain_name <>", value, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameGreaterThan(String value) { + addCriterion("domain_name >", value, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameGreaterThanOrEqualTo(String value) { + addCriterion("domain_name >=", value, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameLessThan(String value) { + addCriterion("domain_name <", value, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameLessThanOrEqualTo(String value) { + addCriterion("domain_name <=", value, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameLike(String value) { + addCriterion("domain_name like", value, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameNotLike(String value) { + addCriterion("domain_name not like", value, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameIn(List values) { + addCriterion("domain_name in", values, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameNotIn(List values) { + addCriterion("domain_name not in", values, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameBetween(String value1, String value2) { + addCriterion("domain_name between", value1, value2, "domainName"); + return (Criteria) this; + } + + public Criteria andDomainNameNotBetween(String value1, String value2) { + addCriterion("domain_name not between", value1, value2, "domainName"); + return (Criteria) this; + } + + public Criteria andRecordStatusIsNull() { + addCriterion("record_status is null"); + return (Criteria) this; + } + + public Criteria andRecordStatusIsNotNull() { + addCriterion("record_status is not null"); + return (Criteria) this; + } + + public Criteria andRecordStatusEqualTo(Integer value) { + addCriterion("record_status =", value, "recordStatus"); + return (Criteria) this; + } + + public Criteria andRecordStatusNotEqualTo(Integer value) { + addCriterion("record_status <>", value, "recordStatus"); + return (Criteria) this; + } + + public Criteria andRecordStatusGreaterThan(Integer value) { + addCriterion("record_status >", value, "recordStatus"); + return (Criteria) this; + } + + public Criteria andRecordStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("record_status >=", value, "recordStatus"); + return (Criteria) this; + } + + public Criteria andRecordStatusLessThan(Integer value) { + addCriterion("record_status <", value, "recordStatus"); + return (Criteria) this; + } + + public Criteria andRecordStatusLessThanOrEqualTo(Integer value) { + addCriterion("record_status <=", value, "recordStatus"); + return (Criteria) this; + } + + public Criteria andRecordStatusIn(List values) { + addCriterion("record_status in", values, "recordStatus"); + return (Criteria) this; + } + + public Criteria andRecordStatusNotIn(List values) { + addCriterion("record_status not in", values, "recordStatus"); + return (Criteria) this; + } + + public Criteria andRecordStatusBetween(Integer value1, Integer value2) { + addCriterion("record_status between", value1, value2, "recordStatus"); + return (Criteria) this; + } + + public Criteria andRecordStatusNotBetween(Integer value1, Integer value2) { + addCriterion("record_status not between", value1, value2, "recordStatus"); + return (Criteria) this; + } + + public Criteria andAccessTokenIsNull() { + addCriterion("access_token is null"); + return (Criteria) this; + } + + public Criteria andAccessTokenIsNotNull() { + addCriterion("access_token is not null"); + return (Criteria) this; + } + + public Criteria andAccessTokenEqualTo(String value) { + addCriterion("access_token =", value, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenNotEqualTo(String value) { + addCriterion("access_token <>", value, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenGreaterThan(String value) { + addCriterion("access_token >", value, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenGreaterThanOrEqualTo(String value) { + addCriterion("access_token >=", value, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenLessThan(String value) { + addCriterion("access_token <", value, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenLessThanOrEqualTo(String value) { + addCriterion("access_token <=", value, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenLike(String value) { + addCriterion("access_token like", value, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenNotLike(String value) { + addCriterion("access_token not like", value, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenIn(List values) { + addCriterion("access_token in", values, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenNotIn(List values) { + addCriterion("access_token not in", values, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenBetween(String value1, String value2) { + addCriterion("access_token between", value1, value2, "accessToken"); + return (Criteria) this; + } + + public Criteria andAccessTokenNotBetween(String value1, String value2) { + addCriterion("access_token not between", value1, value2, "accessToken"); + return (Criteria) this; + } + + public Criteria andExpiresInIsNull() { + addCriterion("expires_in is null"); + return (Criteria) this; + } + + public Criteria andExpiresInIsNotNull() { + addCriterion("expires_in is not null"); + return (Criteria) this; + } + + public Criteria andExpiresInEqualTo(Integer value) { + addCriterion("expires_in =", value, "expiresIn"); + return (Criteria) this; + } + + public Criteria andExpiresInNotEqualTo(Integer value) { + addCriterion("expires_in <>", value, "expiresIn"); + return (Criteria) this; + } + + public Criteria andExpiresInGreaterThan(Integer value) { + addCriterion("expires_in >", value, "expiresIn"); + return (Criteria) this; + } + + public Criteria andExpiresInGreaterThanOrEqualTo(Integer value) { + addCriterion("expires_in >=", value, "expiresIn"); + return (Criteria) this; + } + + public Criteria andExpiresInLessThan(Integer value) { + addCriterion("expires_in <", value, "expiresIn"); + return (Criteria) this; + } + + public Criteria andExpiresInLessThanOrEqualTo(Integer value) { + addCriterion("expires_in <=", value, "expiresIn"); + return (Criteria) this; + } + + public Criteria andExpiresInIn(List values) { + addCriterion("expires_in in", values, "expiresIn"); + return (Criteria) this; + } + + public Criteria andExpiresInNotIn(List values) { + addCriterion("expires_in not in", values, "expiresIn"); + return (Criteria) this; + } + + public Criteria andExpiresInBetween(Integer value1, Integer value2) { + addCriterion("expires_in between", value1, value2, "expiresIn"); + return (Criteria) this; + } + + public Criteria andExpiresInNotBetween(Integer value1, Integer value2) { + addCriterion("expires_in not between", value1, value2, "expiresIn"); + return (Criteria) this; + } + + public Criteria andLastGetTimeIsNull() { + addCriterion("last_get_time is null"); + return (Criteria) this; + } + + public Criteria andLastGetTimeIsNotNull() { + addCriterion("last_get_time is not null"); + return (Criteria) this; + } + + public Criteria andLastGetTimeEqualTo(Date value) { + addCriterion("last_get_time =", value, "lastGetTime"); + return (Criteria) this; + } + + public Criteria andLastGetTimeNotEqualTo(Date value) { + addCriterion("last_get_time <>", value, "lastGetTime"); + return (Criteria) this; + } + + public Criteria andLastGetTimeGreaterThan(Date value) { + addCriterion("last_get_time >", value, "lastGetTime"); + return (Criteria) this; + } + + public Criteria andLastGetTimeGreaterThanOrEqualTo(Date value) { + addCriterion("last_get_time >=", value, "lastGetTime"); + return (Criteria) this; + } + + public Criteria andLastGetTimeLessThan(Date value) { + addCriterion("last_get_time <", value, "lastGetTime"); + return (Criteria) this; + } + + public Criteria andLastGetTimeLessThanOrEqualTo(Date value) { + addCriterion("last_get_time <=", value, "lastGetTime"); + return (Criteria) this; + } + + public Criteria andLastGetTimeIn(List values) { + addCriterion("last_get_time in", values, "lastGetTime"); + return (Criteria) this; + } + + public Criteria andLastGetTimeNotIn(List values) { + addCriterion("last_get_time not in", values, "lastGetTime"); + return (Criteria) this; + } + + public Criteria andLastGetTimeBetween(Date value1, Date value2) { + addCriterion("last_get_time between", value1, value2, "lastGetTime"); + return (Criteria) this; + } + + public Criteria andLastGetTimeNotBetween(Date value1, Date value2) { + addCriterion("last_get_time not between", value1, value2, "lastGetTime"); + 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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/wx/model/AccessToken.java b/src/main/java/com/xmomen/module/wx/model/AccessToken.java new file mode 100644 index 0000000..e074533 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/AccessToken.java @@ -0,0 +1,92 @@ +package com.xmomen.module.wx.model; + +import com.xmomen.framework.utils.DateUtils; +import com.xmomen.framework.utils.StringUtilsExt; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Date; + +/** + * 微信返回的token + */ +public class AccessToken { + static Logger log = LoggerFactory.getLogger(AccessToken.class); + + /** + * 获取到的token + */ + private String access_token = StringUtilsExt.EMPTY; + + /** + * 凭证有效时间，单位：秒 + */ + private String expires_in = StringUtilsExt.EMPTY; + + /** + * 最后获取时间，单位:秒 + */ + private long lastTime = 0; + + /** + * 注意：Json解析用必须设置默认构造函数，禁止删除此构造函数 + */ + public AccessToken() { + + } + + public AccessToken(String access_token, String expires_in, Date lastTime) { + this.access_token = access_token; + this.expires_in = expires_in; + if (lastTime != null) { + this.lastTime = lastTime.getTime() / 1000; + } + } + + public String getAccess_token() { + return access_token; + } + + public void setAccess_token(String access_token) { + this.access_token = access_token; + } + + public String getExpires_in() { + return expires_in; + } + + public void setExpires_in(String expires_in) { + this.expires_in = expires_in; + } + + public long getLastTime() { + return lastTime; + } + + public void setLastTime(long lastTime) { + this.lastTime = lastTime; + } + + /** + * 是否失效 + * + * @return true:失效/false:未失效 + */ + public boolean isExpired() { + if (StringUtilsExt.isEmpty(this.getAccess_token()) || this.getLastTime() == 0 || StringUtilsExt.isEmpty(this.getExpires_in())) { + return true; + } + + long currentTime = (new Date()).getTime() / 1000; + long diffSecond = currentTime - lastTime; + + log.info(String.format("当前时间：%s/Token取得时间：%s/凭证有效时间：%s/间隔时间：%s", currentTime, this.lastTime, this.expires_in, diffSecond)); + + //凭证失效的场合（微信实际失效期为7200） + if (diffSecond > Integer.parseInt(expires_in) - 600) { + return true; + } + return false; + } +} diff --git a/src/main/java/com/xmomen/module/wx/model/AjaxResult.java b/src/main/java/com/xmomen/module/wx/model/AjaxResult.java new file mode 100644 index 0000000..0fa7f3f --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/AjaxResult.java @@ -0,0 +1,11 @@ +package com.xmomen.module.wx.model; + +import java.io.Serializable; + +import lombok.Data; + +public @Data class AjaxResult implements Serializable { + private int result; + private Object content; + private String message; +} diff --git a/src/main/java/com/xmomen/module/wx/model/JsApiTicket.java b/src/main/java/com/xmomen/module/wx/model/JsApiTicket.java new file mode 100644 index 0000000..b7635ef --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/JsApiTicket.java @@ -0,0 +1,17 @@ +package com.xmomen.module.wx.model; + +import lombok.Data; + +import java.io.Serializable; + +/** + * Created by tanxinzheng on 17/3/24. + */ +@Data +public class JsApiTicket implements Serializable { + + private Integer errcode; + private String errmsg; + private String ticket; + private Long expires_in; +} diff --git a/src/main/java/com/xmomen/module/wx/model/PayModel.java b/src/main/java/com/xmomen/module/wx/model/PayModel.java new file mode 100644 index 0000000..0d62fcd --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/PayModel.java @@ -0,0 +1,33 @@ +package com.xmomen.module.wx.model; + +import javax.validation.constraints.NotNull; + +import lombok.Data; + +public +@Data +class PayModel { + + /** + * 订单编号，如卡号和订单号 + */ + String outTradeNo; + /** + * 订单金额，单位为元 + */ + @NotNull + Double totalFee; + /** + * 微信用户openId + */ + String openId; + /** + * 1 为支付 + * 2 为充值 + */ + @NotNull + Integer type; + + @NotNull + Integer memberId; +} diff --git a/src/main/java/com/xmomen/module/wx/model/UserInfoModel.java b/src/main/java/com/xmomen/module/wx/model/UserInfoModel.java new file mode 100644 index 0000000..bb9bd0b --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/UserInfoModel.java @@ -0,0 +1,10 @@ +package com.xmomen.module.wx.model; + +import lombok.Data; + +public @Data class UserInfoModel { + + private String name; + private String headimgurl; + private String phone; +} diff --git a/src/main/java/com/xmomen/module/wx/model/WeixinResponseStatusModel.java b/src/main/java/com/xmomen/module/wx/model/WeixinResponseStatusModel.java new file mode 100644 index 0000000..ccc3a53 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/WeixinResponseStatusModel.java @@ -0,0 +1,46 @@ +package com.xmomen.module.wx.model; + +/** + * 微信服务器请求回复封装类 + */ +public class WeixinResponseStatusModel { + + /** + * 状态码 + */ + private int errcode; + + /** + * 消息 + */ + private String errmsg; + + /** + * 消息id + */ + private String msgid; + + public int getErrcode() { + return errcode; + } + + public void setErrcode(int errcode) { + this.errcode = errcode; + } + + public String getErrmsg() { + return errmsg; + } + + public void setErrmsg(String errmsg) { + this.errmsg = errmsg; + } + + public String getMsgid() { + return msgid; + } + + public void setMsgid(String msgid) { + this.msgid = msgid; + } +} diff --git a/src/main/java/com/xmomen/module/wx/model/WeixinUserInfo.java b/src/main/java/com/xmomen/module/wx/model/WeixinUserInfo.java new file mode 100644 index 0000000..ca3d071 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/WeixinUserInfo.java @@ -0,0 +1,187 @@ +package com.xmomen.module.wx.model; + +/** + * 微信用户信息类 + */ +public class WeixinUserInfo { + + private String errcode; + + /** + * 关注的公众号 + */ + private String publicUid; + + /** + * 是否关注 0为未关注，1为关注 + */ + private int subscribe; + + /** + * 用户的标识，对当前公众号唯一 + */ + private String openid; + + /** + * 用户昵称 + */ + private String nickname; + + /** + * 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 + */ + private int sex; + + /** + * 用户的语言，简体中文为zh_CN + */ + private String language; + + /** + * 用户所在城市 + */ + private String city; + + /** + * 用户所在省份 + */ + private String province; + + /** + * 用户所在国家 + */ + private String country; + + /** + * 用户头像 + */ + private String headimgurl; + + /** + * 用户关注时间，为时间戳。如果用户曾多次关注，则取最后关注时间 + */ + private long subscribe_time; + + /** + * 公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注 + */ + private String remark; + + /** + * 用户所在的分组ID + */ + private String groupid; + + public String getPublicUid() { + return publicUid; + } + + public void setPublicUid(String publicUid) { + this.publicUid = publicUid; + } + + public int getSubscribe() { + return subscribe; + } + + public void setSubscribe(int subscribe) { + this.subscribe = subscribe; + } + + public String getOpenid() { + return openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public int getSex() { + return sex; + } + + public void setSex(int sex) { + this.sex = sex; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getHeadimgurl() { + return headimgurl; + } + + public void setHeadimgurl(String headimgurl) { + this.headimgurl = headimgurl; + } + + public long getSubscribe_time() { + return subscribe_time; + } + + public void setSubscribe_time(long subscribe_time) { + //微信传过来的时间戳为秒，需要乘以100 + this.subscribe_time = subscribe_time * 1000; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getGroupid() { + return groupid; + } + + public void setGroupid(String groupid) { + this.groupid = groupid; + } + + public String getErrcode() { + return errcode; + } + + public void setErrcode(String errcode) { + this.errcode = errcode; + } +} diff --git a/src/main/java/com/xmomen/module/wx/model/messageTemplate/CustomSendMessageBaseModel.java b/src/main/java/com/xmomen/module/wx/model/messageTemplate/CustomSendMessageBaseModel.java new file mode 100644 index 0000000..f7b6fa1 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/messageTemplate/CustomSendMessageBaseModel.java @@ -0,0 +1,31 @@ +package com.xmomen.module.wx.model.messageTemplate; + +/** + * 客服发送消息模板抽象类 + */ +public abstract class CustomSendMessageBaseModel { + /** + * 普通用户openid + */ + String touser; + /** + * 消息类型，文本为text，图片为image，语音为voice，视频消息为video，音乐消息为music，图文消息为news，卡券为wxcard + */ + String msgtype; + + public String getTouser() { + return touser; + } + + public void setTouser(String touser) { + this.touser = touser; + } + + public String getMsgtype() { + return msgtype; + } + + public void setMsgtype(String msgtype) { + this.msgtype = msgtype; + } +} diff --git a/src/main/java/com/xmomen/module/wx/model/requestModel/RequestMessageBeanFactory.java b/src/main/java/com/xmomen/module/wx/model/requestModel/RequestMessageBeanFactory.java new file mode 100644 index 0000000..5593aaa --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/requestModel/RequestMessageBeanFactory.java @@ -0,0 +1,65 @@ +package com.xmomen.module.wx.model.requestModel; + +import com.xmomen.module.wx.constants.RequestEventEnum; +import com.xmomen.module.wx.constants.RequestMsgTypeEnum; +import com.xmomen.module.wx.model.MessageBase; +import com.xmomen.module.wx.model.requestModel.event.*; +import com.xmomen.module.wx.model.requestModel.message.*; + +import java.util.concurrent.ConcurrentHashMap; + +/** + * 接收服务器请求baen转换工厂 + */ +public class RequestMessageBeanFactory { + + public final static String EVENT_PREFIX = "event_"; + static ConcurrentHashMap> requestMap = new ConcurrentHashMap>(); + + static { + //文本消息 + requestMap.put(RequestMsgTypeEnum.text.toString(), RequestMessageText.class); + //图片消息 + requestMap.put(RequestMsgTypeEnum.image.toString(), RequestMessageImage.class); + //语音消息 + requestMap.put(RequestMsgTypeEnum.voice.toString(), RequestMessageVoice.class); + //短视频消息 + requestMap.put(RequestMsgTypeEnum.shortvideo.toString(), RequestMessageVideo.class); + //视频消息 + requestMap.put(RequestMsgTypeEnum.video.toString(), RequestMessageVideo.class); + //位置消息 + requestMap.put(RequestMsgTypeEnum.location.toString(), RequestMessageLocation.class); + //链接消息 + requestMap.put(RequestMsgTypeEnum.link.toString(), RequestMessageLink.class); + + //关注事件请求封装类 + requestMap.put(EVENT_PREFIX + RequestEventEnum.subscribe.toString(), RequestMessageEventBase.class); + //取消关注事件请求封装类 + requestMap.put(EVENT_PREFIX + RequestEventEnum.unsubscribe.toString(), RequestMessageEventBase.class); + //扫描带参数二维码事件封装类 + requestMap.put(EVENT_PREFIX + RequestEventEnum.SCAN.toString(), RequestMessageEventScan.class); + //主动上报地理位置事件封装类 + requestMap.put(EVENT_PREFIX + RequestEventEnum.LOCATION.toString(), RequestMessageEventLocation.class); + //发送模板消息，反馈事件封装类 + requestMap.put(EVENT_PREFIX + RequestEventEnum.TEMPLATESENDJOBFINISH.toString(), RequestMessageEventTemplateSendJobFinish.class); + //自定义菜单拉取消息事件封装类 + requestMap.put(EVENT_PREFIX + RequestEventEnum.CLICK.toString(), RequestMessageEventBase.class); + //自定义菜单跳转链接事件封装类 + requestMap.put(EVENT_PREFIX + RequestEventEnum.VIEW.toString(), RequestMessageEventBase.class); + //自定义菜单扫码推事件的事件推送封装类 + requestMap.put(EVENT_PREFIX + RequestEventEnum.scancode_push.toString(), RequestMessageEventScanCode.class); + //自定义菜单扫码推事件且弹出“消息接收中”提示框的事件推送封装类 + requestMap.put(EVENT_PREFIX + RequestEventEnum.scancode_waitmsg.toString(), RequestMessageEventScanCode.class); + } + + public static MessageBase createInstance(String key) throws InstantiationException, IllegalAccessException { + //未配置请求类型 + if (!requestMap.containsKey(key)) { + return RequestMessageEventBase.class.newInstance(); + } + //配置请求类型 + else { + return (MessageBase) requestMap.get(key).newInstance(); + } + } +} diff --git a/src/main/java/com/xmomen/module/wx/model/requestModel/event/RequestMessageEventBase.java b/src/main/java/com/xmomen/module/wx/model/requestModel/event/RequestMessageEventBase.java new file mode 100644 index 0000000..4f2c333 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/requestModel/event/RequestMessageEventBase.java @@ -0,0 +1,38 @@ +package com.xmomen.module.wx.model.requestModel.event; + + +import com.xmomen.module.wx.model.MessageBase; + +import java.io.Serializable; + +/** + * 请求事件消息基类 + */ +public class RequestMessageEventBase extends MessageBase implements Serializable { + + /** + * 事件类型 + */ + private String event; + + /** + * 事件KEY值 + */ + private String eventKey; + + public String getEvent() { + return event; + } + + public void setEvent(String event) { + this.event = event; + } + + public String getEventKey() { + return eventKey; + } + + public void setEventKey(String eventKey) { + this.eventKey = eventKey; + } +} diff --git a/src/main/java/com/xmomen/module/wx/model/requestModel/message/RequestMessageBase.java b/src/main/java/com/xmomen/module/wx/model/requestModel/message/RequestMessageBase.java new file mode 100644 index 0000000..ff4c787 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/requestModel/message/RequestMessageBase.java @@ -0,0 +1,25 @@ +package com.xmomen.module.wx.model.requestModel.message; + + +import com.xmomen.module.wx.model.MessageBase; + +import java.io.Serializable; + +/** + * 接收到请求基类（包含事件消息，用户交互消息） + */ +public class RequestMessageBase extends MessageBase implements Serializable { + + /** + * 消息ID + */ + private String msgId; + + public String getMsgID() { + return msgId; + } + + public void setMsgID(String msgID) { + this.msgId = msgID; + } +} diff --git a/src/main/java/com/xmomen/module/wx/model/requestModel/message/RequestMessageImage.java b/src/main/java/com/xmomen/module/wx/model/requestModel/message/RequestMessageImage.java new file mode 100644 index 0000000..a4ae808 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/requestModel/message/RequestMessageImage.java @@ -0,0 +1,36 @@ +package com.xmomen.module.wx.model.requestModel.message; + + +import java.io.Serializable; + +/** + * 图片消息 + */ +public class RequestMessageImage extends RequestMessageBase implements Serializable { + + /** + * 图片链接（由微信系统生成） + */ + private String picUrl; + + /** + * 图片消息媒体id + */ + private String mediaId; + + public String getPicUrl() { + return picUrl; + } + + public void setPicUrl(String picUrl) { + this.picUrl = picUrl; + } + + public String getMediaId() { + return mediaId; + } + + public void setMediaId(String mediaId) { + this.mediaId = mediaId; + } +} diff --git a/src/main/java/com/xmomen/module/wx/model/requestModel/message/RequestMessageLocation.java b/src/main/java/com/xmomen/module/wx/model/requestModel/message/RequestMessageLocation.java new file mode 100644 index 0000000..e0ae46a --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/requestModel/message/RequestMessageLocation.java @@ -0,0 +1,62 @@ +package com.xmomen.module.wx.model.requestModel.message; + + +import java.io.Serializable; + +/** + * 地理位置消息 + */ +public class RequestMessageLocation extends RequestMessageBase implements Serializable { + + /** + * 地理位置维度 + */ + private double Location_X; + + /** + * 地理位置经度 + */ + private double Location_Y; + + /** + * 地图缩放大小 + */ + private int Scale; + + /** + * 地理位置信息 + */ + private String Label; + + public double getLocation_X() { + return Location_X; + } + + public void setLocation_X(double location_X) { + Location_X = location_X; + } + + public double getLocation_Y() { + return Location_Y; + } + + public void setLocation_Y(double location_Y) { + Location_Y = location_Y; + } + + public int getScale() { + return Scale; + } + + public void setScale(int scale) { + Scale = scale; + } + + public String getLabel() { + return Label; + } + + public void setLabel(String label) { + Label = label; + } +} diff --git a/src/main/java/com/xmomen/module/wx/model/responseModel/ResponseMessageBase.java b/src/main/java/com/xmomen/module/wx/model/responseModel/ResponseMessageBase.java new file mode 100644 index 0000000..9c30bad --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/responseModel/ResponseMessageBase.java @@ -0,0 +1,10 @@ +package com.xmomen.module.wx.model.responseModel; + +import com.xmomen.module.wx.model.MessageBase; + +/** + * 回复消息的基类 + */ +public abstract class ResponseMessageBase extends MessageBase { + +} diff --git a/src/main/java/com/xmomen/module/wx/model/responseModel/ResponseMessageNews.java b/src/main/java/com/xmomen/module/wx/model/responseModel/ResponseMessageNews.java new file mode 100644 index 0000000..00b9a78 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/responseModel/ResponseMessageNews.java @@ -0,0 +1,108 @@ +package com.xmomen.module.wx.model.responseModel; + + +import java.util.List; + +/** + * 图文响应 + * 格式： + * + * + * + * 12345678 + * + * 2 + * + * + * <![CDATA[title1]]> + * + * + * + * + * + * <![CDATA[title]]> + * + * + * + * + * + * + */ +public class ResponseMessageNews extends ResponseMessageBase { + + /** + * 图文消息个数，限制为10条以内 + */ + private int articleCount; + /** + * 多条图文消息信息，默认第一个item为大图,注意，如果图文数超过10，则将会无响应 + */ + private List

articles; + + public int getArticleCount() { + return articleCount; + } + + public void setArticleCount(int articleCount) { + this.articleCount = articleCount; + } + + public List

getArticles() { + return articles; + } + + public void setArticles(List

articles) { + this.articles = articles; + } + + public class Article { + /** + * 图文消息名称 + */ + private String title; + /** + * 图文消息描述 + */ + private String description; + /** + * 图片链接，支持JPG、PNG格式，较好的效果为大图640*320，小图80*80，限制图片链接的域名需要与开发者填写的基本资料中的Url一致 + */ + private String picUrl; + /** + * 点击图文消息跳转链接 + */ + private String url; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getPicUrl() { + return picUrl; + } + + public void setPicUrl(String picUrl) { + this.picUrl = picUrl; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + } +} diff --git a/src/main/java/com/xmomen/module/wx/model/responseModel/ResponseMessageVideo.java b/src/main/java/com/xmomen/module/wx/model/responseModel/ResponseMessageVideo.java new file mode 100644 index 0000000..9c8ac9e --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/model/responseModel/ResponseMessageVideo.java @@ -0,0 +1,73 @@ +package com.xmomen.module.wx.model.responseModel; + + +/** + * 回复视频消息 + * 格式： + * + * + * + * 12345678 + * + *

+ * + */ +public class ResponseMessageVideo extends ResponseMessageBase { + /** + * 视频 + */ + private Video video; + + public Video getVideo() { + return video; + } + + public void setVideo(Video video) { + this.video = video; + } + + class Video { + /** + * 通过上传多媒体文件，得到的id + */ + private String mediaId; + + /** + * 视频消息的标题 + */ + private String title; + + /** + * 视频消息的描述 + */ + private String description; + + public String getMediaId() { + return mediaId; + } + + public void setMediaId(String mediaId) { + this.mediaId = mediaId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + } +} diff --git a/src/main/java/com/xmomen/module/wx/module/cart/model/CartItemModel.java b/src/main/java/com/xmomen/module/wx/module/cart/model/CartItemModel.java new file mode 100644 index 0000000..6ad4b6e --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/cart/model/CartItemModel.java @@ -0,0 +1,25 @@ +package com.xmomen.module.wx.module.cart.model; + +import lombok.Data; + +public @Data class CartItemModel { + + private String id; + private String userToken; + + private Integer itemId; + private Integer itemQty; + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("CartItemModel [itemId="); + builder.append(itemId); + builder.append(", itemQty="); + builder.append(itemQty); + builder.append("]"); + return builder.toString(); + } + + +} diff --git a/src/main/java/com/xmomen/module/wx/module/cart/model/CartMetadata.java b/src/main/java/com/xmomen/module/wx/module/cart/model/CartMetadata.java new file mode 100644 index 0000000..dba45cb --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/cart/model/CartMetadata.java @@ -0,0 +1,54 @@ +package com.xmomen.module.wx.module.cart.model; + +import java.sql.Timestamp; +import java.util.Date; + +import com.xmomen.module.wx.util.Constant; + +import lombok.Data; + +public @Data class CartMetadata { + + private String userToken; + /** + * 商品ID + */ + private Integer itemId; + + /** + * 商品数目 + */ + private Integer itemQty = 0; + + /** + * MODIFY 数目改动，包含新增 + * DELETE 物品删除 + * CLEAN 已与DB同步了 + */ + private volatile String status = Constant.CLEAN; + + private volatile Timestamp updateTime; + + + /** + * 会自动根据数据更新状态和时间 + * @param number + * return order是否有改变 + */ + public boolean setItemQty(Integer number) { + if(this.itemQty == null && this.itemQty == number) return false; + if(this.itemQty != null && this.itemQty.equals(number)) return false; + if(number == 0) { + this.itemQty = number; + this.status = Constant.DELETE; + this.updateTime = new Timestamp(new Date().getTime()); + return true; + } else if(number > 0) { + this.itemQty = number; + this.status = Constant.MODIFY; + this.updateTime = new Timestamp(new Date().getTime()); + return true; + } + return false; + } +} diff --git a/src/main/java/com/xmomen/module/wx/module/cart/model/CartModel.java b/src/main/java/com/xmomen/module/wx/module/cart/model/CartModel.java new file mode 100644 index 0000000..ae4786b --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/cart/model/CartModel.java @@ -0,0 +1,35 @@ +package com.xmomen.module.wx.module.cart.model; + +import java.sql.Timestamp; +import java.util.concurrent.CopyOnWriteArrayList; + +import lombok.Data; + +/** + * @author xiao + * + */ +public @Data class CartModel { + + /** + * 微信用户memberId + */ + private String userToken; + + /** + * 购物车中的商品(一般购物车中数目有限，复制的开销不大,如果后期出现数据问题，可只存储改变量) + */ + private CopyOnWriteArrayList items; + + /** + * 上一次同步到数据库的时间 + */ + private volatile Timestamp syncTime; + + /** + * 购物车的状态 + * CLEAN -- 没有改动 + * DIRTY -- 有修改 + */ + private volatile String status; +} diff --git a/src/main/java/com/xmomen/module/wx/module/cart/model/UpdateCartModel.java b/src/main/java/com/xmomen/module/wx/module/cart/model/UpdateCartModel.java new file mode 100644 index 0000000..24c8026 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/cart/model/UpdateCartModel.java @@ -0,0 +1,14 @@ +package com.xmomen.module.wx.module.cart.model; + +import javax.validation.constraints.NotNull; + +import lombok.Data; + +public @Data class UpdateCartModel { + +// @NotNull + private Integer memberId; + @NotNull + private Integer itemId; + private Integer itemQty; +} diff --git a/src/main/java/com/xmomen/module/wx/module/coupon/controller/WxCouponController.java b/src/main/java/com/xmomen/module/wx/module/coupon/controller/WxCouponController.java new file mode 100644 index 0000000..aae1ae9 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/coupon/controller/WxCouponController.java @@ -0,0 +1,54 @@ +package com.xmomen.module.wx.module.coupon.controller; + +import java.util.List; + +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.module.base.service.CouponService; +import com.xmomen.module.wx.module.coupon.model.CouponQueryModel; +import com.xmomen.module.wx.module.coupon.model.WxCouponModel; + + +@RestController +@RequestMapping("/wx/coupon") +public class WxCouponController { + + @Autowired + private CouponService couponService; + + @RequestMapping(method = RequestMethod.GET) + List getCoupons(@RequestParam(value = "memberId") Integer memberId, + @RequestParam(value="couponType") Integer couponType, + @RequestParam(value="useable", required = false) Boolean useable) { + CouponQueryModel couponQueryModel = new CouponQueryModel(); + couponQueryModel.setCdUserId(memberId); + couponQueryModel.setCouponType(couponType); + couponQueryModel.setUseable(useable); + return couponService.getMyCouponList(couponQueryModel); + } + + @RequestMapping(value="/bind", method = RequestMethod.POST) + Boolean bindCoupon(@RequestParam(value = "memberId", required=true) Integer memberId, + @RequestParam(value="couponNumber", required=true) String couponNumber, + @RequestParam(value="password", required = false) String password) throws Exception { + return couponService.bindMember(couponNumber, memberId, password); + } + + @RequestMapping(value="/validate", method = RequestMethod.GET) + Boolean validateCoupon(@RequestParam(value="couponNumber", required=true) String couponNumber, + @RequestParam(value="password", required = false) String password) { + return couponService.validate(couponNumber, password); + } + + @RequestMapping(value="/reset", method = RequestMethod.POST) + Boolean resetPasword(@RequestParam(value = "memberId", required=true) Integer memberId, + @RequestParam(value="couponNumber", required=true) String couponNumber, + @RequestParam(value="password", required = false) String password, + @RequestParam(value="newPassword", required = true) String newPassword) throws Exception { + return couponService.resetPasword(couponNumber, password, newPassword, memberId); + } +} diff --git a/src/main/java/com/xmomen/module/wx/module/coupon/model/WxCouponModel.java b/src/main/java/com/xmomen/module/wx/module/coupon/model/WxCouponModel.java new file mode 100644 index 0000000..72df3c6 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/coupon/model/WxCouponModel.java @@ -0,0 +1,15 @@ +package com.xmomen.module.wx.module.coupon.model; + +import java.math.BigDecimal; + +import lombok.Data; + +public @Data class WxCouponModel { + + private Integer id; + private Integer couponType; + private Integer couponCategory; + private String couponNumber; + private BigDecimal couponValue; + private BigDecimal userPrice; +} diff --git a/src/main/java/com/xmomen/module/wx/module/order/model/MyOrderQuery.java b/src/main/java/com/xmomen/module/wx/module/order/model/MyOrderQuery.java new file mode 100644 index 0000000..71597e5 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/order/model/MyOrderQuery.java @@ -0,0 +1,19 @@ +package com.xmomen.module.wx.module.order.model; + +import java.util.Date; + +import lombok.Data; + +public @Data class MyOrderQuery { + + private String memberCode; + private Integer status; + + private Date minOrderTime; + private Date maxOrderTime; + + private String userId; + + private Integer orderId; + private String orderNo; +} diff --git a/src/main/java/com/xmomen/module/wx/module/order/model/OrderDetailModel.java b/src/main/java/com/xmomen/module/wx/module/order/model/OrderDetailModel.java new file mode 100644 index 0000000..0f86242 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/order/model/OrderDetailModel.java @@ -0,0 +1,51 @@ +package com.xmomen.module.wx.module.order.model; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import lombok.Data; + +public @Data class OrderDetailModel { + + private Integer id; + private String orderNo; + private String orderType; + private String orderTypeDesc; + private Integer orderSource; + private String orderSourceDesc; + private Integer paymentMode; + private String paymentModeDesc; + private Integer otherPaymentMode; + private String otherPaymentModeDesc; + private String memberCode; + private String orderStatus; + private String orderStatusDesc; + private Integer payStatus; + private String payStatusDesc; + private String consigneePhone; + private String consigneeName; + private String consigneeAddress; + private String postcode; + private Integer transportMode; + private String transportModeDesc; + private String remark; + + private BigDecimal discountPrice; + private BigDecimal totalAmount; + + private Date createTime; + private Date outDate; + private Date shouHuoDate; + private Date appointmentTime; + + private Boolean isReject; + private String expressName; + + private String expressMemberName; + private String expressMemberPhone; + + + List products; + private Boolean canCancel; +} diff --git a/src/main/java/com/xmomen/module/wx/module/order/model/OrderModel.java b/src/main/java/com/xmomen/module/wx/module/order/model/OrderModel.java new file mode 100644 index 0000000..8ee9454 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/order/model/OrderModel.java @@ -0,0 +1,32 @@ +package com.xmomen.module.wx.module.order.model; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +import lombok.Data; + +public @Data class OrderModel { + + private Integer id; + private String orderNo; + private Integer orderType; + private String orderTypeDesc; + private Integer orderSource; + private String orderSourceDesc; + private Integer paymentMode; + private String paymentModeDesc; + private Integer otherPaymentMode; + private String otherPaymentModeDesc; + private String orderStatus; + private String orderStatusDesc; + private Integer payStatus; + private String payStatusDesc; + private BigDecimal totalAmount; + + private Date createTime; + private Date appointmentTime; + + private List products; + private Boolean canCancel = false; +} diff --git a/src/main/java/com/xmomen/module/wx/module/order/model/OrderProductItem.java b/src/main/java/com/xmomen/module/wx/module/order/model/OrderProductItem.java new file mode 100644 index 0000000..bf8ff35 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/order/model/OrderProductItem.java @@ -0,0 +1,18 @@ +package com.xmomen.module.wx.module.order.model; + +import java.math.BigDecimal; + +import lombok.Data; + +public @Data class OrderProductItem { + + private String orderNo; + private Integer itemId; + private String itemName; + private String itemCode; + private BigDecimal itemPrice; + private BigDecimal itemQty; + private String itemUnit; + + private String picUrl; +} diff --git a/src/main/java/com/xmomen/module/wx/module/order/model/PayOrderModel.java b/src/main/java/com/xmomen/module/wx/module/order/model/PayOrderModel.java new file mode 100644 index 0000000..311f802 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/module/order/model/PayOrderModel.java @@ -0,0 +1,20 @@ +package com.xmomen.module.wx.module.order.model; + +import javax.validation.constraints.NotNull; + +import org.hibernate.validator.constraints.NotBlank; + +import lombok.Data; + +public @Data class PayOrderModel { + + @NotNull + private Integer orderId; + + private String paymentNo; + + /** + * 卡类付款订单为1,其余为货到付款类型 + */ + private Integer orderType; +} diff --git a/src/main/java/com/xmomen/module/wx/pay/common/Configure.java b/src/main/java/com/xmomen/module/wx/pay/common/Configure.java new file mode 100644 index 0000000..95cdf17 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/pay/common/Configure.java @@ -0,0 +1 @@ +package com.xmomen.module.wx.pay.common; /** * User: rizenguo * Date: 2014/10/29 * Time: 14:40 * 这里放置各种配置数据 */ public class Configure { //这个就是自己要保管好的私有Key了（切记只能放在自己的后台代码里，不能放在任何可能被看到源代码的客户端程序中） // 每次自己Post数据给API的时候都要用这个key来对所有字段进行签名，生成的签名会放在Sign这个字段，API收到Post数据的时候也会用同样的签名算法对Post过来的数据进行签名和验证 // 收到API的返回的时候也要用这个key来对返回的数据算下签名，跟API的Sign数据进行比较，如果值不一致，有可能数据被第三方给篡改\ //供应链 herunxianyigushanghE112018788331 //益谷上禾 HErunxianyigushanghe112018788331 private static String key = "HErunxianyigushanghe112018788331"; //微信分配的公众号ID（开通公众号之后可以获取到） private static String appID = "wx6e25cbce77bacdff"; //微信支付分配的商户号ID（开通公众号的微信支付功能之后可以获取到） private static String mchID = "1449172302"; //受理模式下给子商户分配的子商户号 private static String subMchID = ""; //HTTPS证书的本地路径 // private static String certLocalPath = "D:\\cert\\apiclient_cert.p12"; private static String certLocalPath = "/project/cert/apiclient_cert.p12"; //HTTPS证书密码，默认密码等于商户号MCHID private static String certPassword = "1449172302"; //是否使用异步线程的方式来上报API测速，默认为异步模式 private static boolean useThreadToDoReport = true; //机器IP private static String ip = ""; //通知地址 private static String notify_url = "http://system.1g3h.com/wx/api/notify"; //以下是几个API的路径： //统一下单接口 public static String PUBLIC_PAY = "https://api.mch.weixin.qq.com/pay/unifiedorder"; //申请退款接口 public static String APPLY_REFUND = "https://api.mch.weixin.qq.com/secapi/pay/refund"; public static boolean isUseThreadToDoReport() { return useThreadToDoReport; } public static void setUseThreadToDoReport(boolean useThreadToDoReport) { Configure.useThreadToDoReport = useThreadToDoReport; } public static String HttpsRequestClassName = "com.xmomen.module.wx.pay.common.HttpsRequest"; public static void setKey(String key) { Configure.key = key; } public static void setAppID(String appID) { Configure.appID = appID; } public static void setMchID(String mchID) { Configure.mchID = mchID; } public static void setSubMchID(String subMchID) { Configure.subMchID = subMchID; } public static void setCertLocalPath(String certLocalPath) { Configure.certLocalPath = certLocalPath; } public static void setCertPassword(String certPassword) { Configure.certPassword = certPassword; } public static void setIp(String ip) { Configure.ip = ip; } public static String getKey() { return key; } public static String getAppid() { return appID; } public static String getMchid() { return mchID; } public static String getSubMchid() { return subMchID; } public static String getCertLocalPath() { return certLocalPath; } public static String getCertPassword() { return certPassword; } public static String getIP() { return ip; } public static void setHttpsRequestClassName(String name) { HttpsRequestClassName = name; } public static String getNotify_url() { return notify_url; } public static void setNotify_url(String notify_url) { Configure.notify_url = notify_url; } } \ No newline at end of file diff --git a/src/main/java/com/xmomen/module/wx/pay/common/HttpsRequest.java b/src/main/java/com/xmomen/module/wx/pay/common/HttpsRequest.java new file mode 100644 index 0000000..50a5800 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/pay/common/HttpsRequest.java @@ -0,0 +1,195 @@ +package com.xmomen.module.wx.pay.common; + +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; +import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder; +import com.xmomen.module.wx.pay.service.IServiceRequest; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.conn.ConnectTimeoutException; +import org.apache.http.conn.ConnectionPoolTimeoutException; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLContexts; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.apache.log4j.Logger; + +import javax.net.ssl.SSLContext; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.SocketTimeoutException; +import java.security.*; +import java.security.cert.CertificateException; + +/** + * User: rizenguo + * Date: 2014/10/29 + * Time: 14:36 + */ +public class HttpsRequest implements IServiceRequest { + + public interface ResultListener { + public void onConnectionPoolTimeoutError(); + } + + private static final Logger logger = Logger.getLogger(Signature.class); + + //表示请求器是否已经做了初始化工作 + private boolean hasInit = false; + + //连接超时时间，默认10秒 + private int socketTimeout = 10000; + + //传输超时时间，默认30秒 + private int connectTimeout = 30000; + + //请求器的配置 + private RequestConfig requestConfig; + + //HTTP请求器 + private CloseableHttpClient httpClient; + + public HttpsRequest() throws UnrecoverableKeyException, KeyManagementException, NoSuchAlgorithmException, KeyStoreException, IOException { + init(); + } + + private void init() throws IOException, KeyStoreException, UnrecoverableKeyException, NoSuchAlgorithmException, KeyManagementException { + + KeyStore keyStore = KeyStore.getInstance("PKCS12"); + FileInputStream instream = new FileInputStream(new File(Configure.getCertLocalPath()));//加载本地的证书进行https加密传输 + try { + keyStore.load(instream, Configure.getCertPassword().toCharArray());//设置证书密码 + } catch (CertificateException e) { + e.printStackTrace(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } finally { + instream.close(); + } + + // Trust own CA and all self-signed certs + SSLContext sslcontext = SSLContexts.custom() + .loadKeyMaterial(keyStore, Configure.getCertPassword().toCharArray()) + .build(); + // Allow TLSv1 protocol only + SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory( + sslcontext, + new String[]{"TLSv1"}, + null, + SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); + + httpClient = HttpClients.custom() + .setSSLSocketFactory(sslsf) + .build(); + + //根据默认超时限制初始化requestConfig + requestConfig = RequestConfig.custom().setSocketTimeout(socketTimeout).setConnectTimeout(connectTimeout).build(); + + hasInit = true; + } + + /** + * 通过Https往API post xml数据 + * + * @param url API地址 + * @param xmlObj 要提交的XML数据对象 + * @return API回包的实际数据 + * @throws IOException + * @throws KeyStoreException + * @throws UnrecoverableKeyException + * @throws NoSuchAlgorithmException + * @throws KeyManagementException + */ + + public String sendPost(String url, Object xmlObj) throws IOException, KeyStoreException, UnrecoverableKeyException, NoSuchAlgorithmException, KeyManagementException { + + if (!hasInit) { + init(); + } + + String result = null; + + HttpPost httpPost = new HttpPost(url); + + //解决XStream对出现双下划线的bug + XStream xStreamForRequestPostData = new XStream(new DomDriver("UTF-8", new XmlFriendlyNameCoder("-_", "_"))); + xStreamForRequestPostData.alias("xml", xmlObj.getClass()); + //将要提交给API的数据对象转换成XML格式数据Post给API + String postDataXML = xStreamForRequestPostData.toXML(xmlObj); + logger.info("API，POST过去的数据是："); + logger.info(postDataXML); + + //得指明使用UTF-8编码，否则到API服务器XML的中文不能被成功识别 + StringEntity postEntity = new StringEntity(postDataXML, "UTF-8"); + httpPost.addHeader("Content-Type", "text/xml"); + httpPost.setEntity(postEntity); + + //设置请求器的配置 + httpPost.setConfig(requestConfig); + + logger.info("executing request" + httpPost.getRequestLine()); + + try { + HttpResponse response = httpClient.execute(httpPost); + + HttpEntity entity = response.getEntity(); + + result = EntityUtils.toString(entity, "UTF-8"); + + } catch (ConnectionPoolTimeoutException e) { + logger.error("http get throw ConnectionPoolTimeoutException(wait time out)"); + + } catch (ConnectTimeoutException e) { + logger.error("http get throw ConnectTimeoutException"); + + } catch (SocketTimeoutException e) { + logger.error("http get throw SocketTimeoutException"); + + } catch (Exception e) { + logger.error("http get throw Exception"); + + } finally { + httpPost.abort(); + } + + return result; + } + + /** + * 设置连接超时时间 + * + * @param socketTimeout 连接时长，默认10秒 + */ + public void setSocketTimeout(int socketTimeout) { + socketTimeout = socketTimeout; + resetRequestConfig(); + } + + /** + * 设置传输超时时间 + * + * @param connectTimeout 传输时长，默认30秒 + */ + public void setConnectTimeout(int connectTimeout) { + connectTimeout = connectTimeout; + resetRequestConfig(); + } + + private void resetRequestConfig() { + requestConfig = RequestConfig.custom().setSocketTimeout(socketTimeout).setConnectTimeout(connectTimeout).build(); + } + + /** + * 允许商户自己做更高级更复杂的请求器配置 + * + * @param requestConfig 设置HttpsRequest的请求器配置 + */ + public void setRequestConfig(RequestConfig requestConfig) { + requestConfig = requestConfig; + } +} diff --git a/src/main/java/com/xmomen/module/wx/pay/common/MD5.java b/src/main/java/com/xmomen/module/wx/pay/common/MD5.java new file mode 100644 index 0000000..bc3ef10 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/pay/common/MD5.java @@ -0,0 +1,75 @@ +package com.xmomen.module.wx.pay.common; + +import java.security.MessageDigest; + +/** + * User: rizenguo + * Date: 2014/10/23 + * Time: 15:43 + */ +public class MD5 { + private final static String[] hexDigits = {"0", "1", "2", "3", "4", "5", "6", "7", + "8", "9", "a", "b", "c", "d", "e", "f"}; + + /** + * 转换字节数组为16进制字串 + * @param b 字节数组 + * @return 16进制字串 + */ + public static String byteArrayToHexString(byte[] b) { + StringBuilder resultSb = new StringBuilder(); + for (byte aB : b) { + resultSb.append(byteToHexString(aB)); + } + return resultSb.toString(); + } + + /** + * 转换byte到16进制 + * @param b 要转换的byte + * @return 16进制格式 + */ + private static String byteToHexString(byte b) { + int n = b; + if (n < 0) { + n = 256 + n; + } + int d1 = n / 16; + int d2 = n % 16; + return hexDigits[d1] + hexDigits[d2]; + } + + /** + * MD5编码 + * @param origin 原始字符串 + * @return 经过MD5加密之后的结果 + */ + public static String MD5Encode(String origin) { + String resultString = null; + try { + resultString = origin; + MessageDigest md = MessageDigest.getInstance("MD5"); + resultString = byteArrayToHexString(md.digest(resultString.getBytes())); + } catch (Exception e) { + e.printStackTrace(); + } + return resultString; + } + + public static String MD5Encode(String origin, String charsetname) { + String resultString = null; + try { + resultString = new String(origin); + MessageDigest md = MessageDigest.getInstance("MD5"); + if (charsetname == null || "".equals(charsetname)) + resultString = byteArrayToHexString(md.digest(resultString + .getBytes())); + else + resultString = byteArrayToHexString(md.digest(resultString + .getBytes(charsetname))); + } catch (Exception exception) { + } + return resultString; + } + +} diff --git a/src/main/java/com/xmomen/module/wx/pay/common/Util.java b/src/main/java/com/xmomen/module/wx/pay/common/Util.java new file mode 100644 index 0000000..7c54cd0 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/pay/common/Util.java @@ -0,0 +1,105 @@ +package com.xmomen.module.wx.pay.common; + +import com.thoughtworks.xstream.XStream; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.util.Map; + +/** + * User: rizenguo + * Date: 2014/10/23 + * Time: 14:59 + */ +public class Util { + /** + * 通过反射的方式遍历对象的属性和属性值，方便调试 + * + * @param o 要遍历的对象 + * @throws Exception + */ + public static void reflect(Object o) throws Exception { + Class cls = o.getClass(); + Field[] fields = cls.getDeclaredFields(); + for (int i = 0; i < fields.length; i++) { + Field f = fields[i]; + f.setAccessible(true); + } + } + + public static byte[] readInput(InputStream in) throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int len = 0; + byte[] buffer = new byte[1024]; + while ((len = in.read(buffer)) > 0) { + out.write(buffer, 0, len); + } + out.close(); + in.close(); + return out.toByteArray(); + } + + public static String inputStreamToString(InputStream is) throws IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + int i; + while ((i = is.read()) != -1) { + baos.write(i); + } + return baos.toString(); + } + + + public static InputStream getStringStream(String sInputString) { + ByteArrayInputStream tInputStringStream = null; + if (sInputString != null && !sInputString.trim().equals("")) { + tInputStringStream = new ByteArrayInputStream(sInputString.getBytes()); + } + return tInputStringStream; + } + + public static Object getObjectFromXML(String xml, Class tClass) { + //将从API返回的XML数据映射到Java对象 + XStream xStreamForResponseData = new XStream(); + xStreamForResponseData.alias("xml", tClass); + xStreamForResponseData.ignoreUnknownElements();//暂时忽略掉一些新增的字段 + return xStreamForResponseData.fromXML(xml); + } + + public static String getStringFromMap(Map map, String key, String defaultValue) { + if (key == "" || key == null) { + return defaultValue; + } + String result = (String) map.get(key); + if (result == null) { + return defaultValue; + } + else { + return result; + } + } + + public static int getIntFromMap(Map map, String key) { + if (key == "" || key == null) { + return 0; + } + if (map.get(key) == null) { + return 0; + } + return Integer.parseInt((String) map.get(key)); + } + + /** + * 读取本地的xml数据，一般用来自测用 + * + * @param localPath 本地xml文件路径 + * @return 读到的xml字符串 + */ + public static String getLocalXMLString(String localPath) throws IOException { + return Util.inputStreamToString(Util.class.getResourceAsStream(localPath)); + } + +} + diff --git a/src/main/java/com/xmomen/module/wx/pay/entity/mapper/PayRecordMapper.java b/src/main/java/com/xmomen/module/wx/pay/entity/mapper/PayRecordMapper.java new file mode 100644 index 0000000..db7df5a --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/pay/entity/mapper/PayRecordMapper.java @@ -0,0 +1,6 @@ +package com.xmomen.module.wx.pay.entity.mapper; + +public interface PayRecordMapper { + + public static final String PAY_RECORD_MAPPER_NAMESPACE = "com.xmomen.module.wx.pay.entity.mapper.PayRecordMapper."; +} diff --git a/src/main/java/com/xmomen/module/wx/pay/entity/mapper/TbPayRecordMapper.java b/src/main/java/com/xmomen/module/wx/pay/entity/mapper/TbPayRecordMapper.java new file mode 100644 index 0000000..dbb485e --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/pay/entity/mapper/TbPayRecordMapper.java @@ -0,0 +1,7 @@ +package com.xmomen.module.wx.pay.entity.mapper; + +import com.xmomen.framework.mybatis.mapper.MybatisMapper; + +public interface TbPayRecordMapper extends MybatisMapper { + +} diff --git a/src/main/java/com/xmomen/module/wx/pay/model/PayResData.java b/src/main/java/com/xmomen/module/wx/pay/model/PayResData.java new file mode 100644 index 0000000..f890689 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/pay/model/PayResData.java @@ -0,0 +1,181 @@ +package com.xmomen.module.wx.pay.model; + +/** + * User: rizenguo + * Date: 2014/10/22 + * Time: 16:42 + */ + +/** + * 被扫支付提交Post数据给到API之后，API会返回XML格式的数据，这个类用来装这些数据 + */ +public class PayResData { + //协议层 + private String return_code = ""; + private String return_msg = ""; + + //协议返回的具体数据（以下字段在return_code 为SUCCESS 的时候有返回） + private String appid = ""; + private String mch_id = ""; + private String nonce_str = ""; + private String sign = ""; + private String result_code = ""; + private String err_code = ""; + private String err_code_des = ""; + + private String device_info = ""; + + //业务返回的具体数据（以下字段在return_code 和result_code 都为SUCCESS 的时候有返回） + private String trade_type = ""; + private String prepay_id = ""; + private String timeStamp; + private String packageStr; + private String out_trade_no; + private String transaction_id; + private String attach; + private double total_fee; + + public String getReturn_code() { + return return_code; + } + + public void setReturn_code(String return_code) { + this.return_code = return_code; + } + + public String getReturn_msg() { + return return_msg; + } + + public void setReturn_msg(String return_msg) { + this.return_msg = return_msg; + } + + public String getAppid() { + return appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public String getMch_id() { + return mch_id; + } + + public void setMch_id(String mch_id) { + this.mch_id = mch_id; + } + + public String getDevice_info() { + return device_info; + } + + public void setDevice_info(String device_info) { + this.device_info = device_info; + } + + public String getNonce_str() { + return nonce_str; + } + + public void setNonce_str(String nonce_str) { + this.nonce_str = nonce_str; + } + + public String getSign() { + return sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public String getResult_code() { + return result_code; + } + + public void setResult_code(String result_code) { + this.result_code = result_code; + } + + public String getErr_code() { + return err_code; + } + + public void setErr_code(String err_code) { + this.err_code = err_code; + } + + public String getErr_code_des() { + return err_code_des; + } + + public void setErr_code_des(String err_code_des) { + this.err_code_des = err_code_des; + } + + public String getTrade_type() { + return trade_type; + } + + public void setTrade_type(String trade_type) { + this.trade_type = trade_type; + } + + public String getPrepay_id() { + return prepay_id; + } + + public void setPrepay_id(String prepay_id) { + this.prepay_id = prepay_id; + } + + public String getTimeStamp() { + return timeStamp; + } + + public void setTimeStamp(String timeStamp) { + this.timeStamp = timeStamp; + } + + public String getPackageStr() { + return packageStr; + } + + public void setPackageStr(String packageStr) { + this.packageStr = packageStr; + } + + public String getOut_trade_no() { + return out_trade_no; + } + + public void setOut_trade_no(String out_trade_no) { + this.out_trade_no = out_trade_no; + } + + public String getAttach() { + return attach; + } + + public void setAttach(String attach) { + this.attach = attach; + } + + public double getTotal_fee() { + return total_fee; + } + + public void setTotal_fee(double total_fee) { + this.total_fee = total_fee; + } + + public void setTransaction_id(String transaction_id) { + this.transaction_id = transaction_id; + } + + public String getTransaction_id() { + return this.transaction_id; + } +} diff --git a/src/main/java/com/xmomen/module/wx/pay/model/RefundReqData.java b/src/main/java/com/xmomen/module/wx/pay/model/RefundReqData.java new file mode 100644 index 0000000..b2695bd --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/pay/model/RefundReqData.java @@ -0,0 +1,188 @@ +package com.xmomen.module.wx.pay.model; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +import com.xmomen.module.wx.pay.common.Configure; +import com.xmomen.module.wx.pay.common.RandomStringGenerator; +import com.xmomen.module.wx.pay.common.Signature; + +public class RefundReqData { + + //小程序id 必填 + private String appid = ""; + //商户号必填 + private String mch_id = ""; + //private String device_info = ""; + //随机字符串必填 + private String nonce_str = ""; + //签名必填 + private String sign = ""; + //private String sign_type = ""; + //微信订单号与商户订单号二选一必填 + //微信订单号 + private String transaction_id = ""; + //商户订单号 + private String out_trade_no = ""; + // 商户退款单号必填 + private String out_refund_no = ""; + + //订单金额必填 + private int total_fee = 0; + //退款金额必填 + private int refund_fee = 0; + //操作员必填默认为商户号 + private String op_user_id = ""; + + //退款资金来源否 + //private String refund_account = ""; + + public RefundReqData(String transactionId, int totalFee, int refundFee, String outRefundNo) { + //微信分配的公众号ID（开通公众号之后可以获取到） + setAppid(Configure.getAppid()); + + //微信支付分配的商户号ID（开通公众号的微信支付功能之后可以获取到） + setMch_id(Configure.getMchid()); + + setTransaction_id(transactionId); + + setTotal_fee(totalFee); + + setRefund_fee(refundFee); + + setOut_refund_no(outRefundNo); + + setOp_user_id(Configure.getMchid()); + //随机字符串，不长于32 位 + setNonce_str(RandomStringGenerator.getRandomStringByLength(32)); + + //根据API给的签名规则进行签名 + String sign = Signature.getSign(toMap()); + + setSign(sign);//把签名数据设置到Sign这个属性中 + } + + public String getAppid() { + return appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public String getMch_id() { + return mch_id; + } + + public void setMch_id(String mch_id) { + this.mch_id = mch_id; + } + + /*public String getDevice_info() { + return device_info; + } + + public void setDevice_info(String device_info) { + this.device_info = device_info; + }*/ + + public String getNonce_str() { + return nonce_str; + } + + public void setNonce_str(String nonce_str) { + this.nonce_str = nonce_str; + } + + public String getSign() { + return sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + /*public String getSign_type() { + return sign_type; + } + + public void setSign_type(String sign_type) { + this.sign_type = sign_type; + }*/ + + public String getTransaction_id() { + return transaction_id; + } + + public void setTransaction_id(String transaction_id) { + this.transaction_id = transaction_id; + } + + public String getOut_trade_no() { + return out_trade_no; + } + + public void setOut_trade_no(String out_trade_no) { + this.out_trade_no = out_trade_no; + } + + public String getOut_refund_no() { + return out_refund_no; + } + + public void setOut_refund_no(String out_refund_no) { + this.out_refund_no = out_refund_no; + } + + public int getTotal_fee() { + return total_fee; + } + + public void setTotal_fee(int total_fee) { + this.total_fee = total_fee; + } + + public int getRefund_fee() { + return refund_fee; + } + + public void setRefund_fee(int refund_fee) { + this.refund_fee = refund_fee; + } + + public String getOp_user_id() { + return op_user_id; + } + + public void setOp_user_id(String op_user_id) { + this.op_user_id = op_user_id; + } + + /*public String getRefund_account() { + return refund_account; + } + + public void setRefund_account(String refund_account) { + this.refund_account = refund_account; + }*/ + + public Map toMap() { + Map map = new HashMap(); + Field[] fields = this.getClass().getDeclaredFields(); + for (Field field : fields) { + Object obj; + try { + obj = field.get(this); + if (obj != null && !obj.equals("")) { + map.put(field.getName(), obj); + } + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + return map; + } +} diff --git a/src/main/java/com/xmomen/module/wx/pay/service/IServiceRequest.java b/src/main/java/com/xmomen/module/wx/pay/service/IServiceRequest.java new file mode 100644 index 0000000..afe89c7 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/pay/service/IServiceRequest.java @@ -0,0 +1,20 @@ +package com.xmomen.module.wx.pay.service; + +import java.io.IOException; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.UnrecoverableKeyException; + +/** + * User: rizenguo + * Date: 2014/12/10 + * Time: 15:16 + * 这里定义服务层需要请求器标准接口 + */ +public interface IServiceRequest { + + //Service依赖的底层https请求器必须实现这么一个接口 + public String sendPost(String api_url, Object xmlObj) throws UnrecoverableKeyException, KeyManagementException, NoSuchAlgorithmException, KeyStoreException, IOException; + +} diff --git a/src/main/java/com/xmomen/module/wx/service/AppSettingService.java b/src/main/java/com/xmomen/module/wx/service/AppSettingService.java new file mode 100644 index 0000000..ae38e65 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/service/AppSettingService.java @@ -0,0 +1,20 @@ +package com.xmomen.module.wx.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.module.wx.entity.WxAppSetting; + +@Service +public class AppSettingService { + @Autowired + MybatisDao mybatisDao; + + public WxAppSetting getAppSetting(String publicUid){ + WxAppSetting appSetting = new WxAppSetting(); + appSetting.setPublicUid(publicUid); + appSetting = mybatisDao.selectOneByModel(appSetting); + return appSetting; + } +} diff --git a/src/main/java/com/xmomen/module/wx/service/ResponseMessageEventService.java b/src/main/java/com/xmomen/module/wx/service/ResponseMessageEventService.java new file mode 100644 index 0000000..6d97ba6 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/service/ResponseMessageEventService.java @@ -0,0 +1,206 @@ +package com.xmomen.module.wx.service; + +import com.xmomen.framework.mybatis.dao.MybatisDao; +import com.xmomen.framework.utils.StringUtilsExt; +import com.xmomen.module.base.entity.CdBind; +import com.xmomen.module.wx.constants.RequestEventEnum; +import com.xmomen.module.wx.constants.ResponseMsgTypeEnum; +import com.xmomen.module.wx.model.MessageBase; +import com.xmomen.module.wx.model.requestModel.event.RequestMessageEventBase; +import com.xmomen.module.wx.model.requestModel.event.RequestMessageEventScanCode; +import com.xmomen.module.wx.model.requestModel.event.RequestMessageEventScanCode.ScanCodeInfo; +import com.xmomen.module.wx.model.requestModel.event.RequestMessageEventTemplateSendJobFinish; +import com.xmomen.module.wx.model.responseModel.ResponseMessageText; +import com.xmomen.module.wx.util.MessageUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 微信事件处理（关注，取消关注，上报地理位置等事件) + */ +@Service +public class ResponseMessageEventService implements ResponseMessageBaseService { + + Logger log = LoggerFactory.getLogger(ResponseMessageEventService.class); + + @Autowired + WeixinApiService weixinApiService; + + @Autowired + BindService bindService; + + @Autowired + MybatisDao mybatisDao; + + /** + * 对微信的请求消息做出响应 + * + * @param requestMessage 请求的消息内容 + * @param requestMessageExt 请求内容封装类 + * @return 回复给微信的消息（xml格式） + * @throws InstantiationException + * @throws IllegalAccessException + */ + public String handleRequestMessage(MessageBase requestMessage) throws InstantiationException, IllegalAccessException { + // 如果是事件响应 + if (requestMessage instanceof RequestMessageEventBase) { + RequestMessageEventBase event = (RequestMessageEventBase) requestMessage; + log.info(event.getEvent()); + + //订阅事件 + if (null != event && RequestEventEnum.subscribe.toString().equals(event.getEvent())) { + return onEventSubscribeRequest(event); + } + //取消订阅事件 + else if (null != event && RequestEventEnum.unsubscribe.toString().equals(event.getEvent())) { + return onEventUnSubscribeRequest(event); + } + //菜单事件 + else if (null != event && RequestEventEnum.CLICK.toString().equals(event.getEvent())) { + return onEventClickRequest(event); + } + //扫码事件 + else if (null != event && RequestEventEnum.scancode_waitmsg.toString().equals(event.getEvent())) { + return onEventScancodeWaitMsg((RequestMessageEventScanCode) event); + } + //模板推送消息事件 + else if (null != event && RequestEventEnum.TEMPLATESENDJOBFINISH.toString().equals(event.getEvent())) { + return onEventTemplateSendJobFinishRequest((RequestMessageEventTemplateSendJobFinish) event); + } + else { + return onEventViewRequest(event); + } + } + //不是 + else { + return StringUtilsExt.EMPTY; + } + } + + /** + * 订购(关注) + * + * @param requestMessage 请求的消息 + * @return 回复的消息 + * @throws IllegalAccessException + * @throws InstantiationException + */ + private String onEventSubscribeRequest(RequestMessageEventBase requestMessage) throws InstantiationException, IllegalAccessException { + //回复文本消息 + ResponseMessageText responseMessage = new ResponseMessageText(); + responseMessage.setFromUserName(requestMessage.getToUserName()); + responseMessage.setToUserName(requestMessage.getFromUserName()); + responseMessage.setCreateTime(System.currentTimeMillis()); + responseMessage.setMsgType(ResponseMsgTypeEnum.text.toString().toLowerCase()); + + //用户openId; + String openId = requestMessage.getFromUserName(); + + log.info(String.format("微信关注(openId = %s)。", openId)); + + String content = "欢迎关注"; + + responseMessage.setContent(content); + return MessageUtils.textMessageToXml((ResponseMessageText) responseMessage); + } + + /** + * 取消订购(取消关注) + * + * @param requestMessage 请求的消息 + * @return 回复的消息 + * @throws IllegalAccessException + * @throws InstantiationException + */ + private String onEventUnSubscribeRequest(RequestMessageEventBase requestMessage) throws InstantiationException, IllegalAccessException { + //拼装回复message + ResponseMessageText responseMessage = new ResponseMessageText(); + responseMessage.setFromUserName(requestMessage.getToUserName()); + responseMessage.setToUserName(requestMessage.getFromUserName()); + responseMessage.setCreateTime(System.currentTimeMillis()); + responseMessage.setMsgType(ResponseMsgTypeEnum.text.toString().toLowerCase()); + responseMessage.setContent("取消关注"); + + //用户openId; + String openId = requestMessage.getFromUserName(); + + log.info(String.format("取消关注(openId = %s)。", openId)); + + return MessageUtils.textMessageToXml((ResponseMessageText) responseMessage); + } + + /** + * 点击菜单跳转事件 + * + * @param requestMessage 请求的消息 + * @return 回复的消息 + * @throws IllegalAccessException + * @throws InstantiationException + */ + private String onEventViewRequest(MessageBase requestMessage) throws InstantiationException, IllegalAccessException { + return StringUtilsExt.EMPTY; + } + + /** + * 模板消息推送事件处理 + * + * @param requestMessage 请求的消息 + * @return 回复的消息 + * @throws IllegalAccessException + * @throws InstantiationException + */ + private String onEventTemplateSendJobFinishRequest(RequestMessageEventTemplateSendJobFinish requestMessage) throws InstantiationException, IllegalAccessException { + //回复空串 + return StringUtilsExt.EMPTY; + } + + /** + * 点击菜单事件拉取消息事件 + * + * @param requestMessage 请求的消息 + * @return 回复的消息 + * @throws IllegalAccessException + * @throws InstantiationException + */ + private String onEventClickRequest(RequestMessageEventBase requestMessage) { + return StringUtilsExt.EMPTY; + } + + /** + * 快递扫描操作 + * + * @param requestMessage + * @return + */ + private String onEventScancodeWaitMsg(RequestMessageEventScanCode requestMessage) { + //回复文本消息 + ResponseMessageText responseMessage = new ResponseMessageText(); + responseMessage.setFromUserName(requestMessage.getToUserName()); + responseMessage.setToUserName(requestMessage.getFromUserName()); + responseMessage.setCreateTime(System.currentTimeMillis()); + responseMessage.setMsgType(ResponseMsgTypeEnum.text.toString().toLowerCase()); + ScanCodeInfo scanCodeInfo = requestMessage.getScanCodeInfo(); + //扫描的内容 + String scanResult = scanCodeInfo.getScanResult(); + CdBind bind = new CdBind(); + bind.setOpenId(requestMessage.getFromUserName()); + List binds = mybatisDao.selectByModel(bind); + String content = ""; + if (binds == null || binds.size() == 0) { + content = "请先绑定再进行扫码操作!绑定格式：绑定+手机号(绑定131XXXXXXXX)"; + } + else { + content = bindService.bindExpressMember(binds.get(0).getUserId(), scanResult.split("&")[0]); + } + + log.info(String.format("扫描到的内容(scanResult = %s)。", scanResult.split("&")[0])); + + responseMessage.setContent(content); + return MessageUtils.textMessageToXml((ResponseMessageText) responseMessage); + } +} diff --git a/src/main/java/com/xmomen/module/wx/service/ResponseMessageImageService.java b/src/main/java/com/xmomen/module/wx/service/ResponseMessageImageService.java new file mode 100644 index 0000000..45a1104 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/service/ResponseMessageImageService.java @@ -0,0 +1,32 @@ +package com.xmomen.module.wx.service; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import com.xmomen.framework.utils.StringUtilsExt; +import com.xmomen.module.wx.model.MessageBase; + + +/** + * 微信图片消息响应类 + */ +@Service +public class ResponseMessageImageService implements ResponseMessageBaseService { + Logger log = LoggerFactory.getLogger(ResponseMessageImageService.class); + + + /** + * 对微信的请求消息做出响应 + * + * @param requestMessage 请求的消息内容 + * @param requestMessageExt 请求内容封装类 + * @return 回复给微信的消息（xml格式） + * @throws InstantiationException + * @throws IllegalAccessException + */ + public String handleRequestMessage(MessageBase requestMessage) throws InstantiationException, IllegalAccessException { + return StringUtilsExt.EMPTY; + } +} diff --git a/src/main/java/com/xmomen/module/wx/service/ResponseMessageServiceFactory.java b/src/main/java/com/xmomen/module/wx/service/ResponseMessageServiceFactory.java new file mode 100644 index 0000000..da40e23 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/service/ResponseMessageServiceFactory.java @@ -0,0 +1,61 @@ +package com.xmomen.module.wx.service; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.xmomen.module.wx.constants.RequestMsgTypeEnum; + + +/** + * 微信服务响应处理工厂类 + */ +@Component +public class ResponseMessageServiceFactory { + static Logger log = LoggerFactory.getLogger(ResponseMessageServiceFactory.class); + + @Autowired + ResponseMessageEventService responseMessageEventService; + + @Autowired + ResponseMessageTextService responseMessageTextService; + + @Autowired + ResponseMessageImageService responseMessageImageService; + + @Autowired + ResponseMessageVoiceService responseMessageVoiceService; + + @Autowired + ResponseMessageVideoService responseMessageVideoService; + + public ResponseMessageBaseService createInstance(String key) throws InstantiationException, IllegalAccessException { + //事件消息响应 + if (key.equals(RequestMsgTypeEnum.event.toString())) { + return responseMessageEventService; + } + //文本消息响应 + else if (key.equals(RequestMsgTypeEnum.text.toString())) { + return responseMessageTextService; + } + //图片消息响应 + else if (key.equals(RequestMsgTypeEnum.image.toString())) { + return responseMessageImageService; + } + //语音消息响应 + else if (key.equals(RequestMsgTypeEnum.voice.toString())) { + return responseMessageVoiceService; + } + //视频消息响应 + else if (key.equals(RequestMsgTypeEnum.video.toString()) || key.equals(RequestMsgTypeEnum.shortvideo.toString())) { + return responseMessageVideoService; + } + //未设定的消息响应 + else { + log.info("消息类型" + key + "未实现响应类"); + //默认全部文本消息回复 + return responseMessageTextService; + } + } +} diff --git a/src/main/java/com/xmomen/module/wx/service/ResponseMessageTextService.java b/src/main/java/com/xmomen/module/wx/service/ResponseMessageTextService.java new file mode 100644 index 0000000..616f3e3 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/service/ResponseMessageTextService.java @@ -0,0 +1,69 @@ +package com.xmomen.module.wx.service; + + +import com.alibaba.fastjson.JSON; +import com.xmomen.framework.utils.StringUtilsExt; +import com.xmomen.module.wx.constants.ResponseMsgTypeEnum; +import com.xmomen.module.wx.model.MessageBase; +import com.xmomen.module.wx.model.requestModel.message.RequestMessageText; +import com.xmomen.module.wx.model.responseModel.ResponseMessageText; +import com.xmomen.module.wx.util.MessageUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * 微信文本消息响应类 + */ +@Service +public class ResponseMessageTextService implements ResponseMessageBaseService { + + @Autowired + BindService bindService; + Logger log = LoggerFactory.getLogger(ResponseMessageTextService.class); + + /** + * 对微信的请求消息做出响应 + * + * @param requestMessage 请求的消息内容 + * @param requestMessageExt 请求内容封装类 + * @return 回复给微信的消息（xml格式） + * @throws InstantiationException + * @throws IllegalAccessException + */ + public String handleRequestMessage(MessageBase requestMessage) throws InstantiationException, IllegalAccessException { + ResponseMessageText responseMessageText = new ResponseMessageText(); + //发送者 + responseMessageText.setFromUserName(requestMessage.getToUserName()); + //接收者 + responseMessageText.setToUserName(requestMessage.getFromUserName()); + //回复时间 + responseMessageText.setCreateTime(System.currentTimeMillis()); + //回复类型 + responseMessageText.setMsgType(ResponseMsgTypeEnum.text.toString().toLowerCase()); + //回复默认内容 + String requestContent = ((RequestMessageText)requestMessage).getContent(); + // /文本消息请求 + log.info("获取的内容"+requestContent); + if(requestContent.startsWith("绑定")){ + if(requestMessage instanceof RequestMessageText) { + String phone = requestContent.substring(2); + log.info("openId:"+requestMessage.getFromUserName()+"，绑定的手机号为:" + phone); + boolean flag = bindService.bindAccount(requestMessage.getFromUserName(), phone, "2"); + if(flag){ + responseMessageText.setContent("绑定成功!"); + }else{ + responseMessageText.setContent("号码:"+phone+"不存在"); + } + } else { + responseMessageText.setContent("绑定格式为：绑定+手机号"); + } + }else{ + responseMessageText.setContent("发送固定格式信息进行绑定！绑定格式：绑定+手机号(绑定131XXXXXXXX)"); + } + return MessageUtils.convertEntityToXml((ResponseMessageText) responseMessageText); + } +} diff --git a/src/main/java/com/xmomen/module/wx/util/HttpRequest.java b/src/main/java/com/xmomen/module/wx/util/HttpRequest.java new file mode 100644 index 0000000..0a77f95 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/util/HttpRequest.java @@ -0,0 +1,64 @@ +package com.xmomen.module.wx.util; + +import java.util.Map; + +import com.alibaba.fastjson.JSONObject; + +/** + * IHttpRequest.java 2014年11月6日下午6:42:07 + * + * + * Copyright (c) 2014 by MTA. + * + * @author jizong.li + * @Email 85150225@qq.com + * @company 上海递优国际物流 + * @description + * @version 1.0 + */ +public interface HttpRequest { + + /** + * get 请求返回 string + * @param url + * @param paramsMap + * @return + */ + public String doGet(String url,Map paramsMap); + + /** + * get 请求返回jsonobject 无参 + * @param url + * @return + */ + public JSONObject doGetToJsonObject(String url); + + /** + * do get 请求返回 jsonobject 有参 + * @param url + * @param paramsMap + * @return + */ + public JSONObject doGetToJsonObject(String url,Map paramsMap); + + /** + * do get 请求返回 string 无参 + * @param url + * @return + */ + public String doGet(String url); + + /** + * + * @param url + * @param paramsMap + * @return + */ + public String doPost(String url,Map paramsMap); + + public String doPost(String url, String jsonXMLString); + + public String doPost(String url); + + public JSONObject doPostToJsonObject(String url,Map paramsMap); +} diff --git a/src/main/java/com/xmomen/module/wx/util/JsonMapper.java b/src/main/java/com/xmomen/module/wx/util/JsonMapper.java new file mode 100644 index 0000000..3af40d1 --- /dev/null +++ b/src/main/java/com/xmomen/module/wx/util/JsonMapper.java @@ -0,0 +1,28 @@ +package com.xmomen.module.wx.util; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.*; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +public class JsonMapper extends ObjectMapper { + private static final long serialVersionUID = -5382012949634670295L; + + public JsonMapper() { + configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + configure(MapperFeature.DEFAULT_VIEW_INCLUSION, true); + configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true); + configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true); + //null + getSerializerProvider().setNullValueSerializer( + new JsonSerializer

' + lang.mergeLine + '	' + lang.delLine + '
' + lang.removeFormat + '	' + lang.indent + '
' + lang.alignment + '	' + + '' + me.getLang("justifyleft") + + '' + me.getLang("justifycenter") + + '' + me.getLang("justifyright") + + '
' + lang.imageFloat + '	' + + '' + me.getLang("default") + + '' + me.getLang("justifyleft") + + '' + me.getLang("justifycenter") + + '' + me.getLang("justifyright") + + '
' + lang.removeFontsize + '	' + lang.removeFontFamily + '
' + lang.removeHtml + '
' + lang.pasteFilter + '
' + lang.symbol + '	' + + '' + lang.bdc2sb + + '' + lang.tobdc + '' + + '

已优惠产品*
操作	产品编号	名称	单价	优惠方式	折扣	优惠后金额
+ + + + + +	{{choseItem.itemCode}}	{{choseItem.itemName}}	{{choseItem.sellPrice \| number:2}}	{{choseItem.contractTypeName}}	{{choseItem.discountText}}	{{choseItem.contractValue \| number:2}}

+ + + + +	卡券类型	卡劵类别	付费方式	描述	卡号/劵号	面值	余额	有效日期	使用状态	激活状态	是否赠送	是否发卡	批次号	发放单位	发放客户经理	备注	操作
+ + + + +	卡消费劵		预付款后付款					{{coupon.beginTime \| date: 'yyyy-MM-dd'}} 至 {{coupon.endTime \| date: 'yyyy-MM-dd'}}	未使用已使用	未激活已激活	未赠送已赠送	未发卡已发卡					+ + + + + \| + + + + \| + + + + \| + + + + \| + + + + +
+ 暂无数据 +

序号	卡券类型	卡劵类别	卡号/劵号	批号	可用金额	发放单位	发放客户经理	操作
	卡消费劵					{{coupon.couponValue}}			+ + + + + + + + +
+ 暂无数据 +

+ + + + +	序号	卡券类型	卡劵类别	卡号/劵号	批号	充值金额	发放单位	发放客户经理	实收金额	审核激活
+ + + + +		卡消费劵				{{coupon.couponValue}}				{{coupon.receivedPrice}}	+ + + + +
+ 暂无数据 +

'+editor.getLang("themeColor")+'
'+editor.getLang("standardColor")+'

类别类型	类别名称	操作
+ 卡 + 消费券 + +		+ + + + + \| + + + + +
+ 暂无消息数据 +

卡号/劵号	调整金额	调整时间	调整人	备注
		{{tradeRecord.createTime \| date: 'yyyy-MM-dd'}}	{{tradeRecord.recordUserName}}	{{tradeRecord.remark}}
+ 暂无数据 +

+ + + + +	序号	订单编号	订单状态	快递商	分配状态	客户姓名	手机号	地址	配送时间	操作
+ + + + +					+ 已分配 + 待分配 +					+ + + + + + + + + + +
+ 暂无数据 +

+ + + + +	序号	订单编号	客户经理	收货人	批次号	装箱任务负责人	订单状态	分配状态	配送时间	操作
+ + + + +								+ 已分配 + 待分配 +		+ + + + + + + + +
+ 暂无数据 +

	需求日期	产品名称	销售方式	采购状态	数量	产品规格	重量	创建时间	操作
			计重计件			{{purchase.spec}}{{purchase.itemUnit}}	{{purchase.totalWeight}}{{purchase.itemUnit}}		+ + + + + + +
+ 暂无数据 +

+ + + + +	餐桌计划	配送频率(周)/配送时间(星期)	卡号	收货人姓名	手机号	地址	所属单位	客户经理	总配送次数	剩余配送次数	是否暂停	生效时间	操作
+ + + + +		每{{tablePlan.deliveryType}}周/星期{{tablePlan.sendWeekDay}}									+ + + + +		+ + + + + \| + + + + +
+ 暂无消息数据 +

退货商品*
序号	商品编码	商品名称	退货份数
	{{returnOrderItem.itemCode}}	{{returnOrderItem.itemName}}	{{returnOrderItem.itemNumber \| number:2}}

序号	时间	商品名称	商品编号	前一日库存	订单出库数	订单退/换货（取消）入库数	入库数	破损数	核销数	库存
					{{stockDaily.outNum}}	{{stockDaily.returnInNum}}	{{stockDaily.inNum}}	{{stockDaily.damagedNum}}	{{stockDaily.verificationNum}}
+ 暂无数据 +

	采购单号	产品名称	包装份数	已包装份数	未包装份数	任务创建时间	任务开始时间	任务完成时间	任务执行人	任务状态	操作
						{{packageTask.jobCreateTime \| date: 'yyyy-MM-dd HH:mm:ss'}}	{{packageTask.jobBeginTime \| date: 'yyyy-MM-dd HH:mm:ss'}}	{{packageTask.finishTime \| date: 'yyyy-MM-dd HH:mm:ss'}}		未开始包装中包装完成	+ + + + + +
+ 暂无数据 +

+ + + + +	标题内容	提交时间	消息类型
+ + + + +
+ 暂无消息数据 +

+ + + + +	用户名	邮箱	真实姓名	性别	年龄	手机号码	办公电话	用户组	组织	锁定	操作
+ + + + +								+ {{group.userGorup}} +		+ + + + +	+ + + + + \| + + + + \| + + + + +
+ 暂无数据 +

${tableComment}

State 1

State 2

List of State 1 Items

List of State 2 Things

inline template definition

generated template

HELLO!

HELLO!

HELLO!

HELLO!

inline template definition

generated template

{{ originalText }}

{{ filteredText }}

Which is your favorite?

'+e.o.labelError+" "+f.status+" "+f.statusText+"

SmartAdmin

John Doe Locked

Error 403

unauthorized

Error 404

Page Not Found

Error 500

Oooops, Something went wrong!

+ + + + Page Header + > + Subtitle + +

新增/更新客户

Api key authorization

Basic authentication"+(null!=(a=n["if"].call(o,null!=t?t.isLogout:t,{name:"if",hash:{},fn:e.program(1,i,0),inverse:e.noop,data:i}))?a:"")+'

Select OAuth2.0 Scopes

Warning: Deprecated

Implementation Notes

Response Class (Status '+(null!=(a=(n.escape||t&&t.escape||n.helperMissing).call(o,null!=t?t.successCode:t,{name:"escape",hash:{},data:i}))?a:"")+")

Headers

Parameters

Response Messages

Request Headers

\n \n '+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.method:t,{name:"escape",hash:{},data:i}))?a:"")+"\n \n \n '+(null!=(a=(n.escape||t&&t.escape||s).call(o,null!=t?t.path:t,{name:"escape",hash:{},data:i}))?a:"")+"\n \n

Curl

Request URL

Response Body

Response Code

Response Headers