Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/index.html

iamberry-app-interface/src/main/java/com/iamberry/app/face/UserService.java

@@ -149,13 +149,8 @@ public interface UserService {
 	 * @return User Information
 	 */
 	public User selectUserByUsername(String username);
-<<<<<<< .mine
 
-||||||| .r5272
-	
 	public List<User> getAll(int start, int end);
-=======
-	
+
 	/*public List<User> getAll(int start, int end);*/
->>>>>>> .r5562
 }

iamberry-app-interface/src/main/java/com/iamberry/app/face/UserService.java.mine

@@ -1,153 +0,0 @@
-package com.iamberry.app.face;
-
-import java.util.List;
-
-import com.iamberry.app.core.dto.RemoteIpInfoDTO;
-import com.iamberry.app.core.dto.UserDTO;
-import com.iamberry.app.core.entity.User;
-
-/**
- * UserService
- *
- * @author Moon Cheng
- * @date 2016年3月23日 上午11:33:29
- */
-
-public interface UserService {
-	
-	
-	public User validateUserToken(String token);
-
-	/**
-	 * register
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param password
-	 * @return User Information
-	 */
-	public User register(String phone, String password, String ip) ;
-
-	/**
-	 * thirdPartBindingPhone
-	 *
-	 * @param phone
-	 * @param openId
-	 * @return
-	 */
-	public User thirdPartBindingPhone(String phone, String openId) ;
-	/**
-	 * findById
-	 *
-	 * @param id
-	 * @return User
-	 */
-	public User findById(Long id);
-
-	/**
-	 * login
-	 *
-	 * @param phone
-	 * @param password
-	 * @param userAgent
-	 * @return
-	 */
-	public Object login(String phone, String password) ;
-
-	/**
-	 * thirdPartLogin
-	 *
-	 * @param openId
-	 * @param extType
-	 * @param extName
-	 * @param extPicture
-	 * @return
-	 */
-	public User thirdPartLogin(String openId, String extType, String extName, String extPicture, String ip) ;
-
-	/**
-	 * updateUserInfo
-	 *
-	 * @param user
-	 * @param token
-	 * @return
-	 */
-	public User updateUserInfo(User user, String token) ;
-
-	/**
-	 * updateDisplayPicture
-	 *
-	 * @author Moon Cheng
-	 * @param base64
-	 * @param token
-	 * @return
-	 */
-	public String updateDisplayPicture(String base64, String token) ;
-	/**
-	 * changePhone
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param token
-	 * @return
-	 */
-	public User changePhone(String phone, String token) ;
-	/**
-	 * resetPassWord
-	 *
-	 * @param oldPassword
-	 * @param newPassword
-	 * @param token
-	 * @return
-	 */
-	public int changePassword(String oldPassword, String newPassword, String token) ;
-	/**
-	 * changePassWord
-	 *
-	 * @param username,
-	 *            newPassword
-	 * @param session
-	 * @return int
-	 */
-	public int resetPassWord(String username, String newPassword) ;
-
-	public UserDTO tuyaConnect(User user) ;
-
-	/**
-	 * getStartPage
-	 *
-	 * @return String
-	 */
-	public String getStartPage() ;
-	/**
-	 * getLocation
-	 *
-	 * @param ip
-	 * @return String
-	 */
-	public RemoteIpInfoDTO getLocation(String ip) ;
-
-	/**
-	 * getApkVersion
-	 *
-	 * @return
-	 */
-	public String getApkVersion();
-	
-	/**
-	 * selectUserAvator
-	 *
-	 * @param id
-	 * @return String
-	 */
-	public String selectUserAvator(Long id);
-	
-	/**
-	 * selectUserByUsername
-	 *
-	 * @param username
-	 * @return User Information
-	 */
-	public User selectUserByUsername(String username);
-
-}

iamberry-app-interface/src/main/java/com/iamberry/app/face/UserService.java.r5272

@@ -1,154 +0,0 @@
-package com.iamberry.app.face;
-
-import java.util.List;
-
-import com.iamberry.app.core.dto.RemoteIpInfoDTO;
-import com.iamberry.app.core.dto.UserDTO;
-import com.iamberry.app.core.entity.User;
-
-/**
- * UserService
- *
- * @author Moon Cheng
- * @date 2016年3月23日 上午11:33:29
- */
-
-public interface UserService {
-	
-	
-	public User validateUserToken(String token);
-
-	/**
-	 * register
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param password
-	 * @return User Information
-	 */
-	public User register(String phone, String password, String ip) ;
-
-	/**
-	 * thirdPartBindingPhone
-	 *
-	 * @param phone
-	 * @param openId
-	 * @return
-	 */
-	public User thirdPartBindingPhone(String phone, String openId) ;
-	/**
-	 * findById
-	 *
-	 * @param id
-	 * @return User
-	 */
-	public User findById(Long id);
-
-	/**
-	 * login
-	 *
-	 * @param phone
-	 * @param password
-	 * @param userAgent
-	 * @return
-	 */
-	public Object login(String phone, String password) ;
-
-	/**
-	 * thirdPartLogin
-	 *
-	 * @param openId
-	 * @param extType
-	 * @param extName
-	 * @param extPicture
-	 * @return
-	 */
-	public User thirdPartLogin(String openId, String extType, String extName, String extPicture, String ip) ;
-
-	/**
-	 * updateUserInfo
-	 *
-	 * @param user
-	 * @param token
-	 * @return
-	 */
-	public User updateUserInfo(User user, String token) ;
-
-	/**
-	 * updateDisplayPicture
-	 *
-	 * @author Moon Cheng
-	 * @param base64
-	 * @param token
-	 * @return
-	 */
-	public String updateDisplayPicture(String base64, String token) ;
-	/**
-	 * changePhone
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param token
-	 * @return
-	 */
-	public User changePhone(String phone, String token) ;
-	/**
-	 * resetPassWord
-	 *
-	 * @param oldPassword
-	 * @param newPassword
-	 * @param token
-	 * @return
-	 */
-	public int changePassword(String oldPassword, String newPassword, String token) ;
-	/**
-	 * changePassWord
-	 *
-	 * @param username,
-	 *            newPassword
-	 * @param session
-	 * @return int
-	 */
-	public int resetPassWord(String username, String newPassword) ;
-
-	public UserDTO tuyaConnect(User user) ;
-
-	/**
-	 * getStartPage
-	 *
-	 * @return String
-	 */
-	public String getStartPage() ;
-	/**
-	 * getLocation
-	 *
-	 * @param ip
-	 * @return String
-	 */
-	public RemoteIpInfoDTO getLocation(String ip) ;
-
-	/**
-	 * getApkVersion
-	 *
-	 * @return
-	 */
-	public String getApkVersion();
-	
-	/**
-	 * selectUserAvator
-	 *
-	 * @param id
-	 * @return String
-	 */
-	public String selectUserAvator(Long id);
-	
-	/**
-	 * selectUserByUsername
-	 *
-	 * @param username
-	 * @return User Information
-	 */
-	public User selectUserByUsername(String username);
-	
-	public List<User> getAll(int start, int end);
-}

iamberry-app-interface/src/main/java/com/iamberry/app/face/UserService.java.r5562

@@ -1,154 +0,0 @@
-package com.iamberry.app.face;
-
-import java.util.List;
-
-import com.iamberry.app.core.dto.RemoteIpInfoDTO;
-import com.iamberry.app.core.dto.UserDTO;
-import com.iamberry.app.core.entity.User;
-
-/**
- * UserService
- *
- * @author Moon Cheng
- * @date 2016年3月23日 上午11:33:29
- */
-
-public interface UserService {
-	
-	
-	public User validateUserToken(String token);
-
-	/**
-	 * register
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param password
-	 * @return User Information
-	 */
-	public User register(String phone, String password, String ip) ;
-
-	/**
-	 * thirdPartBindingPhone
-	 *
-	 * @param phone
-	 * @param openId
-	 * @return
-	 */
-	public User thirdPartBindingPhone(String phone, String openId) ;
-	/**
-	 * findById
-	 *
-	 * @param id
-	 * @return User
-	 */
-	public User findById(Long id);
-
-	/**
-	 * login
-	 *
-	 * @param phone
-	 * @param password
-	 * @param userAgent
-	 * @return
-	 */
-	public Object login(String phone, String password) ;
-
-	/**
-	 * thirdPartLogin
-	 *
-	 * @param openId
-	 * @param extType
-	 * @param extName
-	 * @param extPicture
-	 * @return
-	 */
-	public User thirdPartLogin(String openId, String extType, String extName, String extPicture, String ip) ;
-
-	/**
-	 * updateUserInfo
-	 *
-	 * @param user
-	 * @param token
-	 * @return
-	 */
-	public User updateUserInfo(User user, String token) ;
-
-	/**
-	 * updateDisplayPicture
-	 *
-	 * @author Moon Cheng
-	 * @param base64
-	 * @param token
-	 * @return
-	 */
-	public String updateDisplayPicture(String base64, String token) ;
-	/**
-	 * changePhone
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param token
-	 * @return
-	 */
-	public User changePhone(String phone, String token) ;
-	/**
-	 * resetPassWord
-	 *
-	 * @param oldPassword
-	 * @param newPassword
-	 * @param token
-	 * @return
-	 */
-	public int changePassword(String oldPassword, String newPassword, String token) ;
-	/**
-	 * changePassWord
-	 *
-	 * @param username,
-	 *            newPassword
-	 * @param session
-	 * @return int
-	 */
-	public int resetPassWord(String username, String newPassword) ;
-
-	public UserDTO tuyaConnect(User user) ;
-
-	/**
-	 * getStartPage
-	 *
-	 * @return String
-	 */
-	public String getStartPage() ;
-	/**
-	 * getLocation
-	 *
-	 * @param ip
-	 * @return String
-	 */
-	public RemoteIpInfoDTO getLocation(String ip) ;
-
-	/**
-	 * getApkVersion
-	 *
-	 * @return
-	 */
-	public String getApkVersion();
-	
-	/**
-	 * selectUserAvator
-	 *
-	 * @param id
-	 * @return String
-	 */
-	public String selectUserAvator(Long id);
-	
-	/**
-	 * selectUserByUsername
-	 *
-	 * @param username
-	 * @return User Information
-	 */
-	public User selectUserByUsername(String username);
-	
-	/*public List<User> getAll(int start, int end);*/
-}

pom.xml

@@ -575,15 +575,15 @@
 	<!-- 配置 -->
 	<profiles>
 		<profile>
-			<id>jdk-1.8</id>
+			<id>jdk-1.7</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
-				<jdk>1.8</jdk>
+				<jdk>1.7</jdk>
 			</activation>
 			<properties>
-				<maven.compiler.source>1.8</maven.compiler.source>
-				<maven.compiler.target>1.8</maven.compiler.target>
-				<maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
+				<maven.compiler.source>1.7</maven.compiler.source>
+				<maven.compiler.target>1.7</maven.compiler.target>
+				<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
 			</properties>
 		</profile>
 		<profile>

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/ResultMsg.java

@@ -12,6 +12,9 @@ public class ResultMsg implements java.io.Serializable{
 	 */
 	private static final long serialVersionUID = 8987614804726091566L;
 
+	public static final String SUCCESS = "SUCCESS";
+	public static final String ERROR = "ERROR";
+
 	private boolean status; // 状态
 	
 	private String ResultCode ; //状态码

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/Exchange.java

@@ -0,0 +1,52 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  兑换表类
+ * @author
+ * @Date 2018-12-11
+ */
+public class Exchange  implements  Serializable{
+    private static final long serialVersionUID = 4161577323724581015L;
+    //
+    private Integer exchangeId;
+    //
+    private Integer couponId;
+    //创建时间
+    private Date exchangeCreateTime;
+    //修改时间'
+    private Date exchangeUpdateTime;
+
+    public Integer getExchangeId(){
+        return exchangeId;
+    }
+
+    public void setExchangeId(Integer  exchangeId){
+        this.exchangeId=exchangeId;
+    }
+
+    public Integer getCouponId(){
+        return couponId;
+    }
+
+    public void setCouponId(Integer  couponId){
+        this.couponId=couponId;
+    }
+
+    public Date getExchangeCreateTime(){
+        return exchangeCreateTime;
+    }
+
+    public void setExchangeCreateTime(Date  exchangeCreateTime){
+        this.exchangeCreateTime=exchangeCreateTime;
+    }
+
+    public Date getExchangeUpdateTime(){
+        return exchangeUpdateTime;
+    }
+
+    public void setExchangeUpdateTime(Date  exchangeUpdateTime){
+        this.exchangeUpdateTime=exchangeUpdateTime;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/ExchangeItem.java

@@ -0,0 +1,52 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+
+import  java.io.Serializable;
+/**
+ *  兑换子表类
+ * @author
+ * @Date 2018-12-11
+ */
+public class ExchangeItem  implements  Serializable{
+    private static final long serialVersionUID = 5940933839681811215L;
+    //
+    private Integer exchangeItemId;
+    //兑换表id
+    private Integer exchangeId;
+    //颜色id
+    private Integer colorId;
+    //数量'
+    private Integer exchangeItemNum;
+
+    public Integer getExchangeItemId(){
+        return exchangeItemId;
+    }
+
+    public void setExchangeItemId(Integer  exchangeItemId){
+        this.exchangeItemId=exchangeItemId;
+    }
+
+    public Integer getExchangeId(){
+        return exchangeId;
+    }
+
+    public void setExchangeId(Integer  exchangeId){
+        this.exchangeId=exchangeId;
+    }
+
+    public Integer getColorId(){
+        return colorId;
+    }
+
+    public void setColorId(Integer  colorId){
+        this.colorId=colorId;
+    }
+
+    public Integer getExchangeItemNum(){
+        return exchangeItemNum;
+    }
+
+    public void setExchangeItemNum(Integer  exchangeItemNum){
+        this.exchangeItemNum=exchangeItemNum;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/thanksgiving/ThanksGiving.java

@@ -0,0 +1,72 @@
+package com.iamberry.wechat.core.entity.thanksgiving;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  活动-领取优惠券类
+ * @author
+ * @Date 2018-12-11
+ */
+public class ThanksGiving  implements  Serializable{
+    private static final long serialVersionUID = 4870415709390973071L;
+    //
+    private Integer thanksGivingId;
+    //电话号码
+    private String thanksGivingPhone;
+    //领取状态 1:未领取 2:已领取
+    private Integer thanksGivingStatus;
+    //领取时间
+    private Date thanksGivingTime;
+    //领取人openid'
+    private String thanksGivingOpenId;
+    //领取的优惠券id'
+    private String couponItemId;
+
+    public Integer getThanksGivingId(){
+        return thanksGivingId;
+    }
+
+    public void setThanksGivingId(Integer  thanksGivingId){
+        this.thanksGivingId=thanksGivingId;
+    }
+
+    public String getThanksGivingPhone(){
+        return thanksGivingPhone;
+    }
+
+    public void setThanksGivingPhone(String  thanksGivingPhone){
+        this.thanksGivingPhone=thanksGivingPhone;
+    }
+
+    public Integer getThanksGivingStatus(){
+        return thanksGivingStatus;
+    }
+
+    public void setThanksGivingStatus(Integer  thanksGivingStatus){
+        this.thanksGivingStatus=thanksGivingStatus;
+    }
+
+    public Date getThanksGivingTime(){
+        return thanksGivingTime;
+    }
+
+    public void setThanksGivingTime(Date  thanksGivingTime){
+        this.thanksGivingTime=thanksGivingTime;
+    }
+
+    public String getThanksGivingOpenId(){
+        return thanksGivingOpenId;
+    }
+
+    public void setThanksGivingOpenId(String  thanksGivingOpenId){
+        this.thanksGivingOpenId=thanksGivingOpenId;
+    }
+
+    public String getCouponItemId() {
+        return couponItemId;
+    }
+
+    public void setCouponItemId(String couponItemId) {
+        this.couponItemId = couponItemId;
+    }
+}

watero-common-tool/src/main/java/com/iamberry/wechat/tools/HttpClient431Util.java

@@ -725,9 +725,20 @@ public class HttpClient431Util {
     }
 
     public static void main(String[] args) throws Exception {
-    	long start = System.currentTimeMillis();
-    	boolean b = downloadFile("https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=gQHT8DoAAAAAAAAAASxodHRwOi8vd2VpeGluLnFxLmNvbS9xLzgwamFXRURsc3AzTE1pQnoxbUFfAAIEkhQsVwMEAAAAAA%3D%3D", "D://abcdefgj.png");
-    	long end = System.currentTimeMillis();
-    	System.out.println(b + "," + (end - start));
+//    	long start = System.currentTimeMillis();
+//    	boolean b = downloadFile("https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=gQHT8DoAAAAAAAAAASxodHRwOi8vd2VpeGluLnFxLmNvbS9xLzgwamFXRURsc3AzTE1pQnoxbUFfAAIEkhQsVwMEAAAAAA%3D%3D", "D://abcdefgj.png");
+//    	long end = System.currentTimeMillis();
+//    	System.out.println(b + "," + (end - start));
+
+        // 生成系统级请求数据
+//        Map<String, String> params = new HashMap<String, String>();
+//        params.put("nu", "221435993148");
+//        String url = "http://api.open.baidu.com/pae/common/api/Redirect";
+//        // 发送请求
+//        String html = HttpClient431Util.doGet(params, url);
+//        Document doc = Jsoup.parse(html);
+//        Element content = doc.getElementById("companyCode");
+//        String value = content.val();
     }
+
 }

watero-common-tool/src/main/java/com/iamberry/wechat/tools/NameUtils.java

@@ -101,5 +101,5 @@ public class NameUtils {
     /** 
      * 验证码类型为仅小写字母 
      */  
-    public static final int TYPE_LOWER_ONLY = 6;  
+    public static final int TYPE_LOWER_ONLY = 6;
 }

watero-common-tool/src/main/java/com/iamberry/wechat/tools/payUtil/RandomUtil.java

@@ -82,4 +82,15 @@ public class RandomUtil {
 		return sb.toString();
 	}
 
+	/**
+	 * 6为短信验证码
+	 * @return
+	 */
+	public static String getRandom(){
+		String randNum = new Random().nextInt(1000000)+"";
+		if(randNum.length()!=4){
+			return getRandom();
+		}
+		return randNum;
+	}
 }

watero-common-web/pom.xml

@@ -13,4 +13,28 @@
 	<groupId>com.iamberry</groupId>
 	<artifactId>watero-common-web</artifactId>
 	<version>1.0.0</version>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.properties</include>
+					<include>**/*.xml</include>
+				</includes>
+				<filtering>false</filtering>
+			</resource>
+		</resources>
+		<finalName>watero-rst-service</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

watero-rent-interface/.classpath

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

watero-rent-interface/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>watero-rent-interface</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>

watero-rent-interface/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8

watero-rent-interface/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7

watero-rent-interface/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

watero-rent-interface/pom.xml

@@ -1,42 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<!-- 父类定义 -->
-	<parent>
-		<groupId>com.iamberry</groupId>
-		<artifactId>iamberry-parent</artifactId>
-		<version>1.0.0</version>
-	</parent>
-  	<artifactId>watero-rent-interface</artifactId>
-  	<packaging>jar</packaging>
-
-  	<properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  	</properties>
-
-  	<dependencies>
-		<dependency>
-  		<groupId>com.iamberry</groupId>
-  		<artifactId>watero-common-core</artifactId>
-  		<version>1.0.0</version>
-  	</dependency>
-  	<dependency>
-  		<groupId>com.iamberry</groupId>
-  		<artifactId>watero-common-tool</artifactId>
-  		<version>1.0.0</version>
-  	</dependency>
-  	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.3</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>

watero-rent-interface/src/main/java/com/iamberry/rent/face/efast/EfastRentService.java

@@ -1,27 +0,0 @@
-package com.iamberry.rent.face.efast;
-
-import java.util.Map;
-
-/**
- * Created by Administrator on 2017/4/27.
- */
-public interface EfastRentService {
-
-    /**
-     * 同步百胜发货订单
-     * @param oid
-     * @return
-     */
-    Map<String,Object> getEfastSendOrderInfo(String oid);
-
-    /**
-     * 兑换记录
-     * @param address 收货人地址信息
-     * @param id 推送订单号
-     * @param colorId 产品颜色id
-     * @param addrName 收货人姓名
-     * @param tel 收货人电话
-     * @param openId 当前用户openid
-     */
-    boolean sendRentFilter(String address, String id, Integer colorId, String addrName, String tel, String openId) throws Exception;
-}

watero-rent-interface/src/main/java/com/iamberry/rent/face/machine/MachineService.java

@@ -1,241 +0,0 @@
-package com.iamberry.rent.face.machine;
-
-import java.util.List;
-
-import com.iamberry.exception.ServiceException;
-import com.iamberry.wechat.core.entity.ResultMsg;
-import com.iamberry.wechat.core.entity.rent.*;
-import com.iamberry.wechat.tools.ResponseJson;
-
-/**
- * 机器业务暴露接口
- * @company 深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author  献
- * @tel     18271840547
- * @date    2017年3月9日
- */
-public interface MachineService {
-
-    /**
-     * 激活机器 - 扫描二维码激活, 必须有openid 以及其deviceid参数, 整个过程不包含返利
-     * @param machineInfo
-     * @return
-     * @author 献
-     * @throws ServiceException 
-     * @Time   2017年3月10日
-     */
-    int initBefore(MachineInfo machineInfo) throws ServiceException;
-    
-    /**
-     * 激活返利，在接受到机器上报的数据以后，开始激活返利的操作
-     * @param openid
-     * @param deviceId
-     * @return
-     * @author 献
-     * @throws ServiceException 
-     * @Time   2017年4月5日
-     */
-    int init(String openid, String deviceId) throws ServiceException;
-    
-    /**
-     * 查询机器信息,如果deviceid不能为空，那么查询为单条数据
-     * @param info
-     * @return
-     * @author 献
-     * @Time   2017年3月10日
-     */
-    List<MachineInfo> list(MachineInfo info);
-    
-    /**
-     * 同步机器信息（TDS、剩余水量）
-     * @param info
-     * @return
-     * @author 献
-     * @Time   2017年3月10日
-     */
-    Integer syncMachine(MachineInfo info);
-    
-    /**
-     * 获取当前用户服务费抵扣券列表
-     * @Date 2017年3月22日
-     * @author muzx
-     * @return
-     */
-    ResponseJson listServiceCoupon(String openId, String machineId);
-    /**
-     * 为机器续费 - 请求支付
-     * @param machineRecharge
-     * @return
-     * @author 献
-     * @Time   2017年3月13日
-     */
-    ResponseJson requestPay(MachineRecharge machineRecharge, Integer couponId);
-    
-    /**
-     * 根据续费记录的订单id - 请求支付
-     */
-    ResponseJson rechargeOrderIdPay(String orderId);
-    
-    /**
-     * 续费支付回调
-     * @param orderId
-     * @return  0 : 失败；其他表示成功
-     * @author 献
-     * @Time   2017年3月13日
-     */
-    Integer rechargeOrderPayCallback(String orderId, String transactionId);
-    
-    /**
-     * 查询续费记录
-     */
-    List<MachineRecharge> listRecharge(Integer machineId);
-    
-    /**
-     * 后台机器信息列表
-     * @param machineInfo
-     * @return
-     */
-    List<MachineInfo> selectEquipmentList(MachineInfo machineInfo);
-    
-    /**
-     * 后台机器信息总数
-     * @param machineInfo
-     * @return
-     */
-    Integer selectEquipmentCount(MachineInfo machineInfo);
-    
-    /**
-     * 添加机器，注意：只能初始化机器信息
-     * @param info
-     * @return
-     * @author LJK
-     * @Time   2017年3月16日10:58:27
-     */
-    Integer add(MachineInfo info);
-    
-    /**
-     * 根据 id 或 orderid 查询单个充值记录
-     * @date 2017年3月22日
-     * @author muzx
-     * @param recharge
-     * @return
-     */
-    MachineRecharge getRechargeByIdOrOrderId(MachineRecharge recharge);
-    
-    /**
-     * 订单详情页面送人 将机器分享出去，添加分享记录
-     * 2017年3月29日
-     * @author muzx
-     * @param orderItemId
-     * @param openId
-     * @return
-     */
-    ResultMsg presentMachine(String orderItemId, String openId);
-    
-    /**
-     * 领取他人分享的机器
-     * 2017年3月29日
-     * @author muzx
-     */
-    ResultMsg receiveMachine(String shareId, String openId);
-    
-    /**
-     * 绑定用户和机器的关系
-     * @param machineId
-     * @param openId
-     * @return
-     * @author 献
-     * @Time   2017年3月20日
-     */
-    int bindMachineToOpenId(String machineId, String openId);
-    
-    /**
-     * 根据设备id查询单个设备
-     * @param machineInfo
-     * @return
-     */
-    MachineInfo selectMachineById(MachineInfo machineInfo);
-    
-    /**
-     * 分页查询所有分享机器记录<后台>
-     * 2017年3月20日
-     * @author muzx
-     * @param machineShare
-     * @return
-     */
-    List<MachineShare> listMachineShareAdmin(MachineShare machineShare);
-    
-    /**
-     * 查询所有分享机器记录总数<后台>
-     * 2017年3月20日
-     * @author muzx
-     * @return
-     */
-    int countMachineShare(MachineShare machineShare);
-    
-    /**
-     * 处理存在下一条指令的机器，注意：此方法只下发指令，不参与具体的业务逻辑
-     * @author 献
-     * @Time   2017年4月8日
-     */
-    void handlerNextCommand();
-    
-    /**
-	 * 修改机器,根据machineId或deviceid修改，其他不能为空的机器信息
-	 * @param info
-	 * @return
-	 * @author LJK
-	 * @Time   2017年4月7日16:23:53
-	 */
-	Integer update(MachineInfo info);
-	
-	/**
-     * 根据条件查询滤芯更换记录
-     * @param rentChangeLogs
-     * @return
-     */
-    List<RentChangeLogs> listSelectChangeLogs(RentChangeLogs rentChangeLogs);
-    
-    /**
-     * 批量添加滤芯更换记录
-     * @param list
-     * @return
-     */
-    Integer saveChangeLogs(List<RentChangeLogs> list, RentOrder rentOrder) throws Exception;
-    
-    /**
-     * 查询更换滤芯集合
-     * @param rentChangeLogs
-     * @return
-     */
-    List<RentChangeLogs> listChangeFilterLogs(RentChangeLogs rentChangeLogs);
-    
-    /**
-     * 根据条件查询更换滤芯数量
-     * @param rentChangeLogs
-     * @return
-     */
-    Integer getChangeFilterCount(RentChangeLogs rentChangeLogs);
-
-    /**
-     * 新增比拼水质记录
-     * @param competeWaterInfo
-     * @return
-     */
-    Integer addCompeteWater(CompeteWaterInfo competeWaterInfo);
-
-    /**
-     * 查询比拼水质记录
-     * @param shareId
-     * @return
-     */
-    CompeteWaterInfo selectCompeteWater(String shareId);
-
-    /**
-     * 修改滤芯更换记录表
-     * @param rentChangeLogs
-     * @return
-     */
-    boolean updateChangeLogsById(RentChangeLogs rentChangeLogs);
-}

watero-rent-interface/src/main/java/com/iamberry/rent/face/order/RentOrderService.java

@@ -1,224 +0,0 @@
-package com.iamberry.rent.face.order;
-
-import java.util.List;
-import java.util.Map;
-
-import com.iamberry.wechat.core.entity.rent.*;
-
-
-/**
- * 租赁订单业务接口
- * @company	深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author 	献
- * @tel		18271840547
- * @date	2017年3月10日
- */
-public interface RentOrderService {
-
-	/**
-	 * 根据用户openid，查询已支付但为使用的激活码
-	 * @param openId
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月10日
-	 */
-	List<RentOrderItem> listInitCode(String openId);
-	
-	/**
-     * 根据openid 获取当前用户订单详情
-     * 2017年3月10日
-     * @author muzx
-     * @param rentOrderDTO
-     * @return
-     */
-	Map<String, Object> listRentOrder(RentOrderDTO rentOrderDTO);
-    
-	/**
-	 * 添加租赁订单信息
-	 * @param rentOrder
-	 * @return
-	 */
-	Integer insertRentOrderInfo(RentOrder rentOrder);
-	
-	/**
-	 * 批量添加租赁订单项数据
-	 * @param list
-	 * @return
-	 */
-	Integer insertRentOrderItemList(List<RentOrderItem> list);
-	
-	/**
-	 * 跟据条件查询一条订单项数据
-	 * @param rentOrderItem
-	 * @return
-	 */
-	RentOrderItem getOrderItemByInitCode(RentOrderItem rentOrderItem);
-	
-	/**
-	 * 添加订单和订单项信息
-	 * @param rentOrder
-	 * @param list
-	 * @return
-	 */
-	Integer insertRentOrderAndItem(RentOrder rentOrder, List<RentOrderItem> list, ServiceCouponInfo couponInfo);
-	
-	/**
-	 * 根据orderid查询租赁订单信息
-	 * @param rentOrder
-	 * @return
-	 */
-	RentOrder getRentOrderByOrderId(RentOrder rentOrder);
-	
-	/**
-	 * 根据条件查询租赁订单项列表
-	 * @param rentOrderItem
-	 * @return
-	 */
-	List<RentOrderItem> listOrderItem(RentOrderItem rentOrderItem);
-	
-	/**
-     * 修改订单状态
-     * @param rentOrder
-     * @return
-     */
-    boolean updateRentOrder(RentOrder rentOrder);
-    
-	/**
-	 * 修改订单和订单项状态
-	 * @param rentOrder
-	 * @param rentOrderItem
-	 * @return
-	 */
-	boolean updateOrderAndOrderItem(RentOrder rentOrder, RentOrderItem rentOrderItem, ServiceCouponInfo serviceCouponInfo);
-	
-
-	/**
-     * 根据openid查询订单
-     * @param rentOpenid
-     * @return
-     */
-    List<RentOrderItem> getRentOrderByOpenId(String rentOpenid);
-    
-    /**
-     * 将租赁订单推送至百胜
-     * @param rentOrderId
-     * @param rentOpenId
-     * @return
-     * @throws Exception
-     */
-    public boolean addRentOrderToEfast(String rentOrderId, String rentOpenId) throws Exception;
-	
-	/**
-	 * 根据订单id 发货 并添加物流信息
-	 * 2017年3月16日
-	 * @author muzx
-	 * @param rentOrder
-	 * @return
-	 */
-	boolean deliverOrderByOrderId(RentOrder rentOrder);
-	
-	/**
-	 * 根据订单创建时间和状态查询订单信息
-	 * @param rentOrder
-	 * @return
-	 */
-	List<RentOrder> listOrderByDeadline(RentOrder rentOrder);
-	
-	/**
-	 * 修改订单，订单项，服务费抵扣券状态
-	 * @param orderList
-	 * @param couponList
-	 * @return
-	 */
-	boolean updateOrderAndCoupon(List<String> orderList, List<Integer> couponList);
-	
-	/**
-	 * 根据条件查询订单总数
-	 * 2017年3月16日
-	 * @author muzx
-	 * @param rentOrderDto
-	 * @return
-	 */
-	int countRentOrder(RentOrderDTO rentOrderDto);
-
-	/**
-	 * 修改租赁订单、订单项状态
-	 * 2017年4月25日
-	 * @author muzx
-	 * @param rentOrder
-	 * @return
-	 */
-	boolean updateOrderStatusAndItemStatus(RentOrder rentOrder );
-
-	/**
-	 * 退货
-	 * @param rentOrder
-	 * @return
-	 */
-	boolean updateReturnRentOrder(RentOrder rentOrder);
-
-	/**
-	 * 租赁订单退货申请
-	 * 2017年5月10日
-	 * @author muzx
-	 * @param rentOrder
-	 * @return
-	 */
-	boolean rentExitOrder(RentOrder rentOrder);
-	/**
-	 * 租赁订单换货申请
-	 * 2017年4月25日
-	 * @author muzx
-	 * @param rentOrder
-	 * @return
-	 */
-	boolean rentExchangeOrder( RentOrder rentOrder, RentExchangeInfo exchangeInfo);
-
-	/**
-	 * 处理租赁订单换货申请
-	 * 2017年4月25日
-	 * @author muzx
-	 * @param order
-	 * @return
-	 */
-	boolean opertionRentExchangeOrder(RentOrder order);
-
-	/**
-	 * 根据openid查询订单(押金抵扣卷使用)
-	 * @param rentOpenid
-	 * @return
-	 */
-	List<RentOrderItem> selectRentOrderByOpenId(String rentOpenid);
-
-	/**
-	 * 新增转账记录
-	 * @param accountLogsInfo
-	 * @return
-	 */
-	Integer addTransferRecord(AccountLogsInfo accountLogsInfo);
-
-	/**
-	 * 修改订单项
-	 * @param rentOrderItem
-	 * @return
-	 */
-	Integer update(RentOrderItem rentOrderItem);
-
-	/**
-	 * 后台处理订单退款
-	 * 2017年5月8日
-	 * @author muzx
-	 * @param rentOrder
-	 * @return
-	 */
-	boolean rentReturnMoneyRentOrder(RentOrder rentOrder) throws IllegalArgumentException;
-
-	/**
-	 * 修改服务费抵扣券和押金提取券状态
-	 * @param serviceId
-	 * @param pledgeId
-	 * @return
-	 */
-	boolean updateServiceAndPledge(Integer serviceId, Integer pledgeId);
-}

watero-rent-interface/src/main/java/com/iamberry/rent/face/order/ServiceCouponService.java

@@ -1,46 +0,0 @@
-package com.iamberry.rent.face.order;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.rent.PledgeCouponInfo;
-import com.iamberry.wechat.core.entity.rent.ServiceCouponInfo;
-
-public interface ServiceCouponService {
-
-	/**
-	 * 查询优惠券
-	 * @param info
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月13日
-	 */
-	List<ServiceCouponInfo> list(ServiceCouponInfo info);
-	
-	/**
-	 * 添加服务费抵扣券
-	 * @param couponInfo
-	 * @return
-	 */
-	Integer saveServiceCoupon(ServiceCouponInfo couponInfo);
-	
-	/**
-	 * 添加押金提取券
-	 * @param pledgeCouponInfo
-	 * @return
-	 */
-	Integer savePledgeCoupon(PledgeCouponInfo pledgeCouponInfo);
-	
-	/**
-	 * 根据条件查询押金提取券信息
-	 * @param pledgeCouponInfo
-	 * @return
-	 */
-	List<PledgeCouponInfo> listPledgeCoupon(PledgeCouponInfo pledgeCouponInfo);
-
-	/**
-	 * 修改押金提取券状态
-	 * @param pledgeCouponInfo
-	 * @return
-	 */
-	Integer updatePledgeCouponStatus(PledgeCouponInfo pledgeCouponInfo);
-}

watero-rent-interface/src/main/java/com/iamberry/rent/face/pay/RentPayService.java

@@ -1,19 +0,0 @@
-package com.iamberry.rent.face.pay;
-import com.iamberry.wechat.tools.ResponseJson;
-
-/**
- * @author LJK
- * Class Description: 微信支付Servier接口
- * Create Date:2017年5月8日15:16:48
- */
-public interface RentPayService {
-	/**
-	 *
-	 * @param openid
-	 * @param orderid
-	 * @param amount
-	 * @param accountType 1：提取押金 2：返利；3：退货；4:退款(为了写入日志表)
-	 * @param dese
-	 */
-	public ResponseJson payTransfer(String openid, String orderid, Integer amount, Integer accountType, String dese);
-}

watero-rent-interface/src/main/java/com/iamberry/rent/face/rebate/OrderRebateService.java

@@ -1,60 +0,0 @@
-package com.iamberry.rent.face.rebate;
-
-import java.util.List;
-import java.util.Map;
-
-import com.iamberry.wechat.core.entity.rent.RebateRecord;
-import com.iamberry.wechat.core.entity.rent.RentTypeInfo;
-import com.iamberry.wechat.tools.ResponseJson;
-
-public interface OrderRebateService {
-
-	/**
-	 * 根据id和状态查询租赁类型数据
-	 * @param rentTypeInfo
-	 * @return
-	 */
-	RentTypeInfo getRebateType(RentTypeInfo rentTypeInfo);
-	
-	/**
-	 * 查询租赁方式列表
-	 * @param rentTypeInfo
-	 * @return
-	 */
-	List<RentTypeInfo> listRebateType(RentTypeInfo rentTypeInfo);
-	
-	/**
-	 * 添加待返利信息
-	 * @param rentOrderId
-	 * @param openId
-	 * @return
-	 */
-	boolean saveRentOrderRebate(String rentOrderId, String openId);
-	
-	/**
-	 * 保存返利内容
-	 * @param rentOrderId
-	 * @param type
-	 * @param openId
-	 * @param resOpenId
-	 * @param rebateLevel
-	 * @return
-	 */
-	boolean saveRebateRecord(String rentOrderId, int type, String openId, String resOpenId, int rebateLevel);
-
-	/**
-	 * 查询待转账的返利记录
-	 * @param pageSize
-	 * @param pageNO
-	 * @param isPageTotal
-	 * @return
-	 */
-	Map<String, Object> listPayRebate(int pageSize, int pageNO, boolean isPageTotal);
-
-	/**
-	 * 完成支付转账
-	 * @param id
-	 * @return
-	 */
-	ResponseJson transPay(Integer id);
-}

watero-rent-service/.classpath

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

watero-rent-service/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>watero-rent-service</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>

watero-rent-service/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8

watero-rent-service/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7

watero-rent-service/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

watero-rent-service/pom.xml

@@ -1,44 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  	<modelVersion>4.0.0</modelVersion>
-	
-	<!-- 父类定义 -->
-	<parent>
-		<groupId>com.iamberry</groupId>
-		<artifactId>iamberry-parent</artifactId>
-		<version>1.0.0</version>
-	</parent>
-	
-  <artifactId>watero-rent-service</artifactId>
-  <packaging>jar</packaging>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <dependencies>
-    <dependency>
-		<groupId>com.iamberry</groupId>
-		<artifactId>watero-rent-interface</artifactId>
-		<version>1.0.0</version>
-    </dependency>
-    <dependency>
-		<groupId>com.iamberry</groupId>
-		<artifactId>watero-wechat-interface</artifactId>
-		<version>1.0.0</version>
-    </dependency>
-  </dependencies>
-
-	<build>
-	<resources>
-		<resource>
-			<directory>src/main/java</directory>
-			<includes>
-				<include>**/*.properties</include>
-				<include>**/*.xml</include>
-			</includes>
-			<filtering>false</filtering>
-		</resource>
-	</resources>
-	</build>
-</project>

watero-rent-service/src/main/java/com/iamberry/rent/service/efast/EfastRentServiceImpl.java

@@ -1,181 +0,0 @@
-package com.iamberry.rent.service.efast;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iamberry.app.tool.log.RatFWLogger;
-import com.iamberry.rent.face.efast.EfastRentService;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.face.porduct.ProductColorService;
-import com.iamberry.wechat.tools.DateTimeUtil;
-import com.iamberry.wechat.tools.HttpClient431Util;
-import com.iamberry.wechat.tools.NameUtils;
-import net.sf.json.JSONObject;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by Administrator on 2017/4/21.
- */
-@Service
-public class EfastRentServiceImpl implements EfastRentService {
-
-    @Autowired
-    private RatFWLogger logger;
-    @Autowired
-    private ProductColorService productColorService;
-
-    @Override
-    public Map<String,Object> getEfastSendOrderInfo(String oid) {
-        // TODO Auto-generated method stub
-
-        // 组装数据
-        Map<String, String> requestData = new HashMap<String, String>();
-        Map<String,Object> map = new HashMap<String,Object>();
-        map.put("status", false);
-        requestData.put("app_nick", NameUtils.getConfig("app_nick"));
-        requestData.put("app_key", NameUtils.getConfig("app_key"));
-        requestData.put("app_secret", NameUtils.getConfig("app_secret"));
-        requestData.put("timestamp", DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
-        requestData.put("app_act", "efast.trade.detail.get");
-        requestData.put("oid", oid);
-        requestData.put("feilds", NameUtils.getConfig("order_field"));
-        try {
-            String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
-            logger.info("订单号为:" + oid + "的订单，百胜返回信息:" + resultJson);
-            resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
-            Pattern p = Pattern.compile("\\s*|\t|\r|\n");
-            Matcher m = p.matcher(resultJson);
-            if (m.find()) {
-                resultJson = m.replaceAll("");
-            }
-            logger.info("get-订单号为:" + oid + "的订单，百胜返回信息:" + resultJson);
-            JSONObject jsonObject = JSONObject.fromObject(resultJson);
-
-            // default HTTP SUCCESS
-            JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
-            // 发货状态 : shipping_status
-            String shippingStatus = respData.getString("shipping_status");
-            if ("1".equals(shippingStatus)) {
-                map.put("postFirm", respData.getString("shipping_name"));
-                map.put("postNum", respData.getString("invoice_no"));
-                map.put("status", true);
-            }
-            logger.error(this, "get-订单号为:" + oid + "的订单，百胜返回信息:" + resultJson);
-        } catch (Exception e) {
-            // TODO Auto-generated catch block
-            logger.error(this, "get-订单号为:" + oid + "的订单，发生错误:" + e.getMessage());
-        }
-        return map;
-    }
-
-    @Override
-    public boolean sendRentFilter(String address, String id, Integer colorId, String addrName, String tel, String openId) throws Exception {
-        Map<String, Object> orderData = new HashMap<String, Object>();
-        Map<String, String> requestData = new HashMap<String, String>();
-        // request url
-        String url = NameUtils.getConfig("efast_base_url");
-
-        requestData.put("app_nick", NameUtils.getConfig("app_nick"));
-        requestData.put("app_key", NameUtils.getConfig("app_key"));
-        requestData.put("app_secret", NameUtils.getConfig("app_secret"));
-        requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
-        requestData.put("app_act", "efast.trade.new.add");
-
-        //颜色表查询
-        ProductColor productColor =	productColorService.selectProductColorById(colorId);
-
-        //地址截取
-        String [] addressDesc = address.split("-");
-
-        String provinceName = addressDesc[0];
-        if (addressDesc[0].indexOf("北京") != -1) {
-            provinceName = "北京";
-        } else if (addressDesc[0].indexOf("上海") != -1) {
-            provinceName = "上海";
-        } else if (addressDesc[0].indexOf("天津") != -1) {
-            provinceName = "天津";
-        } else if (addressDesc[0].indexOf("重庆") != -1) {
-            provinceName = "重庆";
-        }
-
-
-        String	sd_id = NameUtils.getConfig("sd_id");
-
-        orderData.put("add_time", DateTimeUtil.format(new Date()));				// 时间
-        orderData.put("address", addressDesc[3]);								// 收货地址
-        orderData.put("city_name", addressDesc[1]); 							// 城市
-        orderData.put("consignee", addrName);									// 收货人
-        orderData.put("district_name", addressDesc[2]);							// 区域
-        orderData.put("email", "");												// email
-        orderData.put("goods_amount", 0);			// 商品总价
-        orderData.put("goods_count", 1);										// 产品数量
-        orderData.put("mobile", tel);											// 手机号码
-        orderData.put("money_paid", 0);				// 已付款
-        // 兑换
-        orderData.put("oid", id);		// 订单号
-        orderData.put("order_amount", 0);			// 应付款,应付款金额要与已付款金额相同
-
-
-        /**
-         * 产品信息
-         */
-        List<Map<String, Object>> maps = new ArrayList<Map<String, Object>>();
-        Map<String, Object> orders1 = new HashMap<String, Object>();
-        orders1.put("goods_name", productColor.getColorProductName());	// 产品名称
-        orders1.put("goods_number",1);									    	// 产品数量
-        orders1.put("goods_price", 0);				// 产品原价
-        orders1.put("outer_sku", productColor.getColor69Code());				// 产品SKU
-        orders1.put("payment_ft", 0);		// 产品分摊价
-        maps.add(orders1);
-
-
-        orderData.put("orders", maps);													// 订单产品
-        orderData.put("pay_name", "weixinpay");											// 支付方式
-        orderData.put("pay_time", DateTimeUtil.format(new Date()));						// 支付时间
-        orderData.put("postscript", "");												// 买家留言
-        orderData.put("province_name", provinceName);									// 省份
-        orderData.put("sd_id", sd_id);													// 对应 efast 店铺 id
-        orderData.put("shipping_fee", 0);												// 快递费
-        orderData.put("shipping_name", "yto");											// 快递公司代码
-        orderData.put("tel", "");											// 我司电话
-        orderData.put("to_buyer", "");													// 商家备注
-        orderData.put("total_amount", 0);					// 订单总额
-        orderData.put("user_name", openId);												// 买家账户   百胜根据user_name来判断是否有重复，传openId是为了防止重复
-        orderData.put("zipcode", "");													// 邮编
-
-
-        com.fasterxml.jackson.databind.ObjectMapper mapper = new ObjectMapper();
-        String orderDataStr = null;
-        try {
-            orderDataStr = mapper.writeValueAsString(orderData);
-        } catch (JsonProcessingException e2) {
-            e2.printStackTrace();
-        }
-
-        requestData.put("info", orderDataStr);
-
-        try {
-            String result = HttpClient431Util.doGet(requestData, url);
-            result = StringEscapeUtils.unescapeJava(result); // unicode 编码
-            logger.info("add-推送订单号为:" + id + "的订单，百胜返回信息:" + result);
-            // parse JSON String to Object
-            JSONObject jsonObject = JSONObject.fromObject(result);
-            JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
-            String oderSn = respData.getString("oder_sn");
-            if (oderSn != null) {
-                String msg = respData.getString("msg");
-                if ("success".equals(msg)) {
-                    return true;
-                }
-            }
-            logger.error(this, "add-推送订单号为:" + id + "的订单，百胜返回信息:" + result);
-            throw new Exception(respData.getString("msg"));
-        } catch (Exception e) {
-            throw e;
-        }
-    }
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/machine/MachineServiceImpl.java

@@ -1,722 +0,0 @@
-package com.iamberry.rent.service.machine;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.iamberry.rent.face.efast.EfastRentService;
-import com.iamberry.wechat.core.entity.rent.*;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import com.iamberry.exception.ServiceException;
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.rent.face.rebate.OrderRebateService;
-import com.iamberry.rent.service.machine.mapper.MachineMapper;
-import com.iamberry.rent.service.order.mapper.RentOrderMapper;
-import com.iamberry.rent.service.order.mapper.ServiceCouponMapper;
-import com.iamberry.rent.service.rebate.mapper.OrderRebateMapper;
-import com.iamberry.wechat.core.entity.ResultMsg;
-import com.iamberry.wechat.core.entity.member.Member;
-import com.iamberry.wechat.core.entity.pay.PayResult;
-import com.iamberry.wechat.face.member.MemberService;
-import com.iamberry.wechat.face.pay.PayService;
-import com.iamberry.wechat.face.wechat.ConfigService;
-import com.iamberry.wechat.iot.WechatIotUtils;
-import com.iamberry.wechat.tools.DateTimeUtil;
-import com.iamberry.wechat.tools.NameUtils;
-import com.iamberry.wechat.tools.OrderNOUtil;
-import com.iamberry.wechat.tools.ResponseJson;
-import com.iamberry.wechat.tools.ResultInfo;
-
-import net.sf.json.JSONObject;
-/**
- * 机器业务实现类
- * @company 深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author  献
- * @tel     18271840547
- * @date    2017年3月9日
- */
-@Service
-public class MachineServiceImpl implements MachineService {
-
-    @Autowired
-    private MachineMapper machineMapper;
-    @Autowired
-    private RentOrderMapper rentOrderMapper;
-    @Autowired
-    private ConfigService configService;
-    private static final Logger LOGGER = LoggerFactory.getLogger(MachineService.class);
-    @Autowired
-    private ServiceCouponMapper couponMapper;
-    @Autowired
-    private PayService payService;
-    @Autowired
-    private OrderRebateService orderRebateService;
-    @Autowired
-    private OrderRebateMapper orderRebateMapper;
-    @Autowired
-    private MemberService memberService;
-    @Autowired
-    private EfastRentService efastRentService;
-
-    @Override
-    public int initBefore(MachineInfo machineInfo) throws ServiceException {
-        // TODO Auto-generated method stub
-        if (machineInfo == null || machineInfo.getMachineDeviceId() == null
-                || machineInfo.getMachineOpenid() == null) {
-            return 0;
-        }
-
-    	// 激活时间
-    	Date nowDate = new Date();
-
-        // 查询机器信息 , 只有没有激活的机器才能绑定
-        String openid = machineInfo.getMachineOpenid();
-        machineInfo.setMachineOpenid(null);
-        List<MachineInfo> infos = machineMapper.list(machineInfo);
-        if (infos == null || infos.isEmpty()) {
-            LOGGER.error("{'errorCode':{}, 'msg':'机器信息不存在，请管理员审核!', 'deviceid':'{}'}", 500, machineInfo.getMachineDeviceId());
-            return 0;
-        }
-        MachineInfo temp = infos.get(0);
-        if (temp.getMachineInitState() != 2) {
-            return 500;         // 已经激活的机器不能做激活使用，留待优化：查询续费记录中没有下发成功的命令,如果存在，则下发续费指令
-        }
-
-        // 激活
-        machineInfo.setMachineOpenid(openid);
-        List<RentOrderItem> list = rentOrderMapper.listInitCode(machineInfo.getMachineOpenid()); // 自己拥有订单
-        RentOrderItem item = null;
-        if (list != null && !list.isEmpty()) {
-            item = list.get(0); // 从订单中选择第一个做激活使用
-        } else {
-            item = rentOrderMapper.getWaitInit(machineInfo.getMachineOpenid()); // 别人分享的订单
-        }
-        if (item == null) {
-            return 0;
-        }
-
-        // 修改订单激活码状态
-        item.setItemInitCodeOldState(1);
-        item.setItemCodeState(2);
-        Integer res = rentOrderMapper.update(item);
-        if (res == null || res <= 0) {
-            LOGGER.error("{'method':'{}', 'deviceId':'{}', 'openid':'{}', 'itemId':{}}",
-            		"修改订单项中状态失败", machineInfo.getMachineDeviceId(), machineInfo.getMachineOpenid(), item.getItemId());
-            return 0;
-        }
-
-        // 准备命令
-        // 计算下发的小时数:结束时间 - 当前时间 / 1000 = x 秒  / 60 = y 分 / 60 = z 小时
-        long hour = (DateTimeUtil.addMonth(item.getItemUseYears()).getTime() - nowDate.getTime()) / 1000 / 60 / 60;
-        String hourStr = WechatIotUtils.align(Long.toString(hour));							// 补0
-        String waterNum = WechatIotUtils.align(item.getItemMachineNum().toString());		// 补0
-        String message = String.format(WechatIotUtils.INIT_MACHINE_COMMAND, hourStr, waterNum);
-
-        // 封装数据 & 修改机器的状态 说明：通过行级锁保证正确性，一旦A 修改 deviceid='ABC'的记录后，那么后来者在A未提交事务之前，无法修改ABC记录,需要等待A将事务提交，释放行级锁
-        temp.setMachineSurplusWater(item.getItemMachineNum());
-        temp.setMachineTotalWater(item.getItemMachineNum());
-        temp.setMachineStopDate(DateTimeUtil.addMonth(item.getItemUseYears()));
-        temp.setMachineConnectState(1);         // 修改机器的状态为已连接
-        temp.setMachineInitState(3);            // 激活中
-        temp.setMachineActivationTime(nowDate);//激活时间
-        temp.setMachineState(1);                // 修改为正常使用
-        temp.setMachineOrderId(list.get(0).getItemOrderId());
-        temp.setMachineOpenid(openid);
-        temp.setMachineInitCode(list.get(0).getItemInitCode());
-        temp.setMachineNextCommand(message);
-        res = machineMapper.update(temp);
-        if (res == null || res <= 0) {
-            LOGGER.error("{'method':'{}', 'deviceId':'{}', 'openid':'{}', 'itemId':{}}",
-            		"修改机器信息失败", machineInfo.getMachineDeviceId(), machineInfo.getMachineOpenid(), item.getItemId());
-            throw new ServiceException(500, "修改机器信息失败！");
-        }
-
-
-        // 发送消息 : 注意，此处存在待优化的逻辑，在事务中使用HTTP，导致行锁长时间的被当前事务持有，其他事务必须等待
-//        JSONObject json = WechatIotUtils.send(configService.getAccessToken(), message, 
-//                machineInfo.getMachineDeviceId(), machineInfo.getMachineOpenid(), "gh_2674097b2442");
-//        if (json == null || json.toString().indexOf("errcode") != -1) {
-//            LOGGER.error("{'method':{}, 'msg':{}}", "发送激活信息失败", json.toString());
-//            throw new ServiceException(500, "激活命令下发成功，请重试!");
-//        }
-//        if (json.getInt("ret") != 0) {
-//        	LOGGER.error("{'method':{}, 'msg':{}}", "发送激活信息失败", json.toString());
-//        	throw new ServiceException(500, "激活命令下发失败，请重试!");
-//        }
-//        LOGGER.info("{'deviceId':'{}', 'method':'INIT_SEND_SUCCESS', 'send_msg':'{}'}", machineInfo.getMachineDeviceId(), json.toString());
-        return 1;
-    }
-
-	@Override
-	public int init(String openid, String deviceId) throws ServiceException {
-		// TODO Auto-generated method stub
-		// 抽象机器
-		MachineInfo machineInfo = new MachineInfo();
-		machineInfo.setMachineOpenid(openid);
-		machineInfo.setMachineDeviceId(deviceId);
-
-		// 查询机器是否存在
-		List<MachineInfo> list = machineMapper.list(machineInfo);
-		if (list.size() != 1) {
-			return 0;
-		}
-
-		// 判断激活还是续费
-		if (list.get(0).getMachineInitState() != 3 || list.get(0).getMachineInitState() == 1) {
-			// 续费
-            LOGGER.info(deviceId + ",续费流程");
-			return rechargeAfter(openid, deviceId);
-		}
-		// 激活
-
-		// 查询激活订单是否存在
-		RentOrder orderIdByInitCode = rentOrderMapper.getOrderIdByInitCode(list.get(0).getMachineInitCode());
-		if (orderIdByInitCode == null || StringUtils.isEmpty(orderIdByInitCode.getRentOrderId())) {
-			return 0;
-		}
-
-		// 修改机器状态
-		machineInfo.setMachineInitState(1);			// 已激活
-		machineInfo.setMachineNextCommand("");		// 清空命令
-		Integer res = machineMapper.update(machineInfo);
-        if (res == null || res <= 0) {
-            LOGGER.error("{'method':'{}', 'deviceId':'{}', 'openid':'{}', 'orderId':{}}",
-            		"修改机器信息失败", machineInfo.getMachineDeviceId(), machineInfo.getMachineOpenid(), orderIdByInitCode);
-            return 0;
-        }
-
-        // 成功 & 触发返利 !!! 注意，此处触发返利的订单所属人，非当前激活订单用户
-        if (!orderRebateService.saveRentOrderRebate(orderIdByInitCode.getRentOrderId(), orderIdByInitCode.getRentOpenid())) {
-        	throw new ServiceException(501, "init - 触发返利任务失败!");
-        }
-
-		return 1;
-	}
-
-    @Override
-    public List<MachineInfo> list(MachineInfo info) {
-        // TODO Auto-generated method stub
-        return machineMapper.list(info);
-    }
-
-    @Override
-    public Integer syncMachine(MachineInfo info) {
-        // TODO Auto-generated method stub
-        int state = info.getMachineState();
-        info.setMachineState(null);
-        List<MachineInfo> infos = machineMapper.list(info);
-        if (infos == null || infos.size() != 1) {
-            return 0;
-        }
-        // TDS
-        if (info.getMachineTDS() <= -1) {
-            info.setMachineTDS(null);
-        }
-        //计算剩余水量
-        int surplusWater = infos.get(0).getMachineTotalWater() - info.getMachineHaveWater();
-
-        // 不能修改机器所属人
-        info.setMachineOpenid(null);
-        info.setMachineState(state);
-        info.setMachineId(infos.get(0).getMachineId());
-        info.setMachineSurplusWater(surplusWater);
-        info.setMachineConnectState(1);
-        return machineMapper.update(info);
-    }
-
-    @Override
-    public ResponseJson listServiceCoupon(String openId, String machineId) {
-        ResponseJson rj = new ResponseJson();
-        rj.setResultCode(200);
-        rj.setReturnCode(500);
-        rj.setResultMsg("参数有误!该机器不可以续费!");
-        if(StringUtils.isEmpty(machineId)){
-            return rj;
-        }
-        //服务费抵扣券下拉框
-        ServiceCouponInfo couponInfo = new ServiceCouponInfo();
-        couponInfo.setServiceStatus(1);         // 未使用的
-        couponInfo.setServiceOpenId(openId);
-        List<ServiceCouponInfo> couponList = couponMapper.list(couponInfo);
-
-        //机器信息
-        MachineInfo mac = new MachineInfo();
-        mac.setMachineOpenid(openId);
-        mac.setMachineId(Integer.parseInt(machineId));
-        List<MachineInfo> list = machineMapper.list(mac);
-        if(list == null || list.size() != 1){
-            return rj;
-        }
-        rj.setResultMsg("SUCCESS");
-        rj.setReturnCode(200);
-        rj.addResponseKeyValue("couponList", couponList);
-        rj.addResponseKeyValue("machine", list.get(0));
-        return rj;
-    }
-
-    @Override
-    public ResponseJson requestPay(MachineRecharge machineRecharge, Integer couponId) {
-        // TODO Auto-generated method stub
-        // 校验机器的状态
-        MachineInfo info = new MachineInfo();
-        info.setMachineId(machineRecharge.getRechargeMachineId());
-        info.setMachineOpenid(machineRecharge.getRechargeOpenId());
-        List<MachineInfo> infos = machineMapper.list(info);
-        if (infos == null || infos.size() != 1) {
-            // 没有找到机器
-            return new ResponseJson(200, "NOT_FOUND", 404);
-        }
-        // 只有已激活 & 已连接的机器才能续费
-        info = infos.get(0);
-        if (info.getMachineConnectState() != 1 || info.getMachineInitState() != 1) {
-            return new ResponseJson(200, "MACHINE_STATE_ERROR", 500);
-        }
-
-        // 拼装参数
-        int discount = 0;
-        ServiceCouponInfo couponInfo = null;
-        if (couponId != null && couponId != 0) {
-            couponInfo = new ServiceCouponInfo();
-            couponInfo.setServiceId(couponId);
-            couponInfo.setServiceStatus(1);         // 未使用的
-            couponInfo.setServiceOpenId(machineRecharge.getRechargeOpenId());
-            List<ServiceCouponInfo> couponInfos = couponMapper.list(couponInfo);
-            if (couponInfos != null && !couponInfos.isEmpty()) {
-                couponInfo = couponInfos.get(0);
-                discount = couponInfo.getServiceMoney();
-                couponInfo.setServiceStatus(2);
-                couponMapper.update(couponInfo);    //改為已使用
-            }
-        }
-        if (couponInfo == null) {
-            machineRecharge.setRechargeCouponId(0);
-        } else {
-            machineRecharge.setRechargeCouponId(couponId);
-        }
-        // 保存数据库
-        String orderId = "XF001" + OrderNOUtil.createOrderCode(info.getMachineId());
-        machineRecharge.setRechargeOrderId(orderId);
-
-        RentTypeInfo rentTypeInfo = getRentType(machineRecharge.getRechargeDuration());
-        machineRecharge.setRechargeWater(rentTypeInfo.getTypeWaterNum());         // 充值水量
-        machineRecharge.setRechargeAmount(rentTypeInfo.getTypeServiceMoney() - discount);   // 充值金额，单位为分
-        machineRecharge.setRechargeDuration(rentTypeInfo.getTypeDuration());        // 充值时长
-        machineRecharge.setRechargeMessageState(0);
-        machineRecharge.setRechargeState(0);
-        machineRecharge.setRechargeEndTime(DateTimeUtil.addMonth(info.getMachineStopDate(), machineRecharge.getRechargeDuration()));
-        Integer res = machineMapper.addRecharge(machineRecharge);
-        if (res == null || res <= 0) {
-            return new ResponseJson(200, "SERVER_ERROR", 500);
-        }
-
-        // 请求预支付id
-        PayResult payResult = payService.requestPay(machineRecharge.getRechargeOpenId(),
-                orderId,
-                rentTypeInfo.getTypeServiceMoney() - discount,
-                "【租赁】美国watero净饮水一体机!", NameUtils.getConfig("WECHAT_RENT_RECHARGE_BACK"));
-        if (payResult.isPaySuccess()) {
-            // 修改抵扣券为已使用
-            return new ResponseJson(200, "SUCCESS", 200).addResponseKeyValue(orderId)
-                    .addResponseKeyValue("wechat_pay_id", payResult.getPayData());
-        } else {
-            return new ResponseJson(200, "REQUEST_PAY_ERROR", 501);
-        }
-    }
-
-    /**
-     * 根据年限查看对应的充值信息
-     * 2017年3月28日
-     * @author muzx
-     * @param years 充值年数
-     * @return
-     */
-    private RentTypeInfo getRentType(int years){
-        RentTypeInfo rentType = new RentTypeInfo();
-        rentType.setTypeId(years);
-        rentType = orderRebateMapper.getRebateType(rentType);
-        return rentType;
-    }
-    @Override
-    public ResponseJson rechargeOrderIdPay(String orderId) {
-        // TODO Auto-generated method stub
-        MachineRecharge machineRecharge = new MachineRecharge();
-        machineRecharge.setRechargeOrderId(orderId);
-        machineRecharge.setRechargeState(0);
-        List<MachineRecharge> listRecharge = machineMapper.listRecharge(machineRecharge);
-        if (listRecharge == null || listRecharge.isEmpty() || listRecharge.size() != 1) {
-            return new ResponseJson(200, "NOT_FOUND", 404);
-        }
-        // 请求预支付id
-        PayResult payResult = payService.requestPay(listRecharge.get(0).getRechargeOpenId(), orderId,
-                listRecharge.get(0).getRechargeAmount(),
-                "【租赁】美国watero净饮水一体机!", NameUtils.getConfig("WECHAT_RENT_RECHARGE_BACK"));
-        if (payResult.isPaySuccess()) {
-            return new ResponseJson(200, "SUCCESS", 200).addResponseKeyValue(orderId)
-                    .addResponseKeyValue("wechat_pay_id", payResult.getPayData());
-        } else {
-            return new ResponseJson(200, "REQUEST_PAY_ERROR", 501).addResponseKeyValue(payResult.getPayData());
-        }
-    }
-
-    @Override
-    public Integer rechargeOrderPayCallback(String orderId, String transactionId) {
-        // TODO Auto-generated method stub
-        // 校验续费记录是否存在
-        MachineRecharge machineRecharge = new MachineRecharge();
-        machineRecharge.setRechargeOrderId(orderId);
-        machineRecharge.setRechargeState(0);
-        List<MachineRecharge> listRecharge = machineMapper.listRecharge(machineRecharge);
-        if (listRecharge == null || listRecharge.isEmpty() || listRecharge.size() != 1) {
-            return 3;
-        }
-        machineRecharge.setRechargeId(listRecharge.get(0).getRechargeId());
-        // 修改服务券状态
-        Integer couponId = listRecharge.get(0).getRechargeCouponId();
-        if (couponId != 0) {
-            ServiceCouponInfo info = new ServiceCouponInfo();
-            info.setServiceId(couponId);
-            info.setServiceStatus(3);
-            couponMapper.update(info);
-        }
-
-        // 查询机器信息
-        MachineInfo info = new MachineInfo();
-        info.setMachineId(listRecharge.get(0).getRechargeMachineId());
-        List<MachineInfo> list = machineMapper.list(info);
-        if (list == null || list.size() != 1) {
-            return 2;
-        }
-
-        // 计算下发的小时数:结束时间 - 当前时间 / 1000 = x 秒  / 60 = y 分 / 60 = z 小时z
-        long hour = (DateTimeUtil.addMonth(listRecharge.get(0).getRechargeDuration()).getTime() - new Date().getTime()) / 1000 / 60 / 60;
-
-        // 发送续费消息 : 注意，此处存在待优化的逻辑，在事务中使用HTTP，导致行锁长时间的被当前事务持有，其他事务必须等待
-        // 补0
-        info = list.get(0);
-        String hourStr = WechatIotUtils.align(Long.toString(hour));
-        String waterNum = WechatIotUtils.align(String.valueOf(info.getMachineSurplusWater() + listRecharge.get(0).getRechargeWater()));
-
-        String message = String.format(WechatIotUtils.INIT_MACHINE_COMMAND, hourStr, waterNum);
-       /* JSONObject json = WechatIotUtils.send(configService.getAccessToken(), message,
-                list.get(0).getMachineDeviceId(), list.get(0).getMachineOpenid(), "gh_2674097b2442");
-        if (json == null || json.toString().indexOf("errcode") != -1) {
-            LOGGER.error("{'method':{}, 'msg':{}}", "发送激活信息失败", json.toString());
-            machineRecharge.setRechargeMessageState(2);
-        } else {
-            machineRecharge.setRechargeMessageState(1);
-        }*/
-
-        // 修改机器信息
-        info.setMachineStopDate(listRecharge.get(0).getRechargeEndTime());
-        info.setMachineSurplusWater(info.getMachineSurplusWater() + listRecharge.get(0).getRechargeWater());
-        info.setMachineTotalWater(listRecharge.get(0).getRechargeWater() + info.getMachineSurplusWater());
-        info.setMachineState(1);
-        info.setMachineNextCommand(message);                            // 保存指令
-        Integer res = machineMapper.update(info);
-        if (res == null || res <= 0) {
-            throw new IllegalArgumentException();
-        }
-
-        // 修改续费订单的状态：待确认下发命令 & 支付成功
-        machineRecharge.setRechargeMessageState(2);
-        machineRecharge.setRechargeState(1);
-        machineRecharge.setRechargePayTime(new Date());
-        machineRecharge.setRechargeWxOrderId(transactionId);
-        res = machineMapper.updateRecharge(machineRecharge);
-        return res;
-    }
-
-    /**
-     * 续费以后 - 接受到续费成功命令后修改
-     * @param openid
-     * @throws ServiceException
-     * @author 献
-     * @Time   2017年4月5日
-     */
-    public int rechargeAfter(String openid, String deviceId) throws ServiceException {
-        // 查询机器信息
-        MachineInfo info = new MachineInfo();
-        info.setMachineDeviceId(deviceId);
-        // info = machineMapper.list(info).get(0);
-        if (machineMapper.list(info) == null) {
-            return 0;
-        }
-
-    	// 查询续费记录 : 查询所有支付成功，并且消息下发失败的
-    	MachineRecharge machineRecharge = new MachineRecharge();
-        machineRecharge.setRechargeOpenId(openid);
-        machineRecharge.setRechargeState(1);
-        machineRecharge.setRechargeMessageState(2);
-        machineRecharge.setRechargeMachineId(info.getMachineId());
-        List<MachineRecharge> listRecharge = machineMapper.listRecharge(machineRecharge);
-        if (listRecharge == null || listRecharge.isEmpty()) {
-            return 0;
-        }
-
-        // 修改续费订单的状态
-        for (MachineRecharge machineRecharge2 : listRecharge) {
-        	machineRecharge = new MachineRecharge();
-        	machineRecharge.setRechargeId(machineRecharge2.getRechargeId());
-        	machineRecharge.setRechargeMessageState(1);
-            machineRecharge.setRechargePayTime(new Date());
-            machineRecharge.setRechargeWxOrderId(machineRecharge2.getRechargeWxOrderId());
-            machineRecharge.setRechargeState(1);
-            machineMapper.updateRecharge(machineRecharge);
-		}
-
-		// 修改机器中的 下一条指令
-        info.setMachineNextCommand("");
-        machineMapper.update(info);
-        
-        return 1;
-    }
-
-    @Override
-    public List<MachineRecharge> listRecharge(Integer machineId) {
-        // TODO Auto-generated method stub
-        MachineRecharge machineRecharge = new MachineRecharge();
-        machineRecharge.setRechargeMachineId(machineId);
-        machineRecharge.setRechargeState(1);
-        return machineMapper.listRecharge(machineRecharge);
-    }
-
-    @Override
-    public List<MachineInfo> selectEquipmentList(MachineInfo machineInfo) {
-        // TODO Auto-generated method stub
-        return machineMapper.selectEquipmentList(machineInfo);
-    }
-
-    @Override
-    public Integer selectEquipmentCount(MachineInfo machineInfo) {
-        // TODO Auto-generated method stub
-        return machineMapper.selectEquipmentCount(machineInfo);
-    }
-
-    @Override
-    public Integer add(MachineInfo info) {
-        // TODO Auto-generated method stub
-        return machineMapper.add(info);
-    }
-
-    @Override
-    public MachineRecharge getRechargeByIdOrOrderId(MachineRecharge recharge) {
-        // TODO Auto-generated method stub
-        return machineMapper.getRechargeByIdOrOrderId(recharge);
-    }
-
-    @Override
-    public ResultMsg presentMachine(String orderItemId, String openId) {
-        ResultMsg rm = new ResultMsg();
-        rm.setMessage(ResultInfo.ERRORCODE);
-        rm.setStatus(false);
-        if(StringUtils.isEmpty(orderItemId)){
-            rm.setMessage("请选择正确的机器!");
-            return rm;
-        }
-        RentOrderItem item = new RentOrderItem();
-        item.setItemId(Integer.parseInt(orderItemId));
-        item = rentOrderMapper.getOrderItemByInitCode(item);
-        if(item == null || item.getItemProductType() != 1){
-            rm.setMessage("该机器不可以送人!");
-            return rm;
-        }
-        if(StringUtils.isEmpty(item.getItemInitCode()) || item.getItemCodeState() != 1){
-            rm.setMessage("该激活码已经被激活,不可以送人!");
-            return rm;
-        }
-        MachineShare machineShare = new MachineShare();
-        machineShare.setShareOpenId(openId);
-        machineShare.setShareTime(new Date());
-        machineShare.setShareCode(item.getItemInitCode());
-        if(machineMapper.insertMachineShare(machineShare) != null){
-            rm.setStatus(true);
-            rm.setResultCode(ResultInfo.SUCCESSCODE);
-            rm.setMessage("");
-            rm.setData(machineShare.getShareId());
-        }else{
-            rm.setMessage("赠送失败!请确认后重试!");
-        }
-        return rm;
-    }
-
-    @Override
-    public ResultMsg receiveMachine(String shareId, String openId) {
-        ResultMsg rm = new ResultMsg();
-        rm.setMessage(ResultInfo.ERRORCODE);
-        rm.setResultCode("500");
-        rm.setStatus(false);
-
-        if(StringUtils.isEmpty(shareId)){
-            rm.setMessage("分享有误!请联系分享用户重新分享!");
-            return rm;
-        }
-        MachineShare machineShare = machineMapper.getMachineShareById(shareId);
-        if(machineShare == null){
-            rm.setMessage("分享有误!请联系分享您的用户重新分享!");
-            return rm;
-        }
-
-        Member member = memberService.getMemberByUserOpenId(machineShare.getShareOpenId());
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("userName", member.getUserNickname());
-        map.put("userHead", member.getUserHead());
-        map.put("userDate", DateTimeUtil.format(machineShare.getShareTime()));
-        map.put("isUsed", "0");
-        rm.setData(map);
-        rm.setResultCode("200");
-        if(StringUtils.isNotEmpty(machineShare.getShareReOpenid())){
-            rm.setMessage("这台净水机已经被人领取。");
-            if(ObjectUtils.equals(machineShare.getShareReOpenid(), openId)){
-            	map.put("isUsed", "1");
-            }else{
-            	map.put("isUsed", "2");
-            }
-        }
-        if(ObjectUtils.equals(machineShare.getShareOpenId(), openId)){
-        	rm.setResultCode("201");
-        }else{
-        	if(StringUtils.isEmpty(machineShare.getShareReOpenid())){
-        		machineShare.setShareReOpenid(openId);
-        		machineShare.setShareBindTime(new Date());
-        		if(machineMapper.updateMachineShare(machineShare) > 0){
-        			rm.setStatus(true);
-        			rm.setMessage("");
-        		}else{
-        			rm.setMessage("领取机器失败,请联系分享您的用户重新分享!");
-        		}
-        	}
-        }
-        return rm;
-    }
-
-	@Override
-	public int bindMachineToOpenId(String device_id, String openId) {
-		// TODO Auto-generated method stub
-		MachineInfo info = new MachineInfo();
-		info.setMachineDeviceId(device_id);
-		info.setMachineOpenid(openId);
-		Integer res = machineMapper.update(info);
-		return res == null ? 0 : res;
-	}
-
-	@Override
-	public MachineInfo selectMachineById(MachineInfo machineInfo) {
-		// TODO Auto-generated method stub
-		return machineMapper.selectMachineById(machineInfo);
-	}
-
-    @Override
-    public List<MachineShare> listMachineShareAdmin(MachineShare machineShare) {
-        // TODO Auto-generated method stub
-        machineShare.getPage().initRecordBegin();
-        return machineMapper.listMachineShareAdmin(machineShare);
-    }
-
-    @Override
-    public int countMachineShare(MachineShare machineShare) {
-        // TODO Auto-generated method stub
-        return machineMapper.countMachineShare(machineShare);
-    }
-
-	/*@Override
-	@Scheduled(cron = "0/10 * * * * ?")//每10秒执行一次*/
-	public synchronized void handlerNextCommand() {
-		// TODO Auto-generated method stub
-        List<MachineInfo> listNextCommandMachine = machineMapper.listNextCommandMachine();
-		for (MachineInfo machineInfo : listNextCommandMachine) {
-            // 第一条消息总是改变数据方向：Server
-            String accessToken = configService.getAccessToken();
-            WechatIotUtils.send(accessToken, "*setDir0#", machineInfo.getMachineDeviceId(), machineInfo.getMachineOpenid(), "gh_2674097b2442");
-			// 接着发送正式的命令
-            JSONObject json = WechatIotUtils.send(accessToken, machineInfo.getMachineNextCommand(),
-					machineInfo.getMachineDeviceId(), machineInfo.getMachineOpenid(), "gh_2674097b2442");
-	        if (json == null || json.toString().contains("errcode")) {
-                LOGGER.error("{'method':'{}', 'msg':'{}'}", "发送激活信息失败", json.toString());
-	        } else {
-                LOGGER.info("{'device_id':'{}', 'msg':'{}'}", machineInfo.getMachineDeviceId(), "发送激活信息成功");
-            }
-		}
-	}
-
-	@Override
-	public Integer update(MachineInfo info) {
-		// TODO Auto-generated method stub
-		return machineMapper.update(info);
-	}
-
-	@Override
-	public List<RentChangeLogs> listSelectChangeLogs(
-			RentChangeLogs rentChangeLogs) {
-		// TODO Auto-generated method stub
-		return machineMapper.listSelectChangeLogs(rentChangeLogs);
-	}
-
-	@Override
-	public Integer saveChangeLogs(List<RentChangeLogs> list, RentOrder rentOrder) throws Exception {
-		// TODO Auto-generated method stub
-        int id = 0;
-        if (list != null && list.size() > 0) {
-            //循环插入更换滤芯表中，返回id并推送到百胜系统
-            for (RentChangeLogs rentChangeLogs : list) {
-                int colorId = 0;
-                switch (rentChangeLogs.getLogsFilterType().intValue()) {
-                    case 1:colorId = 7;break;
-                    case 2:colorId = 8;break;
-                    case 3:colorId = 8;break;
-                    case 4:colorId = 8;break;
-                    default:colorId = 7;break;
-                }
-                id = machineMapper.insertFilterLogs(rentChangeLogs);
-                if (id > 0) {
-                    efastRentService.sendRentFilter(rentChangeLogs.getLogsAddressInfo(),"RF00000000"+id,colorId,
-                            rentChangeLogs.getLogsAddressName(),rentChangeLogs.getLogsAddressTel(),rentOrder.getRentOpenid());
-                }
-            }
-        }
-		return id;
-	}
-
-	@Override
-	public List<RentChangeLogs> listChangeFilterLogs(
-			RentChangeLogs rentChangeLogs) {
-		// TODO Auto-generated method stub
-		return machineMapper.listChangeFilterLogs(rentChangeLogs);
-	}
-
-	@Override
-	public Integer getChangeFilterCount(RentChangeLogs rentChangeLogs) {
-		// TODO Auto-generated method stub
-		int count = machineMapper.getChangeFilterCount(rentChangeLogs);
-		int pageCount =  count % rentChangeLogs.getPage().getPageSize() == 0 ? count/rentChangeLogs.getPage().getPageSize():(count/rentChangeLogs.getPage().getPageSize()) + 1;
-		return pageCount;
-	}
-
-    @Override
-    public Integer addCompeteWater(CompeteWaterInfo competeWaterInfo) {
-        return machineMapper.addCompeteWater(competeWaterInfo);
-    }
-
-    @Override
-    public CompeteWaterInfo selectCompeteWater(String shareId) {
-        return machineMapper.selectCompeteWater(shareId);
-    }
-
-    @Override
-    public boolean updateChangeLogsById(RentChangeLogs rentChangeLogs) {
-        int num = machineMapper.updateChangeLogsById(rentChangeLogs);
-        if (num > 0) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/machine/mapper/MachineMapper.java

@@ -1,206 +0,0 @@
-package com.iamberry.rent.service.machine.mapper;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.rent.*;
-
-/**
- * 机器Mapper
- * @company	深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author 	献
- * @tel		18271840547
- * @date	2017年3月10日
- */
-public interface MachineMapper {
-
-	/**
-	 * 添加机器，注意：只能初始化机器信息
-	 * @param info
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月10日
-	 */
-	Integer add(MachineInfo info);
-
-	/**
-	 * 修改机器,根据machineId和deviceid修改，其他不能为空的机器信息
-	 * @param info
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月10日
-	 */
-	Integer update(MachineInfo info);
-	
-	/**
-	 * 查询机器信息,如果deviceid不能为空，那么查询为单条数据
-	 * @param info
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月10日
-	 */
-	List<MachineInfo> list(MachineInfo info);
-	
-	/**
-	 * 添加充值续费记录
-	 * @param recharge
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月13日
-	 */
-	Integer addRecharge(MachineRecharge recharge);
-	
-	/**
-	 * 查询充值记录
-	 * @param machineRecharge
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月13日
-	 */
-	List<MachineRecharge> listRecharge(MachineRecharge machineRecharge);
-	
-	/**
-	 * 修改充值记录信息
-	 * @param machineRecharge
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月13日
-	 */
-	Integer updateRecharge(MachineRecharge machineRecharge);
-	
-	/**
-	 * 后台机器信息列表
-	 * @param machineInfo
-	 * @return
-	 */
-	List<MachineInfo> selectEquipmentList(MachineInfo machineInfo);
-	
-	/**
-	 * 后台机器信息总数
-	 * @param machineInfo
-	 * @return
-	 */
-	Integer selectEquipmentCount(MachineInfo machineInfo);
-	
-	/**
-	 * 根据 id 或 orderid 查询单个充值记录
-	 * @date 2017年3月22日
-	 * @author muzx
-	 * @param recharge
-	 * @return
-	 */
-	MachineRecharge getRechargeByIdOrOrderId(MachineRecharge recharge);
-	
-	/**
-     * 添加分享机器记录
-     * 2017年3月17日
-     * @author muzx
-     * @param machineShare
-     * @return
-     */
-    Integer insertMachineShare(MachineShare machineShare);
-    
-    /**
-     * 根据shareId查询一个机器分享记录
-     * 2017年3月17日
-     * @author muzx
-     * @param shareId
-     * @return
-     */
-    MachineShare getMachineShareById(String shareId);
-    /**
-     * 根据shareid 修改机器分享记录
-     * 2017年3月17日
-     * @author muzx
-     * @param machineShare
-     * @return
-     */
-    Integer updateMachineShare(MachineShare machineShare);
-    
-    /**
-     * 根据设备id查询单个设备
-     * @param machineInfo
-     * @return
-     */
-    MachineInfo selectMachineById(MachineInfo machineInfo);
-    /**
-     * 分页查询所有分享机器记录<后台>
-     * 2017年3月20日
-     * @author muzx
-     * @param machineShare
-     * @return
-     */
-    List<MachineShare> listMachineShareAdmin(MachineShare machineShare);
-    
-    /**
-     * 查询所有分享机器记录总数<后台>
-     * 2017年3月20日
-     * @author muzx
-     * @return
-     */
-    Integer countMachineShare(MachineShare machineShare);
-    
-    /**
-     * 查询需要下发命令的机器
-     * @return
-     * @author 献
-     * @Time   2017年4月8日
-     */
-    List<MachineInfo> listNextCommandMachine();
-    
-    /**
-     * 根据条件查询滤芯更换记录
-     * @param rentChangeLogs
-     * @return
-     */
-    List<RentChangeLogs> listSelectChangeLogs(RentChangeLogs rentChangeLogs);
-    
-    /**
-     * 批量添加滤芯更换记录
-     * @param list
-     * @return
-     */
-    Integer saveChangeLogs(List<RentChangeLogs> list);
-
-	/**
-	 * 单个添加滤芯更换记录，并返回id
-	 * @param rentChangeLogs
-	 * @return
-	 */
-	Integer insertFilterLogs(RentChangeLogs rentChangeLogs);
-    
-    /**
-     * 查询更换滤芯集合
-     * @param rentChangeLogs
-     * @return
-     */
-    List<RentChangeLogs> listChangeFilterLogs(RentChangeLogs rentChangeLogs);
-    
-    /**
-     * 根据条件查询更换滤芯数量
-     * @param rentChangeLogs
-     * @return
-     */
-    Integer getChangeFilterCount(RentChangeLogs rentChangeLogs);
-
-	/**
-	 * 新增比拼水质记录
-	 * @param competeWaterInfo
-	 * @return
-	 */
-	Integer addCompeteWater(CompeteWaterInfo competeWaterInfo);
-
-	/**
-	 * 查询比拼水质记录
-	 * @param shareId
-	 * @return
-	 */
-	CompeteWaterInfo selectCompeteWater(String shareId);
-
-	/**
-	 * 修改滤芯更换记录表
-	 * @param rentChangeLogs
-	 * @return
-	 */
-	Integer updateChangeLogsById(RentChangeLogs rentChangeLogs);
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/machine/mapper/machineMapper.xml

@@ -1,543 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iamberry.rent.service.machine.mapper.MachineMapper">
-	<sql id="rentMachineInfo">
-		machine_id machineId,
-		machine_order_id  machineOrderId,
-		<!-- machine_openid machineOpenid, -->
-		machine_device_id machineDeviceId,
-		machine_qrcode machineQrcode,
-		machine_mac machineMac,
-		machine_surplus_water machineSurplusWater,
-		machine_have_water machineHaveWater,
-		machine_update_time machineUpdateTime,
-		machine_stop_date machineStopDate,
-		machine_next_command machineNextCommand,
-		machine_connect_state machineConnectState,
-		machine_init_state machineInitState,
-		machine_state machineState,
-		machine_init_code  machineInitCode,
-		machine_create_time machineCreateTime,
-		machine_TDS machineTDS,
-		machine_activation_time machineActivationTime
-	</sql>
-	<sql id="CompeteWater" >
-		share_one_openid shareOneOpenId,
-		share_machine_id shareMachineId,
-		share_nickname shareNickname,
-		machine_water_TDS machineWaterTDS,
-		machine_amount_water machineAmountWater,
-		share_creation_time shareCreationTime,
-		share_user_head shareUserHead
-	</sql>
-
-	<select id="list" parameterType="MachineInfo" resultType="MachineInfo">
-		SELECT
-			*
-		FROM
-			TB_IAMBERRY_RENT_MACHINE_INFO	
-		<where>
-			<!-- 机器id -->
-			<if test="machineId!=null and machineId!=''">
-				MACHINE_ID = #{machineId}
-			</if>
-			<!-- 机器号 -->
-			<if test="machineDeviceId!=null and machineDeviceId!=''">
-				MACHINE_DEVICE_ID = #{machineDeviceId}
-			</if>
-			<!-- openid -->
-			<if test="machineOpenid!=null and machineOpenid!=''">
-				AND MACHINE_OPENID = #{machineOpenid}
-			</if>
-			<!-- 订单id -->
-			<if test="machineOrderId!=null and machineOrderId!=''">
-				AND MACHINE_ORDER_ID = #{machineOrderId}
-			</if>
-			<!-- 机器MAC -->
-			<if test="machineMac!=null and machineMac!=''">
-				AND MACHINE_MAC = #{machineMac}
-			</if>
-			<!-- 链接状态 -->
-			<if test="machineConnectState!=null and machineConnectState!=''">
-				AND MACHINE_CONNECT_STATE = #{machineConnectState}
-			</if>
-			<!-- 激活状态 -->
-			<if test="machineInitState!=null and machineInitState!=''">
-				AND MACHINE_INIT_STATE = #{machineInitState}
-			</if>
-			<!-- 机器状态 -->
-			<if test="machineState!=null and machineState!=''">
-				AND MACHINE_STATE = #{machineState}
-			</if>
-		</where>
-		<if test="machineDeviceId!=null and machineDeviceId!=''">
-			LIMIT 0, 1
-		</if>
-	</select>
-	
-	<!-- 添加一台机器 -->
-	<insert id="add" parameterType="MachineInfo" 
-		keyProperty="machineId" useGeneratedKeys="true">
-		 INSERT INTO 
-		 	TB_IAMBERRY_RENT_MACHINE_INFO
-	 		(
-		 		MACHINE_ORDER_ID, MACHINE_OPENID, MACHINE_DEVICE_ID, MACHINE_QRCODE, MACHINE_MAC, MACHINE_SURPLUS_WATER,
-		 		MACHINE_UPDATE_TIME, MACHINE_STOP_DATE, MACHINE_NEXT_COMMAND, MACHINE_CONNECT_STATE, MACHINE_INIT_STATE,
-		 		MACHINE_STATE, MACHINE_INIT_CODE, MACHINE_CREATE_TIME,MACHINE_HAVE_WATER
-			)
-		 VALUES 
-		  	(
-		  		#{machineOrderId}, #{machineOpenid}, #{machineDeviceId}, #{machineQrcode}, #{machineMac}, 0,
-		  		NOW(), NOW(), null, 2, 2, 2, null, NOW(),#{machineHaveWater}
-		  	)
-	</insert>
-	
-	<!-- 修改机器信息 -->
-	<update id="update" parameterType="MachineInfo">
-		UPDATE
-			TB_IAMBERRY_RENT_MACHINE_INFO 
-		<set>
-			<if test="machineOrderId != null">
-				MACHINE_ORDER_ID = #{machineOrderId}, 
-			</if>
-			<if test="machineOpenid != null">
-				MACHINE_OPENID = #{machineOpenid}, 
-			</if>
-			<if test="machineSurplusWater != null">
-				MACHINE_SURPLUS_WATER = #{machineSurplusWater}, 
-			</if>
-			<if test="machineStopDate != null">
-				MACHINE_STOP_DATE = #{machineStopDate}, 
-			</if>
-			<if test="machineNextCommand != null">
-				MACHINE_NEXT_COMMAND = #{machineNextCommand},
-			</if>
-			<if test="machineConnectState != null">
-				MACHINE_CONNECT_STATE = #{machineConnectState}, 
-			</if>
-			<if test="machineInitState != null">
-				MACHINE_INIT_STATE = #{machineInitState}, 
-			</if>
-			<if test="machineState != null">
-				MACHINE_STATE = #{machineState}, 
-			</if>
-			<if test="machineInitCode != null and machineInitCode != ''">
-				MACHINE_INIT_CODE = #{machineInitCode},
-			</if>
-			<if test="machineActivationTime != null">
-				machine_activation_time = #{machineActivationTime},
-			</if>
-			<if test="machineHaveWater != null">
-				machine_have_water = #{machineHaveWater},
-			</if>
-			<if test="machineTDS != null">
-				machine_TDS = #{machineTDS},
-			</if>
-			<if test="machineTotalWater != null and machineTotalWater != 0">
-				machine_total_water = #{machineTotalWater}
-			</if>
-		</set>
-		<where>
-			<if test="machineId != null and machineId != 0">
-				MACHINE_ID = #{machineId}
-			</if>
-			<if test="machineDeviceId != null">
-				AND MACHINE_DEVICE_ID = #{machineDeviceId}
-			</if>
-			<!-- 根据机器的状态修改 -->
-			<if test="machineOldState != null">
-				AND MACHINE_STATE = #{machineOldState}
-			</if>
-		</where>
-	</update>
-	
-	<!-- 添加续费记录 -->
-	<insert id="addRecharge" parameterType="MachineRecharge">
-		 INSERT INTO 
-		 	TB_IAMBERRY_RENT_MACHINE_RECHARGE
-	 		(
-		 		RECHARGE_OPENID, RECHARGE_MACHINE_ID, RECHARGE_AMOUNT, RECHARGE_TIME, RECHARGE_WATER, RECHARGE_COUPONID,
-		 		RECHARGE_DURATION, RECHARGE_STATE, RECHARGE_ORDERID, RECHARGE_PAY_TIME, RECHARGE_MESSAGE_STATE, RECHARGE_END_TIME
-			)
-		 VALUES 
-		  	(
-		  		#{rechargeOpenId}, #{rechargeMachineId}, #{rechargeAmount}, NOW(), #{rechargeWater}, #{rechargeCouponId},
-		  		#{rechargeDuration}, 0, #{rechargeOrderId}, null, 0, #{rechargeEndTime}
-		  	)
-	</insert>
-	
-	<!-- 获取续费的信息 -->
-	<select id="listRecharge" parameterType="MachineRecharge" resultType="MachineRecharge">
-		SELECT
-			*
-		FROM
-			TB_IAMBERRY_RENT_MACHINE_RECHARGE
-		<where>
-			<if test="rechargeId != null">
-				AND RECHARGE_ID = #{rechargeId}
-			</if>
-			<if test="rechargeOrderId != null">
-				AND RECHARGE_ORDERID = #{rechargeOrderId}
-			</if>
-			<if test="rechargeMachineId != null">
-				AND RECHARGE_MACHINE_ID = #{rechargeMachineId}
-			</if>
-			<if test="rechargeOpenId != null">
-				AND RECHARGE_OPENID = #{rechargeOpenId}
-			</if>
-			<if test="rechargeState != null">
-				AND RECHARGE_STATE = #{rechargeState}
-			</if>
-		</where>
-	</select>
-	
-	<!-- 修改状态 -->
-	<update id="updateRecharge" parameterType="MachineRecharge">
-		UPDATE
-			TB_IAMBERRY_RENT_MACHINE_RECHARGE
-		SET
-			RECHARGE_STATE = #{rechargeState},
-			RECHARGE_MESSAGE_STATE = #{rechargeMessageState},
-			RECHARGE_WX_ORDERID = #{rechargeWxOrderId},
-			RECHARGE_PAY_TIME = #{rechargePayTime}
-		WHERE
-			RECHARGE_ID = #{rechargeId}
-	</update>
-	
-	<!-- 后台设备列表页面 -->
-	<select id="selectEquipmentList" parameterType="MachineInfo" resultType="MachineInfo">
-		SELECT 
-			<include refid="rentMachineInfo"/>
-			,tb_iamberry_user_userinfo.user_nickname machineOpenid
-		FROM
-			tb_iamberry_rent_machine_info left join tb_iamberry_user_userinfo 
-			on tb_iamberry_rent_machine_info.machine_openid = tb_iamberry_user_userinfo.user_openid
-		<where>
-			<if test="machineDeviceId != null and machineDeviceId != ''">
-				and machine_device_id = #{machineDeviceId}
-			</if>
-			<if test="machineMac != null and machineMac != ''">
-				and machine_mac = #{machineMac}
-			</if>
-			<if test="machineInitState != null and machineInitState != '' ">
-				and machine_init_state = #{machineInitState}
-			</if>
-			<if test="beginWater != null">
-				and machine_surplus_water &gt;  #{beginWater}
-			</if>
-			<if test="endWater != null">
-				and machine_surplus_water &lt; #{endWater}
-			</if>
-			<if test="beginDate != null">
-				and machine_stop_date &gt; #{beginDate}
-			</if>
-			<if test="endDate != null">
-				and machine_stop_date &lt; #{endDate}
-			</if>
-		</where>
-		 order by machine_create_time desc
-	    <if test="page!=null and page.pageNo>0 and page.pageSize>0 ">
-	     limit ${page.pageNo},${page.pageSize}
-	    </if>
-	     <if test="page!=null and page.pageNo==0 and page.pageSize>0 ">
-	     limit ${page.pageSize}
-	    </if>  
-	</select>
-	<!-- 后台设备列表页面总数 -->
-	<select id="selectEquipmentCount" parameterType="MachineInfo" resultType="Integer">
-		SELECT 
-			count(1)
-		FROM
-			tb_iamberry_rent_machine_info
-		<where>
-			<if test="machineDeviceId != null and machineDeviceId != ''">
-				and machine_device_id = #{machineDeviceId}
-			</if>
-			<if test="machineMac != null and machineMac != ''">
-				and machine_mac = #{machineMac}
-			</if>
-			<if test="machineInitState != null and machineInitState != '' ">
-				and machine_init_state = #{machineInitState}
-			</if>
-			<if test="beginWater != null">
-				and machine_surplus_water &gt;  #{beginWater}
-			</if>
-			<if test="endWater != null">
-				and machine_surplus_water &lt; #{endWater}
-			</if>
-			<if test="beginDate != null">
-				and machine_stop_date &gt; #{beginDate}
-			</if>
-			<if test="endDate != null">
-				and machine_stop_date &lt; #{endDate}
-			</if>
-		</where>
-	</select>
-	
-	<!--  -->
-	<select id="getRechargeByIdOrOrderId" parameterType="MachineRecharge" resultType="MachineRecharge">
-		SELECT * FROM TB_IAMBERRY_RENT_MACHINE_RECHARGE
-		<where>
-			<if test="rechargeId != null and rechargeId != ''">
-				RECHARGE_ID = #{rechargeId}
-			</if>
-			<if test="rechargeOrderId != null and rechargeOrderId != ''">
-				RECHARGE_ORDERID = #{rechargeOrderId}
-			</if>
-		</where>
-	</select>
-	<!-- 添加分享机器记录 -->
-	<insert id="insertMachineShare" parameterType="MachineShare"
-		keyProperty="shareId" useGeneratedKeys="true">
-		INSERT INTO TB_IAMBERRY_RENT_MACHINE_SHARE
-		(
-			SHARE_OPENID,
-			SHARE_RE_OPENID,
-			SHARE_TIME,
-			SHARE_CODE,
-			SHARE_BIND_TIME
-		)
-		VALUES
-		(
-			#{shareOpenId},#{shareReOpenid},NOW(),#{shareCode},#{shareBindTime}
-		)
-	</insert>
-	
-	<!-- 根据shareId查询一个机器分享记录 -->
-	<select id="getMachineShareById" parameterType="String" resultType="MachineShare" >
-		SELECT * FROM TB_IAMBERRY_RENT_MACHINE_SHARE
-		WHERE SHARE_ID = #{shareId}
-	</select>
-	
-	<!-- 根据shareid 修改机器分享记录 -->
-	<update id="updateMachineShare" parameterType="MachineShare">
-		UPDATE TB_IAMBERRY_RENT_MACHINE_SHARE
-		<set>
-			SHARE_BIND_TIME=NOW()
-			<if test="shareReOpenid != null and shareReOpenid != ''">
-				,share_re_openid=#{shareReOpenid}
-			</if>
-		</set>
-		WHERE SHARE_ID = #{shareId}
-	</update>
-	
-	<!-- 根据设备id查询单个设备 -->
-	<select id="selectMachineById" parameterType="machineInfo" resultType="MachineInfo">
-		SELECT 
-			<include refid="rentMachineInfo"/>
-		FROM
-			tb_iamberry_rent_machine_info
-		<where>
-			<if test="machineId != null and machineId != ''">
-				and machine_id = #{machineId}
-			</if>
-			<if test="machineDeviceId != null and machineDeviceId != ''">
-				and machine_device_id = #{machineDeviceId}
-			</if>
-		</where>
-		
-	</select>
-	
-	<!-- 分页查询所有分享机器记录 -->
-	<select id="listMachineShareAdmin" parameterType="MachineShare" resultType="MachineShare">
-		SELECT 
-			S.*,
-			U1.USER_NICKNAME SHAREUSERNICKNAME,
-			U2.USER_NICKNAME SHAREREUSERNICKNAME
-		FROM TB_IAMBERRY_RENT_MACHINE_SHARE S
-		LEFT JOIN TB_IAMBERRY_USER_USERINFO U1 ON S.SHARE_OPENID=U1.USER_OPENID
-		LEFT JOIN TB_IAMBERRY_USER_USERINFO U2 ON S.SHARE_RE_OPENID=U2.USER_OPENID
-		ORDER BY SHARE_BIND_TIME DESC,SHARE_TIME DESC
-		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
-	     LIMIT ${page.recordBegin},${page.pageSize}
-	    </if>
-	     <if test="page!=null and page.recordBegin==0 and page.pageSize>0 ">
-	     LIMIT ${page.pageSize} 
-	    </if>
-	</select>
-	
-	<!-- 查询所有分享机器记录总数 -->
-	<select id="countMachineShare"  parameterType="MachineShare" resultType="Integer">
-		SELECT COUNT(SHARE_ID) FROM TB_IAMBERRY_RENT_MACHINE_SHARE
-	</select>
-	
-	<!-- 获取还需要执行命令的机器 -->
-	<select id="listNextCommandMachine" resultType="MachineInfo">
-		SELECT
-			*
-		FROM
-			TB_IAMBERRY_RENT_MACHINE_INFO
-		WHERE
-			!(MACHINE_NEXT_COMMAND IS NULL) AND MACHINE_NEXT_COMMAND != ""
-	</select>
-	
-	<!-- 根据条件查询滤芯更换记录 -->
-	<select id="listSelectChangeLogs" parameterType="RentChangeLogs" resultType="RentChangeLogs">
-		SELECT 
-			* 
-		FROM 
-			TB_IAMBERRY_RENT_CHANGE_LOGS 
-		<where>
-			<if test="logsOrderId != null and logsOrderId != ''">
-				LOGS_ORDER_ID = #{logsOrderId} 
-			</if>
-			<if test="logsOpenid != null and logsOpenid != ''">
-				AND LOGS_OPENID = #{logsOpenid} 
-			</if>
-			<if test="logsId != null and logsId != ''">
-				AND LOGS_ID = #{logsId} 
-			</if>
-			<if test="logsStatus != null and logsStatus != ''">
-				AND LOGS_STATUS = #{logsStatus} 
-			</if>
-		</where> 
-	</select>
-	
-	<!-- 批量添加滤芯更换记录 -->
-	<insert id="saveChangeLogs" parameterType="RentChangeLogs">
-		INSERT INTO TB_IAMBERRY_RENT_CHANGE_LOGS
-		(
-			LOGS_MACHINE_DEVICE_ID,LOGS_ORDER_ID,LOGS_OPENID,LOGS_RENT_TYPE,LOGS_FILTER_TYPE,
-			LOGS_STATUS,LOGS_CREATE_TIME,LOGS_ADDRESS_INFO,LOGS_ADDRESS_TEL,LOGS_ADDRESS_NAME 
-		) 
-		VALUES 
-		<foreach collection="list" item="item" separator=",">
-			(
-				#{item.logsMachineDeviceId},#{item.logsOrderId},#{item.logsOpenid},#{item.logsRentType},#{item.logsFilterType},
-				#{item.logsStatus},NOW(),#{item.logsAddressInfo},#{item.logsAddressTel},#{item.logsAddressName} 
-			)
-		</foreach>
-	</insert>
-
-	<!-- 单个添加更换滤芯记录 -->
-	<insert id="insertFilterLogs" parameterType="RentChangeLogs" keyProperty="logsId" useGeneratedKeys="true">
-		INSERT INTO TB_IAMBERRY_RENT_CHANGE_LOGS
-		(
-			LOGS_MACHINE_DEVICE_ID,LOGS_ORDER_ID,LOGS_OPENID,LOGS_RENT_TYPE,LOGS_FILTER_TYPE,
-			LOGS_STATUS,LOGS_CREATE_TIME,LOGS_ADDRESS_INFO,LOGS_ADDRESS_TEL,LOGS_ADDRESS_NAME
-		)
-		VALUES
-		(
-			#{logsMachineDeviceId},#{logsOrderId},#{logsOpenid},#{logsRentType},#{logsFilterType},
-			#{logsStatus},NOW(),#{logsAddressInfo},#{logsAddressTel},#{logsAddressName}
-		)
-	</insert>
-	
-	<!-- 查询更换滤芯集合 -->
-	<select id="listChangeFilterLogs" parameterType="RentChangeLogs" resultType="RentChangeLogs">
-		SELECT
-			l.*,u.USER_NICKNAME rentUserNickName
-		FROM 
-			TB_IAMBERRY_RENT_CHANGE_LOGS l LEFT JOIN TB_IAMBERRY_USER_USERINFO u ON l.LOGS_OPENID = u.USER_OPENID 
-		<where>
-			<if test="logsStatus != null and logsStatus != -1">
-				LOGS_STATUS = #{logsStatus} 
-			</if>
-			<if test="logsAddressInfo != null">
-				AND LOGS_ADDRESS_INFO LIKE CONCAT('%',#{logsAddressInfo},'%')
-			</if>
-			<if test="logsAddressName != null">
-				AND LOGS_ADDRESS_NAME LIKE CONCAT('%',#{logsAddressName},'%')
-			</if>
-			<if test="logsAddressTel != null">
-				AND LOGS_ADDRESS_TEL LIKE CONCAT('%',#{logsAddressTel},'%')
-			</if>
-			<if test="logsOrderId != null">
-				AND LOGS_ORDER_ID LIKE CONCAT('%',#{logsOrderId},'%')
-			</if>
-			<if test="logsId != null">
-				AND LOGS_ID = #{logsId}
-			</if>
-			<if test="logsMachineDeviceId != null">
-				AND LOGS_MACHINE_DEVICE_ID = #{logsMachineDeviceId}
-			</if>
-			<if test="logsOpenid != null">
-				AND LOGS_OPENID = #{logsOpenid}
-			</if>
-		</where>
-		ORDER BY LOGS_CREATE_TIME ASC
-		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
-	     LIMIT ${page.recordBegin},${page.pageSize} 
-	    </if>
-	     <if test="page!=null and page.recordBegin==0 and page.pageSize>0 ">
-	     LIMIT ${page.pageSize} 
-	    </if>
-	</select>
-	
-	<!-- 根据条件获取更换滤芯的数量 -->
-	<select id="getChangeFilterCount" parameterType="RentChangeLogs" resultType="Integer">
-		SELECT
-			COUNT(LOGS_ID) 
-		FROM 
-			TB_IAMBERRY_RENT_CHANGE_LOGS l LEFT JOIN TB_IAMBERRY_USER_USERINFO u ON l.LOGS_OPENID = u.USER_OPENID
-		<where>
-			<if test="logsStatus != null and logsStatus != -1">
-				LOGS_STATUS = #{logsStatus}
-			</if>
-			<if test="logsAddressInfo != null">
-				AND LOGS_ADDRESS_INFO LIKE CONCAT('%',#{logsAddressInfo},'%')
-			</if>
-			<if test="logsAddressName != null">
-				AND LOGS_ADDRESS_NAME LIKE CONCAT('%',#{logsAddressName},'%')
-			</if>
-			<if test="logsAddressTel != null">
-				AND LOGS_ADDRESS_TEL LIKE CONCAT('%',#{logsAddressTel},'%')
-			</if>
-			<if test="logsOrderId != null">
-				AND LOGS_ORDER_ID LIKE CONCAT('%',#{logsOrderId},'%')
-			</if>
-		</where>
-	</select>
-
-	<insert id="addCompeteWater" parameterType="CompeteWaterInfo"
-			keyProperty="shareId" useGeneratedKeys="true">
-		INSERT INTO tb_iamberry_compete_water
-		(
-			share_one_openid,
-			share_machine_id,
-			share_nickname,
-			machine_water_TDS,
-			machine_amount_water,
-			share_creation_time,
-			share_user_head
-		)
-		VALUES
-		(
-			#{shareOneOpenId},#{shareMachineId},#{shareNickname},#{machineWaterTDS},#{machineAmountWater},NOW(),#{shareUserHead}
-		)
-	</insert>
-
-	<select id="selectCompeteWater" parameterType="String" resultType="CompeteWaterInfo">
-		SELECT <include refid="CompeteWater"/> FROM  tb_iamberry_compete_water
-		WHERE share_id = #{shareId}
-	</select>
-
-	<!-- 修改滤芯更换记录表 -->
-	<update id="updateChangeLogsById" parameterType="RentChangeLogs">
-		UPDATE
-			TB_IAMBERRY_RENT_CHANGE_LOGS
-		<set>
-			<if test="logsStatus != null">
-				LOGS_STATUS = #{logsStatus},
-			</if>
-			<if test="logsPostNum != null and logsPostNum != ''">
-				LOGS_POST_NUM = #{logsPostNum},
-			</if>
-			<if test="logsPostFirm != null and logsPostFirm != ''">
-				LOGS_POST_FIRM = #{logsPostFirm},
-			</if>
-			<if test="logsSendTime != null and logsSendTime != ''">
-				LOGS_SEND_TIME = #{logsSendTime},
-			</if>
-			<if test="logsAccomplishTime != null and logsAccomplishTime != ''">
-				LOGS_ACCOMPLISH_TIME = #{logsAccomplishTime}
-			</if>
-		</set>
-		<where>
-			LOGS_ID = #{logsId}
-			<if test="logsOldStatus != null and logsOldStatus != ''">
-				AND LOGS_STATUS = #{logsOldStatus}
-			</if>
-		</where>
-	</update>
-</mapper>

watero-rent-service/src/main/java/com/iamberry/rent/service/order/RentOrderServiceImpl.java

@@ -1,569 +0,0 @@
-package com.iamberry.rent.service.order;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.iamberry.rent.face.pay.RentPayService;
-import com.iamberry.rent.service.order.mapper.RentExchangeMapper;
-import com.iamberry.rent.service.rebate.mapper.OrderRebateMapper;
-import com.iamberry.wechat.core.entity.rent.*;
-import com.iamberry.wechat.tools.ResponseJson;
-import net.sf.json.JSONObject;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iamberry.app.tool.log.RatFWLogger;
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.rent.service.order.mapper.RentOrderMapper;
-import com.iamberry.rent.service.order.mapper.ServiceCouponMapper;
-import com.iamberry.wechat.tools.DateTimeUtil;
-import com.iamberry.wechat.tools.HttpClient431Util;
-import com.iamberry.wechat.tools.NameUtils;
-/**
- * 租赁订单业务实现
- * @company	深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author 	献
- * @tel		18271840547
- * @date	2017年3月10日
- */
-@Service
-public class RentOrderServiceImpl implements RentOrderService{
-	@Autowired
-	private RentOrderMapper rentOrderMapper;
-	@Autowired
-	private ServiceCouponMapper serviceCouponMapper;
-	@Autowired
-	private RentExchangeMapper rentExchangeMapper;
-	@Autowired
-    private RatFWLogger inLongLogger;
-	@Autowired
-	private RentPayService rentPayService;
-	@Autowired
-	private OrderRebateMapper orderRebateMapper;
-	@Autowired
-	private RentOrderService rentOrderService;
-
-	@Override
-	public List<RentOrderItem> listInitCode(String openId) {
-		// TODO Auto-generated method stub
-		return rentOrderMapper.listInitCode(openId);
-	}
-
-    @Override
-    public Map<String, Object> listRentOrder(RentOrderDTO rentOrderDTO) {
-        // TODO Auto-generated method stub
-        rentOrderDTO.getPage().initRecordBegin();
-        List<RentOrderDTO> dtoList = rentOrderMapper.listRentOrder(rentOrderDTO);
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("list", dtoList);
-        map.put("countOrder", rentOrderMapper.countRentOrder(rentOrderDTO));
-        return map;
-    }
-
-	@Override
-	public int countRentOrder(RentOrderDTO rentOrderDto) {
-		// TODO Auto-generated method stub
-		return rentOrderMapper.countRentOrder(rentOrderDto);
-	}
-
-	@Override
-	public Integer insertRentOrderInfo(RentOrder rentOrder) {
-		// TODO Auto-generated method stub
-		return rentOrderMapper.insertRentOrderInfo(rentOrder);
-	}
-
-	@Override
-	public Integer insertRentOrderItemList(List<RentOrderItem> list) {
-		// TODO Auto-generated method stub
-		return rentOrderMapper.insertRentOrderItemList(list);
-	}
-
-	@Override
-	public RentOrderItem getOrderItemByInitCode(RentOrderItem rentOrderItem) {
-		// TODO Auto-generated method stub
-		return rentOrderMapper.getOrderItemByInitCode(rentOrderItem);
-	}
-
-	@Override
-	public Integer insertRentOrderAndItem(RentOrder rentOrder,
-			List<RentOrderItem> list, ServiceCouponInfo couponInfo) {
-		// TODO Auto-generated method stub
-		int num = rentOrderMapper.insertRentOrderInfo(rentOrder);
-		int sum = rentOrderMapper.insertRentOrderItemList(list);
-		if (couponInfo == null) {
-			if (num > 0 && sum > 0) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			int flag = serviceCouponMapper.update(couponInfo);
-			if (num > 0 && sum > 0 && flag > 0) {
-				return 1;
-			} else {
-				return 0;
-			}
-		}
-		
-	}
-
-	@Override
-	public RentOrder getRentOrderByOrderId(RentOrder rentOrder) {
-		// TODO Auto-generated method stub
-		return rentOrderMapper.getRentOrderByOrderId(rentOrder);
-	}
-
-	@Override
-	public List<RentOrderItem> listOrderItem(RentOrderItem rentOrderItem) {
-		// TODO Auto-generated method stub
-		return rentOrderMapper.listOrderItem(rentOrderItem);
-	}
-
-	@Override
-    public boolean updateRentOrder(RentOrder rentOrder) {
-        // TODO Auto-generated method stub
-	    if(rentOrderMapper.updateRentOrder(rentOrder) > 0){
-	        return true;
-	    }else{
-	        return false;
-	    }
-    }
-	
-	@Override
-	public boolean updateOrderAndOrderItem(RentOrder rentOrder,
-			RentOrderItem rentOrderItem, ServiceCouponInfo serviceCouponInfo) {
-		// TODO Auto-generated method stub
-		int num = rentOrderMapper.updateRentOrder(rentOrder);
-		int sum = rentOrderMapper.updateOrderItem(rentOrderItem);
-		if (serviceCouponInfo == null) {
-			if (num > 0 && sum > 0) {
-				return true;
-			} else {
-				return false;
-			}
-		} else {
-			int flag = serviceCouponMapper.update(serviceCouponInfo);
-			if (num > 0 && sum > 0 && flag > 0) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}
-
-
-	@Override
-public List<RentOrderItem> getRentOrderByOpenId(String rentOpenid) {
-	// TODO Auto-generated method stub
-	return rentOrderMapper.getRentOrderByOpenId(rentOpenid);
-}
-
-
-
-@Override
-public boolean addRentOrderToEfast(String rentOrderId,  String rentOpenId) throws Exception {
-	// TODO Auto-generated method stub
-	RentOrderDTO rentOrder = new RentOrderDTO();
-	rentOrder.setRentOrderId(rentOrderId);
-	//根据orderId查询订单信息，只会有一条
-	List<RentOrderDTO> rentOrderList = rentOrderMapper.listRentOrder(rentOrder);
-	rentOrder = rentOrderList.get(0);
-	if (rentOrderList == null || rentOrderList.size() == 0) {
-		return false;
-	}
-	if (rentOrder.getOrderItemList() == null || rentOrder.getOrderItemList().size() == 0) {
-		return false;
-	}
-	// request url
-	String url = NameUtils.getConfig("efast_base_url");
-	// set Requeset Data
-	Map<String, String> requestData = new HashMap<String, String>();
-	/**
-	 * 系统级参数
-	 */
-	requestData.put("app_nick", NameUtils.getConfig("app_nick"));
-	requestData.put("app_key", NameUtils.getConfig("app_key"));
-	requestData.put("app_secret", NameUtils.getConfig("app_secret"));
-	requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
-	requestData.put("app_act", "efast.trade.new.add"); // "efast.trade.new.add"
-	
-	/**
-	 * 订单基本信息
-	 */
-	String [] addressDesc = rentOrder.getRentAddressInfo().split("-");
-	
-	String address = addressDesc[3];
-    if (addressDesc[3]!=null) {
-        Pattern p = Pattern.compile("\\s*|\t|\r|\n");
-        Matcher m = p.matcher(addressDesc[3]);
-        if (m.find()) {
-        	address = m.replaceAll("");
-		}
-    }
-	
-	String provinceName = addressDesc[0];
-	if (addressDesc[0].indexOf("北京") != -1) {
-		provinceName = "北京";
-	} else if (addressDesc[0].indexOf("上海") != -1) {
-		provinceName = "上海";
-	} else if (addressDesc[0].indexOf("天津") != -1) {
-		provinceName = "天津";
-	} else if (addressDesc[0].indexOf("重庆") != -1) {
-		provinceName = "重庆";
-	}
-	Map<String, Object> orderData = new HashMap<String, Object>();
-	orderData.put("add_time", DateTimeUtil.format(rentOrder.getRentCreateDate()));	// 时间
-	orderData.put("address", address);// 收货地址
-	orderData.put("city_name", addressDesc[1]); // 城市
-	orderData.put("consignee", rentOrder.getRentAddressName());// 收货人
-	orderData.put("district_name", addressDesc[2]);// 区域
-	orderData.put("email", "");// email
-	orderData.put("goods_amount", (rentOrder.getRentAmount()/100.0));	// 商品总价
-	orderData.put("goods_count", 1);	// 产品数量
-	orderData.put("mobile", rentOrder.getRentAddressTel());// 手机号码
-	orderData.put("money_paid", rentOrder.getRentPayMoney()/100.0);// 已付款
-	orderData.put("oid", rentOrder.getRentOrderId());	// 订单号
-	orderData.put("order_amount", rentOrder.getRentPayMoney()/100.0);	// 应付款,应付款金额要与已付款金额相同
-	
-	/**
-	 * 产品信息
-	 */
-	List<Map<String, Object>> maps = new ArrayList<Map<String, Object>>();
-	Map<String, Object> orders1 = new HashMap<String, Object>();
-	for (RentOrderItemDTO item : rentOrder.getOrderItemList()) {
-		orders1.put("goods_name", item.getItemProductName());	// 产品名称
-		orders1.put("goods_number", 1);// 产品数量
-		orders1.put("goods_price", (item.getColorDiscount()/100.0));// 产品原价
-		orders1.put("outer_sku", item.getColor69Code());// 产品SKU
-		orders1.put("payment_ft", rentOrder.getRentPayMoney()/100.0);// 产品分摊价
-	}
-	maps.add(orders1);
-	orderData.put("orders", maps);// 订单产品
-	orderData.put("pay_name", "weixinpay");// 支付方式
-	orderData.put("pay_time", DateTimeUtil.format(rentOrder.getRentTransactionDate()));// 支付时间
-	orderData.put("postscript", "");// 买家留言
-	orderData.put("province_name", provinceName);// 省份
-	orderData.put("sd_id", NameUtils.getConfig("sd_idt"));// 对应 efast 店铺 id
-	orderData.put("shipping_fee", 0);// 快递费
-	orderData.put("shipping_name", "02");// 快递公司代码
-	orderData.put("tel", "");	// 我司电话
-	orderData.put("to_buyer", "租用订单");// 商家备注
-	orderData.put("total_amount", (rentOrder.getRentAmount()/100.0));// 订单总额
-	orderData.put("user_name", rentOpenId);// 买家账户   百胜根据user_name来判断是否有重复，传openId是为了防止重复
-	orderData.put("zipcode", "");						// 邮编
-	
-	com.fasterxml.jackson.databind.ObjectMapper mapper = new ObjectMapper();
-	String orderDataStr = null;;
-	try {
-		orderDataStr = mapper.writeValueAsString(orderData);
-	} catch (JsonProcessingException e2) {
-		e2.printStackTrace();
-	}
-	
-	requestData.put("info", orderDataStr);
-	
-	try {
-		String result = HttpClient431Util.doGet(requestData, url);
-		result = StringEscapeUtils.unescapeJava(result); // unicode 编码
-		inLongLogger.info("add-推送订单号为:" + rentOrder.getRentOrderId() + "的订单，百胜返回信息:" + result);
-		// parse JSON String to Object
-		JSONObject jsonObject = JSONObject.fromObject(result);
-		JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
-		String oderSn = respData.getString("oder_sn");
-		if (oderSn != null) {
-			String msg = respData.getString("msg");
-			if ("success".equals(msg)) {
-				return true;
-			}
-		}
-		inLongLogger.error(this, "add-推送订单号为:" + rentOrder.getRentOrderId() + "的订单，百胜返回信息:" + result);
-		throw new Exception(respData.getString("msg"));
-	} catch (Exception e) {
-		throw e;
-	}
-}
-	@Override
-    public boolean deliverOrderByOrderId(RentOrder rentOrder) {
-        // TODO Auto-generated method stub
-		RentOrderItem rentOrderItem = new RentOrderItem();
-		rentOrderItem.setItemOrderId(rentOrder.getRentOrderId());
-		rentOrderItem.setItemStatus(rentOrder.getRentStatus());
-        if(rentOrderMapper.updateRentOrderByOrderId(rentOrder) > 0
-				&& rentOrderMapper.updateOrderItem(rentOrderItem) > 0){
-            return true;
-        }else{
-            return false;
-        }
-    }
-
-	@Override
-	public List<RentOrder> listOrderByDeadline(RentOrder rentOrder) {
-		// TODO Auto-generated method stub
-		return rentOrderMapper.listOrderByDeadline(rentOrder);
-	}
-
-	@Override
-	public boolean updateOrderAndCoupon(List<String> orderList,
-			List<Integer> couponList) {
-		// TODO Auto-generated method stub
-		int orderNum = 0;	//修改订单数量
-		int itemNum = 0;		//修改订单项数量
-		int couponNum = 0;//修改服务费抵扣券数量
-		
-		if (orderList == null || orderList.size() == 0) {
-			return false;
-		}
-		//批量修改订单状态
-		orderNum = rentOrderMapper.updateOrderList(orderList);
-		//批量修改订单项状态
-		itemNum = rentOrderMapper.updateOrderItemList(orderList);
-		if (couponList != null && couponList.size() > 0) {
-			//批量修改服务费抵扣券状态
-			couponNum = serviceCouponMapper.updateServiceCouponList(couponList);
-		}
-		if (couponList != null && couponList.size() > 0) {
-			if (orderNum > 0 && itemNum > 0 && couponNum > 0) {
-				return true;
-			}
-		} else {
-			if (orderNum > 0 && itemNum > 0) {
-				return true;
-			}
-		}
-		
-		return false;
-	}
-
-	@Override
-	public boolean updateOrderStatusAndItemStatus(RentOrder rentOrder) {
-		if(rentOrder == null || StringUtils.isEmpty(rentOrder.getRentOrderId()))
-			return false;
-		int i = rentOrderMapper.updateRentOrder(rentOrder);
-		int j = 0;
-		if (rentOrder.getList() != null && rentOrder.getList().size() > 0){
-			j = rentOrderMapper.updateOrderItem(rentOrder.getList().get(0));
-		}
-		if(i < 1 || j < 1){
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	public boolean updateReturnRentOrder(RentOrder rentOrder) {
-
-		int money = 0;
-
-		if (rentOrder == null || rentOrder.getList() == null || rentOrder.getList().size() <= 0) {
-			return false;
-		}
-		//判断该订单的机器是否已经被激活,状态为2表示已激活
-		if (rentOrder.getList().get(0).getItemCodeState().intValue() == 2) {
-			//当租赁类型为1年时，退货只退押金
-			if (rentOrder.getRentTypeId().intValue() == 1) {
-				for (RentOrderItem item : rentOrder.getList()) {
-					//判断租赁物品是否还有押金，如果有，则退货时需要退还押金
-					if (item.getItemProductType().intValue() != 5 && item.getRentRemainDeposit() > 0) {
-						money = item.getRentRemainDeposit();
-					}
-				}
-			} else {
-				long sendDateTime = rentOrder.getRentSendDate().getTime();
-				long newDateTime = new Date().getTime();
-				//计算使用了多长时间（单位：年，不满一年按一年算）
-				int year = (int)Math.ceil((double)(newDateTime - sendDateTime)/1000/24/60/60/365);
-				RentTypeInfo typeInfo = new RentTypeInfo();
-				typeInfo.setTypeId(rentOrder.getRentTypeId());
-				typeInfo.setTypeStatus(1);
-				//根据租赁类型id查询租赁的金额和时限
-				typeInfo = orderRebateMapper.getRebateType(typeInfo);
-				//租用总时长
-				int sumYear = typeInfo.getTypePayDuration().intValue()/12;
-				//计算每年的平均租赁金额
-				int aveMoney = (int)Math.floor(rentOrder.getRentPayMoney().doubleValue()/sumYear/100);
-				if (sumYear - year > 0) {
-					money = (sumYear - year) * aveMoney;
-				}
-			}
-		} else {
-			//如果订单的机器没有被激活，则退货时全额退款；如果使用了优惠券，则需重置优惠券
-			//计算已经提取的押金金额
-			int deposit = rentOrder.getList().get(0).getRentDeposit() - rentOrder.getList().get(0).getRentRemainDeposit();
-			money = rentOrder.getRentPayMoney().intValue() - deposit;
-			rentOrderService.updateServiceAndPledge(rentOrder.getRentServiceId(),
-					Integer.getInteger(rentOrder.getList().get(0).getRentPledgeId()));
-		}
-
-
-
-		int returnCode = 500;
-
-		//微信转账
-		try {
-			ResponseJson json = rentPayService.payTransfer(rentOrder.getRentOpenid(),rentOrder.getRentOrderId(),
-					money,3,"订单退货");
-			returnCode = json.getReturnCode().intValue();
-			if (returnCode == 200) {
-				inLongLogger.info("订单号为:" + rentOrder.getRentOrderId() + "的退货订单微信转账成功");
-			} else {
-				inLongLogger.info("订单号为:" + rentOrder.getRentOrderId() + "的退货订单微信转账失败");
-			}
-
-		} catch (Exception e) {
-			inLongLogger.info("订单号为:" + rentOrder.getRentOrderId() + "的退货订单微信转账失败");
-			e.printStackTrace();
-		}
-
-		if(rentOrder == null || StringUtils.isEmpty(rentOrder.getRentOrderId()))
-			return false;
-		int i = rentOrderMapper.updateRentOrder(rentOrder);
-		int j = 0;
-		if (rentOrder.getList() != null && rentOrder.getList().size() > 0){
-			j = rentOrderMapper.updateOrderItem(rentOrder.getList().get(0));
-		}
-		if(i < 1 || j < 1 || returnCode != 200){
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	public boolean updateServiceAndPledge(Integer serviceId, Integer pledgeId) {
-		int serviceNum = 0;
-		int pledgeNum = 0;
-		//如果服务费抵扣券不为空，则修改服务费抵扣券状态
-		if (serviceId != null) {
-			ServiceCouponInfo couponInfo = new ServiceCouponInfo();
-			couponInfo.setServiceId(serviceId);
-			couponInfo.setServiceStatus(1);
-			couponInfo.setServiceOldStatus(3);
-			serviceNum = serviceCouponMapper.update(couponInfo);
-		} else {
-			serviceNum = 1;
-		}
-		//如果押金提取券不为空，则修改押金提取券状态
-		if (pledgeId != null) {
-			PledgeCouponInfo pledgeCouponInfo = new PledgeCouponInfo();
-			pledgeCouponInfo.setPledgeId(pledgeId);
-			pledgeCouponInfo.setPledgeStatus(1);
-			pledgeNum = serviceCouponMapper.updatePledgeCouponStatus(pledgeCouponInfo);
-		} else {
-			pledgeNum = 1;
-		}
-		if (serviceNum > 0 && pledgeNum > 0) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-    @Override
-	public boolean rentExitOrder(RentOrder rentOrder){
-        boolean flag = rentOrderService.updateOrderStatusAndItemStatus(rentOrder);
-        if (flag){
-            if (StringUtils.isEmpty(rentOrder.getRentPostNum())){
-                return false;
-            }
-            Integer i = rentOrderMapper.updateRentOrderByOrderId(rentOrder);
-            if(i > 0){
-                return true;
-            }
-        }
-        return false;
-    }
-
-	@Override
-	public boolean rentExchangeOrder(RentOrder rentOrder, RentExchangeInfo exchangeInfo) {
-		boolean flag = rentOrderService.updateOrderStatusAndItemStatus(rentOrder);
-		if (flag){
-			if (StringUtils.isEmpty(exchangeInfo.getExchangeAddressName())
-					|| StringUtils.isEmpty(exchangeInfo.getExchangeAddressInfo())
-					|| StringUtils.isEmpty(exchangeInfo.getExchangeAddressTel())
-					|| StringUtils.isEmpty(exchangeInfo.getExchangePostNum())){
-				return false;
-			}
-			exchangeInfo.setExchangeItemId(rentOrder.getList().get(0).getItemId());
-			exchangeInfo.setExchangeStatus(1);
-			List<RentExchangeInfo> list = rentExchangeMapper.getExchangeInfoByItemId(exchangeInfo);
-			if(list != null && list.size() > 0) return true;
-			int i = rentExchangeMapper.insertRentExchange(exchangeInfo);
-			if(i > 0){
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean opertionRentExchangeOrder(RentOrder order) {
-		RentOrderItem item = order.getList().get(0);
-		RentExchangeInfo exInfo = new RentExchangeInfo();
-		exInfo.setExchangeItemId(item.getItemId());
-		exInfo.setExchangeStatus(1);
-		List<RentExchangeInfo> list = rentExchangeMapper.getExchangeInfoByItemId(exInfo);
-		if(list == null || list.size() != 1) return false;
-		RentExchangeInfo exchangeInfo = list.get(0);
-		//修改租赁订单和订单项状态
-		if (!rentOrderService.updateOrderStatusAndItemStatus(order)) return false;
-
-		//修改换货记录状态
-		if(order.getRentStatus() == 9){
-			exchangeInfo.setExchangeStatus(2);
-		}else{
-			exchangeInfo.setExchangeStatus(0);
-		}
-		exchangeInfo.setExchangeCheckDate(new Date());
-		Integer i = rentExchangeMapper.updateExchangeById(exchangeInfo);
-		if (i < 1)	return false;
-		return true;
-	}
-
-	@Override
-	public List<RentOrderItem> selectRentOrderByOpenId(String rentOpenid) {
-		return rentOrderMapper.selectRentOrderByOpenId(rentOpenid);
-	}
-
-	@Override
-	public Integer addTransferRecord(AccountLogsInfo accountLogsInfo) {
-		return rentOrderMapper.addTransferRecord(accountLogsInfo);
-	}
-
-	@Override
-	public Integer update(RentOrderItem rentOrderItem) {
-		return rentOrderMapper.update(rentOrderItem);
-	}
-
-	@Override
-	public boolean rentReturnMoneyRentOrder(RentOrder rentOrder) {
-		boolean flag = updateOrderStatusAndItemStatus(rentOrder);
-		if(!flag){
-		    return false;
-        }
-		if(rentOrder.getRentStatus() == 4){
-			//微信转账
-            ResponseJson json = rentPayService.payTransfer(rentOrder.getRentOpenid(),rentOrder.getRentOrderId(),
-                    rentOrder.getRentPayMoney(),4,"订单退款");
-            if (json.getReturnCode().intValue() == 200) {
-                inLongLogger.info("订单号:" + rentOrder.getRentOrderId() + ",退款，微信转账成功!");
-                boolean flag1 = updateServiceAndPledge(rentOrder.getRentServiceId(),
-                        Integer.getInteger(rentOrder.getList().get(0).getRentPledgeId()));
-                return true;
-            } else {
-                inLongLogger.info("订单号:" + rentOrder.getRentOrderId() + ",退款，微信转账失败!");
-                throw new IllegalArgumentException("微信转账失败!");
-            }
-		}
-		return true;
-	}
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/order/ServiceCouponServiceImpl.java

@@ -1,53 +0,0 @@
-package com.iamberry.rent.service.order;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.iamberry.rent.face.order.ServiceCouponService;
-import com.iamberry.rent.service.order.mapper.ServiceCouponMapper;
-import com.iamberry.wechat.core.entity.rent.PledgeCouponInfo;
-import com.iamberry.wechat.core.entity.rent.ServiceCouponInfo;
-/**
- * 租赁订单优惠券实现
- * @author 刘志伟
- *
- */
-@Service
-public class ServiceCouponServiceImpl implements ServiceCouponService{
-	
-	@Autowired
-	private ServiceCouponMapper serviceCouponMapper;
-
-	@Override
-	public List<ServiceCouponInfo> list(ServiceCouponInfo info) {
-		// TODO Auto-generated method stub
-		return serviceCouponMapper.list(info);
-	}
-
-	@Override
-	public Integer saveServiceCoupon(ServiceCouponInfo couponInfo) {
-		// TODO Auto-generated method stub
-		return serviceCouponMapper.saveServiceCoupon(couponInfo);
-	}
-
-	@Override
-	public Integer savePledgeCoupon(PledgeCouponInfo pledgeCouponInfo) {
-		// TODO Auto-generated method stub
-		return serviceCouponMapper.savePledgeCoupon(pledgeCouponInfo);
-	}
-
-	@Override
-	public List<PledgeCouponInfo> listPledgeCoupon(
-			PledgeCouponInfo pledgeCouponInfo) {
-		// TODO Auto-generated method stub
-		return serviceCouponMapper.listPledgeCoupon(pledgeCouponInfo);
-	}
-
-	@Override
-	public Integer updatePledgeCouponStatus(PledgeCouponInfo pledgeCouponInfo) {
-		return serviceCouponMapper.updatePledgeCouponStatus(pledgeCouponInfo);
-	}
-
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/order/mapper/RentExchangeMapper.java

@@ -1,37 +0,0 @@
-package com.iamberry.rent.service.order.mapper;
-
-import com.iamberry.wechat.core.entity.rent.RentExchangeInfo;
-
-import java.util.List;
-
-/**
- * Created by muzx on 2017/4/26.
- */
-public interface RentExchangeMapper {
-    /**
-     * 添加一条换货记录
-     * 2017年4月26日
-     * @author muzx
-     * @param exchangeInfo
-     * @return
-     */
-    Integer insertRentExchange(RentExchangeInfo exchangeInfo);
-
-    /**
-     * 根据订单项id查看换货记录
-     * 2017年4月26日
-     * @author muzx
-     * @param itemId
-     * @return
-     */
-    List<RentExchangeInfo> getExchangeInfoByItemId(RentExchangeInfo exchangeInfo);
-
-    /**
-     * 根据订单项id查看换货记录
-     * 2017年4月26日
-     * @author muzx
-     * @param exchangeInfo
-     * @return
-     */
-    Integer updateExchangeById(RentExchangeInfo exchangeInfo);
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/order/mapper/RentOrderMapper.java

@@ -1,171 +0,0 @@
-package com.iamberry.rent.service.order.mapper;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.rent.AccountLogsInfo;
-import com.iamberry.wechat.core.entity.rent.RentOrder;
-import com.iamberry.wechat.core.entity.rent.RentOrderDTO;
-import com.iamberry.wechat.core.entity.rent.RentOrderItem;
-
-/**
- * 租赁订单Mapper
- * @company	深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author 	献
- * @tel		18271840547
- * @date	2017年3月10日
- */
-public interface RentOrderMapper {
-
-	/**
-	 * 根据用户openid，查询已支付但为使用的激活码
-	 * @param openId
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月10日
-	 */
-	List<RentOrderItem> listInitCode(String openId);
-	
-	/**
-	 * 修改订单项信息
-	 * @param item
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月10日
-	 */
-	Integer update(RentOrderItem item);
-	
-	/**
-	 * 根据openid，获取当前分享的信息
-	 * @param openId
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月10日
-	 */
-	RentOrderItem getWaitInit(String openId);
-	
-	/**
-	 * 根据openid 获取当前用户订单详情
-	 * 2017年3月10日
-	 * @author muzx
-	 * @param openId
-	 * @return
-	 */
-	List<RentOrderDTO> listRentOrder(RentOrderDTO rentOrderDTO);
-	
-	/**
-	 * 根据条件查询订单总数
-	 * 2017年3月16日
-	 * @author muzx
-	 * @param rentOrderDto
-	 * @return
-	 */
-	int countRentOrder(RentOrderDTO rentOrderDto);
-	
-	/**
-	 * 添加租赁订单信息
-	 * @param rentOrder
-	 * @return
-	 */
-	Integer insertRentOrderInfo(RentOrder rentOrder);
-	
-	/**
-	 * 批量添加租赁订单项数据
-	 * @param list
-	 * @return
-	 */
-	Integer insertRentOrderItemList(List<RentOrderItem> list);
-	
-	/**
-	 * 跟据条件查询一条订单项数据
-	 * @param rentOrderItem
-	 * @return
-	 */
-	RentOrderItem getOrderItemByInitCode(RentOrderItem rentOrderItem);
-	
-	/**
-	 * 根据orderid查询租赁订单信息
-	 * @param rentOrder
-	 * @return
-	 */
-	RentOrder getRentOrderByOrderId(RentOrder rentOrder);
-	
-	/**
-	 * 根据条件查询租赁订单项列表
-	 * @param rentOrderItem
-	 * @return
-	 */
-	List<RentOrderItem> listOrderItem(RentOrderItem rentOrderItem);
-	
-	/**
-	 * 修改订单状态
-	 * @param rentOrder
-	 * @return
-	 */
-	Integer updateRentOrder(RentOrder rentOrder);
-	
-	/**
-	 * 修改订单项状态
-	 * @param rentOrderItem
-	 * @return
-	 */
-	Integer updateOrderItem(RentOrderItem rentOrderItem);
-	
-	/**
-     * 根据openid查询订单
-     * @param rentOpenid
-     * @return
-     */
-    List<RentOrderItem> getRentOrderByOpenId(String rentOpenid);
-    
-	/**
-     * 修改订单相关
-     * @param rentOrder
-     * @return
-     */
-	Integer updateRentOrderByOrderId(RentOrder rentOrder);
-	
-	/**
-	 * 根据激活码查询订单id
-	 * @param initCode
-	 * @return
-	 * @author 献
-	 * @Time   2017年4月5日
-	 */
-	RentOrder getOrderIdByInitCode(String initCode);
-	
-	/**
-	 * 根据订单创建时间和状态查询订单信息
-	 * @param rentOrder
-	 * @return
-	 */
-	List<RentOrder> listOrderByDeadline(RentOrder rentOrder);
-	
-	/**
-	 * 批量修改订单状态
-	 * @param list
-	 * @return
-	 */
-	Integer updateOrderList(List<String> list);
-	
-	/**
-	 * 批量修改订单项状态(1-->0)
-	 * @param list
-	 * @return
-	 */
-	Integer updateOrderItemList(List<String> list);
-
-	/**
-	 * 根据openid查询订单(押金抵扣卷使用)
-	 * @param rentOpenid
-	 * @return
-	 */
-	List<RentOrderItem> selectRentOrderByOpenId(String rentOpenid);
-
-	/**
-	 * 新增转账记录
-	 * @param accountLogsInfo
-	 * @return
-	 */
-	Integer addTransferRecord(AccountLogsInfo accountLogsInfo);
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/order/mapper/ServiceCouponMapper.java

@@ -1,69 +0,0 @@
-package com.iamberry.rent.service.order.mapper;
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.rent.PledgeCouponInfo;
-import com.iamberry.wechat.core.entity.rent.ServiceCouponInfo;
-
-/**
- * 服务费抵扣券Mapper
- * @company	深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author 	献
- * @tel		18271840547
- * @date	2017年3月13日
- */
-public interface ServiceCouponMapper {
-
-	/**
-	 * 查询优惠券
-	 * @param info
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月13日
-	 */
-	List<ServiceCouponInfo> list(ServiceCouponInfo info);
-	
-	/**
-	 * 修改服务费抵扣券信息
-	 * @param couponInfo
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月13日
-	 */
-	Integer update(ServiceCouponInfo couponInfo);
-	
-	/**
-	 * 添加服务费抵扣券
-	 * @param couponInfo
-	 * @return
-	 */
-	Integer saveServiceCoupon(ServiceCouponInfo couponInfo);
-	
-	/**
-	 * 添加押金提取券
-	 * @param pledgeCouponInfo
-	 * @return
-	 */
-	Integer savePledgeCoupon(PledgeCouponInfo pledgeCouponInfo);
-	
-	/**
-	 * 根据条件查询押金提取券信息
-	 * @param pledgeCouponInfo
-	 * @return
-	 */
-	List<PledgeCouponInfo> listPledgeCoupon(PledgeCouponInfo pledgeCouponInfo);
-	
-	/**
-	 * 批量修改服务费抵扣券状态
-	 * @param couponList
-	 * @return
-	 */
-	Integer updateServiceCouponList(List<Integer> couponList);
-
-	/**
-	 * 修改押金提取券状态
-	 * @param pledgeCouponInfo
-	 * @return
-	 */
-	Integer updatePledgeCouponStatus(PledgeCouponInfo pledgeCouponInfo);
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/order/mapper/rentExchangeMapper.xml

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- 命名，每一个映射对象不一样
-	namespace:必须与对应的接口全类名一致
- -->
-<mapper namespace="com.iamberry.rent.service.order.mapper.RentExchangeMapper">
-	<insert id="insertRentExchange" parameterType="RentExchangeInfo"
-			keyProperty="exchangeId" useGeneratedKeys="true">
-		INSERT INTO tb_iamberry_rent_exchange
-			(
-				EXCHANGE_ITEM_ID,
-				EXCHANGE_STATUS,
-				EXCHANGE_SEND_DATE,
-				EXCHANGE_POST_NUM,
-				EXCHANGE_POST_FIRM,
-				EXCHANGE_ADDRESS_INFO,
-				EXCHANGE_ADDRESS_TEL,
-				EXCHANGE_ADDRESS_NAME,
-				EXCHANGE_CREATE_DATE,
-				EXCHANGE_CHECK_DATE,
-				EXCHANGE_REMARK
-			)
-		VALUES
-			(
-				#{exchangeItemId},#{exchangeStatus},#{exchangeSendDate},#{exchangePostNum},
-				#{exchangePostFirm},#{exchangeAddressInfo},#{exchangeAddressTel},
-				#{exchangeAddressName},NOW(),#{exchangeCheckDate},#{exchangeRemark}
-			)
-	</insert>
-
-	<select id="getExchangeInfoByItemId" parameterType="int" resultType="RentExchangeInfo">
-		SELECT
-			EXCHANGE_ID exchangeId,
-			EXCHANGE_ITEM_ID exchangeItemId,
-			EXCHANGE_STATUS exchangeStatus,
-			EXCHANGE_SEND_DATE exchangeSendDate,
-			EXCHANGE_POST_NUM exchangePostNum,
-			EXCHANGE_POST_FIRM exchangePostFirm,
-			EXCHANGE_ADDRESS_INFO exchangeAddressInfo,
-			EXCHANGE_ADDRESS_TEL exchangeAddressTel,
-			EXCHANGE_ADDRESS_NAME exchangeAddressName,
-			EXCHANGE_CREATE_DATE exchangeCreateDate,
-			EXCHANGE_CHECK_DATE exchangeCheckDate,
-			EXCHANGE_REMARK exchangeRemark
-		FROM tb_iamberry_rent_exchange
-		WHERE EXCHANGE_ITEM_id = #{exchangeItemId}
-		<if test="exchangeStatus != null">
-			AND EXCHANGE_STATUS = #{exchangeStatus}
-		</if>
-		ORDER BY EXCHANGE_ID DESC
-	</select>
-
-	<update id="updateExchangeById" parameterType="RentExchangeInfo">
-		UPDATE tb_iamberry_rent_exchange
-		<set>
-			<if test="exchangeStatus != null">
-				EXCHANGE_STATUS = #{exchangeStatus},
-			</if>
-			<if test="exchangeSendDate != null and exchangeSendDate != ''">
-				EXCHANGE_SEND_DATE = NOW(),
-			</if>
-			<if test="exchangePostNum != null and exchangePostNum != ''">
-				EXCHANGE_POST_NUM = #{exchangePostNum},
-			</if>
-			<if test="exchangePostFirm != null and exchangePostFirm != ''">
-				EXCHANGE_POST_FIRM = #{exchangePostFirm},
-			</if>
-			<if test="exchangeCheckDate != null and exchangeCheckDate != ''">
-				EXCHANGE_CHECK_DATE = #{exchangeCheckDate},
-			</if>
-			<if test="exchangeRemark != null and exchangeRemark != ''">
-				EXCHANGE_REMARK = #{exchangeRemark}
-			</if>
-		</set>
-		WHERE EXCHANGE_ID = #{exchangeId}
-	</update>
-</mapper>

watero-rent-service/src/main/java/com/iamberry/rent/service/order/mapper/rentOrderMapper.xml

@@ -1,570 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- 命名，每一个映射对象不一样
-	namespace:必须与对应的接口全类名一致
- -->
-<mapper namespace="com.iamberry.rent.service.order.mapper.RentOrderMapper">
-	<sql id="rentOrderField">
-		RENT_ORDERID rentOrderId,
-		RENT_OPENID rentOpenid,
-		RENT_AMOUNT rentAmount,
-		RENT_PAY_MONEY rentPayMoney,
-		RENT_SERVICE_ID rentServiceId,
-		RENT_SERVICE_MONEY rentServiceMoney,
-		RENT_TYPE_ID rentTypeId,
-		RENT_STATUS rentStatus,
-		RENT_SEND_DATE rentSendDate,
-		RENT_POST_NUM rentPostNum,
-		RENT_POST_FIRM rentPostFirm,
-		RENT_ADDRESS_INFO rentAddressInfo,
-		RENT_ADDRESS_TEL rentAddressTel,
-		RENT_ADDRESS_NAME rentAddressName,
-		RENT_TRANSACTION_ID rentTransactionId,
-		RENT_TRANSACTION_DATE rentTransactionDate,
-		RENT_CREATE_DATE rentCreateDate,
-		RENT_ADMIN_REMARK rentAdminRemark,
-		RENT_USER_REMARK rentUserRemark
-	</sql>
-	
-	<sql id="orderItemInfo">
-		ITEM_ID itemId,
-		ITEM_ORDER_ID itemOrderId,
-		ITEM_PRODUCT_ID itemProductId,
-		ITEM_COLOR_ID itemColorId,
-		ITEM_STATUS itemStatus,
-		RENT_DEPOSIT rentDeposit,
-		RENT_IS_OUT rentIsOut,
-		RENT_REMAIN_DEPOSIT rentRemainDeposit,
-		RENT_PLEDGE_ID rentPledgeId,
-		ITEM_RETURN_DATE itemReturnDate,
-		ITEM_INIT_CODE itemInitCode,
-		ITEM_CODE_STATE itemCodeState,
-		ITEM_MACHINE_NUM ItemMachineNum,
-		ITEM_USE_YEARS itemUseYears,
-		ITEM_PRODUCT_NAME itemProductName,
-		ITEM_PRODUCT_PIC itemProductPic,
-		ITEM_PRODUCT_TYPE itemProductType,
-		ITEM_PRODUCT_COLOR_NAME itemProductColorName,
-		ITEM_CREATE_DATE itemCreateDate 
-	</sql>
-
-	<!-- 订单详情接口展示 前台-->	
-	<select id="listRentOrder" parameterType="com.iamberry.wechat.core.entity.rent.RentOrderDTO" resultMap="rentOrderResult">
-		SELECT 
-			RENT_ORDERID,
-			RENT_AMOUNT ,
-			RENT_PAY_MONEY ,
-			RENT_SERVICE_ID ,
-			RENT_SERVICE_MONEY ,
-			RENT_TYPE_ID,
-			RENT_STATUS ,
-			RENT_SEND_DATE ,
-			RENT_POST_NUM ,
-			RENT_POST_FIRM ,
-			RENT_ADDRESS_INFO ,
-			RENT_ADDRESS_TEL ,
-			RENT_ADDRESS_NAME ,
-			RENT_CREATE_DATE,
-			RENT_TRANSACTION_DATE,
-			T.TYPE_NAME typeName,
-			U.USER_NICKNAME rentUserNickName
-		FROM TB_IAMBERRY_RENT_ORDER O 
-		LEFT JOIN TB_IAMBERRY_RENT_TYPE T ON O.RENT_TYPE_ID = T.TYPE_ID
-		LEFT JOIN TB_IAMBERRY_USER_USERINFO U ON O.RENT_OPENID = U.USER_OPENID
-		<where>
-			<if test="rentOpenid != null and rentOpenid != ''">
-				RENT_OPENID = #{rentOpenid}
-			</if>
-			<if test="rentOrderId != null and rentOrderId != ''">
-				AND RENT_ORDERID LIKE CONCAT('%',#{rentOrderId},'%')
-			</if>
-			<if test="rentAddressName != null and rentAddressName != ''">
-				AND RENT_ADDRESS_NAME LIKE CONCAT('%',#{rentAddressName},'%')
-			</if>
-			<if test="rentAddressTel != null and rentAddressTel != ''">
-				AND RENT_ADDRESS_TEL LIKE CONCAT('%',#{rentAddressTel},'%')
-			</if>
-			<if test="rentAddressInfo != null and rentAddressInfo != ''">
-				AND RENT_ADDRESS_INFO LIKE CONCAT('%',#{rentAddressInfo},'%')
-			</if>
-			<if test="rentStatus != null and rentStatus != -1">
-				AND RENT_STATUS = #{rentStatus}
-			</if>
-		</where>
-		ORDER BY RENT_CREATE_DATE DESC
-		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
-	     LIMIT ${page.recordBegin},${page.pageSize}
-	    </if>
-	     <if test="page!=null and page.recordBegin==0 and page.pageSize>0 ">
-	     LIMIT ${page.pageSize} 
-	    </if>
-	</select>
-	<resultMap type="com.iamberry.wechat.core.entity.rent.RentOrderDTO" id="rentOrderResult">
-		<id property="rentOrderId" column="RENT_ORDERID"/>
-		<result property="rentAmount" column="RENT_AMOUNT" />
-		<result property="rentPayMoney" column="RENT_PAY_MONEY" />
-		<result property="rentServiceId" column="RENT_SERVICE_ID" />
-		<result property="rentServiceMoney" column="RENT_SERVICE_MONEY" />
-		<result property="rentTypeId" column="RENT_TYPE_ID" />
-		
-		<result property="rentStatus" column="RENT_STATUS" />
-		<result property="rentSendDate" column="RENT_SEND_DATE" />
-		<result property="rentPostNum" column="RENT_POST_NUM" />
-		<result property="rentPostFirm" column="RENT_POST_FIRM" />
-		
-		<result property="rentAddressInfo" column="RENT_ADDRESS_INFO" />
-		<result property="rentAddressTel" column="RENT_ADDRESS_TEL" />
-		<result property="rentAddressName" column="RENT_ADDRESS_NAME" />
-		<result property="rentCreateDate" column="RENT_CREATE_DATE" />
-		<result property="rentTransactionDate" column="RENT_TRANSACTION_DATE" />
-		<collection property="orderItemList" column="RENT_ORDERID" ofType="com.iamberry.wechat.core.entity.rent.RentOrderItemDTO" select="listItemOrder"/>
-	</resultMap>
-	<select id="listItemOrder" resultType="com.iamberry.wechat.core.entity.rent.RentOrderItemDTO">
-		SELECT 
-			I.ITEM_ID itemId,
-			I.ITEM_PRODUCT_ID itemProductId,
-			I.ITEM_COLOR_ID itemColorId,
-			I.RENT_DEPOSIT rentDeposit,
-			I.ITEM_PRODUCT_NAME itemProductName,
-			I.ITEM_PRODUCT_COLOR_NAME itemProductColorName,
-			I.ITEM_PRODUCT_TYPE itemProductType,
-			I.ITEM_CODE_STATE itemCodeState,
-			c.COLOR_69CODE color69Code, 
-			c.COLOR_DISCOUNT colorDiscount,
-			c.COLOR_PRICE colorPrice 
-		FROM TB_IAMBERRY_RENT_ORDER O 
-		LEFT JOIN TB_IAMBERRY_RENT_TYPE T ON O.RENT_TYPE_ID = T.TYPE_ID
-		LEFT JOIN TB_IAMBERRY_RENT_ORDER_ITEM I ON O.RENT_ORDERID = I.ITEM_ORDER_ID
-		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR c ON c.COLOR_ID = I.ITEM_COLOR_ID 
-		WHERE RENT_ORDERID = #{rentOrderid}
-	</select>
-	<select id="countRentOrder" parameterType="com.iamberry.wechat.core.entity.rent.RentOrderDTO" resultType="Integer">
-		SELECT 
-			COUNT(RENT_ORDERID)
-		FROM TB_IAMBERRY_RENT_ORDER O 
-		<where>
-			<if test="rentOpenid != null and rentOpenid != ''">
-				RENT_OPENID = #{rentOpenid}
-			</if>
-			<if test="rentOrderId != null and rentOrderId != ''">
-				AND RENT_ORDERID LIKE #{rentOrderId}
-			</if>
-			<if test="rentAddressName != null and rentAddressName != ''">
-				AND RENT_ADDRESS_NAME LIKE #{rentAddressName}
-			</if>
-			<if test="rentAddressTel != null and rentAddressTel != ''">
-				AND RENT_ADDRESS_TEL LIKE #{rentAddressTel}
-			</if>
-			<if test="rentAddressInfo != null and rentAddressInfo != ''">
-				AND RENT_ADDRESS_INFO LIKE #{rentAddressInfo}
-			</if>
-			<if test="rentStatus != null and rentStatus != -1 and rentStatus != 20">
-				AND RENT_STATUS = #{rentStatus}
-			</if>
-			<if test="rentStatus != null and rentStatus == 20">
-				AND RENT_STATUS in (2,5)
-			</if>
-		</where>
-	</select>
-		
-	<!-- list code -->
-	<select id="listInitCode" parameterType="String" resultType="RentOrderItem">
-		SELECT
-			I.ITEM_ID itemId, I.ITEM_INIT_CODE itemInitCode, O.RENT_ORDERID itemOrderId,
-			I.ITEM_USE_YEARS itemUseYears, I.ITEM_MACHINE_NUM itemMachineNum, O.RENT_OPENID itemOpenId
-		FROM
-			TB_IAMBERRY_RENT_ORDER O
-		LEFT JOIN
-			TB_IAMBERRY_RENT_ORDER_ITEM I
-		<!-- 查询没有使用的激活 -->
-		ON
-			O.RENT_ORDERID = I.ITEM_ORDER_ID
-		<!-- 查询用户已支付的订单 -->
-		WHERE
-			RENT_OPENID = #{openId} AND O.RENT_STATUS = 5 AND I.ITEM_CODE_STATE = 1
-	</select>
-	
-	<!-- 修改订单项信息 -->
-	<update id="update" parameterType="RentOrderItem">
-		UPDATE
-			TB_IAMBERRY_RENT_ORDER_ITEM 
-		<set>
-			<if test="itemStatus != null">
-				ITEM_STATUS = #{itemStatus}, 
-			</if>
-			<if test="rentDeposit != null">
-				RENT_DEPOSIT = #{rentDeposit}, 
-			</if>
-			<if test="rentIsOut != null">
-				RENT_IS_OUT = #{rentIsOut}, 
-			</if>
-			<if test="rentRemainDeposit != null">
-				RENT_REMAIN_DEPOSIT = #{rentRemainDeposit}, 
-			</if>
-			<if test="itemReturnDate != null">
-				ITEM_RETURN_DATE = #{itemReturnDate},
-			</if>
-			<if test="itemInitCode != null">
-				ITEM_INIT_CODE = #{itemInitCode}, 
-			</if>
-			<if test="itemCodeState != null">
-				ITEM_CODE_STATE = #{itemCodeState}, 
-			</if>
-			<if test="ItemMachineNum != null">
-				ITEM_MACHINE_NUM = #{ItemMachineNum}
-			</if>
-		</set>
-		<where>
-			<if test="itemId != null and itemId != 0">
-				ITEM_ID = #{itemId}
-			</if>
-			<if test="itemInitCode != null">
-				AND ITEM_INIT_CODE = #{itemInitCode}
-			</if>
-			<if test="itemInitCodeOldState != null">
-				AND ITEM_CODE_STATE = #{itemInitCodeOldState}
-			</if>
-		</where>
-	</update>
-	
-	<!-- 获取最近的激活记录 -->
-	<select id="getWaitInit" parameterType="String" resultType="RentOrderItem">
-		SELECT
-			I.ITEM_ID itemId, I.ITEM_INIT_CODE itemInitCode, i.ITEM_ORDER_ID itemOrderId,
-			I.ITEM_USE_YEARS itemUseYears, I.ITEM_MACHINE_NUM itemMachineNum, O.RENT_OPENID itemOpenId
-		FROM
-			TB_IAMBERRY_RENT_MACHINE_WAIT_INIT w
-		LEFT JOIN
-			TB_IAMBERRY_RENT_ORDER_ITEM i
-		ON
-			w.INIT_CODE = i.ITEM_INIT_CODE
-		LEFT JOIN
-			TB_IAMBERRY_RENT_ORDER O
-		ON
-			i.ITEM_ORDER_ID = O.RENT_ORDERID
-		WHERE 
-			INIT_OPENID = #{openId} AND INIT_STATE = 1
-		ORDER BY
-			INIT_ID DESC
-		LIMIT
-			0, 1
-	</select>
-	
-	<!-- 添加租赁订单信息 -->
-	<insert id="insertRentOrderInfo" parameterType="RentOrder">
-		INSERT INTO 
-		 	TB_IAMBERRY_RENT_ORDER 
-		 		(
-			 		RENT_ORDERID, RENT_OPENID, RENT_AMOUNT, RENT_PAY_MONEY, RENT_SERVICE_ID,RENT_SERVICE_MONEY,
-			 		RENT_TYPE_ID, RENT_STATUS, RENT_ADDRESS_INFO, RENT_ADDRESS_TEL,
-			 		RENT_ADDRESS_NAME,RENT_TRANSACTION_ID,RENT_TRANSACTION_DATE,
-			 		RENT_CREATE_DATE,RENT_ADMIN_REMARK,RENT_USER_REMARK 
-				)
-		 VALUES 
-		 		(
-		 			#{rentOrderId},#{rentOpenid},#{rentAmount},#{rentPayMoney},#{rentServiceId},#{rentServiceMoney},
-					#{rentTypeId},#{rentStatus},#{rentAddressInfo},#{rentAddressTel},
-		 			#{rentAddressName},#{rentTransactionId},NOW(),
-		 			NOW(),#{rentAdminRemark},#{rentUserRemark}
-		 		)
-	</insert>
-	
-	<!-- 插入租赁订单条目信息 -->
-	<insert id="insertRentOrderItemList" parameterType="java.util.List">
-		INSERT INTO 
-		 	TB_IAMBERRY_RENT_ORDER_ITEM 
-		 		(
-			 		ITEM_ORDER_ID, ITEM_PRODUCT_ID, ITEM_COLOR_ID, ITEM_STATUS, RENT_DEPOSIT,RENT_IS_OUT,
-			 		RENT_REMAIN_DEPOSIT, RENT_PLEDGE_ID, ITEM_INIT_CODE, ITEM_CODE_STATE,
-			 		ITEM_MACHINE_NUM,ITEM_USE_YEARS,ITEM_PRODUCT_NAME,ITEM_PRODUCT_PIC,
-			 		ITEM_PRODUCT_COLOR_NAME,ITEM_CREATE_DATE,ITEM_PRODUCT_TYPE  
-				)
-		 VALUES 
-		  	<foreach collection="list" item="item" separator=",">
-				(
-					#{item.itemOrderId}, #{item.itemProductId}, #{item.itemColorId}, #{item.itemStatus}, 
-					#{item.rentDeposit}, #{item.rentIsOut}, #{item.rentRemainDeposit}, #{item.rentPledgeId},
-					#{item.itemInitCode}, #{item.itemCodeState}, #{item.ItemMachineNum}, #{item.itemUseYears}, 
-					#{item.itemProductName}, #{item.itemProductPic}, #{item.itemProductColorName}, NOW(),
-					#{item.itemProductType} 
-				)
-	        </foreach>
-	</insert>
-	
-	<!-- 跟据条件查询一条订单项数据 -->
-	<select id="getOrderItemByInitCode" parameterType="RentOrderItem" resultType="RentOrderItem">
-		SELECT 
-			<include refid="orderItemInfo" /> 
-		FROM 
-			TB_IAMBERRY_RENT_ORDER_ITEM
-		<where>
-			<if test="itemInitCode != null and itemInitCode != ''">
-				ITEM_INIT_CODE = #{itemInitCode}
-			</if>
-			<if test="itemId != null">
-				ITEM_ID = #{itemId}
-			</if>
-		</where> 
-	</select>
-	
-	<!-- 根据激活码查询订单id -->
-	<select id="getOrderIdByInitCode" parameterType="String" resultType="RentOrder">
-		SELECT
-			O.RENT_OPENID rentOpenid, O.RENT_ORDERID rentOrderId
-		FROM
-			TB_IAMBERRY_RENT_ORDER_ITEM i
-		LEFT JOIN
-			TB_IAMBERRY_RENT_ORDER O
-		ON
-			i.ITEM_ORDER_ID = O.RENT_ORDERID
-		WHERE 
-			i.ITEM_INIT_CODE = #{itemInitCode}
-	</select>
-	
-	<select id="getRentOrderByOrderId" parameterType="RentOrder" resultMap="rentOrderResultOne">
-		SELECT 
-			<include refid="rentOrderField" />,
-			item_id,
-			item_order_id,
-			item_product_id,
-			item_color_id,
-			item_product_type,
-			item_status,
-			rent_deposit,
-			rent_is_out,
-			rent_remain_deposit,
-			rent_pledge_id,
-			item_return_date,
-			item_init_code,
-			item_code_state,
-			item_machine_num,
-			item_use_years,
-			item_product_name,
-			item_product_pic,
-			item_product_color_name,
-			item_create_date
-		FROM
-			TB_IAMBERRY_RENT_ORDER
-		LEFT JOIN TB_IAMBERRY_RENT_ORDER_ITEM ON RENT_ORDERID = ITEM_ORDER_ID
-		WHERE  RENT_ORDERID = #{rentOrderId}
-		ORDER BY ITEM_PRODUCT_TYPE ASC
-	</select>
-
-	<resultMap type="RentOrder" id="rentOrderResultOne" autoMapping="true">
-		<id property="rentOrderId" column="RENT_ORDERID"/>
-		<collection property="list" ofType="com.iamberry.wechat.core.entity.rent.RentOrderItem">
-			<id property="itemId" column="ITEM_ID"/>
-			<result property="itemOrderId" column="ITEM_ORDER_ID"/>
-			<result property="itemProductId" column="ITEM_PRODUCT_ID"/>
-			<result property="itemColorId" column="ITEM_COLOR_ID"/>
-			<result property="itemProductType" column="item_product_type"/>
-			<result property="itemStatus" column="item_status"/>
-			<result property="rentDeposit" column="rent_deposit"/>
-			<result property="rentIsOut" column="rent_is_out"/>
-			<result property="rentRemainDeposit" column="rent_remain_deposit"/>
-			<result property="rentPledgeId" column="rent_pledge_id"/>
-			<result property="itemReturnDate" column="item_return_date"/>
-			<result property="itemInitCode" column="item_init_code"/>
-			<result property="itemCodeState" column="item_code_state"/>
-			<result property="ItemMachineNum" column="item_machine_num"/>
-			<result property="itemUseYears" column="item_use_years"/>
-			<result property="itemProductName" column="item_product_name"/>
-			<result property="itemProductPic" column="item_product_pic"/>
-			<result property="itemProductColorName" column="item_product_color_name"/>
-			<result property="itemCreateDate" column="item_create_date"/>
-		</collection>
-	</resultMap>
-	
-	<select id="listOrderItem" parameterType="RentOrderItem" resultType="RentOrderItem">
-		SELECT 
-			<include refid="orderItemInfo" /> 
-		FROM 
-			TB_IAMBERRY_RENT_ORDER_ITEM 
-		<where>
-			<if test="itemOrderId != null and itemOrderId != ''">
-				ITEM_ORDER_ID = #{itemOrderId}
-			</if>
-		</where> 
-	</select>
-	
-	<!-- 修改订单状态 -->
-	<update id="updateRentOrder" parameterType="RentOrder">
-		UPDATE 
-			TB_IAMBERRY_RENT_ORDER 
-		<set>
-			<if test="rentStatus != null and rentStatus != ''">
-				RENT_STATUS = #{rentStatus}, 
-			</if>
-			<if test="rentTransactionId != null and rentTransactionId != ''">
-				RENT_TRANSACTION_ID = #{rentTransactionId}, 
-			</if>
-			<if test="rentTransactionDate != null and rentTransactionDate != ''">
-				RENT_TRANSACTION_DATE = #{rentTransactionDate}
-			</if>
-		</set> 
-		<where>
-				RENT_ORDERID = #{rentOrderId} 
-			<if test="rentOldStatus != null and rentOldStatus != ''">
-				AND RENT_STATUS = #{rentOldStatus} 
-			</if>
-		</where>
-	</update>
-	
-	<!-- 修改订单项状态 -->
-	<update id="updateOrderItem" parameterType="RentOrderItem">
-		UPDATE 
-			TB_IAMBERRY_RENT_ORDER_ITEM 
-		<set>
-			<if test="itemStatus != null and itemStatus != ''">
-				ITEM_STATUS = #{itemStatus},
-			</if>
-			<if test="itemReturnDate != null and itemReturnDate != ''">
-				ITEM_RETURN_DATE = #{itemReturnDate}
-			</if>
-		</set>
-		<where>
-				ITEM_ORDER_ID = #{itemOrderId}
-			<if test="itemId != null and itemId != ''">
-				AND item_id = #{itemId}
-			</if>
-			<if test="itemInitCodeOldState != null and itemInitCodeOldState != ''">
-				AND ITEM_STATUS = #{itemInitCodeOldState} 
-			</if>
-		</where>
-	</update>
-	<!-- 根据openid查询订单返回订单项 -->
-	<select id="getRentOrderByOpenId" parameterType="String" resultType="RentOrderItem">
-		SELECT 
-		<include refid="orderItemInfo" /> 
-		FROM 
-			TB_IAMBERRY_RENT_ORDER o left JOIN tb_iamberry_rent_order_item i on o.rent_orderid = i.item_order_id
-		where
-		
-				o.rent_openid = #{rentOpenid}
-				and item_product_type = 1
-	</select>
-	<select id="listRentOrderAdmin" >
-		SELECT * FROM TB_IAMBERRY_RENT_ORDER 
-		ORDER BY RENT_CREATE_DATE DESC
-		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
-	     LIMIT ${page.recordBegin},${page.pageSize}
-	    </if>
-	     <if test="page!=null and page.recordBegin==0 and page.pageSize>0 ">
-	     LIMIT ${page.pageSize} 
-	    </if>
-	</select>
-
-	<update id="updateRentOrderByOrderId"  parameterType="RentOrder">
-		UPDATE 
-			TB_IAMBERRY_RENT_ORDER 
-		<set>
-			<if test="rentTypeId != null">
-				RENT_TYPE_ID = #{rentTypeId}, 
-			</if>
-			<if test="rentStatus != null and rentStatus != ''">
-				RENT_STATUS = #{rentStatus}, 
-			</if>
-			<if test="rentSendDate != null and rentSendDate != ''">
-				RENT_SEND_DATE = #{rentSendDate}, 
-			</if>
-			<if test="rentPostNum != null and rentPostNum != ''">
-				RENT_POST_NUM = #{rentPostNum}, 
-			</if>
-			<if test="rentPostFirm != null and rentPostFirm != ''">
-				RENT_POST_FIRM = #{rentPostFirm}, 
-			</if>
-			<if test="rentAddressInfo != null and rentAddressInfo != ''">
-				RENT_ADDRESS_INFO = #{rentAddressInfo}, 
-			</if>
-			<if test="rentAddressTel != null and rentAddressTel != ''">
-				RENT_ADDRESS_TEL = #{rentAddressTel},
-			</if>
-			<if test="rentAddressName != null and rentAddressName != ''">
-				RENT_ADDRESS_NAME = #{rentAddressName},
-			</if>
-			<if test="rentAdminRemark != null and rentAdminRemark != ''">
-				RENT_ADMIN_REMARK = #{rentAdminRemark},
-			</if>
-			<if test="rentUserRemark != null and rentUserRemark != ''">
-				RENT_USER_REMARK = #{rentUserRemark}
-			</if>
-		</set> 
-		<where>
-			RENT_ORDERID = #{rentOrderId} 
-			<if test="rentOldStatus != null and rentOldStatus != ''">
-				AND RENT_STATUS = #{rentOldStatus} 
-			</if>
-		</where>
-	</update>
-	
-	<!-- 根据订单创建时间和状态查询订单信息 -->
-	<select id="listOrderByDeadline" parameterType="RentOrder" resultType="RentOrder">
-		SELECT 
-			* 
-		FROM 
-			TB_IAMBERRY_RENT_ORDER 
-		<where>
-			<if test="deadline != null and deadline != ''">
-				<![CDATA[ TIMESTAMPDIFF(SECOND,RENT_CREATE_DATE,NOW()) >= #{deadline} ]]> 
-			</if>
-			<if test="rentStatus != null and rentStatus != ''">
-				AND RENT_STATUS = #{rentStatus} 
-			</if>
-		</where>
-	</select>
-	
-	<!-- 批量修改订单状态 -->
-	<update id="updateOrderList" parameterType="java.util.List">
-		UPDATE 
-			TB_IAMBERRY_RENT_ORDER 
-		SET 
-			RENT_STATUS = 0 
-		WHERE 
-			RENT_ORDERID  IN (
-				<foreach collection="list" item="item" separator=",">
-					#{item} 
-		        </foreach>) 
-		 AND 
-		 	RENT_STATUS = 1 
-	</update>
-	
-	<!-- 批量修改订单项状态 -->
-	<update id="updateOrderItemList" parameterType="java.util.List">
-		UPDATE 
-			TB_IAMBERRY_RENT_ORDER_ITEM 
-		SET 
-			ITEM_STATUS = 0 
-		WHERE 
-			ITEM_ORDER_ID  IN (
-				<foreach collection="list" item="item" separator=",">
-					#{item} 
-		        </foreach>) 
-		 AND 
-		    ITEM_STATUS = 1  
-	</update>
-
-	<!-- 根据openid查询订单返回订单项(押金抵扣卷使用) -->
-	<select id="selectRentOrderByOpenId" parameterType="String" resultType="RentOrderItem">
-		SELECT
-		<include refid="orderItemInfo" />
-		FROM
-		TB_IAMBERRY_RENT_ORDER o left JOIN tb_iamberry_rent_order_item i on o.rent_orderid = i.item_order_id
-		where
-		o.rent_openid = #{rentOpenid}
-		and o.rent_status in (2,5)
-		and item_product_type = 1
-	</select>
-	
-	<insert id="addTransferRecord" parameterType="AccountLogsInfo" >
-		INSERT INTO
-		 	tb_iamberry_rent_account_logs
-		 		(
-			 		account_order_id,account_open_Id,account_money,account_type,account_remark,account_create_time,transfer_order_no
-				)
-		 VALUES
-		 		(
-		 			#{accountOrderId},#{accountOpenId},#{accountMoney},#{accountType},#{accountRemark},
-					,NOW(),#{transferOrderNo}
-		 		)
-	</insert>
-</mapper>

watero-rent-service/src/main/java/com/iamberry/rent/service/order/mapper/serviceCouponMapper.xml

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- 命名，每一个映射对象不一样 namespace:必须与对应的接口全类名一致 -->
-<mapper namespace="com.iamberry.rent.service.order.mapper.ServiceCouponMapper">
-	
-	<!-- list -->
-	<select id="list" parameterType="ServiceCouponInfo" resultType="ServiceCouponInfo">
-		SELECT
-			*
-		FROM
-			TB_IAMBERRY_RENT_SERVICE_COUPON
-		<where>
-			<if test="serviceId != null">
-				SERVICE_ID = #{serviceId}
-			</if>
-			<if test="serviceStatus != null">
-				AND SERVICE_STATUS = #{serviceStatus}
-			</if>
-			<if test="serviceOpenId != null">
-				AND SERVICE_OPENID = #{serviceOpenId}
-			</if>
-		</where>
-		<if test="serviceId != null">
-			LIMIT 0, 1
-		</if>
-		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
-	     LIMIT ${page.recordBegin},${page.pageSize}
-	    </if>
-	</select>
-	
-	<!-- 修改服务费抵扣券信息 -->
-	<update id="update" parameterType="ServiceCouponInfo">
-		UPDATE
-			TB_IAMBERRY_RENT_SERVICE_COUPON 
-		<set>
-			<if test="serviceName != null">
-				SERVICE_NAME = #{serviceName}, 
-			</if>
-			<if test="serviceOpenId != null">
-				SERVICE_OPENID = #{serviceOpenId}, 
-			</if>
-			<if test="serviceMoney != null">
-				SERVICE_MONEY = #{serviceMoney}, 
-			</if>
-			<if test="serviceStatus != null">
-				SERVICE_STATUS = #{serviceStatus}
-			</if>
-		</set>
-		<where>
-			SERVICE_ID = #{serviceId}
-			<if test="serviceOpenId != null">
-				AND SERVICE_OPENID = #{serviceOpenId}
-			</if>
-			<if test="serviceOldStatus != null and serviceOldStatus != ''">
-				AND SERVICE_STATUS = #{serviceOldStatus} 
-			</if>
-		</where>
-	</update>
-	
-	<!-- 添加服务费抵扣券信息 -->
-	<insert id="saveServiceCoupon" parameterType="ServiceCouponInfo" useGeneratedKeys="true" keyProperty="serviceId">
-		INSERT INTO TB_IAMBERRY_RENT_SERVICE_COUPON
-		(
-			SERVICE_NAME,SERVICE_OPENID,SERVICE_MONEY,SERVICE_START_TIME,
-			SERVICE_END_TIME,SERVICE_STATUS,SERVICE_CREATE_TIME
-		) 
-		VALUES 
-		(
-			#{serviceName},#{serviceOpenId},#{serviceMoney},#{serviceStartTime},
-			#{serviceEndTime},#{serviceStatus},NOW()
-		)
-	</insert>
-	
-	<!-- 添加押金抵扣券 -->
-	<insert id="savePledgeCoupon" parameterType="PledgeCouponInfo" useGeneratedKeys="true" keyProperty="pledgeId">
-		INSERT INTO TB_IAMBERRY_RENT_PLEDGE_COUPON
-		(
-			PLEDGE_NAME,PLEDGE_OPENID,PLEDGE_MONEY,PLEDGE_START_TIME,
-			PLEDGE_END_TIME,PLEDGE_STATUS,PLEDGE_CREATE_TIME
-		) 
-		VALUES 
-		(
-			#{pledgeName},#{pledgeOpenId},#{pledgeMoney},#{pledgeStartTime},
-			#{pledgeEndTime},#{pledgeStatus},NOW()
-		)
-	</insert>
-	
-	<!-- 根据条件查询押金提取券信息 -->
-	<select id="listPledgeCoupon" parameterType="PledgeCouponInfo" resultType="PledgeCouponInfo">
-		SELECT
-		 	* 
-		FROM 
-			TB_IAMBERRY_RENT_PLEDGE_COUPON 
-		<where>
-			<if test="pledgeOpenId != null and pledgeOpenId != ''">
-				PLEDGE_OPENID = #{pledgeOpenId} 
-			</if>
-			<if test="pledgeStatus != null and pledgeStatus != ''">
-				AND PLEDGE_STATUS = #{pledgeStatus} 
-			</if>
-			<if test="pledgeId != null and pledgeId != ''">
-				AND pledge_id = #{pledgeId}
-			</if>
-		</where>
-	</select>
-	
-	<!-- 批量修改服务费抵扣券状态 -->
- 	<update id="updateServiceCouponList" parameterType="java.util.List">
- 		UPDATE 
-			TB_IAMBERRY_RENT_SERVICE_COUPON 
-		SET 
-			SERVICE_STATUS = 1 
-		WHERE 
-			SERVICE_ID  IN (
-				<foreach collection="list" item="item" separator=",">
-					#{item} 
-		        </foreach>) 
-		 AND 
-		 	SERVICE_STATUS = 2 
- 	</update>
-
-	<!-- 修改押金提取券状态 -->
-	<update id="updatePledgeCouponStatus" parameterType="PledgeCouponInfo">
-		UPDATE
-		TB_IAMBERRY_RENT_PLEDGE_COUPON
-		<set>
-			<if test="pledgeStatus != null">
-				pledge_status = #{pledgeStatus}
-			</if>
-		</set>
-		<where>
-			pledge_id = #{pledgeId}
-		</where>
-	</update>
-</mapper>

watero-rent-service/src/main/java/com/iamberry/rent/service/pay/RentPayServiceImpl.java

@@ -1,44 +0,0 @@
-package com.iamberry.rent.service.pay;
-
-import java.net.InetAddress;
-import java.util.regex.Pattern;
-
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.rent.face.pay.RentPayService;
-import com.iamberry.wechat.core.entity.rent.AccountLogsInfo;
-import com.iamberry.wechat.tools.*;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.iamberry.wechat.core.entity.pay.PayResult;
-import com.iamberry.wechat.face.pay.PayService;
-
-/**
- * @author LJK Class Description: 微信支付service实现 Create Date:2017年5月8日15:17:19
- *         
- */
-@Service
-public class RentPayServiceImpl implements RentPayService {
-
-	@Autowired
-	private RentOrderService rentOrderService;
-
-	@Override
-	public ResponseJson payTransfer(String openid, String orderid, Integer amount, Integer accountType, String dese) {
-		ResponseJson responseJson = PayUtil.transferPay(openid,orderid,amount,dese);
-		if(responseJson.getReturnCode() == 200){
-			//新增转账记录
-			AccountLogsInfo accountLogsInfo = new AccountLogsInfo();
-			accountLogsInfo.setAccountMoney(Integer.valueOf(amount));
-			accountLogsInfo.setAccountOpenId(openid);
-			accountLogsInfo.setAccountOrderId(orderid);
-			accountLogsInfo.setAccountType(accountType);
-			accountLogsInfo.setAccountRemark(dese);
-			accountLogsInfo.setTransferOrderNo((String)responseJson.getReturnMsg().get("partner_trade_no"));
-			rentOrderService.addTransferRecord(accountLogsInfo);
-		}
-		return responseJson;
-	}
-
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/rebate/OrderRebateServiceImpl.java

@@ -1,258 +0,0 @@
-package com.iamberry.rent.service.rebate;
-
-import java.util.List;
-import java.util.Map;
-
-import com.iamberry.wechat.core.entity.PageBean;
-import com.iamberry.wechat.core.entity.PaperBean;
-import com.iamberry.wechat.tools.PayUtil;
-import com.iamberry.wechat.tools.ResponseJson;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.iamberry.app.tool.log.RatFWLogger;
-import com.iamberry.rent.face.rebate.OrderRebateService;
-import com.iamberry.rent.service.machine.mapper.MachineMapper;
-import com.iamberry.rent.service.order.mapper.RentOrderMapper;
-import com.iamberry.rent.service.order.mapper.ServiceCouponMapper;
-import com.iamberry.rent.service.rebate.mapper.OrderRebateMapper;
-import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
-import com.iamberry.wechat.core.entity.member.Member;
-import com.iamberry.wechat.core.entity.relationship.WdRelation;
-import com.iamberry.wechat.core.entity.rent.MachineInfo;
-import com.iamberry.wechat.core.entity.rent.PledgeCouponInfo;
-import com.iamberry.wechat.core.entity.rent.RebateRecord;
-import com.iamberry.wechat.core.entity.rent.RebateType;
-import com.iamberry.wechat.core.entity.rent.RentOrder;
-import com.iamberry.wechat.core.entity.rent.RentOrderDTO;
-import com.iamberry.wechat.core.entity.rent.RentOrderItem;
-import com.iamberry.wechat.core.entity.rent.RentOrderItemDTO;
-import com.iamberry.wechat.core.entity.rent.RentTypeInfo;
-import com.iamberry.wechat.core.entity.rent.ServiceCouponInfo;
-import com.iamberry.wechat.face.admin.SystemService;
-import com.iamberry.wechat.face.member.MemberService;
-import com.iamberry.wechat.face.relationship.WdRelationService;
-
-@Service
-public class OrderRebateServiceImpl implements OrderRebateService{
-	
-	@Autowired
-	private OrderRebateMapper orderRebateMapper;
-	@Autowired
-	private MemberService memberService;
-	@Autowired
-	private RatFWLogger inLongLogger;
-	@Autowired
-	private WdRelationService wdRelationService;
-	@Autowired
-	private OrderRebateService orderRebateService;
-	@Autowired
-	private RentOrderMapper rentOrderMapper;
-	@Autowired
-	private MachineMapper machineMapper;
-	@Autowired
-	private ServiceCouponMapper serviceCouponMapper;
-	
-	@Override
-	public RentTypeInfo getRebateType(RentTypeInfo rentTypeInfo) {
-		// TODO Auto-generated method stub
-		return orderRebateMapper.getRebateType(rentTypeInfo);
-	}
-
-	@Override
-	public boolean saveRentOrderRebate(String rentOrderId, String openId) {
-		// TODO Auto-generated method stub
-		
-		//获取用户信息
-		Member member = memberService.getMemberByUserOpenId(openId);
-		if (member == null) {
-			inLongLogger.error(this, "--saveRentOrderRebate--:" + openId + "没有查到对应的用户信息");
-			return false;
-		}
-		//如果来源为2，则上线是微代理
-		if (member.getUserResType() != null && member.getUserResType().intValue() == 2) {
-			WdRelation wdRelation = wdRelationService.getWdRelationByOpenid(openId);
-			if (wdRelation == null) {
-				inLongLogger.error(this, "--saveRentOrderRebate--:" + openId + "用户关系有误");
-				return false;
-			}
-			int userId = wdRelation.getWdFirst();
-			//根据上级id查询上级用户信息
-			Member resMember = memberService.getMemberByUserId(userId);
-			if (resMember == null) {
-				inLongLogger.error(this, "--saveRentOrderRebate--:userId=" + userId + ",没有查到对应的用户信息");
-				return false;
-			}
-			RentOrderDTO rentOrder = new RentOrderDTO();
-			rentOrder.setRentOpenid(resMember.getUserOpenid());
-			rentOrder.setRentStatus(5);
-			MachineInfo machineInfo = new MachineInfo();
-			machineInfo.setMachineOpenid(resMember.getUserOpenid());
-			machineInfo.setMachineInitState(1);
-			//查询订单集合
-			List<RentOrderDTO> orderList = rentOrderMapper.listRentOrder(rentOrder);
-			//如果该上线没有租赁该商品或已退款，则不返利
-			if (orderList == null || orderList.size() == 0) {
-				inLongLogger.error(this, "--saveRentOrderRebate--:userId=" + userId + "没有租赁该商品或已退款，所以不返利");
-				return true;
-			}
-			//用来存放被激活的机器数量
-			int rentNum = 0;
-			//如果租赁了该商品，则循环对比，是否有押金，如果有则返利模式为1，如果没有，返利模式则为2
-			int type = 0;
-			for (RentOrderDTO order : orderList) {
-				if (order.getOrderItemList() == null || order.getOrderItemList().size() == 0) {
-					inLongLogger.error(this, "--saveRentOrderRebate--:userId=" + userId + "有订单没有订单项");
-					return false;
-				}
-				for (RentOrderItemDTO item : order.getOrderItemList()) {
-					if (item.getRentDeposit() != null && item.getRentDeposit().intValue() > 0) {
-						type = order.getRentTypeId().intValue();
-					}
-					if (item.getItemCodeState().intValue() == 2) {
-						rentNum++;
-					}
-				}
-			}
-			//如果该值为0，则表示没有激活的机器，因而不参与返利
-			if (rentNum == 0) {
-				inLongLogger.error(this, "--saveRentOrderRebate--:userId=" + userId + "租赁订单商品没有被激活，不返利");
-				return true;
-			}
-			//目前为止，2和3只是租赁方式不同，但返利相同，所以暂定为2
-			if (type == 0 ) {
-				type = 2;
-			}
-			//封装返利信息，查询之前返利的数量
-			RebateRecord rebateRecord = new RebateRecord();
-			rebateRecord.setRecordOpenid(resMember.getUserOpenid());
-			rebateRecord.setRecordStatus(5);
-			//查询之前返利的数量
-			List<RebateRecord> rebateList = orderRebateMapper.listRebateRecord(rebateRecord);
-			//之前返利数量 + 1 = 这次返利该查询的返利层级
-			int rebateLevel = rebateList.size() + 1;
-			orderRebateService.saveRebateRecord(rentOrderId, type, openId, resMember.getUserOpenid(), rebateLevel);
-		}
-		return true;
-	}
-	
-	/**
-	 * 
-	 * @param rentOrderId	返利订单id
-	 * @param type		返利类型id
-	 * @param openId	返利人
-	 * @param resOpenId	被返利人
-	 * @param rebateLevel	返利层级
-	 * @return
-	 */
-	@Override
-	public boolean saveRebateRecord(String rentOrderId, int type, String openId, String resOpenId, int rebateLevel) {
-		//封装返利类型
-		RebateType rebateType = new RebateType();
-		rebateType.setRebateLevel(rebateLevel);
-		rebateType.setRebateTypeId(type);
-		rebateType.setRebateStatus(1);
-		//根据层次，返利类型查询这次返利该返的内容
-		RebateType rebate = orderRebateMapper.getOneRebateType(rebateType);
-		
-		//封装返利信息，查询之前返利的数量
-		RebateRecord record = new RebateRecord();
-		record.setRecordOpenid(resOpenId);
-		record.setRecordRentOpenid(openId);
-		record.setRecordStatus(5);
-		//查询该购买人是否之前就给该上线返利过，如果有，则不再返利
-		List<RebateRecord> rebateRecordList = orderRebateMapper.listRebateRecord(record);
-		//将查询的数据保存到待返利表中
-		RebateRecord rebateRecord = new RebateRecord();
-		rebateRecord.setRecordOrderId(rentOrderId);
-		rebateRecord.setRecordOpenid(resOpenId);
-		rebateRecord.setRecordRentOpenid(openId);
-		rebateRecord.setRecordTypeId(type);
-		//如果为空，则该数据不返利
-		if (rebate == null || (rebateRecordList != null && rebateRecordList.size() > 0)) {
-			inLongLogger.error(this, "--saveRebateRecord--:openId=" + openId + "因返利层次超出或已经给"+resOpenId+"返利，所以不再返利");
-			return true;
-		} else {
-			//获取返利标识，确定该返利的东西
-			int identify = rebate.getRebateIdentify();
-			switch (identify) {
-			case 1:
-				rebateRecord.setRecordIdentify(1);
-				rebateRecord.setRecordMoney(rebate.getRebateMoney());
-				rebateRecord.setRecordStatus(2);
-				break;
-			case 2:
-				rebateRecord.setRecordIdentify(2);
-				rebateRecord.setRecordStatus(3);
-				ServiceCouponInfo couponInfo = new ServiceCouponInfo();
-				couponInfo.setServiceName("服务费抵扣券");
-				couponInfo.setServiceMoney(rebate.getRebateDeductionMoney());
-				couponInfo.setServiceOpenId(resOpenId);
-				couponInfo.setServiceStatus(1);
-				serviceCouponMapper.saveServiceCoupon(couponInfo);
-				rebateRecord.setRecordDeductionId(couponInfo.getServiceId());
-				break;
-			case 3:
-				rebateRecord.setRecordIdentify(3);
-				rebateRecord.setRecordStatus(3);
-				PledgeCouponInfo pledgeCouponInfo = new PledgeCouponInfo();
-				pledgeCouponInfo.setPledgeName("押金提取券");
-				pledgeCouponInfo.setPledgeOpenId(resOpenId);
-				pledgeCouponInfo.setPledgeMoney(rebate.getRebateReplaceMoney());
-				pledgeCouponInfo.setPledgeStatus(1);
-				serviceCouponMapper.savePledgeCoupon(pledgeCouponInfo);
-				rebateRecord.setRecordReplaceId(pledgeCouponInfo.getPledgeId());
-				break;
-			}
-			int recordNum = orderRebateMapper.saveRebateRecord(rebateRecord);
-			if (recordNum > 0) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}
-
-	@Override
-	public Map<String, Object> listPayRebate(int pageSize, int pageNO, boolean isPageTotal) {
-		Map<String, Object> result = new java.util.HashMap<String, Object>(pageSize);
-		// 组织分页数据
-		PaperBean paperBean = new PaperBean();
-		paperBean.setPaperData(pageNO, pageSize);
-
-		// 查询
-		List<RebateRecord> list = orderRebateMapper.listPayRebate(paperBean.getMinNum(), paperBean.getMaxNum());
-		if (isPageTotal) result.put("pageTotal", PaperBean.justPaperCount(orderRebateMapper.countPayRebate(), pageSize));
-		result.put("list", list);
-
-		return result;
-	}
-
-	@Override
-	public ResponseJson transPay(Integer id) {
-
-		RebateRecord rebateRecord = orderRebateMapper.get(id);
-		if (rebateRecord.getRecordMoney() == null || rebateRecord.getRecordIdentify() != 1 || rebateRecord.getRecordStatus() != 2) {
-			// 返利记录有误，不支持现金返利
-			return new ResponseJson(500, "SUCCESS", 200);
-		}
-
-		// 提前修改数据状态,防止并发，但是无法撤回转账,在此就需要获取行锁，到事务提交时释放
-		Integer count = orderRebateMapper.updateRebate(id);
-		if (count == null || count <= 0) {
-			return new ResponseJson(404, "ERROR", 200);
-		}
-
-		ResponseJson res = PayUtil.transferPay(rebateRecord.getRecordOpenid(), rebateRecord.getRecordOrderId(), rebateRecord.getRecordMoney(), "订单返利");
-		if (res.getReturnCode() == 200 && res.getResultCode() == 200) {
-			return res;
-		}
-		throw new RuntimeException();
-	}
-
-	@Override
-	public List<RentTypeInfo> listRebateType(RentTypeInfo rentTypeInfo) {
-		// TODO Auto-generated method stub
-		return orderRebateMapper.listRebateType(rentTypeInfo);
-	}
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/rebate/mapper/OrderRebateMapper.java

@@ -1,80 +0,0 @@
-package com.iamberry.rent.service.rebate.mapper;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.rent.RebateRecord;
-import com.iamberry.wechat.core.entity.rent.RebateType;
-import com.iamberry.wechat.core.entity.rent.RentOrder;
-import com.iamberry.wechat.core.entity.rent.RentTypeInfo;
-import org.apache.ibatis.annotations.Param;
-
-public interface OrderRebateMapper {
-
-	/**
-	 * 根据id和状态查询租赁类型数据
-	 * @param rentTypeInfo
-	 * @return
-	 */
-	RentTypeInfo getRebateType(RentTypeInfo rentTypeInfo);
-	
-	/**
-	 * 查询租赁方式列表
-	 * @param rentTypeInfo
-	 * @return
-	 */
-	List<RentTypeInfo> listRebateType(RentTypeInfo rentTypeInfo);
-	
-	/**
-	 * 根据条件查询订单列表
-	 * @param rentOrder
-	 * @return
-	 */
-	List<RentOrder> listRentOrderByStatus(RentOrder rentOrder);
-	
-	/**
-	 * 根据条件查询返利记录信息
-	 * @param rebateRecord
-	 * @return
-	 */
-	List<RebateRecord> listRebateRecord(RebateRecord rebateRecord);
-	
-	/**
-	 * 根据三个条件查询一条返利类型
-	 * @param rebateType
-	 * @return
-	 */
-	RebateType getOneRebateType(RebateType rebateType);
-	
-	/**
-	 * 保存待返利记录
-	 * @param rebateRecord
-	 * @return
-	 */
-	Integer saveRebateRecord(RebateRecord rebateRecord);
-
-	/**
-	 * 分页查询转账的记录
-	 * @return
-	 */
-	List<RebateRecord> listPayRebate(@Param("min") int min, @Param("max") int max);
-
-	/**
-	 * 统计待转账的返利记录条数
-	 * @return
-	 */
-	Integer countPayRebate();
-
-	/**
-	 * 根据id，查询返利记录
-	 * @param id
-	 * @return
-	 */
-	RebateRecord get(Integer id);
-
-	/**
-	 * 将待返利记录修改为已返利
-	 * @param id
-	 * @return
-	 */
-	Integer updateRebate(Integer id);
-}

watero-rent-service/src/main/java/com/iamberry/rent/service/rebate/mapper/orderRebateMapper.xml

@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- 命名，每一个映射对象不一样 namespace:必须与对应的接口全类名一致 -->
-<mapper namespace="com.iamberry.rent.service.rebate.mapper.OrderRebateMapper">
-	
-	<sql id="rentType">
-		TYPE_ID typeId,
-		TYPE_NAME typeName,
-		TYPE_DURATION typeDuration,
-		TYPE_MONEY typeMoney,
-		TYPE_PLEDGE_MONEY typePledgeMoney,
-		TYPE_SERVICE_MONEY typeServiceMoney,
-		TYPE_WATER_NUM typeWaterNum,
-		TYPE_STATUS typeStatus,
-		TYPE_REMARK typeRemark,
-		TYPE_CREATE_TIME typeCreateTime,
-		TYPE_PAY_DURATION typePayDuration
-	</sql>
-	
-	<sql id="rentOrderField">
-		RENT_ORDERID rentOrderId,
-		RENT_OPENID rentOpenid,
-		RENT_AMOUNT rentAmount,
-		RENT_PAY_MONEY rentPayMoney,
-		RENT_SERVICE_ID rentServiceId,
-		RENT_SERVICE_MONEY rentServiceMoney,
-		RENT_TYPE_ID rentTypeId,
-		RENT_STATUS rentStatus,
-		RENT_SEND_DATE rentSendDate,
-		RENT_POST_NUM rentPostNum,
-		RENT_POST_FIRM rentPostFirm,
-		RENT_ADDRESS_INFO rentAddressInfo,
-		RENT_ADDRESS_TEL rentAddressTel,
-		RENT_ADDRESS_NAME rentAddressName,
-		RENT_TRANSACTION_ID rentTransactionId,
-		RENT_TRANSACTION_DATE rentTransactionDate,
-		RENT_CREATE_DATE rentCreateDate,
-		RENT_ADMIN_REMARK rentAdminRemark,
-		RENT_USER_REMARK rentUserRemark
-	</sql>
-	
-	<sql id="rebateRecordField">
-		RECORD_ID recordId,
-		RECORD_ORDER_ID recordOrderId,
-		RECORD_OPENID recordOpenid,
-		RECORD_RENT_OPENID recordRentOpenid,
-		RECORD_TYPE_ID recordTypeId,
-		RECORD_MONEY recordMoney,
-		RECORD_REPLACE_ID rebateReplaceId,
-		RECORD_DEDUCTION_ID rebateDeductionId,
-		RECORD_IDENTIFY recordIdentify,
-		RECORD_STATUS recordStatus,
-		RECORD_CREATE_TIME recordCreateTime,
-		RECORD_UPDATE_TIME recordUpdateTime 
-	</sql>
-	
-	<sql id="rebateTypeField">
-		REBATE_ID rebateId,
-		REBATE_NAME rebateName,
-		REBATE_TYPE_ID rebateTypeId,
-		REBATE_LEVEL rebateLevel,
-		REBATE_MONEY rebateMoney,
-		REBATE_REPLACE_MONEY rebateReplaceMoney,
-		REBATE_DEDUCTION_MONEY rebateDeductionMoney,
-		REBATE_IDENTIFY rebateIdentify,
-		REBATE_STATUS rebateStatus,
-		REBATE_CREATE_TIME rebateCreateTime 
-	</sql>
-	
-	<!-- 根据id和状态查询租赁类型数据 -->
-	<select id="getRebateType" parameterType="RentTypeInfo" resultType="RentTypeInfo">
-		SELECT 
-			<include refid="rentType" />
-		FROM 
-			TB_IAMBERRY_RENT_TYPE 
-		<where>
-			<if test="typeId != null and typeId != ''">
-				TYPE_ID = #{typeId} 
-			</if>
-			<if test="typeStatus != null and typeStatus != ''">
-				AND TYPE_STATUS = #{typeStatus} 
-			</if>
-		</where>
-	</select>
-	
-	<!-- 查询租赁方式列表 -->
-	<select id="listRebateType" parameterType="RentTypeInfo" resultType="RentTypeInfo">
-		SELECT 
-				* 
-			FROM 
-				TB_IAMBERRY_RENT_TYPE 
-			<where>
-				<if test="typeStatus != null and typeStatus != ''">
-					TYPE_STATUS = #{typeStatus} 
-				</if>
-			</where>
-	</select>
-	
-		<!-- 根据条件查询订单列表 -->
-	<select id="listRentOrderByStatus" parameterType="RentOrder" resultType="RentOrder">
-		SELECT 
-			<include refid="rentOrderField" />
-		FROM 
-			TB_IAMBERRY_RENT_ORDER 
-		<where>
-			<if test="rentOpenid != null and rentOpenid != ''">
-				RENT_OPENID = #{rentOpenid} 
-			</if>
-			<if test="rentStatus != null and rentStatus != ''">
-				AND RENT_STATUS = #{rentStatus}
-			</if>
-		</where>
-	</select>
-	
-	<!-- 根据条件查询返利记录信息 -->
-	<select id="listRebateRecord" parameterType="RebateRecord" resultType="RebateRecord">
-		SELECT
-			<include refid="rebateRecordField" />
-		FROM 
-			TB_IAMBERRY_RENT_REBATE_RECORD 
-		<where>
-			<if test="recordOpenid != null and recordOpenid != ''">
-				RECORD_OPENID = #{recordOpenid} 
-			</if>
-			<if test="recordRentOpenid != null and recordRentOpenid != ''">
-				AND RECORD_RENT_OPENID = #{recordRentOpenid} 
-			</if>
-			<if test="recordStatus != null and recordStatus == 5">
-				AND RECORD_STATUS IN (2,3)
-			</if>
-		</where>
-	</select>
-	
-	<!-- 根据三个条件查询一条返利类型 -->
-	<select id="getOneRebateType" parameterType="RebateType" resultType="RebateType">
-		SELECT
-			<include refid="rebateTypeField" />
-		FROM 
-			TB_IAMBERRY_RENT_REBATE_TYPE 
-		<where>
-			<if test="rebateLevel != null and rebateLevel != ''">
-				REBATE_LEVEL = #{rebateLevel} 
-			</if>
-			<if test="rebateTypeId != null and rebateTypeId != ''">
-				AND REBATE_TYPE_ID = #{rebateTypeId} 
-			</if>
-			<if test="rebateStatus != null and rebateStatus != ''">
-				AND REBATE_STATUS = #{rebateStatus} 
-			</if>
-		</where>
-	</select>
-	
-	<!-- 保存待返利记录 -->
-	<insert id="saveRebateRecord" parameterType="RebateRecord" useGeneratedKeys="true" keyProperty="recordId">
-		INSERT INTO TB_IAMBERRY_RENT_REBATE_RECORD
-		(
-			RECORD_ORDER_ID,RECORD_OPENID,RECORD_RENT_OPENID,RECORD_TYPE_ID,RECORD_MONEY,
-			RECORD_REPLACE_ID,RECORD_DEDUCTION_ID,RECORD_IDENTIFY,RECORD_STATUS,RECORD_CREATE_TIME
-		) 
-		VALUES 
-		(
-			#{recordOrderId},#{recordOpenid},#{recordRentOpenid},#{recordTypeId},#{recordMoney},
-			#{recordReplaceId},#{recordDeductionId},#{recordIdentify},#{recordStatus},NOW()
-		)
-	</insert>
-	
-	<!-- 查询待转账的返利记录 -->
-	<select id="listPayRebate" parameterType="java.util.Map" resultType="RebateRecord">
-		SELECT
-			r.*, u.user_nickname reUserNickName, t.rebate_name rentType, ru.user_nickname userNickName
-		FROM
-			TB_IAMBERRY_RENT_REBATE_RECORD r
-		LEFT JOIN
-			tb_iamberry_user_userinfo u
-		ON
-			r.record_openid = u.user_openid
-		LEFT JOIN
-			tb_iamberry_user_userinfo ru
-		ON
-			ru.user_openid = r.record_rent_openid
-		LEFT JOIN
-			tb_iamberry_rent_rebate_type t
-		ON
-			t.rebate_id = r.record_type_id
-		WHERE
-			record_status = 2 AND record_identify = 1
-		LIMIT
-			#{min}, #{max}
-	</select>
-
-	<!-- 根据id，查询返利金额 -->
-	<select id="get" parameterType="Integer" resultType="RebateRecord">
-		SELECT * FROM TB_IAMBERRY_RENT_REBATE_RECORD WHERE record_id = #{id}
-	</select>
-
-	<!-- 统计待转账的返利记录 -->
-	<select id="countPayRebate" resultType="Integer">
-		SELECT COUNT(record_id) FROM TB_IAMBERRY_RENT_REBATE_RECORD WHERE record_status = 2 AND record_identify = 1
-	</select>
-
-	<!-- 修改返利记录 -->
-	<update id="updateRebate" parameterType="Integer">
-		UPDATE TB_IAMBERRY_RENT_REBATE_RECORD SET record_status = 3 WHERE record_id = #{id} AND record_status = 2
-	</update>
-</mapper>

watero-rent-web/.classpath

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

watero-rent-web/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>watero-rent-web</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>

watero-rent-web/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8

watero-rent-web/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7

watero-rent-web/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

watero-rent-web/pom.xml

@@ -1,40 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  	<modelVersion>4.0.0</modelVersion>
-  
-  	<!-- 父类定义 -->
-	<parent>
-		<groupId>com.iamberry</groupId>
-		<artifactId>iamberry-parent</artifactId>
-		<version>1.0.0</version>
-	</parent>
-  
-  	<artifactId>watero-rent-web</artifactId>
-  	<packaging>jar</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>com.iamberry</groupId>
-			<artifactId>watero-rent-service</artifactId>
-			<version>1.0.0</version>
-	  	</dependency>
-	  	<dependency>
-			<groupId>com.iamberry</groupId>
-			<artifactId>watero-wechat-interface</artifactId>
-			<version>1.0.0</version>
-	  	</dependency>
-	</dependencies>
-	<build>
-	  <finalName>watero-rent-web</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.3</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>

watero-rent-web/src/main/java/com/iamberry/rent/handlers/admin/AdminMachineHandler.java

@@ -1,279 +0,0 @@
-package com.iamberry.rent.handlers.admin;
-
-import bsh.StringUtil;
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.wechat.core.entity.RentFilterUtil;
-import com.iamberry.wechat.core.entity.order.MessageDto;
-import com.iamberry.wechat.core.entity.order.OrderActionDto;
-import com.iamberry.wechat.core.entity.rent.MachineShare;
-import com.iamberry.wechat.core.entity.rent.RentChangeLogs;
-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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import java.net.URLDecoder;
-import java.util.Date;
-import java.util.List;
-
-@Controller
-@RequestMapping("/admin/admin_machine")
-public class AdminMachineHandler {
-    
-    @Autowired
-    private MachineService machineService;
-    @Autowired
-    private RentFilterUtil rentFilterUtil;
-    
-    /**
-     * 机器分享记录后台
-     * 2017年3月20日
-     * @author muzx
-     * @param pageSize
-     * @param pageNO
-     * @param request
-     * @return
-     */
-    @RequestMapping("/share_list")
-    public ModelAndView listMachineShare(
-            @RequestParam(value = "pageSize", defaultValue = "6", required = false) Integer pageSize,
-            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
-            HttpServletRequest request){
-        ModelAndView mv = new ModelAndView("/admin/reserve/machine/list");
-        MachineShare share = new MachineShare();
-        share.getPage().setPageSize(pageSize);
-        share.getPage().setPageNumber(pageNO);
-        List<MachineShare> shareList = machineService.listMachineShareAdmin(share);
-        int count = machineService.countMachineShare(share);
-        int pageCount =  count % share.getPage().getPageSize() == 0 ? count/share.getPage().getPageSize():(count/share.getPage().getPageSize()) + 1;
-        mv.addObject("shareList", shareList);
-        mv.addObject("pageNO", pageNO);
-        mv.addObject("pageSize", pageCount);
-        mv.addObject("url", "/admin/admin_machine/share_list?pageSize=" + pageSize + "&pageNO=");
-        return mv;
-    }
-
-    /**
-     * 分页查询更换滤芯记录
-     * @param request
-     * @param pageSize
-     * @param pageNO
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping("/list_change_filter")
-    public ModelAndView listChangeFilter(HttpServletRequest request,
-    		@RequestParam(value = "pageSize", defaultValue = "6", required = false) Integer pageSize,
-            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO) throws Exception {
-        ModelAndView mv = new ModelAndView("/admin/reserve/machine/filterList");
-    	StringBuilder url = new StringBuilder("/admin/admin_machine/list_change_filter?pageSize=" + pageSize);
-
-        RentChangeLogs logs = new RentChangeLogs();
-        String filterStatus = request.getParameter("filterStatus");
-        if (filterStatus == null || "".equals(filterStatus)) {
-            filterStatus = "inFilter";
-        }
-        String logsOrderId = request.getParameter("logsOrderId");
-        if (StringUtils.isNotEmpty(logsOrderId)) {
-            logs.setLogsOrderId(logsOrderId);
-            mv.addObject("logsOrderId",logsOrderId);
-            url.append("&logsOrderId=" + logsOrderId);
-        }
-        String logsAddressName = request.getParameter("logsAddressName");
-        if (StringUtils.isNotEmpty(logsAddressName)) {
-            logs.setLogsAddressName(logsAddressName);
-            mv.addObject("logsAddressName",logsAddressName);
-            url.append("&logsAddressName=" + logsAddressName);
-        }
-        String logsAddressTel = request.getParameter("logsAddressTel");
-        if (StringUtils.isNotEmpty(logsAddressTel)) {
-            logs.setLogsAddressTel(logsAddressTel);
-            mv.addObject("logsAddressTel",logsAddressTel);
-            url.append("&logsAddressTel=" + logsAddressTel);
-        }
-        String logsAddressInfo = request.getParameter("logsAddressInfo");
-        if (StringUtils.isNotEmpty(logsAddressInfo)) {
-            logs.setLogsAddressInfo(logsAddressInfo);
-            mv.addObject("logsAddressInfo",logsAddressInfo);
-            url.append("&logsAddressInfo=" + logsAddressInfo);
-        }
-        // 订单状态，数字标识
-        int status = -1;
-        if (!filterStatus.equals("allFilter")) {
-            status = rentFilterUtil.getFilterStatusByStr(filterStatus);
-        }
-        logs.setLogsStatus(status);
-    	 logs.getPage().setPageNumber(pageNO);
-    	 logs.getPage().setPageSize(pageSize);
-    	 logs.getPage().initRecordBegin();
-    	 //根据条件查询更换滤芯集合
-    	 List<RentChangeLogs> changeList = machineService.listChangeFilterLogs(logs);
-         if (changeList != null && changeList.size() > 0) {
-             for (RentChangeLogs filter : changeList) {
-                 filter.setRentUserNickName(URLDecoder.decode(filter.getRentUserNickName(),"UTF-8"));
-                 if (status == -1) {
-                     mv.addObject("orderListIsStatus", false);
-                     // 获取用户的操作权限
-                     filter.setOperations(rentFilterUtil.filterStatusToOperation(filter.getLogsStatus(), filter.getLogsId()));
-                     filter.setOrderLinkStatus(rentFilterUtil.filterStatusToString(filter.getLogsStatus())); // 滤芯状态描述，中文
-                 } else {
-                     mv.addObject("orderListIsStatus", true);
-                     // 获取用户的操作权限
-                     filter.setOperations(rentFilterUtil.filterStatusToOperation(filter.getLogsStatus(), filter.getLogsId()));
-                 }
-             }
-         }
-         url.append("&pageNO=");
-        mv.addObject("changeList", changeList);
-        mv.addObject("filterStatus",status);
-        mv.addObject("pageNO", pageNO);
-        mv.addObject("pageSize", machineService.getChangeFilterCount(logs));
-        mv.addObject("statusUrl", "/admin/admin_machine/list_change_filter?bid=&sid=");
-        mv.addObject("url", url.toString());
-        mv.addObject("orderStatusStr", rentFilterUtil.filterStatusIntToOrderStatusString(status));// 订单状态描述（用于选中订单头）
-        mv.addObject("orderLinkStatus", rentFilterUtil.filterStatusToString(status));// 订单状态描述，中文（显示给用户看）
-        return mv;
-    }
-
-    /**
-     * 操作订单
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping("/{action}/{orderId}")
-    public synchronized ModelAndView actionOrder(
-            @PathVariable("action") String action,
-            @PathVariable("orderId") Integer filterId,
-            OrderActionDto actionDto
-    ) throws Exception {
-        ModelAndView mv = new ModelAndView("admin/msg/msg");
-        RentChangeLogs logs = new RentChangeLogs();
-        logs.setLogsId(filterId);
-        // 订单状态，数字标识
-        logs.setLogsPostFirm(actionDto.getPostFirm());
-        logs.setLogsPostNum(actionDto.getPostNum());
-        // 判断当前的订单，是否支持希望进行的操作
-        List<RentChangeLogs> filterList = machineService.listSelectChangeLogs(logs);
-        if (filterList == null || filterList.size() <= 0) {
-            mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-            return mv;
-        }
-        RentChangeLogs filter = filterList.get(0);
-        Integer filterStatus = filter.getLogsStatus();
-        logs.setLogsOldStatus(filterStatus);
-        if (!rentFilterUtil.filterStatusIntToOrderStatusString(filterStatus).equals(actionDto.getOrderStatus())) {
-            mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-            return mv;
-        }
-        switch (filterStatus) {
-            case 0: // 取消的订单，不支持任何修改订单状态的操作
-
-                mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，取消的订单不能操作!"));
-                return mv;
-            case 1: // 更换申请中（管理员存在操作权限：同意申请）
-
-                // 只有两种操作 : 取消、同意
-                if (rentFilterUtil.getFilterActin()[0].equals(action)) {
-                    // 取消更换记录
-                    if (!rentFilterUtil.filterStatusIntToOrderStatusString(0).equals(actionDto.getToOrderStatus())) {// 判断请求修改的订单状态是否相符，否则提示不成功
-                        mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-                        return mv;
-                    }
-                    logs.setLogsStatus(0);
-                    if (machineService.updateChangeLogsById(logs)) {// 驳回退款
-                        mv.addObject("msgObj", new MessageDto(true, "取消订单成功!", "订单取消成功，订单即将封存!"));
-                        return mv;
-                    } else {
-                        mv.addObject("msgObj", new MessageDto(false, "对不起，取消订单失败", "对不起，对不起，取消订单失败，请稍后重试！"));
-                        return mv;
-                    }
-                } else if (rentFilterUtil.getFilterActin()[4].equals(action)) {
-                    // 同意换货
-
-                    if (!rentFilterUtil.filterStatusIntToOrderStatusString(2).equals(actionDto.getToOrderStatus())) {// 判断请求修改的订单状态是否相符，否则提示不成功
-                        mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-                        return mv;
-                    }
-                    logs.setLogsStatus(2);
-                    if (machineService.updateChangeLogsById(logs)) {
-                        //根据orderId查询订单所有信息
-                        mv.addObject("msgObj", new MessageDto(true, "滤芯换货成功", "恭喜您!滤芯换货成功，即将为您发货!"));
-                        return mv;
-                    } else {
-                        mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-                        return mv;
-                    }
-                } else {
-                    mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-                    return mv;
-                }
-            case 2: // 更换中（管理员的操作为：确认发货）
-
-                if (!rentFilterUtil.getFilterActin()[2].equals(action)) {// 判断当前请求操作是否相符, 否则提示不成功
-                    mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-                    return mv;
-                }
-                if (!rentFilterUtil.filterStatusIntToOrderStatusString(4).equals(actionDto.getToOrderStatus())) {// 判断请求修改的订单状态是否相符，否则提示不成功
-                    mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-                    return mv;
-                }
-                // 执行修改操作
-                logs.setLogsStatus(rentFilterUtil.getFilterStatusByStr(actionDto.getToOrderStatus()));
-                logs.setLogsSendTime(new Date());
-                if (machineService.updateChangeLogsById(logs)) {
-                    mv.addObject("msgObj", new MessageDto(true, "操作成功", "订单发货成功!"));
-                    return mv;
-                } else {
-                    mv.addObject("msgObj", new MessageDto(false, "对不起，订单发货失败", "对不起，取消订单失败，请稍后重试！"));
-                    return mv;
-                }
-            case 3: // 驳回
-
-                mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，已发货的订单不能操作!"));
-                return mv;
-            case 4: // 已发货
-
-                mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，已退款的订单不能操作!"));
-                return mv;
-            case 5: // 已完成
-
-                mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，已发货的订单不能操作!"));
-                return mv;
-            default: // 报错
-
-                mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误!"));
-                return mv;
-        }
-    }
-
-    /**
-     *获取订单详情
-     * @param request
-     * @param filterId
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/getFilterById/{orderId}")
-    public ModelAndView getFilterById(HttpServletRequest request,
-           @PathVariable("orderId") Integer filterId) throws Exception {
-        ModelAndView mv = new ModelAndView("/admin/reserve/machine/filterInfo");
-        RentChangeLogs logs = new RentChangeLogs();
-        logs.setLogsId(filterId);
-        //根据id查询滤芯更换记录
-        List<RentChangeLogs> filterList = machineService.listChangeFilterLogs(logs);
-        if (filterList == null) {
-            mv.setViewName("admin/msg/msg");
-            mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-            return mv;
-        }
-        logs = filterList.get(0);
-        logs.setRentUserNickName(URLDecoder.decode(logs.getRentUserNickName(),"UTF-8"));
-        mv.addObject("logs",logs);
-        return mv;
-    }
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/admin/AdminRebateHandler.java

@@ -1,56 +0,0 @@
-package com.iamberry.rent.handlers.admin;
-
-import com.iamberry.rent.face.rebate.OrderRebateService;
-import com.iamberry.wechat.core.entity.rent.RebateRecord;
-import com.iamberry.wechat.tools.PayUtil;
-import com.iamberry.wechat.tools.ResponseJson;
-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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
-
-/**
- * 租赁订单返利 控制器
- * @author 献
- * @company Goochine-深圳古辰创智科技有限公司
- * @website www.goochine.com
- * @tel 18271840547
- * @date 2017/4/27
- */
-@Controller
-@RequestMapping("/admin/rebate")
-public class AdminRebateHandler {
-
-    @Autowired
-    private OrderRebateService orderRebateService;
-
-    @RequestMapping("/_list")
-    public ModelAndView listUI(@RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                               @RequestParam(value = "pageNO", required = false, defaultValue = "1") Integer pageNO,
-                               @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
-                               HttpServletRequest request) {
-        ModelAndView mv = new ModelAndView("admin/reserve/rebate/list");
-
-        Map<String, Object> result = orderRebateService.listPayRebate(pageSize, pageNO, pageTotal == null);
-        pageTotal = pageTotal == null ? ((Integer) result.get("pageTotal")) : pageTotal;
-        // 为页面添加数据
-        mv.addObject("list", result.get("list"));
-        mv.addObject("pageSize", pageTotal);
-        StringBuilder url = new StringBuilder(request.getRequestURI().replaceAll(request.getContextPath(), ""));
-        url.append("?pageTotal=").append(pageTotal).append("&pageSize=").append(pageSize + "&pageNO=");
-        mv.addObject("url", url);
-        mv.addObject("pageNO", pageNO);
-        return mv;
-    }
-
-    @RequestMapping("/transfer_pay")
-    @ResponseBody
-    public ResponseJson transferPay(@RequestParam("rebateId") Integer rebateId) {
-        return orderRebateService.transPay(rebateId);
-    }
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/admin/AdminRentHandler.java

@@ -1,140 +0,0 @@
-package com.iamberry.rent.handlers.admin;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.wechat.core.entity.Page;
-import com.iamberry.wechat.core.entity.rent.MachineInfo;
-@RequestMapping("/admin/rent")
-@Controller
-public class AdminRentHandler {
-	@Autowired
-	private MachineService machineService;
-	
-	/**
-	 * 机器信息列表（后台）
-	 * @param pageNO
-	 * @param pageSize
-	 * @param agentMachineStatus
-	 * @param request
-	 * @return
-	 * @author LJK
-	 * @Time   2017年3月15日14:19:42
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping(value = "/machineInfoList")
-	public ModelAndView agentMachineList(
-			@RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
-			@RequestParam(value = "pageSize", defaultValue = "5", required = false) int pageSize,
-			HttpServletRequest request,MachineInfo machineInfo) throws Exception {
-		ModelAndView mv = new ModelAndView();
-		Page page = new Page();
-		StringBuilder url = new StringBuilder("/admin/reserve/machineInfoList?pageSize=" + pageSize);
-		String stopDate = request.getParameter("stopDate");//剩余时间
-		String initState = request.getParameter("initState");//剩余水量
-		
-		GregorianCalendar gc=new GregorianCalendar(); 
-		gc.setTime(new Date()); 
-		if(stopDate != null && !stopDate.equals("")){
-			switch (Integer.valueOf(stopDate)) {
-			case 1:
-				gc.add(5, +10);
-				machineInfo.setEndDate(gc.getTime());
-				break;
-			case 2:
-				gc.add(5, +10);
-				machineInfo.setBeginDate(gc.getTime());
-				gc.setTime(new Date()); 
-				gc.add(5, +30);
-				machineInfo.setEndDate(gc.getTime());
-				break;
-			case 3:
-				gc.add(Calendar.MONTH, +1);
-				machineInfo.setBeginDate(gc.getTime());
-				gc.setTime(new Date()); 
-				gc.add(Calendar.MONTH, +3);
-				machineInfo.setEndDate(gc.getTime());
-				break;
-			case 4:
-				gc.add(Calendar.MONTH, +3);
-				machineInfo.setBeginDate(gc.getTime());
-				gc.setTime(new Date()); 
-				gc.add(Calendar.MONTH, +6);
-				machineInfo.setEndDate(gc.getTime());
-				break;
-			case 5:
-				gc.add(Calendar.MONTH, +6);
-				machineInfo.setBeginDate(gc.getTime());
-				gc.setTime(new Date()); 
-				gc.add(Calendar.MONTH, +12);
-				machineInfo.setEndDate(gc.getTime());
-				break;
-			default:
-				break;
-			}
-		}
-		if(initState != null && !initState.equals("")){
-			switch (Integer.valueOf(initState)) {
-			case 1:
-				machineInfo.setEndWater(500);
-				break;
-			case 2:
-				machineInfo.setBeginWater(500);
-				machineInfo.setEndWater(1000);
-				break;
-			case 3:
-				machineInfo.setBeginWater(100);
-				machineInfo.setEndWater(1500);
-				break;
-			case 4:
-				machineInfo.setBeginWater(1500);
-				machineInfo.setEndWater(2000);
-				break;
-			case 5:
-				machineInfo.setBeginWater(2000);
-				machineInfo.setEndWater(2500);
-				break;
-			default:
-				break;
-			}
-		}
-		page.setPageNo((pageNO - 1) * pageSize);
-		int count = machineService.selectEquipmentCount(machineInfo);
-		int pageCount = count % pageSize == 0 ? count / pageSize : count
-				/ pageSize + 1;
-		page.setPageSize(pageSize);
-		machineInfo.setPage(page);
-		List<MachineInfo> machineInfoList = machineService.selectEquipmentList(machineInfo);
-		url.append("&pageNO=");
-		if(machineInfo.getMachineMac() != null){
-			mv.addObject("machineMac", machineInfo.getMachineMac());
-		}
-		if(machineInfo.getMachineDeviceId() != null){
-			mv.addObject("machineDeviceId", machineInfo.getMachineDeviceId());
-		}
-		if(machineInfo.getMachineInitState() != null){
-			mv.addObject("machineInitState", machineInfo.getMachineInitState());
-		}
-		mv.addObject("machineInfoList", machineInfoList);
-		mv.addObject("pageNO", pageNO);
-		mv.addObject("pageSize", pageCount);
-		mv.addObject("stopDate", stopDate);
-		mv.addObject("initState", initState);
-		mv.addObject("url", url);
-		mv.setViewName("/admin/reserve/machineInfoList");
-		return mv;
-	}
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/admin/AdminRentOrderHandler.java

@@ -1,312 +0,0 @@
-package com.iamberry.rent.handlers.admin;
-
-import java.net.URLDecoder;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.iamberry.wechat.core.entity.drp.PlaceInfo;
-import com.iamberry.wechat.core.entity.member.CashLog;
-import com.iamberry.wechat.core.entity.member.Member;
-import com.iamberry.wechat.core.entity.mq.MQMessage;
-import com.iamberry.wechat.core.entity.order.Order;
-import com.iamberry.wechat.core.entity.reback.RebackInfo;
-import com.iamberry.wechat.core.entity.relationship.DealerRelation;
-import com.iamberry.wechat.core.entity.relationship.WdRelation;
-import com.iamberry.wechat.tools.DateTimeUtil;
-import com.iamberry.wechat.tools.NameUtils;
-import com.iamberry.wechat.tools.ResultInfo;
-import org.apache.commons.lang3.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.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.wechat.core.entity.OrderUtil;
-import com.iamberry.wechat.core.entity.order.MessageDto;
-import com.iamberry.wechat.core.entity.order.OrderActionDto;
-import com.iamberry.wechat.core.entity.rent.RentOrder;
-import com.iamberry.wechat.core.entity.rent.RentOrderDTO;
-
-@Controller
-@RequestMapping("admin/rent_order")
-public class AdminRentOrderHandler {
-    @Autowired
-    RentOrderService rentOrderService;
-    @Autowired
-    private OrderUtil orderUtil;
-    /**
-     * 订单列表页    后台
-     * 2017年3月16日
-     * @author muzx
-     * @return
-     * @throws Exception 
-     */
-    @SuppressWarnings("unchecked")
-    @RequestMapping("/list")
-    public ModelAndView listRentOrder( 
-            @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
-            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
-            OrderActionDto actionDto,
-            HttpServletRequest request) throws Exception{
-        ModelAndView mv = new ModelAndView("admin/reserve/order/list");
-        String rentStatus = request.getParameter("orderStatus");
-       
-        //url需要进行拼接，拼接的内容是页面上的时间条件
-        StringBuilder url = new StringBuilder("/admin/rent_order/list?orderStatus=" + actionDto.getOrderStatus());
-        //分页并带条件查询接收参数
-        RentOrderDTO rentOrderDTO = new RentOrderDTO();        
-        if (StringUtils.isNotEmpty(actionDto.getText())) {
-            mv.addObject("text", actionDto.getText());
-            url.append("&text=" + actionDto.getText());
-            rentOrderDTO.setRentOrderId(actionDto.getText());
-        }
-        if (StringUtils.isNotEmpty(actionDto.getProbationSendName())) {
-            rentOrderDTO.setRentAddressName(actionDto.getProbationSendName());
-            mv.addObject("probationSendName", actionDto.getProbationSendName());
-            url.append("&probationSendName=" + actionDto.getProbationSendName());
-        }
-        if (StringUtils.isNotEmpty(actionDto.getProbationSendTel())) {
-            rentOrderDTO.setRentAddressTel(actionDto.getProbationSendTel());
-            mv.addObject("probationSendTel", actionDto.getProbationSendTel());
-            url.append("&probationSendTel=" + actionDto.getProbationSendTel());
-        }
-        if (StringUtils.isNotEmpty(actionDto.getSendAddress())) {
-            rentOrderDTO.setRentAddressInfo(actionDto.getSendAddress());
-            mv.addObject("sendAddress", actionDto.getSendAddress());
-            url.append("&sendAddress=" + actionDto.getSendAddress());
-        }
-        url.append("&pageSize=" + pageSize + "&pageNO=");
-        
-        if (rentStatus == null || "".equals(rentStatus)) {
-            rentStatus = "paySuccess";
-        }
-        // 订单状态，数字标识
-        int status = -1;
-        if (!rentStatus.equals("allOrder")) {
-            status = orderUtil.getOrderStatusByStr(rentStatus);
-        }
-        rentOrderDTO.setRentStatus(status);
-        rentOrderDTO.getPage().setPageSize(pageSize);
-        rentOrderDTO.getPage().setPageNumber(pageNO);
-        Map<String, Object> map = rentOrderService.listRentOrder(rentOrderDTO);
-        List<RentOrderDTO> dtoList = (List<RentOrderDTO>) map.get("list");
-       
-        // 订单是否按照状态查询的, 用于页面
-        for (RentOrderDTO orders : dtoList) {
-            // 获取用户的操作权限
-            orders.setOperations(orderUtil.rentOrderStatusToOperation(orders.getRentStatus(), orders.getRentOrderId()));
-            if (status == -1) {
-                mv.addObject("orderListIsStatus", false);
-                orders.setOrderLinkStatus(orderUtil.orderStatusToString(orders.getRentStatus())); // 订单状态描述，中文
-            }else{
-                mv.addObject("orderListIsStatus", true);
-            }
-        }
-
-        int count = (int) map.get("countOrder");
-        int pageCount =  count % rentOrderDTO.getPage().getPageSize() == 0 ? count/rentOrderDTO.getPage().getPageSize():(count/rentOrderDTO.getPage().getPageSize()) + 1;
-        //分页用
-        mv.addObject("orderList", dtoList);
-        mv.addObject("pageNO", pageNO);
-        mv.addObject("pageSize", pageCount);
-        mv.addObject("rentStatus", status);// 订单状态
-        mv.addObject("url", url);
-        mv.addObject("orderStatusStr", orderUtil.orderStatusIntToOrderStatusString(status));// 订单状态描述（用于选中订单头）
-        mv.addObject("orderLinkStatus", orderUtil.orderStatusToString(status));// 订单状态描述，中文（显示给用户看）
-        mv.addObject("statusUrl", "/admin/rent_order/list?bid=&sid=");
-        return mv;
-    }
-    
-    /**
-     * 操作订单
-     * @return
-     * @throws Exception 
-     */
-    @RequestMapping("/{action}/{orderId}")
-    public synchronized ModelAndView actionOrder(
-            @PathVariable("action") String action,
-            @PathVariable("orderId") String orderId,
-            OrderActionDto actionDto
-            ) throws Exception {
-        ModelAndView mv = new ModelAndView("admin/msg/msg");
-        RentOrder rentOrder = new RentOrder();
-        rentOrder.setRentOrderId(orderId);
-        rentOrder.setRentPostFirm(actionDto.getPostFirm());
-        rentOrder.setRentPostNum(actionDto.getPostNum());
-        
-        // 判断当前的订单，是否支持希望进行的操作
-        RentOrder order = rentOrderService.getRentOrderByOrderId(rentOrder);
-        order.setRentPostFirm(actionDto.getPostFirm());
-        order.setRentPostNum(actionDto.getPostNum());
-        rentOrder.setRentOldStatus(order.getRentStatus());
-        if (!orderUtil.orderStatusIntToOrderStatusString(order.getRentStatus()).equals(actionDto.getOrderStatus())) {
-            mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，当前订单状态不支持此操作!请确定后重试!"));
-            return mv;
-        }
-        switch (order.getRentStatus()) {
-            case 0: // 取消的订单，不支持任何修改订单状态的操作
-                return mv;
-            case 1: // 待支付（管理员存在操作权限：取消订单，如果取消订单，订单状态修改为0）
-                return mv;
-            case 2: // 已支付、待发货（管理员的操作为：确认发货）
-                mv = checkOrderOperation1(action, actionDto, 2, 5);
-                if (!(boolean)mv.getModel().get("status"))  return mv;
-                // 执行修改操作
-                rentOrder.setRentStatus(orderUtil.getOrderStatusByStr(actionDto.getToOrderStatus()));
-                rentOrder.setRentSendDate(new Date());
-                if(rentOrderService.deliverOrderByOrderId(rentOrder)){
-                    mv.addObject("msgObj", new MessageDto(true, "操作成功", "发货成功!"));
-                }else{
-                    mv.addObject("msgObj", new MessageDto(false, "对不起，订单发货失败", "对不起，订单发货失败，请稍后重试！"));
-                }
-                return mv;
-            case 3: // 退款申请中（管理员可以操作：确认退款、驳回退款）
-                mv = checkOrderOperation2(action, actionDto, 4, 5, 2, 4);
-                if (!(boolean)mv.getModel().get("status"))  return mv;
-                order.setRentStatus(orderUtil.getOrderStatusByStr(actionDto.getToOrderStatus()));
-                order.getList().get(0).setItemStatus(orderUtil.getOrderStatusByStr(actionDto.getToOrderStatus()));
-                try {
-                    boolean flag = rentOrderService.rentReturnMoneyRentOrder(order);
-                    if(flag){
-                        if(orderUtil.orderStatusIntToOrderStatusString(4).equals(actionDto.getToOrderStatus())){
-                            mv.addObject("msgObj", new MessageDto(true, "订单申请退款成功", "同意订单：" + orderId + "退款!"));
-                        }else{
-                            mv.addObject("msgObj", new MessageDto(true, "驳回退款成功!", "订单：" + orderId + "退款被驳回,状态返回已支付、待发货!"));
-                        }
-                    }else {
-                        mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-                    }
-                } catch (IllegalArgumentException e){
-                    mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "微信企业转账失败,请确认余额是否充足！"));
-                }finally {
-                    return mv;
-                }
-            case 4: // 已退款（管理员通过申请退款，此时订单任何人不能操作）
-                return mv;
-            case 5: // 已发货（管理员不具有权限）
-                mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，已发货的订单不能操作!"));
-                return mv;
-            case 6: // 申请退货中（只有管理员能操作 : 确认退货）
-                mv = checkOrderOperation2(action, actionDto, 6, 10, 5, 7);
-                if (!(boolean)mv.getModel().get("status"))  return mv;
-                // 执行修改操作
-                order.setRentStatus(orderUtil.getOrderStatusByStr(actionDto.getToOrderStatus()));
-                order.getList().get(0).setItemStatus(orderUtil.getOrderStatusByStr(actionDto.getToOrderStatus()));
-                if (rentOrderService.updateOrderStatusAndItemStatus(order)) {
-                    if(orderUtil.orderStatusIntToOrderStatusString(7).equals(actionDto.getToOrderStatus())){
-                        mv.addObject("msgObj", new MessageDto(true, "订单申请退货成功", "恭喜您！同意订单：" + orderId + "退货，等待收到货物后确认退货!"));
-                    }else{
-                        mv.addObject("msgObj", new MessageDto(true, "成功驳回订单退货", "订单：" + orderId + "退货被驳回,状态返回已发货!"));
-                    }
-                } else {
-                    mv.addObject("msgObj", new MessageDto(false, "对不起，处理订单退货失败", "对不起，处理订单退货失败，请稍后重试！"));
-                }
-                return mv;
-            case 7: // 退货中（管理员具有操作能力:确认退货）
-                mv = checkOrderOperation1(action, actionDto, 7, 8 );
-                if (!(boolean)mv.getModel().get("status"))  return mv;
-                // 执行修改操作
-                order.setRentStatus(orderUtil.getOrderStatusByStr(actionDto.getToOrderStatus()));
-                order.getList().get(0).setItemStatus(orderUtil.getOrderStatusByStr(actionDto.getToOrderStatus()));
-                if (rentOrderService.updateReturnRentOrder(order)) {
-                    mv.addObject("msgObj", new MessageDto(true, "确认订单退货成功", "恭喜您！同意订单：" + orderId + "退货，订单关闭!"));
-                    return mv;
-                } else {
-                    mv.addObject("msgObj", new MessageDto(false, "对不起，订单退货失败", "对不起，订单退货失败，请稍后重试！"));
-                    return mv;
-                }
-            case 8: // 订单退货，订单关闭（管理员收到货后，确认退货，订单状态修改为此，订单不对外提供操作能力）
-                return mv;
-            case 9: // 换货中（管理员对申请换货的订单，确认换货时，订单状态为此，此时只有管理员具有操作权限，只能确认换货，录入物流信息）
-                mv = checkOrderOperation1(action, actionDto,9, 5);
-                if (!(boolean)mv.getModel().get("status"))  return mv;
-
-                order.setRentStatus(orderUtil.getOrderStatusByStr(actionDto.getToOrderStatus()));
-                if (rentOrderService.deliverOrderByOrderId(order)) {
-                    mv.addObject("msgObj", new MessageDto(true, "订单发货成功", "恭喜您！订单：" + orderId + "订单发货成功!"));
-                } else {
-                    mv.addObject("msgObj", new MessageDto(false, "对不起，订单发货失败", "对不起，订单发货失败，请稍后重试！"));
-                }
-                return mv;
-            case 10: // 换货完成，当用户对换货中的订单，点击确认换货时，并录入物流信息，此订单进入已发货状态
-                
-                break;
-            case 11: // 在订单为已发货时，用户具有的权限，用户申请换货
-                mv = checkOrderOperation2(action, actionDto, 8, 11,9, 5);
-                if (!(boolean)mv.getModel().get("status"))  return mv;
-
-                // 执行修改操作
-                order.setRentStatus(orderUtil.getOrderStatusByStr(actionDto.getToOrderStatus()));
-                order.getList().get(0).setItemStatus(orderUtil.getOrderStatusByStr(actionDto.getToOrderStatus()));
-                order.setRentPostFirm(actionDto.getPostFirm());
-                order.setRentPostNum(actionDto.getPostNum());
-                if (rentOrderService.opertionRentExchangeOrder(order)) {
-                    if(orderUtil.orderStatusIntToOrderStatusString(9).equals(actionDto.getToOrderStatus())){
-                        mv.addObject("msgObj", new MessageDto(true, "同意换货成功", "恭喜您！同意订单：" + orderId + "换货，请收货后录入物流信息并同意换货!"));
-                    }else{
-                        mv.addObject("msgObj", new MessageDto(true, "驳回换货成功", "您已驳回订单：" + orderId + "换货，订单状态改为已发货!"));
-                    }
-                    return mv;
-                } else {
-                    mv.addObject("msgObj", new MessageDto(false, "对不起，订单换货失败", "对不起，订单换货失败，请稍后重试！"));
-                    return mv;
-                }
-            default: // 报错
-                mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误!"));
-        }
-        return mv;
-    }
-
-    /**
-     * 订单操作校验
-     * @param action
-     * @param actionDto
-     * @param actionId
-     * @param toOrderStatus
-     * @return
-     */
-    private ModelAndView checkOrderOperation1(String action, OrderActionDto actionDto, int actionId, int toOrderStatus){
-        ModelAndView mv = new ModelAndView("admin/msg/msg");
-        // 判断当前请求操作是否相符, 否则提示不成功
-        if (!orderUtil.getOrderActin()[actionId].equals(action)) {
-            mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-            mv.addObject("status", false);
-            return mv;
-        }
-
-        // 判断请求修改的订单状态是否相符，否则提示不成功
-        if (!orderUtil.orderStatusIntToOrderStatusString(toOrderStatus).equals(actionDto.getToOrderStatus())) {
-            mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-            mv.addObject("status", false);
-            return mv;
-        }
-        mv.addObject("status", true);
-        return mv;
-    }
-
-    private ModelAndView checkOrderOperation2(String action, OrderActionDto actionDto,
-             int action1, int action2, int toOrderStatus1, int toOrderStatus2){
-        ModelAndView mv = new ModelAndView("admin/msg/msg");
-        if ((!orderUtil.getOrderActin()[action1].equals(action))
-                && (!orderUtil.getOrderActin()[action2].equals(action))) {// 判断当前请求操作是否相符, 否则提示不成功
-            mv.addObject("status", false);
-            mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-            return mv;
-        }
-
-        if ((!orderUtil.orderStatusIntToOrderStatusString(toOrderStatus1).equals(actionDto.getToOrderStatus())) &&
-                (!orderUtil.orderStatusIntToOrderStatusString(toOrderStatus2).equals(actionDto.getToOrderStatus()))){
-            mv.addObject("status", false);
-            mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
-            return mv;
-        }
-        mv.addObject("status", true);
-        return mv;
-    }
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/admin/AdminServiceCouponHandler.java

@@ -1,83 +0,0 @@
-package com.iamberry.rent.handlers.admin;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-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.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.iamberry.rent.face.order.ServiceCouponService;
-import com.iamberry.wechat.core.entity.banner.MessageDTO;
-import com.iamberry.wechat.core.entity.rent.ServiceCouponInfo;
-
-@Controller
-@RequestMapping("/admin/serviceCoupon")
-public class AdminServiceCouponHandler {
-	
-	@Autowired
-	private ServiceCouponService serviceCouponService;
-
-	@RequestMapping("/selectServiceCouponList")
-	public ModelAndView selectServiceCouponList(HttpServletRequest request) throws Exception {
-		ModelAndView mv = new ModelAndView("admin/msg/msg");
-		ServiceCouponInfo info = new ServiceCouponInfo();
-		List<ServiceCouponInfo> couponList = serviceCouponService.list(info);
-		mv.addObject("couponList", couponList);
-		return mv;
-	}
-	
-	@RequestMapping("/saveServiceCoupon")
-	public ModelAndView saveServiceCoupon(HttpServletRequest request, ServiceCouponInfo info) throws Exception {
-		ModelAndView mv = new ModelAndView("admin/msg/msg");
-		int count = serviceCouponService.saveServiceCoupon(info);
-		if(count > 0){
-			mv.addObject("msgObj", new MessageDTO(true, "操作结果", "添加成功！"));
-		}else{
-			mv.addObject("msgObj", new MessageDTO(true, "操作结果", "添加失败！"));
-		}
-		return mv;
-	}
-	
-	public ModelAndView goUpdateView(HttpServletRequest request,
-			@RequestParam(value="serviceId",defaultValue= "", required=false)Integer serviceId) throws Exception {
-		ModelAndView mv = new ModelAndView("admin/msg/msg");
-		if (serviceId == null) {
-			mv.addObject("msgObj", new MessageDTO(true, "操作结果", "进入修改页面失败！"));
-			return mv;
-		}
-		ServiceCouponInfo info = new ServiceCouponInfo();
-		info.setServiceId(serviceId);
-		List<ServiceCouponInfo> couponList = serviceCouponService.list(info);
-		if (couponList == null || couponList.size() == 0) {
-			mv.setViewName("admin/msg/msg");
-			mv.addObject("msgObj", new MessageDTO(true, "操作结果", "进入修改页面失败！"));
-			return mv;
-		}
-		ServiceCouponInfo serviceCouponInfo = couponList.get(0);
-		mv.addObject("serviceCouponInfo", serviceCouponInfo);
-		return mv;
-	}
-	
-	@RequestMapping("/updateServiceCoupon")
-	public ModelAndView updateServiceCoupon(HttpServletRequest request,
-			@RequestParam(value="serviceId",defaultValue= "", required=false)Integer serviceId) throws Exception {
-		ModelAndView mv = new ModelAndView("admin/msg/msg");
-		if (serviceId == null) {
-			mv.addObject("msgObj", new MessageDTO(true, "操作结果", "添加失败！"));
-			return mv;
-		}
-		ServiceCouponInfo info = new ServiceCouponInfo();
-		info.setServiceId(serviceId);
-		int count = serviceCouponService.saveServiceCoupon(info);
-		if(count > 0){
-			mv.addObject("msgObj", new MessageDTO(true, "操作结果", "添加成功！"));
-		}else{
-			mv.addObject("msgObj", new MessageDTO(true, "操作结果", "添加失败！"));
-		}
-		return mv;
-	}
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/coupon/RentCouponHandler.java

@@ -1,249 +0,0 @@
-package com.iamberry.rent.handlers.coupon;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.wechat.core.entity.rent.RentOrderItem;
-import com.iamberry.wechat.tools.ResponseJson;
-
-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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.iamberry.rent.face.order.ServiceCouponService;
-import com.iamberry.rent.face.pay.RentPayService;
-import com.iamberry.wechat.core.entity.ResultMsg;
-import com.iamberry.wechat.core.entity.WechatUtils;
-import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
-import com.iamberry.wechat.core.entity.member.Member;
-import com.iamberry.wechat.core.entity.rent.PledgeCouponInfo;
-import com.iamberry.wechat.core.entity.rent.ServiceCouponInfo;
-import com.iamberry.wechat.face.coupon.CouponItemService;
-import com.iamberry.wechat.tools.ResultInfo;
-
-@Controller
-@RequestMapping("/wechat/rent_coupon")
-public class RentCouponHandler {
-	
-	@Autowired
-	private ServiceCouponService serviceCouponService;
-	@Autowired
-	private CouponItemService couponItemService;
-	@Autowired
-	private RentOrderService rentOrderService;
-	@Autowired
-	private RentPayService rentPayService;
-
-	/**
-	 * 查询个人所有优惠券总数
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping("/select_coupon_sum")
-    public ResultMsg selectCouponSum(HttpServletRequest request) throws Exception {
-    	ResultMsg msg = new ResultMsg();
-    	int serviceNum = 0;		//租赁服务费抵扣券数量
-    	int pledgeNum = 0;		//租赁押金提取券数量
-    	int couponNum = 0;	//旧的优惠券数量
-    	Member member = WechatUtils.getUserBySession(request);
-    	ServiceCouponInfo serviceCouponInfo = new ServiceCouponInfo();
-    	PledgeCouponInfo pledgeCouponInfo = new PledgeCouponInfo();
-    	serviceCouponInfo.setServiceOpenId(member.getUserOpenid());
-    	CouponItemDto couponItemDto = new CouponItemDto();
-    	couponItemDto.setUseropenid(member.getUserOpenid());
-    	//查询个人所有服务费抵扣券
-    	List<ServiceCouponInfo> serviceList = serviceCouponService.list(serviceCouponInfo);
-    	if (serviceList != null) {
-    		serviceNum = serviceList.size();
-    	}
-    	pledgeCouponInfo.setPledgeOpenId(member.getUserOpenid());
-    	//查询个人所有押金提取券
-    	List<PledgeCouponInfo> pledgeList = serviceCouponService.listPledgeCoupon(pledgeCouponInfo);
-    	if (pledgeList != null) {
-    		pledgeNum = pledgeList.size();
-    	}
-    	List<CouponItemDto> couponList = couponItemService.getCouponItemDtoList(couponItemDto);
-    	if (couponList != null) {
-    		couponNum = couponList.size();
-    	}
-    	int couponSum = serviceNum + pledgeNum + couponNum;
-    	msg.setData(couponSum);
-    	msg.setResultCode(ResultInfo.SUCCESSCODE);
-    	msg.setStatus(true);
-    	return msg;
-    }
-	
-	/**
-	 * 查询个人所有的服务费抵扣券列表
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping("/select_service_coupon_list")
-	public ResultMsg selectServiceCouponList(HttpServletRequest request) throws Exception {
-		ResultMsg msg = new ResultMsg();
-		Member member = WechatUtils.getUserBySession(request);
-		ServiceCouponInfo serviceCouponInfo = new ServiceCouponInfo();
-    	serviceCouponInfo.setServiceOpenId(member.getUserOpenid());
-    	//查询个人所有服务费抵扣券
-    	List<ServiceCouponInfo> serviceList = serviceCouponService.list(serviceCouponInfo);
-    	msg.setData(serviceList);
-    	msg.setResultCode(ResultInfo.SUCCESSCODE);
-    	msg.setStatus(true);
-    	return msg;
-	}
-	
-	/**
-	 * 查询个人所有的押金提取券列表
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping("/select_pledge_coupon_list")
-	public ResultMsg selectPledgeCouponList(HttpServletRequest request) throws Exception {
-		ResultMsg msg = new ResultMsg();
-		Member member = WechatUtils.getUserBySession(request);
-		PledgeCouponInfo pledgeCouponInfo = new PledgeCouponInfo();
-		pledgeCouponInfo.setPledgeOpenId(member.getUserOpenid());
-		//查询个人所有押金提取券
-    	List<PledgeCouponInfo> pledgeList = serviceCouponService.listPledgeCoupon(pledgeCouponInfo);
-    	msg.setData(pledgeList);
-    	msg.setResultCode(ResultInfo.SUCCESSCODE);
-    	msg.setStatus(true);
-    	return msg;
-	}
-
-	/**
-	 * 进入押金提取页面
-	 * @param request
-	 * @param pledgeId
-	 * @return
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping("/toExtractDeposit")
-	public ResultMsg toExtractDeposit(HttpServletRequest request,
-						@RequestParam("pledgeId") Integer pledgeId) throws Exception{
-		ResultMsg msg = new ResultMsg();
-		Member member = WechatUtils.getUserBySession(request);
-		if(null == pledgeId || pledgeId.equals("")){
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			return msg;
-		}
-		PledgeCouponInfo couponInfo = new PledgeCouponInfo();
-		couponInfo.setPledgeId(pledgeId);
-		couponInfo.setPledgeStatus(1);
-		List<PledgeCouponInfo> listcouponInfo = serviceCouponService.listPledgeCoupon(couponInfo);
-		if(listcouponInfo == null || listcouponInfo.size() == 0){
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			return msg;
-		}
-		couponInfo = listcouponInfo.get(0);
-		//查询所有订单
-		List<RentOrderItem> listOrderItem = rentOrderService.selectRentOrderByOpenId(member.getUserOpenid());
-		Map<String,Object> map = new HashMap<String,Object>();
-		map.put("couponInfo",couponInfo);
-		map.put("listOrderItem",listOrderItem);
-		msg.setResultCode(ResultInfo.SUCCESSCODE);
-		msg.setStatus(true);
-		msg.setData(map);
-		return msg;
-	}
-
-
-	/**
-	 * 发起提取押金操作
-	 * @param request
-	 * @param orderItemId
-	 * @param pledgeId
-	 * @return
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping("/extractDeposit")
-	public ResultMsg extractDeposit(HttpServletRequest request,
-					@RequestParam("orderItemId") Integer orderItemId,
-					@RequestParam("pledgeId") Integer pledgeId) throws  Exception{
-		ResultMsg msg = new ResultMsg();
-		Member member = WechatUtils.getUserBySession(request);
-		if(null == orderItemId || orderItemId.equals("")){
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			msg.setMessage("押金提取失败！");
-			return msg;
-		}
-		if(null == pledgeId || pledgeId.equals("")){
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			msg.setMessage("押金提取失败！");
-			return msg;
-		}
-		//查询提取卷信息
-		PledgeCouponInfo couponInfo = new PledgeCouponInfo();
-		couponInfo.setPledgeId(pledgeId);
-		couponInfo.setPledgeStatus(1);
-		List<PledgeCouponInfo> listcouponInfo = serviceCouponService.listPledgeCoupon(couponInfo);
-		if(listcouponInfo == null || listcouponInfo.size() == 0){
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			return msg;
-		}
-
-		couponInfo = listcouponInfo.get(0);
-		//查询订单项信息
-		RentOrderItem itenInfo = new RentOrderItem();
-		itenInfo.setItemId(orderItemId);
-		itenInfo = rentOrderService.getOrderItemByInitCode(itenInfo);
-
-		//判断是否符合提取条件
-		if(couponInfo == null || itenInfo == null){
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			msg.setMessage("数据异常，押金提取失败！");
-			return msg;
-		}
-		if (itenInfo.getRentIsOut() == 1 || couponInfo.getPledgeMoney() > itenInfo.getRentRemainDeposit()){
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			msg.setMessage("抵扣卷金额不得大于待提取金额！");
-			return msg;
-		}
-			//执行转账操作
-			ResponseJson responseJson = rentPayService.payTransfer(member.getUserOpenid(),itenInfo.getItemOrderId(),couponInfo.getPledgeMoney()*100,1,"使用押金抵扣卷提取租赁押金");
-			if (responseJson.getReturnCode() == 200){
-			//转账成功
-			//修改订单项信息
-	 		RentOrderItem rentOrderItem = new RentOrderItem();
-			rentOrderItem.setRentIsOut(1);
-			rentOrderItem.setRentRemainDeposit(itenInfo.getRentRemainDeposit()-couponInfo.getPledgeMoney());
-			rentOrderItem.setRentPledgeId(String.valueOf(couponInfo.getPledgeId()));
-			rentOrderItem.setItemId(itenInfo.getItemId());
-			rentOrderService.update(rentOrderItem);
-			//修改押金提取卷信息
-			PledgeCouponInfo pledgeCouponInfo = new PledgeCouponInfo();
-			pledgeCouponInfo.setPledgeId(couponInfo.getPledgeId());
-			pledgeCouponInfo.setPledgeStatus(2);
-			serviceCouponService.updatePledgeCouponStatus(pledgeCouponInfo);
-			msg.setResultCode(ResultInfo.SUCCESSCODE);
-			msg.setStatus(true);
-			msg.setMessage("押金提取成功！");
-		}else{
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			msg.setMessage("数据异常，押金提取失败！");
-		}
-		return msg;
-	}
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/efast/EfastRentHandler.java

@@ -1,112 +0,0 @@
-package com.iamberry.rent.handlers.efast;
-
-import cn.jpush.api.utils.StringUtils;
-import com.iamberry.rent.face.efast.EfastRentService;
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.wechat.core.entity.ResultMsg;
-import com.iamberry.wechat.face.giftCard.AgentMachineService;
-import com.iamberry.wechat.face.giftCard.GiftCardService;
-import com.iamberry.wechat.face.order.AdminOrderService;
-import com.iamberry.wechat.tools.ResultInfo;
-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.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * Created by Administrator on 2017/4/27.
- * @author 刘志伟
- */
-@Controller
-@RequestMapping("/admin/rent/efast")
-public class EfastRentHandler {
-
-    //创建线程池,通过线程池管理线程，此线程池可灵活回收空闲线程，若无可回收，则新建线程
-    public static ExecutorService service = Executors.newCachedThreadPool();
-
-    @Autowired
-    private EfastRentService efastRentService;
-    @Autowired
-    private AdminOrderService adminOrderService;
-    @Autowired
-    private GiftCardService giftCardService;
-    @Autowired
-    private AgentMachineService agentMachineService;
-    @Autowired
-    private RentOrderService rentOrderService;
-    @Autowired
-    private MachineService machineService;
-
-    /**
-     *
-     * @param request
-     * @param orderId
-     * @param type 1:销售订单;2:万元小代理赠送机器;3:万元小代理兑换机器;4:万元小代理奖励机器;5:租赁订单;6:更换滤芯
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequestMapping("/select_efast_order/{orderId}/{type}")
-    public ResultMsg selectEfastOrder(HttpServletRequest request,
-                                      @PathVariable("orderId") String orderId,
-                                      @PathVariable("type") Integer type) throws Exception {
-        ResultMsg msg = new ResultMsg();
-        Map<String,Object> map = new HashMap<String,Object>();
-        StringBuilder id = new StringBuilder();
-        boolean flag = false;
-        if (!StringUtils.isNotEmpty(orderId) || type == null) {
-            msg.setMessage("订单号或类型为空!");
-            msg.setResultCode(ResultInfo.ERRORCODE);
-            msg.setStatus(false);
-            return msg;
-        }
-        //根据类型重组订单号，该订单号只在efast系统中存在
-        switch (type) {
-            case 1:
-                break;
-            case 2:
-                id.append("ZS1111111_");
-                map.put("donateId","ZS11111111" + orderId);
-                break;
-            case 3:
-                id.append("DH00000000");
-                break;
-            case 4:
-                id.append("ZS22222222");
-                break;
-            case 5:
-                break;
-            case 6:
-                id.append("RF00000000");
-                break;
-        }
-        id.append(orderId);
-        map.put("orderId",orderId);
-        map.put("id",id.toString());
-        map.put("type",type);
-        while (!flag) {
-            //如果此collection包含指定的元素，则返回 true，如果有则不再插入队列
-            if (EfastTask.queues.contains(map)) {
-                msg.setStatus(true);
-                msg.setResultCode(ResultInfo.SUCCESSCODE);
-                msg.setMessage("已存在该同步任务，不需再次插入队列中");
-                return msg;
-            }
-            flag = EfastTask.queues.offer(map);
-            //如果参数没有添加到队列中，则该线程停止1s后继续插入队列，直到插入进去为止
-            if (!flag) {
-                Thread.sleep(1000);
-            }
-        }
-        EfastTask task = new EfastTask(efastRentService,adminOrderService,giftCardService,agentMachineService,rentOrderService,machineService);
-        service.submit(task);
-        return msg;
-    }
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/efast/EfastTask.java

@@ -1,121 +0,0 @@
-package com.iamberry.rent.handlers.efast;
-
-import com.iamberry.rent.face.efast.EfastRentService;
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.wechat.core.entity.giftCard.AgentMachine;
-import com.iamberry.wechat.core.entity.giftCard.UserMachineInfo;
-import com.iamberry.wechat.core.entity.order.Order;
-import com.iamberry.wechat.core.entity.rent.RentChangeLogs;
-import com.iamberry.wechat.core.entity.rent.RentOrder;
-import com.iamberry.wechat.face.giftCard.AgentMachineService;
-import com.iamberry.wechat.face.giftCard.GiftCardService;
-import com.iamberry.wechat.face.order.AdminOrderService;
-
-import java.util.Map;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-
-/**
- * Created by Administrator on 2017/4/27.
- */
-public class EfastTask implements Runnable {
-
-    public static BlockingQueue<Map<String,Object>> queues = new ArrayBlockingQueue<Map<String,Object>>(500);
-
-    private EfastRentService efastRentService;
-    private AdminOrderService adminOrderService;
-    private GiftCardService giftCardService;
-    private AgentMachineService agentMachineService;
-    private RentOrderService rentOrderService;
-    private MachineService machineService;
-
-    public EfastTask(EfastRentService efastRentService,AdminOrderService adminOrderService,
-                     GiftCardService giftCardService,AgentMachineService agentMachineService,
-                     RentOrderService rentOrderService,MachineService machineService) {
-        this.efastRentService = efastRentService;
-        this.adminOrderService = adminOrderService;
-        this.giftCardService = giftCardService;
-        this.agentMachineService = agentMachineService;
-        this.rentOrderService = rentOrderService;
-        this.machineService = machineService;
-    }
-
-    @Override
-    public void run() {
-        try {
-            //获取队列中的map集合
-            Map<String,Object> queuesMap = queues.take();
-            int type = (int)queuesMap.get("type");
-            String id = (String)queuesMap.get("id");
-            String orderId = (String)queuesMap.get("orderId");
-            //查询efast系统该订单的状态
-            Map<String,Object> map = efastRentService.getEfastSendOrderInfo(id);
-            if (!(boolean)map.get("status")) {
-                //类型为2可能有两种单号，如果第一种为空，则查询第二种，如果都为空，则直接返回
-                if (type == 2) {
-                    id = (String)queuesMap.get("donateId");
-                    map = efastRentService.getEfastSendOrderInfo(id);
-                    if (!(boolean)map.get("status")) {
-                        return;
-                    }
-                }
-            }
-            switch (type) {
-                case 1:
-                    Order order = new Order();
-                    order.setSalesOrderid(orderId);
-                    order.setSalesStatus(5);
-                    order.setSalesPostFirm((String)map.get("postFirm"));
-                    order.setSalesPostNum((String)map.get("postNum"));
-                    order.setOldStatus(2);
-                    adminOrderService.updateOrderDeliver(order);
-                    break;
-                case 2:
-                    AgentMachine agentMachineInfo = new AgentMachine();
-                    agentMachineInfo.setAgentMachineId(Integer.parseInt(orderId));
-                    agentMachineInfo.setAgentMachinePostName((String)map.get("postFirm"));
-                    agentMachineInfo.setAgentMachinePostNum((String)map.get("postNum"));
-                    agentMachineInfo.setAgentMachineStatus(3);
-                    agentMachineService.updateAgentMachine(agentMachineInfo);
-                    break;
-                case 3:
-                    UserMachineInfo userMachine = new UserMachineInfo();
-                    userMachine.setUserMachineId(Integer.parseInt(orderId));
-                    userMachine.setUserMachinePostName((String)map.get("postFirm"));
-                    userMachine.setUserMachinePostNum((String)map.get("postNum"));
-                    userMachine.setUserMachineStatus(2);
-                    giftCardService.update(userMachine);
-                    break;
-                case 4:
-                    AgentMachine agentMachine = new AgentMachine();
-                    agentMachine.setAgentMachineId(Integer.parseInt(orderId));
-                    agentMachine.setAgentMachinePostName((String)map.get("postFirm"));
-                    agentMachine.setAgentMachinePostNum((String)map.get("postNum"));
-                    agentMachine.setAgentMachineStatus(3);
-                    agentMachineService.updateAgentMachine(agentMachine);
-                    break;
-                case 5:
-                    RentOrder rentOrder = new RentOrder();
-                    rentOrder.setRentOrderId(orderId);
-                    rentOrder.setRentPostFirm((String)map.get("postFirm"));
-                    rentOrder.setRentPostNum((String)map.get("postNum"));
-                    rentOrder.setRentStatus(5);
-                    rentOrder.setRentOldStatus(2);
-                    rentOrderService.deliverOrderByOrderId(rentOrder);
-                    break;
-                case 6:
-                    RentChangeLogs logs = new RentChangeLogs();
-                    logs.setLogsStatus(4);
-                    logs.setLogsPostFirm((String)map.get("postFirm"));
-                    logs.setLogsPostNum((String)map.get("postNum"));
-                    logs.setLogsId(Integer.parseInt(orderId));
-                    machineService.updateChangeLogsById(logs);
-                    break;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/factory/FactoryHandler.java

@@ -1,92 +0,0 @@
-package com.iamberry.rent.handlers.factory;
-
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.wechat.core.entity.WechatUtils;
-import com.iamberry.wechat.core.entity.machine.Machine;
-import com.iamberry.wechat.core.entity.member.Member;
-import com.iamberry.wechat.core.entity.rent.MachineInfo;
-import com.iamberry.wechat.face.wechat.ConfigService;
-import com.iamberry.wechat.iot.WechatIotUtils;
-import com.iamberry.wechat.tools.ResponseJson;
-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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * 工厂测试使用
- * @author 献
- * @company Goochine-深圳古辰创智科技有限公司
- * @website www.goochine.com
- * @tel 18271840547
- * @date 2017/4/26
- */
-@RequestMapping("/wechat/factory")
-@Controller
-public class FactoryHandler {
-
-    @Autowired
-    private MachineService machineService;
-
-    @Autowired
-    private ConfigService configService;
-
-    @ResponseBody
-    @RequestMapping("/info_by_mac")
-    public ResponseJson getDeviceInfoByMac(@RequestParam("mac") String mac/*, HttpServletRequest request*/) {
-        // Member member = WechatUtils.getUserBySession(request);
-        MachineInfo machine = new MachineInfo();
-        machine.setMachineMac(mac);
-        List<MachineInfo> list = machineService.list(machine);
-        if (list == null || list.isEmpty()) {
-            // 资源为空
-            return new ResponseJson(200, "SUCCESS", 404);
-        }
-        // 返回机器信息
-        return new ResponseJson(200, "SUCCESS", 200).addResponseKeyValue("info", list.get(0));
-    }
-
-
-    /**
-     * 取消绑定
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/un_bind")
-    public ResponseJson unBind(@RequestParam("ticket") String ticket,
-                               @RequestParam("device_id") String device_id,
-                               HttpServletRequest request) {
-        Member member = WechatUtils.getUserBySession(request);
-
-        // 取消用户和机器绑定
-        net.sf.json.JSONObject json = WechatIotUtils.unBind(device_id, ticket, member.getUserOpenid(), configService.getAccessToken(), true);
-        if (json.getJSONObject("base_resp").getInt("errcode") != 0) {
-            return new ResponseJson(200, "ERROR", 500);
-        }
-        return new ResponseJson(200, "SUCCESS", 200);
-    }
-
-    /**
-     * 绑定
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/bind")
-    public ResponseJson bind(@RequestParam("ticket") String ticket,
-                             @RequestParam("device_id") String device_id,
-                             HttpServletRequest request) {
-        Member member = WechatUtils.getUserBySession(request);
-
-        // 取消用户和机器绑定
-        net.sf.json.JSONObject json = WechatIotUtils.unBind(device_id, ticket, member.getUserOpenid(), configService.getAccessToken(), false);
-        if (json.getJSONObject("base_resp").getInt("errcode") != 0) {
-            return new ResponseJson(200, "ERROR", 500);
-        }
-        return new ResponseJson(200, "SUCCESS", 200);
-    }
-
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/listener/RentOrderListener.java

@@ -1,55 +0,0 @@
-package com.iamberry.rent.handlers.listener;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.iamberry.app.tool.log.RatFWLogger;
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
-import com.iamberry.wechat.core.entity.rent.RentOrder;
-import com.iamberry.wechat.face.admin.SystemService;
-
-public class RentOrderListener {
-	
-	@Autowired
-	private RatFWLogger logger;
-	@Autowired
-	private RentOrderService rentOrderService;
-	@Autowired
-    private SystemService systemService;
-	
-	public void closeRentOrder() throws Exception {
-		//获取规则表中对于订单关闭限定的时间
-		logger.info("==============订单关闭开始==================");
-		ShopSystemRule shopSystemRuleOne = systemService.selectOneShopRuleById(234);
-		List<Integer> couponList = new ArrayList<Integer>();//用于存放服务费抵扣券id
-		List<String> rentOrderList = new ArrayList<String>();//用于存放订单orderid
-		RentOrder rentOrder = new RentOrder();
-		rentOrder.setRentStatus(1);
-		//获取的时间以分钟为单位，这里转换成秒，按秒计算
-		rentOrder.setDeadline((int)(shopSystemRuleOne.getRuleNum() * 60));
-		//根据状态和时间查询是否有需要关闭的订单
-		List<RentOrder> orderList = rentOrderService.listOrderByDeadline(rentOrder);
-		if (orderList == null || orderList.size() <= 0) {
-			logger.info("==============订单关闭结束，没有可关闭订单==================");
-			return;
-		}
-		//循环订单，将订单id和抵扣券id添加到集合中
-		for (RentOrder order : orderList) {
-			rentOrderList.add(order.getRentOrderId());
-			if (order.getRentServiceId() != null) {
-				couponList.add(order.getRentServiceId());
-			}
-		}
-		
-		boolean flag = rentOrderService.updateOrderAndCoupon(rentOrderList, couponList);
-		
-		if (flag) {
-			logger.info("==============订单关闭成功==================");
-		} else {
-			logger.info("==============订单关闭失败，有错误==================rentOrderList=" + rentOrderList);
-		}
-	}
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/machine/AdminAcceptEquipmentMessageHandler.java

@@ -1,142 +0,0 @@
-package com.iamberry.rent.handlers.machine;
-
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.json.JSONObject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.Base64Utils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.iamberry.exception.ServiceException;
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.wechat.core.entity.rent.MachineInfo;
-import com.iamberry.wechat.tools.NameUtils;
-
-@RequestMapping("/message")
-@Controller
-public class AdminAcceptEquipmentMessageHandler {
-
-	@Autowired
-	private MachineService machineService;
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(AdminAcceptEquipmentMessageHandler.class);
-	
-    /**
-     * 校验
-     * @param request
-     * @param response
-     * @throws Exception
-     * @author 献
-     * @Time   2017年4月5日
-     */
-    @RequestMapping(value = "/acceptMessage", method = RequestMethod.GET)
-	public void verify(HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
-    	String echostr  = request.getParameter("echostr");	//随即字符串
-		response.getOutputStream().write(echostr.getBytes());
-    }
-    
-	/**
-	 * 接受设备消息
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws Exception
-	 */
-	@RequestMapping(value = "/acceptMessage", method = RequestMethod.POST)
-	public void acceptMessage(HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
-		
-		// 从request中读取数据
-		ServletInputStream inputStream = request.getInputStream();
-		StringBuilder bindingData = new StringBuilder();
-		try {
-			byte[] buffer = new byte[1024];    
-			int len = 0;
-			while ((len = inputStream.read(buffer)) != -1) {
-				bindingData.append(new String(buffer, 0, len));
-			}
-		} catch (Exception e) {
-			LOGGER.error("'method':'{}', 'err':'{}'", "acceptMessage", e.getMessage());
-		}
-		
-		// 格式化数据
-		JSONObject  json = JSONObject.fromObject(bindingData.toString());
-		LOGGER.error("{'method':{}, 'msg':{}}", "接收到的微信消息",json);
-		if(json == null || "".equals(json.toString())) return;
-		
-		// 获取数据
-		String device_id = json.get("device_id").toString();		//设备ID，第三方提供 
-		String device_type = json.get("device_type").toString();	//设备类型，目前为“公众账号原始ID”
-		String msg_type  = json.get("msg_type").toString();			//消息类型：取值为bind/unbind bind：绑定设备 unbind：解除绑定 
-		String open_id  = json.get("open_id").toString();			//微信账号的OpenID 
-		String pubNo = NameUtils.getConfig("pubNo");				//公众号原始id
-		
-		// 校验数据
-		/*if(!pubNo.equals(device_type) || StringUtils.isEmpty(device_id) || StringUtils.isEmpty(open_id)){
-			return;
-		}*/
-		
-		// 消息类型
-		if(msg_type.equals("unbind")){
-			//取消绑定
-			return;
-		} else if (msg_type.equals("bind")) {
-			// 绑定
-			MachineInfo machineInfo = new MachineInfo();
-			machineInfo.setMachineDeviceId(device_id);
-			machineInfo.setMachineOpenid(open_id);
-			try {
-				if (machineService.initBefore(machineInfo) != 1) {
-					machineService.bindMachineToOpenId(device_id, open_id);
-				}
-			} catch (ServiceException e) {
-				e.printStackTrace();
-				if(machineService.bindMachineToOpenId(device_id, open_id) == 0){
-					LOGGER.error("{'method':{}, 'msg':{}}", "绑定用户和机器的关系失败",json);
-				}
-			}
-		} else if (msg_type.equals("device_text")) {
-			// 接受到设备消息
-			String deviceMessage = new String(Base64Utils.decodeFromString(json.get("content").toString()));
-			
-			if (deviceMessage.startsWith("ok1")) {
-
-				try {
-					machineService.init(open_id, device_id);
-				} catch (ServiceException e) {
-					LOGGER.error("'method':'{}', 'err':'{}'", "acceptMessage", e.getMessage());
-				}
-			} else if (deviceMessage.startsWith("getData")) {
-				// 获取到的机器信息
-				if (!deviceMessage.startsWith("getData01")) {
-					return;
-				}
-				String temp = deviceMessage.replace("getData01", "");
-				String[] data = temp.split(" ");
-				MachineInfo info = new MachineInfo();
-				info.setMachineTDS(Integer.parseInt(data[0]));
-				info.setMachineSurplusWater(Integer.parseInt(data[1]));
-				info.setMachineConnectState(1);
-				info.setMachineDeviceId(device_id);
-				machineService.update(info);
-			} else if (deviceMessage.startsWith("setDir")) {
-				// 设置数据方向
-				
-			} else {
-				// 机器故障码
-				LOGGER.error("{'deviceId':'{}', 'errCode':'{}'}", device_id, deviceMessage);
-			}
-		} else {
-			// 未知消息类型
-			
-		}
-	}
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/machine/AdminRentalEquipmentQrCodeHandler.java

@@ -1,135 +0,0 @@
-package com.iamberry.rent.handlers.machine;
-
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.Base64Utils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.rent.service.machine.mapper.MachineMapper;
-import com.iamberry.wechat.core.entity.rent.MachineInfo;
-import com.iamberry.wechat.face.wechat.ConfigService;
-import com.iamberry.wechat.iot.TransMsg;
-import com.iamberry.wechat.iot.WechatIotUtils;
-import com.iamberry.wechat.tools.HttpClient431Util;
-import com.iamberry.wechat.tools.NameUtils;
-import com.iamberry.wechat.tools.ResponseJson;
-
-@RequestMapping("/getCode")
-@Controller
-public class AdminRentalEquipmentQrCodeHandler {
-	//测试
-	/*public static String APPID = "wxc71b789fad06a2d7";
-	public static String APPSECRET = "8a90e3ab0e2db7772f5f64e7ed2f4b98";
-	public static String PRODUCT_ID = "29439";// 微信硬件平台生成的 
-	*/
-	public static String APPID = "wx27c9f825761a861b";
-	public static String APPSECRET = "97b2f2991e4ff0f2567fbc625f858377";
-	public static String PRODUCT_ID = "30361";// 微信硬件平台生成的 正式
-	public static String USERNAME = "water@iamberry.com";// 账号
-	public static String PASSWORD = "Iamberry123";// 密码
-	@Autowired
-	private ConfigService configService;
-	@Autowired
-	private MachineMapper machineMapper;
-	@Autowired
-	private RentOrderService rentOrderService;
-	@Autowired
-	private MachineService machineService;
-	
-
-	@RequestMapping("/selectEquipmentCode")
-	@ResponseBody
-	public ResponseJson selectEquipmentCode(HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
-		String username = request.getParameter("username");
-		String password = request.getParameter("password");
-		String mac = request.getParameter("mac");
-		ResponseJson json = new ResponseJson();
-		if(mac == null || mac.equals("")){
-			//return "{\"status\":\"-1\",\"msg\":\"账号或密码错误!\"}" ;
-			json.setReturnCode(503);
-			json.setResultCode(200);
-			json.addResponseKeyValue("mac错误!");
-			return json;
-		}
-		if(username == null || password == null){
-			//return "{\"status\":\"-1\",\"msg\":\"账号或密码错误!\"}" ;
-			json.setReturnCode(503);
-			json.setResultCode(200);
-			json.addResponseKeyValue("账号或密码错误!");
-			return json;
-		}
-		if(!username.equals(USERNAME)|| !password.equals(PASSWORD)){
-			json.setReturnCode(503);
-			json.setResultCode(200);
-			json.addResponseKeyValue("账号或密码错误!");
-			return json;
-		}
-		String deviceid = "";// 设备ID
-		String qrticket = "";// 二维码
-		/* 获取deviceid和二维码 */
-		String accessToken = configService.getAccessToken();
-		JSONObject data = WechatIotUtils.getQrcode(accessToken, NameUtils.getConfig("productId"));
-		System.out.println("获取设备的deviceid和二维码:" + data);
-		Object msg = JSONObject.fromObject(data.get("base_resp")).get("errmsg");
-		if (msg.equals("ok")) {
-			// 设备授权
-			//mac = "789ce700a001";//需要工厂传值
-			deviceid = data.get("deviceid").toString();
-			qrticket = data.get("qrticket").toString();
-			JSONObject authorizationData = WechatIotUtils.authorize(
-					accessToken, mac, deviceid);
-			System.out.println("返回：" + authorizationData);
-			JSONArray errmsg = authorizationData.getJSONArray("resp");
-			String seccess = JSONObject.fromObject(errmsg.getString(0))
-					.get("errmsg").toString();
-			if (seccess.equals("ok")) {// 是否授权成功
-				// 保存设备信息
-				MachineInfo info = new MachineInfo();
-				info.setMachineDeviceId(deviceid);
-				info.setMachineQrcode(qrticket);
-				info.setMachineMac(mac);
-				info.setMachineConnectState(2);
-				info.setMachineInitState(2);
-				info.setMachineState(1);
-				info.setMachineHaveWater(0);
-				info.setMachineTotalWater(0);
-				machineService.add(info);
-				// 返回二维码
-				json.setReturnCode(200);
-				json.setResultCode(200);
-				json.addResponseKeyValue(qrticket);
-				json.addResponseKeyValue("equipmentId", 10000+info.getMachineId());
-				json.addResponseKeyValue("deviceid", deviceid);
-				return json;
-			} else {
-				json.setReturnCode(503);
-				json.setResultCode(200);
-				json.addResponseKeyValue("获取出错！");
-				return json;
-			}
-
-		} else {
-			json.setReturnCode(503);
-			json.setResultCode(200);
-			json.addResponseKeyValue("获取出错！");
-			return json;
-		}
-	}
-	
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/machine/MachineHandler.java

@@ -1,609 +0,0 @@
-package com.iamberry.rent.handlers.machine;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.iamberry.rent.face.efast.EfastRentService;
-import com.iamberry.wechat.core.entity.rent.*;
-import com.iamberry.wechat.face.member.MemberService;
-import org.apache.commons.lang3.StringUtils;
-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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.wechat.core.entity.ResultMsg;
-import com.iamberry.wechat.core.entity.WechatUtils;
-import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
-import com.iamberry.wechat.core.entity.member.Member;
-import com.iamberry.wechat.face.admin.SystemService;
-import com.iamberry.wechat.tools.ResponseJson;
-import com.iamberry.wechat.tools.ResultInfo;
-
-/**
- * 机器handler
- * @company 深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author  献
- * @tel     18271840547
- * @date    2017年3月10日
- */
-@Controller
-@RequestMapping("/wechat/machine")
-public class MachineHandler {
-    @Autowired
-    private MachineService machineService;
-    @Autowired
-    private RentOrderService rentOrderService;
-    @Autowired
-    private SystemService systemService;
-	@Autowired
-    private EfastRentService efastRentService;
-    @Autowired
-    private MemberService memberService;
-
-    /**
-     * 获取机器信息
-     * @return
-     * @author LJK
-     * @Time   2017年3月10日
-     */
-    @ResponseBody
-    @RequestMapping("/machine_info")
-    public ResultMsg getMachine(@RequestParam(value = "pageNO", required = false, defaultValue = "1") Integer pageNO,
-            HttpServletRequest request) {
-        Member member = WechatUtils.getUserBySession(request);
-        MachineInfo info = new MachineInfo();
-        ResultMsg rm = new ResultMsg();
-       info.setMachineOpenid(member.getUserOpenid());
-		//  info.setMachineOpenid("o-icas0dRzE7WYAEAmcX4BQCUyFo");
-        info.setMachineInitState(1);
-        List<MachineInfo> list = machineService.list(info);
-        if (list == null || list.isEmpty()) {
-            rm.setStatus(false);
-            rm.setResultCode(ResultInfo.ERRORCODE);
-            rm.setMessage("没有机器信息!");
-            return rm;
-        }
-        rm.setStatus(true);
-        rm.setResultCode(ResultInfo.SUCCESSCODE);
-        rm.setMessage("");
-        rm.setData(list);
-        return rm;
-    }
-    
-    /**
-     * 同步机器信息：TDS、总水量
-     * @return
-     * @author 献
-     * @Time   2017年3月10日
-     */
-    @RequestMapping("/sync_machine")
-    @ResponseBody
-    public ResponseJson syncMachineInfo(@RequestParam("tds") Integer tds, 
-            @RequestParam("water_num") Integer water_num,
-            @RequestParam("deviceId") String machineDeviceId,
-            @RequestParam("state") Integer state,
-            HttpServletRequest request) {
-    	 Member member = WechatUtils.getUserBySession(request);
-        MachineInfo info = new MachineInfo();
-        info.setMachineTDS(tds);
-        info.setMachineHaveWater(water_num);
-        info.setMachineState(state);
-		//info.setMachineOpenid("o-icas0dRzE7WYAEAmcX4BQCUyFo");
-		info.setMachineOpenid(member.getUserOpenid());
-        info.setMachineDeviceId(machineDeviceId);
-        Integer res = machineService.syncMachine(info);
-        if (res == null || res <= 0) {
-            return new ResponseJson(200, "同步失败，请重试!", 500);
-        }
-        return new ResponseJson(200, "SUCCESS", 200);
-    }
-    
-    /**
-     * 用户获取：
-     * 1.服务费抵扣券下拉框数据
-     * 2.机器信息
-     * @date 2017年3月22日
-     * @author muzx
-     * @param req
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/get_coupons_machine")
-    public ResponseJson getServiceCouponSelect(HttpServletRequest req,
-            @RequestParam(value = "machineId", required = false, defaultValue = "")String machineId){
-        return machineService.listServiceCoupon(WechatUtils.getUserBySession(req).getUserOpenid(), machineId);
-        /*return machineService.listServiceCoupon("o-icas0dRzE7WYAEAmcX4BQCUyFo", machineId);*/
-    }
-    
-    /**
-     * 续费支付,获取预支付id(第一次支付)
-     * @return
-     * @author 献
-     * @Time   2017年3月13日
-     */
-    @ResponseBody
-    @RequestMapping("/machine_pay")
-    public ResponseJson machinePay(
-            @RequestParam("machineId") Integer machineId,
-            @RequestParam("year_num") Integer year,
-            @RequestParam(value = "couponId", required = false) Integer couponId,
-            HttpServletRequest request
-            ) {
-        Member member = WechatUtils.getUserBySession(request);
-        MachineRecharge machineRecharge = new MachineRecharge();
-        machineRecharge.setRechargeMachineId(machineId);
-        machineRecharge.setRechargeDuration(year);
-        machineRecharge.setRechargeOpenId(member.getUserOpenid());
-        return machineService.requestPay(machineRecharge, couponId);
-    }
-    
-    /**
-     * 根据续费支付id 继续续费(第一次支付中断后,继续发起支付)
-     * @param orderId
-     * @return
-     * @author 献
-     * @Time   2017年3月13日
-     */
-    @RequestMapping("/recharge_pay")
-    @ResponseBody
-    public ResponseJson rechargeOrderIdPay(@RequestParam("orderId") String orderId) {
-        return machineService.rechargeOrderIdPay(orderId);
-    }
-    
-    /**
-     * 根据 续费订单id 查询支付结果(是否支付成功,完成支付回调)
-     * @date 2017年3月22日
-     * @author muzx
-     * @param rechargeOrderId
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/check_recharge_pay_status")
-    public ResultMsg checkRechargeStatus(
-            @RequestParam(value = "rechargeOrderId", defaultValue = "", required = false) String rechargeOrderId){
-        ResultMsg rm = new ResultMsg();
-        rm.setMessage("参数错误!请刷新重试!");
-        rm.setStatus(false);
-        if(StringUtils.isEmpty(rechargeOrderId)){
-            return rm;
-        }
-        MachineRecharge recharge = new MachineRecharge();
-        recharge.setRechargeOrderId(rechargeOrderId);
-        recharge = machineService.getRechargeByIdOrOrderId(recharge);
-        if(recharge == null){
-            return rm;
-        }
-        rm.setData(recharge);
-        rm.setMessage("");
-        rm.setStatus(true);
-        return rm;
-    }
-    /**
-     * 续费记录
-     * @param request
-     * @return
-     * @author LJK
-     * @Time   2017年3月13日
-     */
-    @RequestMapping("/recharge_list")
-    @ResponseBody
-    public ResultMsg rechargeList(HttpServletRequest request) {
-        String rechargeMachineId = request.getParameter("rechargeMachineId");
-        List<MachineRecharge> recharges = machineService.listRecharge(Integer.valueOf(rechargeMachineId));
-        ResultMsg rm = new ResultMsg();
-        if (recharges == null || recharges.isEmpty()) {
-            rm.setStatus(false);
-            rm.setResultCode(ResultInfo.ERRORCODE);
-            rm.setMessage("");
-            return rm;
-        }
-        rm.setStatus(true);
-        rm.setResultCode(ResultInfo.SUCCESSCODE);
-        rm.setMessage("");
-        rm.setData(recharges);
-        return rm;
-    }
-    
-    /**
-     * 订单详情中的送人接口
-     * 2017年3月17日
-     * @author muzx
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/present_other")
-    public ResultMsg presentOther(
-            @RequestParam(value = "orderItemId", defaultValue = "", required = false) String orderItemId,
-            HttpServletRequest request){
-        return machineService.presentMachine(orderItemId, WechatUtils.getUserBySession(request).getUserOpenid());
-    }
-    
-    /**
-     * 查询用户的所有机器
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequestMapping("/select_machine_list")
-    public ResultMsg selectMachineList(HttpServletRequest request) throws Exception {
-    	ResultMsg msg = new ResultMsg();
-    	MachineInfo machine = new MachineInfo();
-    	Member member = WechatUtils.getUserBySession(request);
-    	machine.setMachineOpenid(member.getUserOpenid());
-    	List<MachineInfo> machineList = machineService.list(machine);
-    	if (machineList != null && machineList.size() > 0) {
-    		msg.setResultCode(ResultInfo.SUCCESSCODE);
-    		msg.setStatus(true);
-    		msg.setData(machineList);
-    	} else {
-    		msg.setResultCode(ResultInfo.ERRORCODE);
-    		msg.setStatus(false);
-    		msg.setMessage("您没有可用的机器!");
-    	}
-    	return msg;
-    }
-    
-    /**
-     * 收到的设备前台接口
-     * 2017年3月17日
-     * @author muzx
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/received_machine")
-    public ResultMsg receivedMachine(
-            @RequestParam(value = "shareId", defaultValue = "", required = false)String shareId,
-            HttpServletRequest request){
-        return machineService.receiveMachine(shareId, WechatUtils.getUserBySession(request).getUserOpenid());
-    }
-    
-    @ResponseBody
-    @RequestMapping("/select_machineByDeviceId")
-    public ResultMsg select_machineByDeviceId(
-            @RequestParam(value = "deviceId", defaultValue = "", required = false)String deviceId,
-            HttpServletRequest request){
-    	ResultMsg msg = new ResultMsg();
-    	MachineInfo machineinfo = new MachineInfo();
-    	machineinfo.setMachineDeviceId(deviceId);
-    	machineinfo = machineService.selectMachineById(machineinfo);
-    	msg.setResultCode(ResultInfo.SUCCESSCODE);
-		msg.setStatus(true);
-		msg.setData(machineinfo);
-        return msg;
-        
-    }
-    /**
-     * 修改机器连接状态
-     * @param deviceId
-     * @param state
-     * @param request
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/updateByDeviceId")
-    public ResultMsg updateByDeviceId(
-            @RequestParam(value = "deviceId", defaultValue = "", required = false)String deviceId,
-            @RequestParam(value = "state", defaultValue = "", required = false)Integer state,
-            HttpServletRequest request){
-    	ResultMsg msg = new ResultMsg();
-    	MachineInfo machineinfo = new MachineInfo();
-    	machineinfo.setMachineDeviceId(deviceId);
-    	machineinfo.setMachineConnectState(state);
-    	Integer info = machineService.update(machineinfo);
-    	if(1 == info){
-    		msg.setResultCode(ResultInfo.SUCCESSCODE);
-    		msg.setStatus(true);
-    		msg.setData(machineinfo);
-    	}else{
-    		msg.setResultCode(ResultInfo.ERRORCODE);
-    		msg.setStatus(false);
-    		msg.setData(machineinfo);
-    	}
-        return msg;
-        
-    }
-    
-    /**
-     * 检查四个滤芯是否达到更换标准
-     * @param request
-     * @param deviceId
-     * @param filterT1		T1滤芯是否可更换  1：可以更换，2：不可以更换
-     * @param filterT2
-     * @param filterT3
-     * @param filterT4
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequestMapping("/check_change_filter")
-    public ResultMsg checkChangeFilter(HttpServletRequest request,
-    		@RequestParam("deviceId") String deviceId,
-    		@RequestParam("filterT1") Integer filterT1,
-            @RequestParam("filterT2") Integer filterT2,
-            @RequestParam("filterT3") Integer filterT3,
-            @RequestParam("filterT4") Integer filterT4
-            ) throws Exception {
-    	ResultMsg msg = new ResultMsg();
-    	Member member = WechatUtils.getUserBySession(request);
-    	Map<String,Object> map = new HashMap<String,Object>();
-    	MachineInfo machineinfo = new MachineInfo();
-    	List<Integer> typeList = new ArrayList<Integer>();//用于存放因时间间隔不达标而不能更换滤芯的类型
-    	RentChangeLogs rentChangeLogs = new RentChangeLogs();
-    	rentChangeLogs.setLogsMachineDeviceId(deviceId);
-    	rentChangeLogs.setLogsOpenid(member.getUserOpenid());
-    	machineinfo.setMachineDeviceId(deviceId);
-    	if (filterT1 == null || filterT2 == null || filterT3 == null || filterT4 == null) {
-    		msg.setResultCode(ResultInfo.ERRORCODE);
-    		msg.setStatus(false);
-    		msg.setMessage("机器同步状态有误");
-    		return msg;
-    	}
-    	//根据机器id查询机器信息
-    	machineinfo = machineService.selectMachineById(machineinfo);
-    	if (machineinfo == null) {
-    		msg.setResultCode(ResultInfo.ERRORCODE);
-    		msg.setStatus(false);
-    		msg.setMessage("您没有可用的机器");
-    		return msg;
-    	}
-    	//如果可用水量小于等于0，则租赁期限已到，不可再换滤芯
-    	if (machineinfo.getMachineSurplusWater().intValue() <= 0) {
-    		msg.setResultCode(ResultInfo.ERRORCODE);
-    		msg.setStatus(false);
-    		msg.setMessage("租赁期限已到，不可再换滤芯");
-    		return msg;
-    	}
-    	//如果到期时间小于等于当前时间，则租赁期限已到，不可再换滤芯
-    	if (machineinfo.getMachineStopDate().getTime() <= new Date().getTime()) {
-    		msg.setResultCode(ResultInfo.ERRORCODE);
-    		msg.setStatus(false);
-    		msg.setMessage("租赁期限已到，不可再换滤芯");
-    		return msg;
-    	}
-    	//获取滤芯更换间隔时间
-    	ShopSystemRule shopSystemRuleOne = systemService.selectOneShopRuleById(235);
-    	int num = shopSystemRuleOne.getRuleNum().intValue() * 24 * 60 * 60; //将滤芯更换间隔时间换算为秒为单位
-    	//根据条件查询该机器换滤芯记录
-    	List<RentChangeLogs> changeList = machineService.listSelectChangeLogs(rentChangeLogs);
-    	if (changeList != null && changeList.size() > 0) {
-    		for (RentChangeLogs changeLogs : changeList) {
-    			//计算更换滤芯的当前时间与之前申请的时间之间的间隔是否大于滤芯更换间隔时间
-    			if (new Date().getTime() - changeLogs.getLogsCreateTime().getTime() < num) {
-    				typeList.add(changeLogs.getLogsFilterType());
-    			}
-    		}
-    	}
-    	//循环排除不能更换的滤芯
-    	for (int i = 0;i < typeList.size();i++) {
-    		int filterType = typeList.get(i);
-    		switch (filterType) {
-				case 1:filterT1 = 2;break;
-				case 2:filterT2 = 2;break;
-				case 3:filterT3 = 2;break;
-				case 4:filterT4 = 2;break;
-			}
-    	}
-		map.put("T1", filterT1);
-    	map.put("T2", filterT2);
-    	map.put("T3", filterT3);
-    	map.put("T4", filterT4);
-    	msg.setResultCode(ResultInfo.SUCCESSCODE);
-		msg.setStatus(true);
-		msg.setData(map);
-    	return msg;
-    }
-
-	/**
-	 * 保存更换滤芯记录
-	 * @param request
-	 * @param losgsDTO
-	 * @return
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping("/save_change_filter")
-	public ResultMsg saveChangeFilter(HttpServletRequest request,
-									  RentChangeLosgsDTO losgsDTO) throws Exception {
-		MachineInfo machineinfo = new MachineInfo();
-		ResultMsg msg = new ResultMsg();
-		RentOrder rentOrder = new RentOrder();
-		List<RentChangeLogs> list = new ArrayList<RentChangeLogs>();
-		Member member = new Member();//WechatUtils.getUserBySession(request);
-		machineinfo.setMachineDeviceId(losgsDTO.getLogsMachineDeviceId());
-		//根据机器id查询机器信息
-		machineinfo = machineService.selectMachineById(machineinfo);
-		rentOrder.setRentOrderId(machineinfo.getMachineOrderId());
-		//通过orderId查询租赁订单信息
-		rentOrder = rentOrderService.getRentOrderByOrderId(rentOrder);
-		if (losgsDTO.getFilterT1() != null && losgsDTO.getFilterT1().intValue() == 1) {
-			RentChangeLogs logs = new RentChangeLogs();
-			logs.setLogsOpenid(member.getUserOpenid());
-			logs.setLogsOrderId(machineinfo.getMachineOrderId());
-			logs.setLogsMachineDeviceId(losgsDTO.getLogsMachineDeviceId());
-			logs.setLogsFilterType(1);
-			logs.setLogsStatus(1);
-			logs.setLogsRentType(rentOrder.getRentTypeId());
-			logs.setLogsAddressInfo(losgsDTO.getLogsAddressInfo());
-			logs.setLogsAddressName(losgsDTO.getLogsAddressName());
-			logs.setLogsAddressTel(losgsDTO.getLogsAddressTel());
-			list.add(logs);
-		}
-		if (losgsDTO.getFilterT2() != null && losgsDTO.getFilterT2().intValue() == 1) {
-			RentChangeLogs logs = new RentChangeLogs();
-			logs.setLogsOpenid(member.getUserOpenid());
-			logs.setLogsOrderId(machineinfo.getMachineOrderId());
-			logs.setLogsMachineDeviceId(losgsDTO.getLogsMachineDeviceId());
-			logs.setLogsFilterType(2);
-			logs.setLogsStatus(1);
-			logs.setLogsRentType(rentOrder.getRentTypeId());
-			logs.setLogsAddressInfo(losgsDTO.getLogsAddressInfo());
-			logs.setLogsAddressName(losgsDTO.getLogsAddressName());
-			logs.setLogsAddressTel(losgsDTO.getLogsAddressTel());
-			list.add(logs);
-		}
-		if (losgsDTO.getFilterT3() != null && losgsDTO.getFilterT3().intValue() == 1) {
-			RentChangeLogs logs = new RentChangeLogs();
-			logs.setLogsOpenid(member.getUserOpenid());
-			logs.setLogsOrderId(machineinfo.getMachineOrderId());
-			logs.setLogsMachineDeviceId(losgsDTO.getLogsMachineDeviceId());
-			logs.setLogsFilterType(3);
-			logs.setLogsStatus(1);
-			logs.setLogsRentType(rentOrder.getRentTypeId());
-			logs.setLogsAddressInfo(losgsDTO.getLogsAddressInfo());
-			logs.setLogsAddressName(losgsDTO.getLogsAddressName());
-			logs.setLogsAddressTel(losgsDTO.getLogsAddressTel());
-			list.add(logs);
-		}
-		if (losgsDTO.getFilterT4() != null && losgsDTO.getFilterT4().intValue() == 1) {
-			RentChangeLogs logs = new RentChangeLogs();
-			logs.setLogsOpenid(member.getUserOpenid());
-			logs.setLogsOrderId(machineinfo.getMachineOrderId());
-			logs.setLogsMachineDeviceId(losgsDTO.getLogsMachineDeviceId());
-			logs.setLogsFilterType(4);
-			logs.setLogsStatus(1);
-			logs.setLogsRentType(rentOrder.getRentTypeId());
-			logs.setLogsAddressInfo(losgsDTO.getLogsAddressInfo());
-			logs.setLogsAddressName(losgsDTO.getLogsAddressName());
-			logs.setLogsAddressTel(losgsDTO.getLogsAddressTel());
-			list.add(logs);
-		}
-		//批量添加滤芯更换记录
-		int sum = machineService.saveChangeLogs(list,rentOrder);
-		if (sum > 0) {
-			msg.setResultCode(ResultInfo.SUCCESSCODE);
-			msg.setStatus(true);
-		} else {
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-		}
-		return msg;
-	}
-
-	/**
-	 * 根据机器id和openid查询更换过的滤芯集合
-	 * @param request
-	 * @param deviceId	设备（微信）id
-	 * @return
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping("/select_change_filter_list")
-	public ResultMsg selectChangeFilterList(HttpServletRequest request,
-						@RequestParam("deviceId") String deviceId) throws Exception {
-
-		ResultMsg msg = new ResultMsg();
-		Member member = WechatUtils.getUserBySession(request);
-		if (deviceId == null || "".equals(deviceId)) {
-			msg.setResultCode(ResultInfo.ERRORCODE);
-			msg.setStatus(false);
-			msg.setMessage("没有该设备信息");
-			return msg;
-		}
-		RentChangeLogs logs = new RentChangeLogs();
-		logs.setLogsOpenid(member.getUserOpenid());
-		logs.setLogsMachineDeviceId(deviceId);
-		//根据机器id和openid查询更换过的滤芯集合
-		List<RentChangeLogs> filterList = machineService.listChangeFilterLogs(logs);
-		msg.setStatus(true);
-		msg.setResultCode(ResultInfo.SUCCESSCODE);
-		msg.setData(filterList);
-		return msg;
-	}
-
-	/**
-	 * 比拼水质(查询机器信息)
-	 * @param request
-	 * @param machineDeviceId
-	 * @return
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping("/waterCompete")
-    public ResultMsg waterCompete(HttpServletRequest request,
-				@RequestParam("deviceId") String machineDeviceId) throws Exception {
-    	ResultMsg msg = new ResultMsg();
-		if (machineDeviceId == null || machineDeviceId.equals("")){
-			msg.setStatus(false);
-			msg.setResultCode("500");
-			return msg;
-		}
-		MachineInfo machineinfo = new MachineInfo();
-		machineinfo.setMachineDeviceId(machineDeviceId);
-		machineinfo = machineService.selectMachineById(machineinfo);
-		msg.setResultCode("200");
-		msg.setStatus(true);
-		msg.setData(machineinfo);
-    	return msg;
-
-	}
-
-	/**
-	 * 新增水质比拼记录
-	 * @param request
-	 * @param machineDeviceId
-	 * @return
-	 * @throws Exception
-	 */
-	@ResponseBody
-	@RequestMapping("/addCompetingRecords")
-	public ResultMsg addCompetingRecords(HttpServletRequest request,
-						@RequestParam("deviceId") String machineDeviceId) throws Exception{
-		ResultMsg msg = new ResultMsg();
-		Member member = WechatUtils.getUserBySession(request);
-		MachineInfo machineinfo = new MachineInfo();
-		machineinfo.setMachineDeviceId(machineDeviceId);
-		CompeteWaterInfo competeWaterInfo = new CompeteWaterInfo();
-        member = memberService.getMemberByUserOpenId(member.getUserOpenid());
-		//封装数据
-		competeWaterInfo.setShareOneOpenId(member.getUserOpenid());
-		competeWaterInfo.setShareMachineId(String.valueOf(machineinfo.getMachineId()));
-		competeWaterInfo.setShareNickname(member.getUserNickname());
-		competeWaterInfo.setMachineWaterTDS(machineinfo.getMachineTDS());
-		competeWaterInfo.setMachineAmountWater(machineinfo.getMachineHaveWater());
-        competeWaterInfo.setShareUserHead(member.getUserHead());
-		Integer results = machineService.addCompeteWater(competeWaterInfo);
-		if(results == 1){
-			msg.setStatus(true);
-			msg.setResultCode("200");
-			msg.setData(competeWaterInfo.getShareId());
-		}else{
-			msg.setStatus(false);
-			msg.setResultCode("500");
-		}
-		return msg;
-	}
-
-	/**
-	 * 查询比拼水质记录
-	 * @param request
-	 * @param shareId
-	 * @return
-	 */
-	@ResponseBody
-	@RequestMapping("/selectCompeteWater")
-	public ResultMsg selectCompeteWater(HttpServletRequest request,
-							@RequestParam("shareId") String shareId){
-		ResultMsg msg = new ResultMsg();
-		if (shareId == null || shareId.equals("")){
-			msg.setStatus(false);
-			msg.setResultCode("500");
-			return msg;
-		}
-		CompeteWaterInfo competeWaterInfo = machineService.selectCompeteWater(shareId);
-		msg.setResultCode("200");
-		msg.setStatus(true);
-		msg.setData(competeWaterInfo);
-		return msg;
-	}
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/order/RentOrderHandler.java

@@ -1,669 +0,0 @@
-package com.iamberry.rent.handlers.order;
-
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.iamberry.wechat.core.entity.rent.*;
-import org.apache.commons.lang.StringUtils;
-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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.rent.face.order.ServiceCouponService;
-import com.iamberry.rent.face.rebate.OrderRebateService;
-import com.iamberry.rent.utils.RentOrderUtil;
-import com.iamberry.wechat.core.entity.ResultMsg;
-import com.iamberry.wechat.core.entity.WechatUtils;
-import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
-import com.iamberry.wechat.core.entity.cart.SendPayDto;
-import com.iamberry.wechat.core.entity.member.Member;
-import com.iamberry.wechat.core.entity.pay.PayResult;
-import com.iamberry.wechat.core.entity.product.Product;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.face.admin.SystemService;
-import com.iamberry.wechat.face.cart.ProductInfoService;
-import com.iamberry.wechat.face.home.HomeService;
-import com.iamberry.wechat.face.member.MemberService;
-import com.iamberry.wechat.face.pay.PayService;
-import com.iamberry.wechat.face.porduct.ProductColorService;
-import com.iamberry.wechat.tools.NameUtils;
-import com.iamberry.wechat.tools.OrderNOUtil;
-import com.iamberry.wechat.tools.ResultInfo;
-
-@Controller
-@RequestMapping("/wechat/rent_order")
-public class RentOrderHandler {
-    @Autowired
-    private RentOrderService rentOrderService;
-    @Autowired
-    private ProductColorService productColorService;
-    @Autowired
-    private OrderRebateService orderRebateService;
-    @Autowired
-    private PayService payService;
-    @Autowired
-    private ServiceCouponService serviceCouponService;
-    @Autowired
-    private ProductInfoService productInfoService;
-    @Autowired
-    private MachineService machineService;
-    @Autowired
-    private MemberService memberService;
-    @Autowired
-    private HomeService homeService;
-    @Autowired
-    private SystemService systemService;
-    
-    /**
-     * 订单详情接口
-     * 2017年3月14日
-     * @author muzx
-     * @param req
-     * @param pageSize
-     * @param pageNO
-     * @param rentOrderDTO
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/list")
-    public ResultMsg getRentOrderList(HttpServletRequest req,
-            @RequestParam(value = "pageSize", defaultValue = "2", required = false) Integer pageSize,
-            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
-            RentOrderDTO rentOrderDTO){
-        ResultMsg rm = new ResultMsg();
-        rm.setStatus(false);
-        rm.setMessage("您没有租赁订单,请完成租赁后查看!");
-        rm.setResultCode("400");
-        String openId = WechatUtils.getUserBySession(req).getUserOpenid();
-        rentOrderDTO.setRentOpenid(openId);
-        rentOrderDTO.getPage().setPageSize(pageSize);
-        rentOrderDTO.getPage().setPageNumber(pageNO);
-        Map<String, Object> map = rentOrderService.listRentOrder(rentOrderDTO);
-        if(map != null){
-            rm.setData(map);
-            rm.setStatus(true);
-            rm.setResultCode("200");
-            rm.setMessage("");
-        }
-        return rm;
-    }
-    
-    /**
-     * 查询我要租赁页面详情
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequestMapping("/selectRentProduct")
-    public ResultMsg selectRentProduct(HttpServletRequest request) throws Exception {
-        ResultMsg msg = new ResultMsg();
-        Map<String,Object> map = new HashMap<String,Object>();
-        List<Product> giftList = new ArrayList<Product>();
-        List<Product> rentProductList = new ArrayList<Product>();
-        RentTypeInfo rentTypeInfo = new RentTypeInfo();
-        rentTypeInfo.setTypeStatus(1);
-        Member member = WechatUtils.getUserBySession(request);
-        
-        //查询出租赁类型所对应的赠品id
-        ShopSystemRule shopSystemRuleOne = systemService.selectOneShopRuleById(231);
-        ShopSystemRule shopSystemRuleTwo = systemService.selectOneShopRuleById(232);
-        ShopSystemRule shopSystemRuleThree = systemService.selectOneShopRuleById(233);
-        
-        //查询租赁方式列表
-        List<RentTypeInfo> typeList = orderRebateService.listRebateType(rentTypeInfo);
-        if (typeList == null || typeList.size() == 0) {
-            msg.setMessage("没有查到租赁方式信息");
-            msg.setResultCode(ResultInfo.ERRORCODE);
-            msg.setStatus(false);
-            return msg;
-        }
-        Product product = new Product();
-        product.setProductRentType(2);
-        //查询所有租赁类型的商品和赠品信息
-        List<Product> productList = productInfoService.selectPageProduct(product);
-        product.setProductStatus(2);
-        giftList = productInfoService.listSelectProduct(product);
-        //将商品和赠品拆分
-        if (productList == null || productList.size() == 0) {
-            msg.setMessage("没有查到租赁商品信息");
-            msg.setResultCode(ResultInfo.ERRORCODE);
-            msg.setStatus(false);
-            return msg;
-        }
-        for (Product info : productList) {
-            if (info.getProductType().getTypeId() != null && info.getProductType().getTypeId().intValue() == 1) {
-                rentProductList.add(info);
-            }
-        }
-        map.put("typeList", typeList);
-        map.put("rentProductList", rentProductList);
-        map.put("giftList", giftList);
-        map.put("shareOpenid", member.getUserOpenid());
-        map.put("ruleOne", shopSystemRuleOne.getRuleNum());
-        map.put("ruleTwo", shopSystemRuleTwo.getRuleNum());
-        map.put("ruleThree", shopSystemRuleThree.getRuleNum());
-        msg.setData(map);
-        msg.setResultCode(ResultInfo.SUCCESSCODE);
-        msg.setStatus(true);
-        return msg;
-    }
-    
-    /**
-     * 查询用户可使用服务费抵扣券
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequestMapping("/selectServiceCoupon")
-    public ResultMsg selectServiceCoupon(HttpServletRequest request) throws Exception {
-        ResultMsg msg = new ResultMsg();
-        Member member = WechatUtils.getUserBySession(request);
-        ServiceCouponInfo info = new ServiceCouponInfo();
-        info.setServiceOpenId(member.getUserOpenid());
-        info.setServiceStatus(1);
-        List<ServiceCouponInfo> couponList = serviceCouponService.list(info);
-        msg.setData(couponList);
-        msg.setResultCode(ResultInfo.SUCCESSCODE);
-        msg.setStatus(true);
-        return msg;
-    }
-    /**
-     * 租赁订单支付方法
-     * @param request
-     * @param rentOrderDTO
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequestMapping("/rentOrderPay")
-    public ResultMsg rentOrderPay(HttpServletRequest request,RentOrderDTO rentOrderDTO) throws Exception {
-        ResultMsg msg = new ResultMsg();
-        RentOrder rentOrder = new RentOrder();
-        List<RentOrderItem> orderItemList = new ArrayList<RentOrderItem>();
-        ServiceCouponInfo couponInfo = null;
-        SendPayDto dto = new SendPayDto();
-        Date nowDate=new Date();
-        int rentNum = 0;	//租赁机器数量
-        int rentPayAmount = 0;	//应支付金额，包含押金，不包含抵扣金额
-        int rentYetAmount = 0;	//实际支付总金额，包含押金和抵扣金额
-        
-        if (rentOrderDTO.getProductId() == null || rentOrderDTO.getGiftId() == null) {
-            msg.setMessage("该订单不合法，请重新下单");
-            msg.setResultCode(ResultInfo.ERRORCODE);
-            msg.setStatus(false);
-            return msg;
-        }
-        
-        //将商品和赠品信息添加到集合中
-        List<RentOrderItemDTO> itemList = new ArrayList<RentOrderItemDTO>();
-        RentOrderItemDTO productItem = new RentOrderItemDTO();
-        productItem.setItemColorId(rentOrderDTO.getProductId());
-        itemList.add(productItem);
-        RentOrderItemDTO giftItem = new RentOrderItemDTO();
-        giftItem.setItemColorId(rentOrderDTO.getGiftId());
-        itemList.add(giftItem);
-        rentOrderDTO.setOrderItemList(itemList);
-        
-        Member member =  WechatUtils.getUserBySession(request);
-        //生成订单id
-        String orderId = OrderNOUtil.createOrderCode(member.getUserId());
-        
-        rentOrder.setRentAddressInfo(rentOrderDTO.getRentAddressInfo());
-        rentOrder.setRentAddressName(rentOrderDTO.getRentAddressName());
-        rentOrder.setRentAddressTel(rentOrderDTO.getRentAddressTel());
-        rentOrder.setRentTypeId(rentOrderDTO.getRentTypeId());
-        rentOrder.setRentServiceId(rentOrderDTO.getRentServiceId());
-        rentOrder.setRentOrderId(orderId);
-        rentOrder.setRentOpenid(member.getUserOpenid());
-        rentOrder.setRentStatus(1);
-        rentOrder.setRentTransactionId("8990"+nowDate.getTime());
-        
-        
-        //如果存在优惠券id，则查询优惠券信息
-        if (rentOrderDTO.getRentServiceId() != null && !"".equals(rentOrderDTO.getRentServiceId())) {
-            ServiceCouponInfo serviceCouponInfo = new ServiceCouponInfo();
-            serviceCouponInfo.setServiceId(rentOrderDTO.getRentServiceId());
-            serviceCouponInfo.setServiceStatus(1);
-            List<ServiceCouponInfo> couponList = serviceCouponService.list(serviceCouponInfo);
-            if (couponList == null || couponList.size() == 0) {
-                msg.setMessage("该优惠券已使用，请重新下单");
-                msg.setResultCode(ResultInfo.ERRORCODE);
-                msg.setStatus(false);
-                return msg;
-            }
-            serviceCouponInfo = couponList.get(0);
-            couponInfo = new ServiceCouponInfo();
-            couponInfo.setServiceId(serviceCouponInfo.getServiceId());
-            couponInfo.setServiceOpenId(member.getUserOpenid());
-            couponInfo.setServiceOldStatus(1);
-            couponInfo.setServiceStatus(2);
-            rentOrder.setRentServiceMoney(serviceCouponInfo.getServiceMoney());
-        } else {
-        	rentOrder.setRentServiceMoney(0);
-        }
-        
-        int num = 0;
-        String pass =  "";
-        //生成新的激活码，如果有重复则重新生成
-        while (num < 1) {
-            //随机生成12为激活码
-            pass = RentOrderUtil.getPassward(12, 8);
-            RentOrderItem rentOrderItem = new RentOrderItem();
-            rentOrderItem.setItemInitCode(pass);
-            //根据新生成的密码查询是否有重复，如果有则重新生成
-            rentOrderItem = rentOrderService.getOrderItemByInitCode(rentOrderItem);
-            if (rentOrderItem == null) {
-                ++num;
-            }
-        }
-        
-        //根据id和状态查询租赁类型数据
-        RentTypeInfo rentTypeInfo = new RentTypeInfo();
-        rentTypeInfo.setTypeId(rentOrderDTO.getRentTypeId());
-        rentTypeInfo.setTypeStatus(1);
-        rentTypeInfo = orderRebateService.getRebateType(rentTypeInfo);
-        
-        for (RentOrderItemDTO rentOrderItemDTO : rentOrderDTO.getOrderItemList()) {
-            RentOrderItem rentOrderItem = new RentOrderItem();
-            //根据颜色id查询商品颜色信息
-            ProductColor productColor = productColorService.selectProductColorById(rentOrderItemDTO.getItemColorId());
-            if (productColor == null) {
-                msg.setMessage("没有该商品信息，请重新下单");
-                msg.setResultCode(ResultInfo.ERRORCODE);
-                msg.setStatus(false);
-                return msg;
-            }
-            
-            //判断该订单项是否为赠品，如果是则激活码为“000000000000”
-            if (productColor.getColorProductType().intValue() == 5) {
-                rentOrderItem.setItemInitCode("000000000000");
-                rentOrderItem.setRentDeposit(0);
-                rentOrderItem.setRentRemainDeposit(0);
-                rentOrderItem.setItemCodeState(2);
-            } else {
-            	rentNum++;
-                rentOrderItem.setItemInitCode(pass);
-                rentOrderItem.setRentDeposit(rentTypeInfo.getTypePledgeMoney());
-                rentOrderItem.setRentRemainDeposit(rentTypeInfo.getTypePledgeMoney());
-                rentOrderItem.setItemCodeState(1);
-            }
-            rentOrderItem.setItemProductType(productColor.getColorProductType());
-            rentOrderItem.setRentIsOut(0);
-            rentOrderItem.setItemOrderId(orderId);
-            rentOrderItem.setItemProductId(productColor.getColorProductId());
-            rentOrderItem.setItemColorId(productColor.getColorId());
-            rentOrderItem.setItemStatus(1);
-            rentOrderItem.setItemProductName(productColor.getColorProductName());
-            rentOrderItem.setItemProductPic(productColor.getColorProductPic());
-            rentOrderItem.setItemProductColorName(productColor.getColorName());
-            rentOrderItem.setItemMachineNum(rentTypeInfo.getTypeWaterNum());
-            rentOrderItem.setItemUseYears(rentTypeInfo.getTypeDuration());
-            orderItemList.add(rentOrderItem);
-        }
-        
-        //计算需要支付总金额
-        rentYetAmount = rentTypeInfo.getTypeServiceMoney() * rentNum + rentNum * rentTypeInfo.getTypePledgeMoney();
-        rentOrder.setRentAmount(rentYetAmount);
-        //计算应支付金额
-        if (rentOrder.getRentServiceMoney() != null) {
-        	rentPayAmount = rentOrder.getRentAmount().intValue() - rentOrder.getRentServiceMoney().intValue();
-        } else {
-        	rentPayAmount = rentOrder.getRentAmount().intValue();
-        }
-        if (rentPayAmount <= 0) {
-            rentPayAmount = 1;
-        }
-        rentOrder.setRentPayMoney(rentPayAmount);
-      
-        //添加订单和订单项，修改优惠券状态
-        int sum = rentOrderService.insertRentOrderAndItem(rentOrder, orderItemList, couponInfo);
-        
-        if (sum > 0) {
-            // 发起支付
-            PayResult result = payService.requestPay(member.getUserOpenid(), orderId, rentPayAmount,
-                    orderItemList.get(0).getItemProductName() + "...", NameUtils.getConfig("WECHAT_RENT_ORDER_BACK"));
-            if (result.isPaySuccess()) {
-            	dto.setInfo(result.getPayData());
-                dto.setSuccess(true);
-                dto.setOrderId(orderId);
-                msg.setData(dto);
-                msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-                msg.setMessage(result.getPayData());
-                msg.setResultCode(ResultInfo.SUCCESSCODE);
-                msg.setStatus(true);
-                return msg;
-            } else {
-            	dto.setInfo(result.getPayData());
-                dto.setSuccess(false);
-                msg.setMessage("ERROR");
-                msg.setResultCode(ResultInfo.ERRORCODE);
-                msg.setStatus(false);
-                return msg;
-            }
-        } else {
-            msg.setMessage("生成订单失败");
-            msg.setResultCode(ResultInfo.ERRORCODE);
-            msg.setStatus(false);
-            return msg;
-        }
-    }
-    
-    /**
-     * 支付完成后查询订单状态看是否支付成功
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequestMapping("/check_rent_order_status")
-    public ResultMsg checkRentOrderStatus(HttpServletRequest request) throws Exception {
-    	ResultMsg msg = new ResultMsg();
-    	String orderId = request.getParameter("orderId");
-    	RentOrder rentOrder = new RentOrder();
-    	rentOrder.setRentOrderId(orderId);
-    	//根据订单号查询订单信息
-    	RentOrder order = rentOrderService.getRentOrderByOrderId(rentOrder);
-    	if (order == null) {
-    		msg.setResultCode(ResultInfo.ERRORCODE);
-    		msg.setStatus(false);
-    	}
-    	msg.setData(order);
-    	msg.setResultCode(ResultInfo.SUCCESSCODE);
-    	msg.setStatus(true);
-    	return msg;
-    }
-    
-    /**
-     * 分享我要租赁页面，当用户点进来后即绑定关系
-     * @param request
-     * @param response
-     * @throws Exception
-     */
-    @RequestMapping(value = "/goWantLease", method = RequestMethod.GET)
-	public void goWantLease(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		//如果是分享 则绑定关系
-		Member member = WechatUtils.getUserBySession(request);
-		
-		String shareOpenid = request.getParameter("shareOpenid");
-		if(StringUtils.isNotEmpty(shareOpenid)){
-			memberService.buildChildUser(shareOpenid, member,1,2);
-			member.setUserIsFlag(2);
-			homeService.updateMemberIsFlagByOpenid(member);
-		}
-		request.getRequestDispatcher(NameUtils.getConfig("WECHAT_GO_I_WANT_LEASE")).forward(request, response);
-	}
-    
-    /**
-     * 根据openid查询该用户是否有租赁订单
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequestMapping("/select_rent_order_num")
-    public ResultMsg selectRentOrderNum(HttpServletRequest request) throws Exception {
-    	ResultMsg msg = new ResultMsg();
-    	RentOrderDTO order = new RentOrderDTO();
-    	Member member = WechatUtils.getUserBySession(request);
-    	order.setRentOpenid(member.getUserOpenid());
-    	order.setRentStatus(20);	//正常状态没有20的，只是用于区别
-    	//根据openid查询该用户是否有租赁订单
-    	int num = rentOrderService.countRentOrder(order);
-		msg.setData(num);
-		msg.setStatus(true);
-		msg.setResultCode(ResultInfo.SUCCESSCODE);
-    	return msg;
-    }
-
-    /**
-     * 前台进入申请退货页面
-     * 2017年5月10日
-     * @author muzx
-     * @param orderId
-     * @param itemId
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/to_apply_exit")
-    public ResultMsg toApplyExitOrder(
-            @RequestParam(value = "orderId", defaultValue = "", required = false)String orderId,
-            @RequestParam(value = "itemId", defaultValue = "0", required = false)Integer itemId){
-        ResultMsg rm = new ResultMsg();
-        rm.setStatus(false);
-        if(StringUtils.isEmpty(orderId) || itemId == 0){
-            rm.setResultCode("401-1");
-            rm.setMessage("请选择正确的订单!");
-            return rm;
-        }
-
-        RentOrder rentOrder = new RentOrder();
-        rentOrder.setRentOrderId(orderId);
-        rentOrder = rentOrderService.getRentOrderByOrderId(rentOrder);
-        if(rentOrder == null || StringUtils.isEmpty(rentOrder.getRentOrderId())
-                || rentOrder.getList() == null || rentOrder.getList().isEmpty()){
-            rm.setResultCode("402");
-            rm.setMessage("订单不存在,请确认后重试!");
-            return rm;
-        }
-        if(rentOrder.getList().get(0).getRentIsOut() == null
-                || rentOrder.getList().get(0).getRentIsOut() == 0){
-            rm.setStatus(true);
-            rm.setResultCode("403");
-            rm.setData(0);
-            rm.setMessage("该订单押金已经提取,请确认!");
-            return rm;
-        }
-        rm.setStatus(true);
-        rm.setData(rentOrder.getList().get(0).getRentRemainDeposit());
-        rm.setResultCode("200");
-        return rm;
-    }
-
-    /**
-     * 退货申请前台接口
-     * 2017年4月25日
-     * @author muzx
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/apply_exit")
-    public ResultMsg applyExitOrder(
-            @RequestParam(value = "orderId", defaultValue = "", required = false)String orderId,
-            @RequestParam(value = "itemId", defaultValue = "0", required = false)Integer itemId,
-            RentOrder rentOrderReq){
-        ResultMsg rm = new ResultMsg();
-        rm.setStatus(false);
-        if(StringUtils.isEmpty(orderId) || itemId == 0){
-            rm.setMessage("请选择正确的订单!");
-            rm.setResultCode("401");
-            return rm;
-        }
-        if(StringUtils.isEmpty(rentOrderReq.getRentPostNum())){
-            rm.setResultCode("401-2");
-            rm.setMessage("请输入快递单号!");
-            return rm;
-        }
-
-        RentOrder rentOrder = new RentOrder();
-        rentOrder.setRentOrderId(orderId);
-        rentOrder.setRentStatus(6);
-        rentOrder.setRentPostNum(rentOrderReq.getRentPostNum());
-        RentOrder oldRentOrder = rentOrderService.getRentOrderByOrderId(rentOrder);
-        if (oldRentOrder == null || oldRentOrder.getRentStatus() != 5
-                || oldRentOrder.getList() == null || oldRentOrder.getList().size() < 1) {
-            rm.setMessage("该订单有误,不能退货!");
-            rm.setResultCode("402");
-            return rm;
-        }
-        RentOrderItem item = new RentOrderItem();
-        item.setItemOrderId(orderId);
-        item.setItemId(itemId);
-        item.setItemStatus(6);
-        item.setItemReturnDate(new Date());
-        rentOrder.getList().add(item);
-        boolean flag = rentOrderService.rentExitOrder(rentOrder);
-        rm.setStatus(true);
-        rm.setMessage("申请退货成功!");
-        rm.setResultCode("200");
-        return rm;
-    }
-
-    /**
-     * 前台进入申请换货页面
-     * 2017年4月25日
-     * @author muzx
-     * @param orderId
-     * @param itemId
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/to_apply_exchange")
-    public ResultMsg toApplyExchangeOrder(
-            @RequestParam(value = "orderId", defaultValue = "", required = false)String orderId,
-            @RequestParam(value = "itemId", defaultValue = "0", required = false)Integer itemId){
-        ResultMsg rm = new ResultMsg();
-        rm.setStatus(false);
-        if(StringUtils.isEmpty(orderId) || itemId == 0){
-            rm.setResultCode("401");
-            rm.setMessage("请选择正确的订单!");
-            return rm;
-        }
-
-        RentOrder rentOrder = new RentOrder();
-        rentOrder.setRentOrderId(orderId);
-        rentOrder = rentOrderService.getRentOrderByOrderId(rentOrder);
-        if(rentOrder == null || StringUtils.isEmpty(rentOrder.getRentOrderId())
-                || rentOrder.getList() == null || rentOrder.getList().isEmpty()){
-            rm.setResultCode("402");
-            rm.setMessage("订单不存在,请确认后重试!");
-            return rm;
-        }
-        rm.setStatus(true);
-        rm.setData(rentOrder);
-        rm.setResultCode("200");
-        return rm;
-    }
-
-    /**
-     * 换货申请前台接口
-     * 2017年4月25日
-     * @author muzx
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/apply_exchange")
-    public ResultMsg applyExchangeOrder(
-            @RequestParam(value = "orderId", defaultValue = "", required = false)String orderId,
-            @RequestParam(value = "itemId", defaultValue = "0", required = false)Integer itemId,
-            RentExchangeInfo exchangeInfo){
-        ResultMsg rm = new ResultMsg();
-        rm.setStatus(false);
-        if(StringUtils.isEmpty(orderId) || itemId == 0){
-            rm.setMessage("请选择正确的订单!");
-            rm.setResultCode("400");
-            return rm;
-        }
-        RentOrder rentOrder = new RentOrder();
-        rentOrder.setRentOrderId(orderId);
-        RentOrder oldRentOrder = rentOrderService.getRentOrderByOrderId(rentOrder);
-        if (oldRentOrder == null || oldRentOrder.getRentStatus() != 5
-                || oldRentOrder.getList() == null || oldRentOrder.getList().isEmpty()) {
-            rm.setMessage("该订单有误,不能换货!");
-            rm.setResultCode("402");
-            return rm;
-        }
-        oldRentOrder.setRentStatus(11);
-        oldRentOrder.getList().get(0).setItemStatus(11);
-        boolean flag = rentOrderService.rentExchangeOrder(oldRentOrder,exchangeInfo);
-
-        if (!flag) {
-            rm.setMessage("申请换货出错请刷新后重试!");
-            rm.setResultCode("402");
-            return rm;
-        }
-        rm.setStatus(true);
-        rm.setMessage("申请换货成功!");
-        rm.setResultCode("200");
-        return rm;
-    }
-
-    /**
-     * 退款申请前台接口
-     * 2017年5月5日
-     * @author muzx
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/apply_return_money")
-    public ResultMsg applyReturnMoney(@RequestParam(value = "orderId", defaultValue = "", required = false)String orderId,
-                                    @RequestParam(value = "itemId", defaultValue = "0", required = false)Integer itemId){
-        ResultMsg rm = new ResultMsg();
-        rm.setStatus(false);
-        rm.setMessage("订单退款失败,请刷新重试!");
-        if(StringUtils.isEmpty(orderId) || itemId == 0){
-            rm.setMessage("请选择正确的订单!");
-            rm.setResultCode("400");
-            return rm;
-        }
-        RentOrder rentOrder = new RentOrder();
-        rentOrder.setRentOrderId(orderId);
-        RentOrder oldRentOrder = rentOrderService.getRentOrderByOrderId(rentOrder);
-        if (oldRentOrder == null || oldRentOrder.getRentStatus() != 2
-                || oldRentOrder.getList() == null || oldRentOrder.getList().isEmpty()) {
-            rm.setMessage("该订单有误,不能退款!");
-            rm.setResultCode("402");
-            return rm;
-        }
-        oldRentOrder.setRentStatus(3);
-        oldRentOrder.getList().get(0).setItemStatus(3);
-        oldRentOrder.getList().get(0).setItemReturnDate(new Date());
-        boolean flag = rentOrderService.updateOrderStatusAndItemStatus(oldRentOrder);
-        if(!flag){
-            rm.setMessage("订单退款出错,请刷新重试!");
-            rm.setResultCode("403");
-            return rm;
-        }
-        rm.setStatus(true);
-        rm.setResultCode("200");
-        rm.setMessage("");
-        return rm;
-    }
-    /**
-     * 根据openid判断当前用户是否关注
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequestMapping("/isFocus")
-    public ResultMsg isFocus(HttpServletRequest request) throws Exception {
-        ResultMsg msg = new ResultMsg();
-        RentOrderDTO order = new RentOrderDTO();
-        Member member = WechatUtils.getUserBySession(request);
-        //根据openid查询该用户是否有租赁订单
-        member = memberService.getMemberByUserOpenId(member.getUserOpenid());
-        if(member.getUserStatus() == 2){
-            msg.setStatus(true);
-            msg.setResultCode(ResultInfo.SUCCESSCODE);
-        }else{
-            msg.setStatus(false);
-            msg.setResultCode(ResultInfo.ERRORCODE);
-        }
-        return msg;
-    }
-}

watero-rent-web/src/main/java/com/iamberry/rent/handlers/pay/RentPayHandler.java

@@ -1,278 +0,0 @@
-package com.iamberry.rent.handlers.pay;
-
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.xml.sax.InputSource;
-
-import com.iamberry.app.tool.log.RatFWLogger;
-import com.iamberry.rent.face.machine.MachineService;
-import com.iamberry.rent.face.order.RentOrderService;
-import com.iamberry.rent.face.rebate.OrderRebateService;
-import com.iamberry.rent.utils.SendMessageUtil;
-import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
-import com.iamberry.wechat.core.entity.rent.RentOrder;
-import com.iamberry.wechat.core.entity.rent.RentOrderItem;
-import com.iamberry.wechat.core.entity.rent.RentTypeInfo;
-import com.iamberry.wechat.core.entity.rent.ServiceCouponInfo;
-import com.iamberry.wechat.core.entity.wx.WxPayResult;
-import com.iamberry.wechat.face.admin.SystemService;
-import com.iamberry.wechat.face.order.CodeService;
-import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.tools.StaticInfo;
-
-/**
- * @author 何秀刚
- * Class Description: 微信支付回调handler,所有的支付回调，都在本类完成
- * Create Date:2016年4月19日
- * Update Date:2016年4月19日
- */
-@Controller
-@RequestMapping("/callback")
-public class RentPayHandler {
-	@Autowired
-	private RatFWLogger inLongLogger;
-	@Autowired
-	private RentOrderService rentOrderService;
-	@Autowired
-	private SendMessageUtil sendMessageUtil;
-	@Autowired
-	private CodeService codeService;
-	@Autowired
-	private OrderRebateService orderRebateService;
-	@Autowired
-	private SystemService systemService;
-	@Autowired
-	private MachineService machineService;
-	
-	/**
-	 * 租赁订单支付回调方法
-	 */
-	@SuppressWarnings("rawtypes")
-	@RequestMapping("/rentOrderPayBack")
-	public synchronized void rentOrderPayBack(HttpServletRequest request, 
-			HttpServletResponse response) throws IOException {
-		String inputLine;
-		String notityXml = "";
-		String resXml = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
-		try {
-			//获取XML参数
-			while ((inputLine = request.getReader().readLine()) != null) {
-				notityXml += inputLine;
-			}
-			request.getReader().close();
-			//解析XML格式的数据
-			Map m = parseXmlToList2(notityXml);
-			WxPayResult wpr = new WxPayResult();
-			wpr=setWxPayResultObj(wpr,m);
-			//判断
-			if("SUCCESS".equalsIgnoreCase(wpr.getResultCode())){
-				//resXml:返回给微信服务器的数据
-				resXml = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
-				String orderIdMD5 = StaticInfo.orderIdMD5.decrypt(wpr.getAttach());
-				if (orderIdMD5.equals(wpr.getOutTradeNo())) {
-					// 组装数据
-					RentOrder rentOrder = new RentOrder();
-					rentOrder.setRentOrderId(orderIdMD5);
-					rentOrder.setRentStatus(2);
-					rentOrder.setRentOldStatus(1);
-					rentOrder.setRentTransactionId(wpr.getTransactionId());// 微信支付ID
-					rentOrder.setRentTransactionDate(new Date());// 微信支付时间
-					rentOrder.setRentOpenid(wpr.getOpenid());
-					
-					RentOrderItem rentOrderItem = new RentOrderItem();
-					rentOrderItem.setItemOrderId(orderIdMD5);
-					rentOrderItem.setItemStatus(2);
-					rentOrderItem.setItemInitCodeOldState(1);
-					
-					RentOrder order = rentOrderService.getRentOrderByOrderId(rentOrder);
-					ServiceCouponInfo serviceCouponInfo = null;
-					if (order.getRentServiceId() != null && !"".equals(order.getRentServiceId())) {
-						serviceCouponInfo = new ServiceCouponInfo();
-						serviceCouponInfo.setServiceId(order.getRentServiceId());
-						serviceCouponInfo.setServiceOldStatus(2);
-						serviceCouponInfo.setServiceStatus(3);
-						serviceCouponInfo.setServiceOpenId(wpr.getOpenid());
-					}
-					// 修改订单状态和优惠券状态
-					boolean flag = rentOrderService.updateOrderAndOrderItem(rentOrder, rentOrderItem, serviceCouponInfo);
-					
-					//根据id和状态查询租赁类型数据
-					RentTypeInfo rentTypeInfo = new RentTypeInfo();
-					rentTypeInfo.setTypeId(order.getRentTypeId());
-					rentTypeInfo.setTypeStatus(1);
-					rentTypeInfo = orderRebateService.getRebateType(rentTypeInfo);
-					
-					RentOrderItem orderItem = new RentOrderItem();
-					List<RentOrderItem> itemList = rentOrderService.listOrderItem(orderItem);
-					String productName = "";
-					if (itemList != null && itemList.size() > 0) {
-						for (RentOrderItem item : itemList) {
-							if (item.getItemProductType() != null && item.getItemProductType().intValue() != 5) {
-								productName = item.getItemProductName();
-							}
-						}
-					}
-					//获取租赁押金金额
-					ShopSystemRule shopSystemRule =  systemService.selectOneShopRuleById(228);
-					int deposit = shopSystemRule.getRuleNum().intValue();
-					//支付成功后推送百胜
-					try {
-						rentOrderService.addRentOrderToEfast(orderIdMD5, wpr.getOpenid());
-					} catch (Exception e) {
-						e.printStackTrace();
-						System.out.println("推送支付成功消息失败!");
-					}
-					
-					//发送短信
-					try{
-						codeService.sendRentOrderToUser(order.getRentAddressTel(), 
-								rentTypeInfo.getTypeDuration()/12, deposit/100, rentTypeInfo.getTypeServiceMoney()/100,order.getRentTypeId());
-					} catch (Exception e) {
-						inLongLogger.info("为订单-->" + order.getRentOrderId() + ",:" + "发送短信失败");
-					}
-					
-					//推送消息到微信
-					try {
-						sendMessageUtil.probationPaySuccess(
-								ResultInfo.PAYSUCCESS,
-								order.getRentPayMoney()/100 + "元",
-								productName,
-								ResultInfo.PAYSUCCESSFOOT,
-								order.getRentOpenid(),
-								ResultInfo.RENT_ORDER_DETAIL);
-					} catch (Exception e) {
-						System.out.println("推送支付成功消息失败!");
-					}
-					
-					if (!flag) {
-						resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-					}
-				} else {
-					resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-					inLongLogger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
-				}
-			}else{
-				resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";
-			}
-			BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());
-			out.write(resXml.getBytes());
-			out.flush();
-			out.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	/**
-	 * 解析xml片段为Map
-	 * @param xml
-	 * @return
-	 */
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	private Map parseXmlToList2(String xml) {
-		Map retMap = new HashMap();
-		try {
-			StringReader read = new StringReader(xml);
-			// 创建新的输入源SAX 解析器将使用 InputSource 对象来确定如何读取 XML 输入
-			InputSource source = new InputSource(read);
-			// 创建一个新的SAXBuilder
-			SAXBuilder sb = new SAXBuilder();
-			// 通过输入源构造一个Document
-			Document doc = (Document) sb.build(source);
-			Element root = doc.getRootElement();// 指向根节点
-			List<Element> es = root.getChildren();
-			if (es != null && es.size() != 0) {
-				for (Element element : es) {
-					retMap.put(element.getName(), element.getValue());
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return retMap;
-	}
-    
-	//封装参数
-	public WxPayResult setWxPayResultObj(WxPayResult wpr ,Map m){
-		//解析参数
-		wpr.setAppid(m.get("appid").toString());
-		wpr.setBankType(m.get("bank_type").toString());
-		wpr.setCashFee(m.get("cash_fee").toString());
-		wpr.setFeeType(m.get("fee_type").toString());
-		wpr.setIsSubscribe(m.get("is_subscribe").toString());
-		wpr.setMchId(m.get("mch_id").toString());
-		wpr.setNonceStr(m.get("nonce_str").toString());
-		wpr.setOpenid(m.get("openid").toString());
-		wpr.setOutTradeNo(m.get("out_trade_no").toString());
-		wpr.setAttach(m.get("attach").toString());
-		wpr.setResultCode(m.get("result_code").toString());
-		wpr.setReturnCode(m.get("return_code").toString());
-		wpr.setSign(m.get("sign").toString());
-		wpr.setTimeEnd(m.get("time_end").toString());
-		wpr.setTotalFee(m.get("total_fee").toString());
-		wpr.setTradeType(m.get("trade_type").toString());
-		wpr.setTransactionId(m.get("transaction_id").toString());
-		return wpr;
-	}
-	
-	/**
-     * 续费订单支付回调方法
-     * @date 2017年3月23日09:33:28
-     * @author muzx
-     */
-    @RequestMapping("/rent_recharge_order_pay_back")
-    public synchronized void rentRechargeOrderPayBack(HttpServletRequest request, 
-            HttpServletResponse response) throws IOException { 
-        String inputLine;
-        String notityXml = "";
-        String resXml = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
-        try {
-            //获取XML参数
-            while ((inputLine = request.getReader().readLine()) != null) {
-                notityXml += inputLine;
-            }
-            request.getReader().close();
-            //解析XML格式的数据
-            Map m = parseXmlToList2(notityXml);
-            WxPayResult wpr = new WxPayResult();
-            wpr = setWxPayResultObj(wpr,m);
-            //判断
-            if("SUCCESS".equalsIgnoreCase(wpr.getResultCode())){
-                //resXml:返回给微信服务器的数据
-                resXml = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
-                String orderIdMD5 = StaticInfo.orderIdMD5.decrypt(wpr.getAttach()); //单号
-                if (orderIdMD5.equals(wpr.getOutTradeNo())) {
-                    if (machineService.rechargeOrderPayCallback(orderIdMD5, wpr.getTransactionId()) != 0) {
-                        resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-                    }
-                } else {
-                    resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-                    inLongLogger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
-                }
-            }else{
-                resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";
-            }
-            BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());
-            out.write(resXml.getBytes());
-            out.flush();
-            out.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-	}
-}

watero-rent-web/src/main/java/com/iamberry/rent/utils/RentOrderUtil.java

@@ -1,43 +0,0 @@
-package com.iamberry.rent.utils;
-
-import java.util.Random;
-
-/**
- * 
- * @author liuzhiwei
- *	租赁工具类
- */
-public class RentOrderUtil {
-	
-	/**
-	 * 随机生成一个密码
-	 * @param len 密码总长度
-	 * @param numLen 需要生成数字的总长度
-	 * @return
-	 */
-	public static String getPassward(int len,int numLen) {
-		StringBuilder sb = new StringBuilder(len);
-		Random rnd = new Random();
-		int num = 0;
-		//除了数字以外的字母的总长度
-		if (len >= numLen) {
-			num = len - numLen;
-		}
-		if (num > 0) {
-			String chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-			int j = 0;
-			while (j < num) {
-				//生成一个随机的大写字母
-				String letter = String.valueOf(chars.charAt((int)(Math.random() * 26)));
-				//该大写字母不能是O,I,L等字母，如果是O,I,L则继续生成并且不添加进sb字符串中
-				if (!"O".equals(letter) &&  !"I".equals(letter) && !"L".equals(letter)) {
-					sb.append(letter);
-					j++;
-				}
-			}
-		}
-		for (int i = 0; i < numLen; i++)
-			sb.append("0123456789".charAt(rnd.nextInt("0123456789".length())));
-		return sb.toString();
-	}
-}

watero-rent-web/src/main/java/com/iamberry/rent/utils/SendMessageUtil.java

@@ -1,204 +0,0 @@
-package com.iamberry.rent.utils;
-
-import java.util.HashMap;
-
-import org.springframework.stereotype.Component;
-
-import com.iamberry.wechat.tools.NameUtils;
-import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.tools.WeixinUtil;
-
-@Component("messageUtil")
-public class SendMessageUtil {
-		
-		//快递公司列表
-		public static HashMap<String, String> hashmap = new HashMap<String, String>();
-		//正式环境
-		{
-			hashmap.put("shentong", "申通快递"); 
-			hashmap.put("yuantong", "圆通快递");
-			hashmap.put("shunfeng", "顺丰快递");
-			hashmap.put("longbanwuliu", "龙邦快递");	
-		}
-		
-		/**
-		 * 发送模板通知给用户
-		 * @param date data 日期
-		 * @param openId 接受的用户id
-		 * @param url  点击打开的url
-		 * @param type 发送类型 1，收益成功通知 2，发货提醒通知 3、收入提醒通知,4、订单未支付通知 5、试用进度提醒
-		 * @return
-		 */
-		public boolean sendTemplateMessageToOpenid(String date,String openId, String url,Integer type) {
-			boolean result = false;
-			switch (type) {
-			case 1:  //1，收益成功通知
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId,ResultInfo.rewards_template_id, date, url);
-				break;
-			case 2:  // 2，发货提醒通知 
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.Shipment_template_id, date, url);
-				break;
-			case 3:  //3、收入提醒通知
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.Income_template_id, date, url);
-				break;
-			case 4:  //4、订单未支付通知
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.Order_template_id, date, url);
-				break;
-			case 5:  //5、试用进度提醒
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.trial_progress_remind, date, url);
-				break;
-			case 6:  //6、试用申请通知
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.probation_apply_notice, date, url);
-				break;
-			case 7:  //7、试用申请成功通知
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.probation_apply_success, date, url);
-				break;
-			case 8:  //8、订单支付成功
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.probation_pay_success, date, url);
-				break;
-			case 9:  //9、订单关闭成功
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.probation_shut_down, date, url);
-				break;
-			case 10:  //10、奖品领取通知 
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.prize_receive_push, date, url);
-				break;
-			default: 
-				break;
-			}
-			result = true;
-			return  result;
-		}
-		
-		public static void main(String[] args) {
-			String date = "{'first':{'color':'#173177', 'value':'尊敬的客户您好~您的订单已发货~'}, 'order_id':{'color':'#173177','value':'1009145345B11792L'}, 'package_id':{'color':'#173177','value':'yuantong:34234234'}, 'remark':{'color':'#173177', 'value':'点击进入商城查看-->>'}}";
-			String openId = "o-icas0dRzE7WYAEAmcX4BQCUyFo";
-			String appId = "wxd995fb95b97ece1b";// 应用ID
-			String appSecret = "34922854462fba23cf54ce859349fcf4";// 应用密钥
-			
-			WeixinUtil.sendTemplateMessage(appId, appSecret, openId, "744KA1PdB1I5PzRcjtxqbEz5t2bp8vdsi4I2ytW1rbE", date, "xx");
-			System.out.println("发送成功");
-		}
-		
-		/**
-		 * 试用进度提醒推送
-		 * @param first  标题
-		 * @param keyword1	商品名称
-		 * @param keyword2	订单编号
-		 * @param keyword3	申请时间
-		 * @param keyword4	截止时间
-		 * @param remark	全部内容
-		 * @param openId	用户openid
-		 * @param url	地址
-		 */
-		public void probationPush(String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark,String openId,String url){
-			String temp = ResultInfo.PROBATIONPUSH;
-			temp = temp.replaceFirst("firstValueIamberry", first)
-					.replaceFirst("keyword1Value",keyword1)
-					.replaceFirst("keyword2Value",keyword2)
-					.replaceFirst("keyword3Value",keyword3)
-					.replaceFirst("keyword4Value",keyword4)
-					.replaceFirst("remarkValue",remark);
-				sendTemplateMessageToOpenid(temp, openId, url,5);
-				temp = ResultInfo.PROBATIONPUSH;
-		}
-		
-		/**
-		 * 试用开始通知
-		 * @param first 标题
-		 * @param keyword1	商品信息
-		 * @param keyword2	申请时间
-		 * @param remark	全部内容
-		 * @param openId	用户openid
-		 * @param url	地址
-		 */
-		public void probationApplyNotice(String first,String keyword1,String keyword2,String remark,String openId,String url){
-			String temp = ResultInfo.PROBATIONAPPLYNOTICE;
-			temp = temp.replaceFirst("firstValueIamberry", first)
-					.replaceFirst("keyword1Value",keyword1)
-					.replaceFirst("keyword2Value",keyword2)
-					.replaceFirst("remarkValue",remark);
-				sendTemplateMessageToOpenid(temp, openId, url,6);
-		}
-		/**
-		 * 派送成功通知
-		 * @param first  标题
-		 * @param keyword1	申请单号
-		 * @param keyword2	申请时间
-		 * @param keyword3	应付金额
-		 * @param keyword4	应付积分
-		 * @param keyword5	支付方式
-		 * @param remark	全部内容
-		 * @param openId	用户openid
-		 * @param url	地址
-		 */
-		public void probationApplySuccess(String first,String keyword1,String keyword2,String keyword3,String keyword4,String keyword5,String remark,String openId,String url){
-			String temp = ResultInfo.PROBATIONAPPLYSUCCESS;
-			temp = temp.replaceFirst("firstValueIamberry", first)
-					.replaceFirst("keyword1Value",keyword1)
-					.replaceFirst("keyword2Value",keyword2)
-					.replaceFirst("keyword3Value",keyword3)
-					.replaceFirst("keyword4Value",keyword4)
-					.replaceFirst("keyword5Value",keyword5)
-					.replaceFirst("remarkValue",remark);
-				sendTemplateMessageToOpenid(temp, openId, url,7);
-		}
-		/**
-		 * 试用订单支付成功
-		 * @param first  标题
-		 * @param keyword1	支付金额
-		 * @param keyword2	商品信息
-		 * @param remark	全部内容
-		 * @param openId	用户openid
-		 * @param url	地址
-		 */
-		public void probationPaySuccess(String first,String keyword1,String keyword2,String remark,String openId,String url){
-			String temp = ResultInfo.PROBATIONPAYSUCCESS;
-			temp = temp.replaceFirst("firstValueIamberry", first)
-					.replaceFirst("orderMoneySumValue",keyword1)
-					.replaceFirst("orderProductNameValue",keyword2)
-					.replaceFirst("remarkValue",remark);
-			sendTemplateMessageToOpenid(temp, openId, url,8);
-		}
-		/**
-		 * 试用订单关闭成功
-		 * @param first  标题
-		 * @param keyword1	支付金额
-		 * @param keyword2	商品信息
-		 * @param remark	全部内容
-		 * @param openId	用户openid
-		 * @param url	地址
-		 */
-		public void probationShutDown(String first,String transid,String fee,String pay_time,String remark,String openId,String url){
-			String temp = ResultInfo.PROBATIONSHUTDOWN;
-			temp = temp.replaceFirst("firstValueIamberry", first)
-					.replaceFirst("transidValue",transid)
-					.replaceFirst("feeValue",fee)
-					.replaceFirst("pay_timeValue",pay_time)
-					.replaceFirst("remarkValue",remark);
-			sendTemplateMessageToOpenid(temp, openId, url,9);
-		}
-		
-		/**
-		 * 推荐人领取通知
-		 * @param first  标题
-		 * @param keyword1	被推荐人
-		 * @param keyword2	消费商家
-		 * @param keyword3	消费金额
-		 * @param keyword4	消费时间
-		 * @param keyword4	推荐奖励
-		 * @param remark	全部内容
-		 * @param openId	用户openid
-		 * @param url	跳转地址
-		 */
-		public void prizeReceivePush(String first,String keyword1,String keyword2,String keyword3,String keyword4,String keyword5,String remark,String openId,String url){
-			String temp = ResultInfo.PRIZERECEIVEPUSH;
-			temp = temp.replaceFirst("firstValueIamberry", first)
-					.replaceFirst("keyword1Value",keyword1)
-					.replaceFirst("keyword2Value",keyword2)
-					.replaceFirst("keyword3Value",keyword3)
-					.replaceFirst("keyword4Value",keyword4)
-					.replaceFirst("keyword5Value",keyword5)
-					.replaceFirst("remarkValue",remark);
-				sendTemplateMessageToOpenid(temp, openId, url,10);
-		}
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalApplyPickItem.java

@@ -31,6 +31,8 @@ public class ApprovalApplyPickItem implements Serializable{
     private String itemProductUnit;
     //箱数/套数
     private Integer itemProductBoxNumber;
+    //生产审批订单项id
+    private Integer productionItemId;
     //创建时间
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -156,4 +158,12 @@ public class ApprovalApplyPickItem implements Serializable{
     public void setItemExternalModel(String itemExternalModel) {
         this.itemExternalModel = itemExternalModel;
     }
+
+    public Integer getProductionItemId() {
+        return productionItemId;
+    }
+
+    public void setProductionItemId(Integer productionItemId) {
+        this.productionItemId = productionItemId;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalProductionItem.java

@@ -22,6 +22,7 @@ public class ApprovalProductionItem implements Serializable{
     private Integer itemActualStorage;//实际入库数量
     private Integer itemShouldStorage;//应入库数量
     private Integer itemLackNumber;//缺少数量
+    private Integer itemCanpickNumber;//可提货数量
     private Date itemCreateTime;
     private Date itemUpdateTime;
 
@@ -154,4 +155,12 @@ public class ApprovalProductionItem implements Serializable{
     public void setItemExternalModel(String itemExternalModel) {
         this.itemExternalModel = itemExternalModel;
     }
+
+    public Integer getItemCanpickNumber() {
+        return itemCanpickNumber;
+    }
+
+    public void setItemCanpickNumber(Integer itemCanpickNumber) {
+        this.itemCanpickNumber = itemCanpickNumber;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/AwaitingSignclosedProductInfo.java

@@ -1,114 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 客诉-待签收产品表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class AwaitingSignclosedProductInfo implements Serializable {
-    private static final long serialVersionUID = 3037851079332430546L;
-    private Integer productId;//id
-    private Integer signclosedId;//签收id
-    private String productName;//产品名称
-    private Integer productNum;//产品数量
-    private Date signclosedCreateTime;//创建时间
-    private Date signclosedUpdateTime;//修改时间
-    private Integer signclosedProductType;//1 产品  2配件
-    private Integer signclosedProductId;//关联产品id  （根据产品类型判断）
-    private Integer signclosedProductColor;//关联产品颜色id
-
-    private String colorName;//颜色名称
-    private String productNumber;//产品型号
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public Integer getSignclosedId() {
-        return signclosedId;
-    }
-
-    public void setSignclosedId(Integer signclosedId) {
-        this.signclosedId = signclosedId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public Integer getProductNum() {
-        return productNum;
-    }
-
-    public void setProductNum(Integer productNum) {
-        this.productNum = productNum;
-    }
-
-    public Date getSignclosedCreateTime() {
-        return signclosedCreateTime;
-    }
-
-    public void setSignclosedCreateTime(Date signclosedCreateTime) {
-        this.signclosedCreateTime = signclosedCreateTime;
-    }
-
-    public Date getSignclosedUpdateTime() {
-        return signclosedUpdateTime;
-    }
-
-    public void setSignclosedUpdateTime(Date signclosedUpdateTime) {
-        this.signclosedUpdateTime = signclosedUpdateTime;
-    }
-
-    public Integer getSignclosedProductType() {
-        return signclosedProductType;
-    }
-
-    public void setSignclosedProductType(Integer signclosedProductType) {
-        this.signclosedProductType = signclosedProductType;
-    }
-
-    public Integer getSignclosedProductId() {
-        return signclosedProductId;
-    }
-
-    public void setSignclosedProductId(Integer signclosedProductId) {
-        this.signclosedProductId = signclosedProductId;
-    }
-
-    public Integer getSignclosedProductColor() {
-        return signclosedProductColor;
-    }
-
-    public void setSignclosedProductColor(Integer signclosedProductColor) {
-        this.signclosedProductColor = signclosedProductColor;
-    }
-
-    public String getColorName() {
-        return colorName;
-    }
-
-    public void setColorName(String colorName) {
-        this.colorName = colorName;
-    }
-
-    public String getProductNumber() {
-        return productNumber;
-    }
-
-    public void setProductNumber(String productNumber) {
-        this.productNumber = productNumber;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/BackGoods.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ClosedProdcue.java

@@ -27,6 +27,7 @@ public class ClosedProdcue  implements Serializable {
     private Integer productType;        //商品类型
     private String productNumber;       //产品型号
     private ProductColor productColor;      //颜色
+    private Integer itemId;      //订单项id
 
     private String colorBar;        //69码
 
@@ -38,10 +39,12 @@ public class ClosedProdcue  implements Serializable {
         this.closedProductName = closedProductName;
     }
 
+    @Deprecated
     public Integer getClosedProdcueType() {
         return closedProdcueType;
     }
 
+    @Deprecated
     public void setClosedProdcueType(Integer closedProdcueType) {
         this.closedProdcueType = closedProdcueType;
     }
@@ -133,4 +136,12 @@ public class ClosedProdcue  implements Serializable {
     public void setColorBar(String colorBar) {
         this.colorBar = colorBar;
     }
+
+    public Integer getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Integer itemId) {
+        this.itemId = itemId;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CmRelation.java

@@ -0,0 +1,386 @@
+package com.iamberry.rst.core.cm;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.ArrayList;
+import  java.util.Date;
+import  java.io.Serializable;
+import java.util.List;
+
+/**
+ *  售后处理类
+ * @author
+ * @Date 2018-12-28
+ */
+public class CmRelation implements  Serializable{
+    private static final long serialVersionUID = 8181376563638802640L;
+    //处理主键
+    private Integer relationId;
+    //
+    private Integer procMethodId;
+    //客诉基本信息主键
+    private Integer customerId;
+    //仓储任务(签收id)
+    private Integer signclosedId;
+    //售后生成订单的交易号
+    private String relationBackEfastOrderId;
+    //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
+    private Integer relationBackStatus;
+    //寄回人姓名
+    private String relationBackName;
+    //寄回人电话
+    private String relationBackTel;
+    //寄回物流公司
+    private String relationBackLogisticsCompany;
+    //寄回物流单号
+    private String relationBackLogisticsNo;
+    //寄回邮费 单位为分
+    private Integer relationBackPostage;
+    //寄回机器编号
+    private String relationBackMachineNo;
+    //寄送状态 1：未寄送 2：已寄送 3：已收货
+    private Integer relationSendStatus;
+    //寄送人姓名
+    private String relationSendName;
+    //寄送人电话
+    private String relationSendTel;
+    //寄送地址-省
+    private Integer provinceNumber;
+    //寄送地址-市
+    private Integer cityNumber;
+    //寄送地址-区
+    private Integer areaNumber;
+    //寄送地址-省市区
+    private String relationSendMergeAddress;
+    //寄送地址-详细地址
+    private String relationSendAddress;
+    //寄送物流公司
+    private String relationSendLogisticsCompany;
+    //寄送物流单号
+    private String relationSendLogisticsNo;
+    //备注
+    private String relationDesc;
+    //状态 1：使用中 2：停用中
+    private Integer relationState;
+    //转账账户
+    private String relationAlipay;
+    //是否已转账邮费  1.需要 2:不需要
+    private Integer relationIsTransfer;
+    //转账账户姓名
+    private String relationAlipayName;
+    //签收日期
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date relationBackReceiptDate;
+    //工厂维修报价
+    private Integer relationFactoryCosts;
+    //客户报价
+    private Integer relationCustomerCosts;
+    //创建时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date relationCreateTime;
+    //修改时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date relationUpdateTime;
+
+    //售后寄出产品表
+    private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();
+    //售后寄回产品表
+    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();
+
+    /*订单关联集合*/
+    private List<RelationOrder> relationOrderList = new ArrayList<>();
+    /*订单集合*/
+    private List<SalesOrder> salesOrderList = new ArrayList<>();
+
+    public Integer getRelationId(){
+        return relationId;
+    }
+
+    public void setRelationId(Integer  relationId){
+        this.relationId=relationId;
+    }
+
+    public Integer getProcMethodId(){
+        return procMethodId;
+    }
+
+    public void setProcMethodId(Integer  procMethodId){
+        this.procMethodId=procMethodId;
+    }
+
+    public Integer getCustomerId(){
+        return customerId;
+    }
+
+    public void setCustomerId(Integer  customerId){
+        this.customerId=customerId;
+    }
+
+    public Integer getSignclosedId(){
+        return signclosedId;
+    }
+
+    public void setSignclosedId(Integer  signclosedId){
+        this.signclosedId=signclosedId;
+    }
+
+    public String getRelationBackEfastOrderId(){
+        return relationBackEfastOrderId;
+    }
+
+    public void setRelationBackEfastOrderId(String  relationBackEfastOrderId){
+        this.relationBackEfastOrderId=relationBackEfastOrderId;
+    }
+
+    public Integer getRelationBackStatus(){
+        return relationBackStatus;
+    }
+
+    public void setRelationBackStatus(Integer  relationBackStatus){
+        this.relationBackStatus=relationBackStatus;
+    }
+
+    public String getRelationBackName(){
+        return relationBackName;
+    }
+
+    public void setRelationBackName(String  relationBackName){
+        this.relationBackName=relationBackName;
+    }
+
+    public String getRelationBackTel(){
+        return relationBackTel;
+    }
+
+    public void setRelationBackTel(String  relationBackTel){
+        this.relationBackTel=relationBackTel;
+    }
+
+    public String getRelationBackLogisticsCompany(){
+        return relationBackLogisticsCompany;
+    }
+
+    public void setRelationBackLogisticsCompany(String  relationBackLogisticsCompany){
+        this.relationBackLogisticsCompany=relationBackLogisticsCompany;
+    }
+
+    public String getRelationBackLogisticsNo(){
+        return relationBackLogisticsNo;
+    }
+
+    public void setRelationBackLogisticsNo(String  relationBackLogisticsNo){
+        this.relationBackLogisticsNo=relationBackLogisticsNo;
+    }
+
+    public Integer getRelationBackPostage(){
+        return relationBackPostage;
+    }
+
+    public void setRelationBackPostage(Integer  relationBackPostage){
+        this.relationBackPostage=relationBackPostage;
+    }
+
+    public String getRelationBackMachineNo(){
+        return relationBackMachineNo;
+    }
+
+    public void setRelationBackMachineNo(String  relationBackMachineNo){
+        this.relationBackMachineNo=relationBackMachineNo;
+    }
+
+    public Integer getRelationSendStatus(){
+        return relationSendStatus;
+    }
+
+    public void setRelationSendStatus(Integer  relationSendStatus){
+        this.relationSendStatus=relationSendStatus;
+    }
+
+    public String getRelationSendName(){
+        return relationSendName;
+    }
+
+    public void setRelationSendName(String  relationSendName){
+        this.relationSendName=relationSendName;
+    }
+
+    public String getRelationSendTel(){
+        return relationSendTel;
+    }
+
+    public void setRelationSendTel(String  relationSendTel){
+        this.relationSendTel=relationSendTel;
+    }
+
+    public Integer getProvinceNumber(){
+        return provinceNumber;
+    }
+
+    public void setProvinceNumber(Integer  provinceNumber){
+        this.provinceNumber=provinceNumber;
+    }
+
+    public Integer getCityNumber(){
+        return cityNumber;
+    }
+
+    public void setCityNumber(Integer  cityNumber){
+        this.cityNumber=cityNumber;
+    }
+
+    public Integer getAreaNumber(){
+        return areaNumber;
+    }
+
+    public void setAreaNumber(Integer  areaNumber){
+        this.areaNumber=areaNumber;
+    }
+
+    public String getRelationSendMergeAddress(){
+        return relationSendMergeAddress;
+    }
+
+    public void setRelationSendMergeAddress(String  relationSendMergeAddress){
+        this.relationSendMergeAddress=relationSendMergeAddress;
+    }
+
+    public String getRelationSendAddress(){
+        return relationSendAddress;
+    }
+
+    public void setRelationSendAddress(String  relationSendAddress){
+        this.relationSendAddress=relationSendAddress;
+    }
+
+    public String getRelationSendLogisticsCompany(){
+        return relationSendLogisticsCompany;
+    }
+
+    public void setRelationSendLogisticsCompany(String  relationSendLogisticsCompany){
+        this.relationSendLogisticsCompany=relationSendLogisticsCompany;
+    }
+
+    public String getRelationSendLogisticsNo(){
+        return relationSendLogisticsNo;
+    }
+
+    public void setRelationSendLogisticsNo(String  relationSendLogisticsNo){
+        this.relationSendLogisticsNo=relationSendLogisticsNo;
+    }
+
+    public String getRelationDesc(){
+        return relationDesc;
+    }
+
+    public void setRelationDesc(String  relationDesc){
+        this.relationDesc=relationDesc;
+    }
+
+    public Integer getRelationState(){
+        return relationState;
+    }
+
+    public void setRelationState(Integer  relationState){
+        this.relationState=relationState;
+    }
+
+    public String getRelationAlipay(){
+        return relationAlipay;
+    }
+
+    public void setRelationAlipay(String  relationAlipay){
+        this.relationAlipay=relationAlipay;
+    }
+
+    public Integer getRelationIsTransfer(){
+        return relationIsTransfer;
+    }
+
+    public void setRelationIsTransfer(Integer  relationIsTransfer){
+        this.relationIsTransfer=relationIsTransfer;
+    }
+
+    public String getRelationAlipayName(){
+        return relationAlipayName;
+    }
+
+    public void setRelationAlipayName(String  relationAlipayName){
+        this.relationAlipayName=relationAlipayName;
+    }
+
+    public Date getRelationBackReceiptDate(){
+        return relationBackReceiptDate;
+    }
+
+    public void setRelationBackReceiptDate(Date  relationBackReceiptDate){
+        this.relationBackReceiptDate=relationBackReceiptDate;
+    }
+
+    public Integer getRelationFactoryCosts(){
+        return relationFactoryCosts;
+    }
+
+    public void setRelationFactoryCosts(Integer  relationFactoryCosts){
+        this.relationFactoryCosts=relationFactoryCosts;
+    }
+
+    public Integer getRelationCustomerCosts(){
+        return relationCustomerCosts;
+    }
+
+    public void setRelationCustomerCosts(Integer  relationCustomerCosts){
+        this.relationCustomerCosts=relationCustomerCosts;
+    }
+
+    public Date getRelationCreateTime(){
+        return relationCreateTime;
+    }
+
+    public void setRelationCreateTime(Date  relationCreateTime){
+        this.relationCreateTime=relationCreateTime;
+    }
+
+    public Date getRelationUpdateTime(){
+        return relationUpdateTime;
+    }
+
+    public void setRelationUpdateTime(Date  relationUpdateTime){
+        this.relationUpdateTime=relationUpdateTime;
+    }
+
+    public List<SendProdcue> getSendProdcues() {
+        return sendProdcues;
+    }
+
+    public void setSendProdcues(List<SendProdcue> sendProdcues) {
+        this.sendProdcues = sendProdcues;
+    }
+
+    public List<ClosedProdcue> getClosedProdcues() {
+        return closedProdcues;
+    }
+
+    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
+        this.closedProdcues = closedProdcues;
+    }
+
+    public List<RelationOrder> getRelationOrderList() {
+        return relationOrderList;
+    }
+
+    public void setRelationOrderList(List<RelationOrder> relationOrderList) {
+        this.relationOrderList = relationOrderList;
+    }
+
+    public List<SalesOrder> getSalesOrderList() {
+        return salesOrderList;
+    }
+
+    public void setSalesOrderList(List<SalesOrder> salesOrderList) {
+        this.salesOrderList = salesOrderList;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintDetectInfo.java

@@ -1,71 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 客诉-品质检测表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class ComplaintDetectInfo implements Serializable {
-    private static final long serialVersionUID = -4586699316347839979L;
-    private Integer detectId;//id
-    private Integer customerId;//客诉id
-    private Integer signclosedId;//签收ID
-    private String detectDesc;//备注
-    private Date detectCreateTime;//创建时间
-    private Date detectUpdateTime;//修改时间
-
-    public Integer getDetectId() {
-        return detectId;
-    }
-
-    public void setDetectId(Integer detectId) {
-        this.detectId = detectId;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public Integer getSignclosedId() {
-        return signclosedId;
-    }
-
-    public void setSignclosedId(Integer signclosedId) {
-        this.signclosedId = signclosedId;
-    }
-
-    public String getDetectDesc() {
-        return detectDesc;
-    }
-
-    public void setDetectDesc(String detectDesc) {
-        this.detectDesc = detectDesc;
-    }
-
-    public Date getDetectCreateTime() {
-        return detectCreateTime;
-    }
-
-    public void setDetectCreateTime(Date detectCreateTime) {
-        this.detectCreateTime = detectCreateTime;
-    }
-
-    public Date getDetectUpdateTime() {
-        return detectUpdateTime;
-    }
-
-    public void setDetectUpdateTime(Date detectUpdateTime) {
-        this.detectUpdateTime = detectUpdateTime;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintDetectItem.java

@@ -1,246 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by Administrator on 2018/7/11.
- */
-public class ComplaintDetectItem implements Serializable {
-    private static final long serialVersionUID = -3623612031356499488L;
-    private Integer detectItemId;//主键
-    private Integer detectId;//检测id
-    private Integer productId;//产品id
-    private Integer productColorId;//产品颜色id
-    private String machineNo;//机器编号
-    private String detectProductNumber;//产品型号
-    private Integer detectItemState;//状态 1未检测 2已检测
-    private String detectItemPhenomenon;//工厂检测现象
-    private String detectItemClassification;//故障分类
-    private String detectItemFailureCause;//故障原因
-    private String detectItemResults;//判定结果
-    private String detectItemPoint;//故障指向
-    private String detectItemNalysis;//原因分析
-    private String detectItemContent;//维修内容
-    private Integer isMaintenance;//是否维修
-    private Integer maintenanceResults;//QC检测结果
-    private String detectItemDesc;//备注
-    private Date detectItemDate;//检测日期
-    private Date detectItemCreateTime;//创建时间
-    private Date detectItemUpdateTime;//修改时间
-    private Integer customerId;//客诉id
-
-    private Integer productTypeId;//产品类型id
-    private String productTypeName;//产品类型名称
-    private String questionTitle;//问题标题
-    private String colorName;//产品颜色名称
-    private String productName;//产品名称
-
-    public Integer getDetectItemId() {
-        return detectItemId;
-    }
-
-    public void setDetectItemId(Integer detectItemId) {
-        this.detectItemId = detectItemId;
-    }
-
-    public Integer getDetectId() {
-        return detectId;
-    }
-
-    public void setDetectId(Integer detectId) {
-        this.detectId = detectId;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public String getMachineNo() {
-        return machineNo;
-    }
-
-    public void setMachineNo(String machineNo) {
-        this.machineNo = machineNo;
-    }
-
-    public String getDetectProductNumber() {
-        return detectProductNumber;
-    }
-
-    public void setDetectProductNumber(String detectProductNumber) {
-        this.detectProductNumber = detectProductNumber;
-    }
-
-    public Integer getDetectItemState() {
-        return detectItemState;
-    }
-
-    public void setDetectItemState(Integer detectItemState) {
-        this.detectItemState = detectItemState;
-    }
-
-    public String getDetectItemPhenomenon() {
-        return detectItemPhenomenon;
-    }
-
-    public void setDetectItemPhenomenon(String detectItemPhenomenon) {
-        this.detectItemPhenomenon = detectItemPhenomenon;
-    }
-
-    public String getDetectItemClassification() {
-        return detectItemClassification;
-    }
-
-    public void setDetectItemClassification(String detectItemClassification) {
-        this.detectItemClassification = detectItemClassification;
-    }
-
-    public String getDetectItemFailureCause() {
-        return detectItemFailureCause;
-    }
-
-    public void setDetectItemFailureCause(String detectItemFailureCause) {
-        this.detectItemFailureCause = detectItemFailureCause;
-    }
-
-    public String getDetectItemResults() {
-        return detectItemResults;
-    }
-
-    public void setDetectItemResults(String detectItemResults) {
-        this.detectItemResults = detectItemResults;
-    }
-
-    public String getDetectItemPoint() {
-        return detectItemPoint;
-    }
-
-    public void setDetectItemPoint(String detectItemPoint) {
-        this.detectItemPoint = detectItemPoint;
-    }
-
-    public String getDetectItemNalysis() {
-        return detectItemNalysis;
-    }
-
-    public void setDetectItemNalysis(String detectItemNalysis) {
-        this.detectItemNalysis = detectItemNalysis;
-    }
-
-    public String getDetectItemContent() {
-        return detectItemContent;
-    }
-
-    public void setDetectItemContent(String detectItemContent) {
-        this.detectItemContent = detectItemContent;
-    }
-
-    public Integer getIsMaintenance() {
-        return isMaintenance;
-    }
-
-    public void setIsMaintenance(Integer isMaintenance) {
-        this.isMaintenance = isMaintenance;
-    }
-
-    public Integer getMaintenanceResults() {
-        return maintenanceResults;
-    }
-
-    public void setMaintenanceResults(Integer maintenanceResults) {
-        this.maintenanceResults = maintenanceResults;
-    }
-
-    public String getDetectItemDesc() {
-        return detectItemDesc;
-    }
-
-    public void setDetectItemDesc(String detectItemDesc) {
-        this.detectItemDesc = detectItemDesc;
-    }
-
-    public Date getDetectItemDate() {
-        return detectItemDate;
-    }
-
-    public void setDetectItemDate(Date detectItemDate) {
-        this.detectItemDate = detectItemDate;
-    }
-
-    public Date getDetectItemCreateTime() {
-        return detectItemCreateTime;
-    }
-
-    public void setDetectItemCreateTime(Date detectItemCreateTime) {
-        this.detectItemCreateTime = detectItemCreateTime;
-    }
-
-    public Date getDetectItemUpdateTime() {
-        return detectItemUpdateTime;
-    }
-
-    public void setDetectItemUpdateTime(Date detectItemUpdateTime) {
-        this.detectItemUpdateTime = detectItemUpdateTime;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public Integer getProductTypeId() {
-        return productTypeId;
-    }
-
-    public void setProductTypeId(Integer productTypeId) {
-        this.productTypeId = productTypeId;
-    }
-
-    public String getProductTypeName() {
-        return productTypeName;
-    }
-
-    public void setProductTypeName(String productTypeName) {
-        this.productTypeName = productTypeName;
-    }
-
-    public String getQuestionTitle() {
-        return questionTitle;
-    }
-
-    public void setQuestionTitle(String questionTitle) {
-        this.questionTitle = questionTitle;
-    }
-
-    public Integer getProductColorId() {
-        return productColorId;
-    }
-
-    public void setProductColorId(Integer productColorId) {
-        this.productColorId = productColorId;
-    }
-
-    public String getColorName() {
-        return colorName;
-    }
-
-    public void setColorName(String colorName) {
-        this.colorName = colorName;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintMaintenanceInfo.java

@@ -1,215 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-/**
- * 客诉-生产维修表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class ComplaintMaintenanceInfo  implements Serializable {
-    private static final long serialVersionUID = 4914099958529063786L;
-    private Integer maintenanceId;
-
-    private Integer detectId;//品质检测ID
-
-    private String maintenanceEquipmentNumber;//设备编号
-
-    private Integer productId;//产品id
-
-    private String maintenanceProductNumber;//产品型号
-
-
-
-    private Integer maintenanceState;//状态
-
-    private String maintenanceAnalysis;//原因分析
-
-    private Integer maintenanceCustomerId;//客诉id
-
-    private Integer maintenanceIsRepair;//是否可返修
-
-    private Date maintenanceContentDate;//返修日期
-
-    private Date maintenanceCreateTime;//创建时间
-
-    private Date maintenanceUpdateTime;//修改时间
-
-    private Integer maintenanceIsWarehousing;// 是否入库1待入库2已入库3无法入库
-
-    private String maintenanceDesc;//备注
-
-    private Integer productColorId;//产品颜色id
-
-    private Integer productType;    //1.净水机 2.配件
-
-    private Integer maintenanceResults;//QC检测结果 1.通过 2不通过
-
-
-    private String detectDesc;//品质备注
-
-    private Integer equipmentNumber;//维修次数
-
-    private String customerIdDescribe;//客诉描述
-
-    public Integer getMaintenanceId() {
-        return maintenanceId;
-    }
-
-    public void setMaintenanceId(Integer maintenanceId) {
-        this.maintenanceId = maintenanceId;
-    }
-
-    public Integer getDetectId() {
-        return detectId;
-    }
-
-    public void setDetectId(Integer detectId) {
-        this.detectId = detectId;
-    }
-
-    public String getMaintenanceEquipmentNumber() {
-        return maintenanceEquipmentNumber;
-    }
-
-    public void setMaintenanceEquipmentNumber(String maintenanceEquipmentNumber) {
-        this.maintenanceEquipmentNumber = maintenanceEquipmentNumber;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public String getMaintenanceProductNumber() {
-        return maintenanceProductNumber;
-    }
-
-    public void setMaintenanceProductNumber(String maintenanceProductNumber) {
-        this.maintenanceProductNumber = maintenanceProductNumber == null ? null : maintenanceProductNumber.trim();
-    }
-
-    public Integer getMaintenanceState() {
-        return maintenanceState;
-    }
-
-    public void setMaintenanceState(Integer maintenanceState) {
-        this.maintenanceState = maintenanceState;
-    }
-
-    public String getMaintenanceAnalysis() {
-        return maintenanceAnalysis;
-    }
-
-    public void setMaintenanceAnalysis(String maintenanceAnalysis) {
-        this.maintenanceAnalysis = maintenanceAnalysis == null ? null : maintenanceAnalysis.trim();
-    }
-
-    public Integer getMaintenanceCustomerId() {
-        return maintenanceCustomerId;
-    }
-
-    public void setMaintenanceCustomerId(Integer maintenanceCustomerId) {
-        this.maintenanceCustomerId = maintenanceCustomerId;
-    }
-
-    public Integer getMaintenanceIsRepair() {
-        return maintenanceIsRepair;
-    }
-
-    public void setMaintenanceIsRepair(Integer maintenanceIsRepair) {
-        this.maintenanceIsRepair = maintenanceIsRepair;
-    }
-
-    public Date getMaintenanceContentDate() {
-        return maintenanceContentDate;
-    }
-
-    public void setMaintenanceContentDate(Date maintenanceContentDate) {
-        this.maintenanceContentDate = maintenanceContentDate;
-    }
-
-    public Date getMaintenanceCreateTime() {
-        return maintenanceCreateTime;
-    }
-
-    public void setMaintenanceCreateTime(Date maintenanceCreateTime) {
-        this.maintenanceCreateTime = maintenanceCreateTime;
-    }
-
-    public Date getMaintenanceUpdateTime() {
-        return maintenanceUpdateTime;
-    }
-
-    public void setMaintenanceUpdateTime(Date maintenanceUpdateTime) {
-        this.maintenanceUpdateTime = maintenanceUpdateTime;
-    }
-
-    public Integer getProductType() {
-        return productType;
-    }
-
-    public void setProductType(Integer productType) {
-        this.productType = productType;
-    }
-
-    public Integer getMaintenanceResults() {
-        return maintenanceResults;
-    }
-
-    public void setMaintenanceResults(Integer maintenanceResults) {
-        this.maintenanceResults = maintenanceResults;
-    }
-
-    public Integer getMaintenanceIsWarehousing() {
-        return maintenanceIsWarehousing;
-    }
-
-    public void setMaintenanceIsWarehousing(Integer maintenanceIsWarehousing) {
-        this.maintenanceIsWarehousing = maintenanceIsWarehousing;
-    }
-
-    public String getDetectDesc() {
-        return detectDesc;
-    }
-
-    public void setDetectDesc(String detectDesc) {
-        this.detectDesc = detectDesc;
-    }
-
-    public Integer getEquipmentNumber() {
-        return equipmentNumber;
-    }
-
-    public void setEquipmentNumber(Integer equipmentNumber) {
-        this.equipmentNumber = equipmentNumber;
-    }
-
-    public String getCustomerIdDescribe() {
-        return customerIdDescribe;
-    }
-
-    public void setCustomerIdDescribe(String customerIdDescribe) {
-        this.customerIdDescribe = customerIdDescribe;
-    }
-
-    public String getMaintenanceDesc() {
-        return maintenanceDesc;
-    }
-
-    public void setMaintenanceDesc(String maintenanceDesc) {
-        this.maintenanceDesc = maintenanceDesc;
-    }
-
-    public Integer getProductColorId() {
-        return productColorId;
-    }
-
-    public void setProductColorId(Integer productColorId) {
-        this.productColorId = productColorId;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintSignclosedInfo.java

@@ -1,214 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 1.1.57	客诉-签收表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class ComplaintSignclosedInfo implements Serializable {
-    private static final long serialVersionUID = 2416773719172770710L;
-    private Integer signclosedId;//id
-    private Integer signclosedType;//签收类型
-    private String signclosedTypeName;//签收类型名称
-    private String signclosedLogistics;//寄回物流
-    private String signclosedLogisticsNumber;//物流单号
-    private String signclosedSendName;//寄件人姓名
-    private String signclosedSendTel;//寄件人电话
-    private String signclosedAddrProvinces;//寄件地址（省）
-    private String signclosedAddrCity;//寄件地址（市）
-    private String signclosedAddrArea;//寄件地址（区）
-    private Date signclosedDate;//签收时间
-    private Integer signclosedCustomerId;//客诉id
-    private String signclosedDesc;//备注
-    private Date signclosedCreateTime;//创建时间
-    private Date signclosedUpdateTime;//修改时间
-    private Integer signclosedState;//状态1已签收2已移交QC
-    private String signclosedCustomerDesc;//客服备注
-    private Integer isBinding;//是否绑定客诉
-
-    private String customerIdDescribe;//客诉标题
-    private List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList = new ArrayList<AwaitingSignclosedProductInfo>();	//待签收实体类
-    private List<SignclosedProductInfo> signclosedProductInfoList = new ArrayList<SignclosedProductInfo>();	//签收实体类
-    private String describeHandleDesc;//处理描述
-    public Integer getSignclosedId() {
-        return signclosedId;
-    }
-
-    public void setSignclosedId(Integer signclosedId) {
-        this.signclosedId = signclosedId;
-    }
-
-    public Integer getSignclosedType() {
-        return signclosedType;
-    }
-
-    public void setSignclosedType(Integer signclosedType) {
-        this.signclosedType = signclosedType;
-    }
-
-    public String getSignclosedTypeName() {
-        return signclosedTypeName;
-    }
-
-    public void setSignclosedTypeName(String signclosedTypeName) {
-        this.signclosedTypeName = signclosedTypeName;
-    }
-
-    public String getSignclosedLogistics() {
-        return signclosedLogistics;
-    }
-
-    public void setSignclosedLogistics(String signclosedLogistics) {
-        this.signclosedLogistics = signclosedLogistics;
-    }
-
-    public String getSignclosedLogisticsNumber() {
-        return signclosedLogisticsNumber;
-    }
-
-    public void setSignclosedLogisticsNumber(String signclosedLogisticsNumber) {
-        this.signclosedLogisticsNumber = signclosedLogisticsNumber;
-    }
-
-    public String getSignclosedSendName() {
-        return signclosedSendName;
-    }
-
-    public void setSignclosedSendName(String signclosedSendName) {
-        this.signclosedSendName = signclosedSendName;
-    }
-
-    public String getSignclosedSendTel() {
-        return signclosedSendTel;
-    }
-
-    public void setSignclosedSendTel(String signclosedSendTel) {
-        this.signclosedSendTel = signclosedSendTel;
-    }
-
-    public String getSignclosedAddrProvinces() {
-        return signclosedAddrProvinces;
-    }
-
-    public void setSignclosedAddrProvinces(String signclosedAddrProvinces) {
-        this.signclosedAddrProvinces = signclosedAddrProvinces;
-    }
-
-    public String getSignclosedAddrCity() {
-        return signclosedAddrCity;
-    }
-
-    public void setSignclosedAddrCity(String signclosedAddrCity) {
-        this.signclosedAddrCity = signclosedAddrCity;
-    }
-
-    public String getSignclosedAddrArea() {
-        return signclosedAddrArea;
-    }
-
-    public void setSignclosedAddrArea(String signclosedAddrArea) {
-        this.signclosedAddrArea = signclosedAddrArea;
-    }
-
-    public Date getSignclosedDate() {
-        return signclosedDate;
-    }
-
-    public void setSignclosedDate(Date signclosedDate) {
-        this.signclosedDate = signclosedDate;
-    }
-
-    public Integer getSignclosedCustomerId() {
-        return signclosedCustomerId;
-    }
-
-    public void setSignclosedCustomerId(Integer signclosedCustomerId) {
-        this.signclosedCustomerId = signclosedCustomerId;
-    }
-
-    public String getSignclosedDesc() {
-        return signclosedDesc;
-    }
-
-    public void setSignclosedDesc(String signclosedDesc) {
-        this.signclosedDesc = signclosedDesc;
-    }
-
-    public Date getSignclosedCreateTime() {
-        return signclosedCreateTime;
-    }
-
-    public void setSignclosedCreateTime(Date signclosedCreateTime) {
-        this.signclosedCreateTime = signclosedCreateTime;
-    }
-
-    public Date getSignclosedUpdateTime() {
-        return signclosedUpdateTime;
-    }
-
-    public void setSignclosedUpdateTime(Date signclosedUpdateTime) {
-        this.signclosedUpdateTime = signclosedUpdateTime;
-    }
-
-    public String getCustomerIdDescribe() {
-        return customerIdDescribe;
-    }
-
-    public void setCustomerIdDescribe(String customerIdDescribe) {
-        this.customerIdDescribe = customerIdDescribe;
-    }
-
-    public List<AwaitingSignclosedProductInfo> getAwaitingSignclosedProductInfoList() {
-        return awaitingSignclosedProductInfoList;
-    }
-
-    public void setAwaitingSignclosedProductInfoList(List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList) {
-        this.awaitingSignclosedProductInfoList = awaitingSignclosedProductInfoList;
-    }
-
-    public List<SignclosedProductInfo> getSignclosedProductInfoList() {
-        return signclosedProductInfoList;
-    }
-
-    public void setSignclosedProductInfoList(List<SignclosedProductInfo> signclosedProductInfoList) {
-        this.signclosedProductInfoList = signclosedProductInfoList;
-    }
-
-    public String getDescribeHandleDesc() {
-        return describeHandleDesc;
-    }
-
-    public void setDescribeHandleDesc(String describeHandleDesc) {
-        this.describeHandleDesc = describeHandleDesc;
-    }
-
-    public Integer getSignclosedState() {
-        return signclosedState;
-    }
-
-    public void setSignclosedState(Integer signclosedState) {
-        this.signclosedState = signclosedState;
-    }
-
-    public String getSignclosedCustomerDesc() {
-        return signclosedCustomerDesc;
-    }
-
-    public void setSignclosedCustomerDesc(String signclosedCustomerDesc) {
-        this.signclosedCustomerDesc = signclosedCustomerDesc;
-    }
-
-    public Integer getIsBinding() {
-        return isBinding;
-    }
-
-    public void setIsBinding(Integer isBinding) {
-        this.isBinding = isBinding;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintSmallClassInfo.java

@@ -1,109 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 客诉小类表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class ComplaintSmallClassInfo implements Serializable {
-
-    private static final long serialVersionUID = 6528451065211178607L;
-    private Integer smallClassId;           //id
-    private Integer complaintId;           //所属类别
-    private String smallClassName;           //小类名称
-    private String smallClassProfile;           //小类简介
-    private Integer smallClassState;           //类型状态
-    private Integer smallQuestionNum;           //客诉问题数量
-    private Date smallClassCreateTime;           //创建时间
-    private Date smallClassUpdateTime;           //修改时间
-
-    private Integer smallClassNum; //数量
-
-    private List<ComplaintQuestionInfo> questionInfoList = new ArrayList<ComplaintQuestionInfo>();
-
-    public Integer getSmallClassId() {
-        return smallClassId;
-    }
-
-    public void setSmallClassId(Integer smallClassId) {
-        this.smallClassId = smallClassId;
-    }
-
-    public Integer getComplaintId() {
-        return complaintId;
-    }
-
-    public void setComplaintId(Integer complaintId) {
-        this.complaintId = complaintId;
-    }
-
-    public String getSmallClassName() {
-        return smallClassName;
-    }
-
-    public void setSmallClassName(String smallClassName) {
-        this.smallClassName = smallClassName;
-    }
-
-    public String getSmallClassProfile() {
-        return smallClassProfile;
-    }
-
-    public void setSmallClassProfile(String smallClassProfile) {
-        this.smallClassProfile = smallClassProfile;
-    }
-
-    public Integer getSmallClassState() {
-        return smallClassState;
-    }
-
-    public void setSmallClassState(Integer smallClassState) {
-        this.smallClassState = smallClassState;
-    }
-
-    public Integer getSmallQuestionNum() {
-        return smallQuestionNum;
-    }
-
-    public void setSmallQuestionNum(Integer smallQuestionNum) {
-        this.smallQuestionNum = smallQuestionNum;
-    }
-
-    public Date getSmallClassCreateTime() {
-        return smallClassCreateTime;
-    }
-
-    public void setSmallClassCreateTime(Date smallClassCreateTime) {
-        this.smallClassCreateTime = smallClassCreateTime;
-    }
-
-    public Date getSmallClassUpdateTime() {
-        return smallClassUpdateTime;
-    }
-
-    public void setSmallClassUpdateTime(Date smallClassUpdateTime) {
-        this.smallClassUpdateTime = smallClassUpdateTime;
-    }
-
-    public List<ComplaintQuestionInfo> getQuestionInfoList() {
-        return questionInfoList;
-    }
-
-    public void setQuestionInfoList(List<ComplaintQuestionInfo> questionInfoList) {
-        this.questionInfoList = questionInfoList;
-    }
-
-    public Integer getSmallClassNum() {
-        return smallClassNum;
-    }
-
-    public void setSmallClassNum(Integer smallClassNum) {
-        this.smallClassNum = smallClassNum;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintTypeInfo.java

@@ -1,5 +1,7 @@
 package com.iamberry.rst.core.cm;
 
+import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerInfo.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -37,7 +38,7 @@ public class CustomerInfo  implements Serializable {
     private String customerTel;
     // 微信昵称
     private String customerWechatName;
-    //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
+    //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货     客诉修改 --> 不维护此字段
     private Integer customerIsSolve;
     //  是否需要回访  1:不需要回访  2:需要回复 
     private String customerIsVisit;
@@ -128,8 +129,11 @@ public class CustomerInfo  implements Serializable {
 
     private Visit visit = new Visit();  //回访类
 
+    @Deprecated
     private CustomerCommon customerCommon = new CustomerCommon(); //处理结果综合  公共类
 
+    private CmRelation cmRelation = new CmRelation();
+
     private String transactionNumber;     //外部交易号，订单id
     private Integer isAddOrder;      //1:原来就有订单  2：需要新添加订单
     //QC质检集合
@@ -148,6 +152,19 @@ public class CustomerInfo  implements Serializable {
     private Integer customerLastId;//上次客诉id
     private Integer customerInitialId;//初始客诉id
 
+    private Integer procTypeId; //处理方式类型id
+    private Integer procMethodId; //处理方式id
+    private String procTypeName; //处理方式类型名称
+    private String procMethodName; //处理方式名称
+    private Integer procMethodIsBack; //处理方式名称1:需要寄回 2:不需要寄回
+    private Integer procMethodIsSend; //处理方式名称1:需要寄出 2:不需要寄出
+
+
+    private String customerProvinceId;    //省
+    private String customerCityId;    //市
+    private String customerDistrictId;    //区
+    private List<PostageInfo> postageInfoList;    //邮费集合
+    private List<SendbackInfo> sendbackInfoList;    //寄回信息集合
 
     public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
         this.complaintDetectList = complaintDetectList;
@@ -428,7 +445,6 @@ public class CustomerInfo  implements Serializable {
     public Integer getCustomerIsSolve() {
         return customerIsSolve;
     }
-
     public void setCustomerIsSolve(Integer customerIsSolve) {
         this.customerIsSolve = customerIsSolve;
     }
@@ -497,10 +513,20 @@ public class CustomerInfo  implements Serializable {
         this.visit = visit;
     }
 
+    /**
+     * 请使用 getCmRelation
+     * @param
+     */
+    @Deprecated
     public CustomerCommon getCustomerCommon() {
         return customerCommon;
     }
 
+    /**
+     * 请使用 setCmRelation
+     * @param customerCommon
+     */
+    @Deprecated
     public void setCustomerCommon(CustomerCommon customerCommon) {
         this.customerCommon = customerCommon;
     }
@@ -705,6 +731,15 @@ public class CustomerInfo  implements Serializable {
 //        this.isQuality = isQuality;
 //    }
 
+
+    public CmRelation getCmRelation() {
+        return cmRelation;
+    }
+
+    public void setCmRelation(CmRelation cmRelation) {
+        this.cmRelation = cmRelation;
+    }
+
     public Integer getFactoryId() {
         return factoryId;
     }
@@ -712,4 +747,92 @@ public class CustomerInfo  implements Serializable {
     public void setFactoryId(Integer factoryId) {
         this.factoryId = factoryId;
     }
+
+    public Integer getProcTypeId() {
+        return procTypeId;
+    }
+
+    public void setProcTypeId(Integer procTypeId) {
+        this.procTypeId = procTypeId;
+    }
+
+    public Integer getProcMethodId() {
+        return procMethodId;
+    }
+
+    public void setProcMethodId(Integer procMethodId) {
+        this.procMethodId = procMethodId;
+    }
+
+    public String getProcTypeName() {
+        return procTypeName;
+    }
+
+    public void setProcTypeName(String procTypeName) {
+        this.procTypeName = procTypeName;
+    }
+
+    public String getProcMethodName() {
+        return procMethodName;
+    }
+
+    public void setProcMethodName(String procMethodName) {
+        this.procMethodName = procMethodName;
+    }
+
+    public Integer getProcMethodIsBack() {
+        return procMethodIsBack;
+    }
+
+    public void setProcMethodIsBack(Integer procMethodIsBack) {
+        this.procMethodIsBack = procMethodIsBack;
+    }
+
+    public Integer getProcMethodIsSend() {
+        return procMethodIsSend;
+    }
+
+    public void setProcMethodIsSend(Integer procMethodIsSend) {
+        this.procMethodIsSend = procMethodIsSend;
+    }
+
+    public String getCustomerProvinceId() {
+        return customerProvinceId;
+    }
+
+    public void setCustomerProvinceId(String customerProvinceId) {
+        this.customerProvinceId = customerProvinceId;
+    }
+
+    public String getCustomerCityId() {
+        return customerCityId;
+    }
+
+    public void setCustomerCityId(String customerCityId) {
+        this.customerCityId = customerCityId;
+    }
+
+    public String getCustomerDistrictId() {
+        return customerDistrictId;
+    }
+
+    public void setCustomerDistrictId(String customerDistrictId) {
+        this.customerDistrictId = customerDistrictId;
+    }
+
+    public List<PostageInfo> getPostageInfoList() {
+        return postageInfoList;
+    }
+
+    public void setPostageInfoList(List<PostageInfo> postageInfoList) {
+        this.postageInfoList = postageInfoList;
+    }
+
+    public List<SendbackInfo> getSendbackInfoList() {
+        return sendbackInfoList;
+    }
+
+    public void setSendbackInfoList(List<SendbackInfo> sendbackInfoList) {
+        this.sendbackInfoList = sendbackInfoList;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerStatisticalInfo.java

@@ -40,6 +40,11 @@ public class CustomerStatisticalInfo implements Serializable {
     private String customerOutDamaged;//是否开箱损
     private String customerSecondaryCustomer;//是否二次客诉
     private String adminName;//根据客服姓名
+    private Integer relationFactoryCosts;//工厂维修报价
+    private Integer relationCustomerCosts;//客户报价
+    private Integer relationId;//处理主键
+    private String procMethodName;//处理详细方式
+    private String postageString;//邮费信息
 
     public Integer getCustomerId() {
         return customerId;
@@ -256,4 +261,44 @@ public class CustomerStatisticalInfo implements Serializable {
     public void setAdminName(String adminName) {
         this.adminName = adminName;
     }
+
+    public Integer getRelationFactoryCosts() {
+        return relationFactoryCosts;
+    }
+
+    public void setRelationFactoryCosts(Integer relationFactoryCosts) {
+        this.relationFactoryCosts = relationFactoryCosts;
+    }
+
+    public Integer getRelationCustomerCosts() {
+        return relationCustomerCosts;
+    }
+
+    public void setRelationCustomerCosts(Integer relationCustomerCosts) {
+        this.relationCustomerCosts = relationCustomerCosts;
+    }
+
+    public Integer getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Integer relationId) {
+        this.relationId = relationId;
+    }
+
+    public String getProcMethodName() {
+        return procMethodName;
+    }
+
+    public void setProcMethodName(String procMethodName) {
+        this.procMethodName = procMethodName;
+    }
+
+    public String getPostageString() {
+        return postageString;
+    }
+
+    public void setPostageString(String postageString) {
+        this.postageString = postageString;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/DetectionBasis.java

@@ -1,110 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-
-/**
- * Created by Administrator on 2018/8/8.
- */
-public class DetectionBasis implements Serializable{
-
-    private static final long serialVersionUID = -2454116797606102140L;
-    private Integer basisId;//id
-    private String basisState;//状态1正在使用2停止使用
-    private String basisPhenomenon;//工厂检测现象
-    private String basisClassification;//故障分类
-    private String basisFailureCause;//故障原因
-    private String basisResults;//判定结果
-    private String basisPoint;//故障指向
-    private String basisNalysis;//原因分析
-    private String basisContent;//维修内容
-    private String basisCreate_time;//创建时间
-    private String basisUpdateTime;//修改时间
-
-    public Integer getBasisId() {
-        return basisId;
-    }
-
-    public void setBasisId(Integer basisId) {
-        this.basisId = basisId;
-    }
-
-    public String getBasisState() {
-        return basisState;
-    }
-
-    public void setBasisState(String basisState) {
-        this.basisState = basisState;
-    }
-
-    public String getBasisPhenomenon() {
-        return basisPhenomenon;
-    }
-
-    public void setBasisPhenomenon(String basisPhenomenon) {
-        this.basisPhenomenon = basisPhenomenon;
-    }
-
-    public String getBasisClassification() {
-        return basisClassification;
-    }
-
-    public void setBasisClassification(String basisClassification) {
-        this.basisClassification = basisClassification;
-    }
-
-    public String getBasisFailureCause() {
-        return basisFailureCause;
-    }
-
-    public void setBasisFailureCause(String basisFailureCause) {
-        this.basisFailureCause = basisFailureCause;
-    }
-
-    public String getBasisResults() {
-        return basisResults;
-    }
-
-    public void setBasisResults(String basisResults) {
-        this.basisResults = basisResults;
-    }
-
-    public String getBasisPoint() {
-        return basisPoint;
-    }
-
-    public void setBasisPoint(String basisPoint) {
-        this.basisPoint = basisPoint;
-    }
-
-    public String getBasisNalysis() {
-        return basisNalysis;
-    }
-
-    public void setBasisNalysis(String basisNalysis) {
-        this.basisNalysis = basisNalysis;
-    }
-
-    public String getBasisContent() {
-        return basisContent;
-    }
-
-    public void setBasisContent(String basisContent) {
-        this.basisContent = basisContent;
-    }
-
-    public String getBasisCreate_time() {
-        return basisCreate_time;
-    }
-
-    public void setBasisCreate_time(String basisCreate_time) {
-        this.basisCreate_time = basisCreate_time;
-    }
-
-    public String getBasisUpdateTime() {
-        return basisUpdateTime;
-    }
-
-    public void setBasisUpdateTime(String basisUpdateTime) {
-        this.basisUpdateTime = basisUpdateTime;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/FactoryInfo.java

@@ -1,48 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 工厂信息表
- * Created by Administrator on 2018/7/11.
- */
-public class FactoryInfo implements Serializable{
-    private static final long serialVersionUID = -823097103866425176L;
-    private Integer factoryId;//主键
-    private String factoryName;//工厂名称
-    private String factoryDesc;//工厂备注
-    private Date factoryCreateDate;//创建时间
-
-    public Integer getFactoryId() {
-        return factoryId;
-    }
-
-    public void setFactoryId(Integer factoryId) {
-        this.factoryId = factoryId;
-    }
-
-    public String getFactoryName() {
-        return factoryName;
-    }
-
-    public void setFactoryName(String factoryName) {
-        this.factoryName = factoryName;
-    }
-
-    public String getFactoryDesc() {
-        return factoryDesc;
-    }
-
-    public void setFactoryDesc(String factoryDesc) {
-        this.factoryDesc = factoryDesc;
-    }
-
-    public Date getFactoryCreateDate() {
-        return factoryCreateDate;
-    }
-
-    public void setFactoryCreateDate(Date factoryCreateDate) {
-        this.factoryCreateDate = factoryCreateDate;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/InformationInfo.java

@@ -0,0 +1,91 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+
+/**
+ * Created by Administrator on 2019/3/8.
+ */
+public class InformationInfo implements Serializable{
+    private static final long serialVersionUID = 2422002050608696730L;
+    private Integer feeId;//
+    private Integer relationId;//处理id
+    private Integer feeCharges;//收费金额
+    private Integer feeOriginally;//收费原由1：以旧换新   2：机器维修 3：机器运费
+    private Integer feePayChannel;//支付渠道1：微信   2：支付宝 3：银行卡
+    private Integer feePayAccount;//支付账号
+    private Integer feeStatus;//状态1代付款，2已收款
+    private Integer feeDesc;//
+    private Integer feeCreateTime;
+
+    public Integer getFeeId() {
+        return feeId;
+    }
+
+    public void setFeeId(Integer feeId) {
+        this.feeId = feeId;
+    }
+
+    public Integer getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Integer relationId) {
+        this.relationId = relationId;
+    }
+
+    public Integer getFeeCharges() {
+        return feeCharges;
+    }
+
+    public void setFeeCharges(Integer feeCharges) {
+        this.feeCharges = feeCharges;
+    }
+
+    public Integer getFeeOriginally() {
+        return feeOriginally;
+    }
+
+    public void setFeeOriginally(Integer feeOriginally) {
+        this.feeOriginally = feeOriginally;
+    }
+
+    public Integer getFeePayChannel() {
+        return feePayChannel;
+    }
+
+    public void setFeePayChannel(Integer feePayChannel) {
+        this.feePayChannel = feePayChannel;
+    }
+
+    public Integer getFeePayAccount() {
+        return feePayAccount;
+    }
+
+    public void setFeePayAccount(Integer feePayAccount) {
+        this.feePayAccount = feePayAccount;
+    }
+
+    public Integer getFeeStatus() {
+        return feeStatus;
+    }
+
+    public void setFeeStatus(Integer feeStatus) {
+        this.feeStatus = feeStatus;
+    }
+
+    public Integer getFeeDesc() {
+        return feeDesc;
+    }
+
+    public void setFeeDesc(Integer feeDesc) {
+        this.feeDesc = feeDesc;
+    }
+
+    public Integer getFeeCreateTime() {
+        return feeCreateTime;
+    }
+
+    public void setFeeCreateTime(Integer feeCreateTime) {
+        this.feeCreateTime = feeCreateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/InventoryInfo.java

@@ -1,84 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 工厂-库存表
- * Created by Administrator on 2018/8/14.
- */
-public class InventoryInfo implements Serializable{
-    private static final long serialVersionUID = 4067885659182190574L;
-    private Integer inventoryId;
-    private String inventoryProductName;//产品名称
-    private String inventoryProductBar;//产品sku
-    private Integer inventoryRemainingNum;//库存剩余数量
-    private Integer inventoryState;//1.正在使用 2.暂停使用
-    private String inventoryDesc;//备注
-    private Date inventoryCreateTime;//创建时间
-    private Date inventoryUpdateTime;//修改时间
-
-    public Integer getInventoryId() {
-        return inventoryId;
-    }
-
-    public void setInventoryId(Integer inventoryId) {
-        this.inventoryId = inventoryId;
-    }
-
-    public String getInventoryProductName() {
-        return inventoryProductName;
-    }
-
-    public void setInventoryProductName(String inventoryProductName) {
-        this.inventoryProductName = inventoryProductName;
-    }
-
-    public String getInventoryProductBar() {
-        return inventoryProductBar;
-    }
-
-    public void setInventoryProductBar(String inventoryProductBar) {
-        this.inventoryProductBar = inventoryProductBar;
-    }
-
-    public Integer getInventoryRemainingNum() {
-        return inventoryRemainingNum;
-    }
-
-    public void setInventoryRemainingNum(Integer inventoryRemainingNum) {
-        this.inventoryRemainingNum = inventoryRemainingNum;
-    }
-
-    public Integer getInventoryState() {
-        return inventoryState;
-    }
-
-    public void setInventoryState(Integer inventoryState) {
-        this.inventoryState = inventoryState;
-    }
-
-    public String getInventoryDesc() {
-        return inventoryDesc;
-    }
-
-    public void setInventoryDesc(String inventoryDesc) {
-        this.inventoryDesc = inventoryDesc;
-    }
-
-    public Date getInventoryCreateTime() {
-        return inventoryCreateTime;
-    }
-
-    public void setInventoryCreateTime(Date inventoryCreateTime) {
-        this.inventoryCreateTime = inventoryCreateTime;
-    }
-
-    public Date getInventoryUpdateTime() {
-        return inventoryUpdateTime;
-    }
-
-    public void setInventoryUpdateTime(Date inventoryUpdateTime) {
-        this.inventoryUpdateTime = inventoryUpdateTime;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/InventoryLog.java

@@ -1,112 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 工厂-库存日志表
- * Created by Administrator on 2018/8/14.
- */
-public class InventoryLog implements Serializable {
-    private static final long serialVersionUID = 4726786119194494939L;
-    private Integer logId;//
-    private String logProductName;//产品名称
-    private String logProductBar;//产品sku
-    private Integer logWarehouseId;//仓库id
-    private Integer logRemainingNum;//变动数量
-    private Integer logType;//类型1.采购 2.发货 3.次品
-    private Integer logOperationType;//操作类型 增加/减少
-    private String logDesc;//备注
-    private Date logCreateTime;//创建时间
-    private Date logUpdateTime;//修改时间
-
-    private String logWarehouseName;//仓库名称
-
-    public Integer getLogId() {
-        return logId;
-    }
-
-    public void setLogId(Integer logId) {
-        this.logId = logId;
-    }
-
-    public String getLogProductName() {
-        return logProductName;
-    }
-
-    public void setLogProductName(String logProductName) {
-        this.logProductName = logProductName;
-    }
-
-    public String getLogProductBar() {
-        return logProductBar;
-    }
-
-    public void setLogProductBar(String logProductBar) {
-        this.logProductBar = logProductBar;
-    }
-
-    public Integer getLogWarehouseId() {
-        return logWarehouseId;
-    }
-
-    public void setLogWarehouseId(Integer logWarehouseId) {
-        this.logWarehouseId = logWarehouseId;
-    }
-
-    public Integer getLogRemainingNum() {
-        return logRemainingNum;
-    }
-
-    public void setLogRemainingNum(Integer logRemainingNum) {
-        this.logRemainingNum = logRemainingNum;
-    }
-
-    public Integer getLogType() {
-        return logType;
-    }
-
-    public void setLogType(Integer logType) {
-        this.logType = logType;
-    }
-
-    public Integer getLogOperationType() {
-        return logOperationType;
-    }
-
-    public void setLogOperationType(Integer logOperationType) {
-        this.logOperationType = logOperationType;
-    }
-
-    public String getLogDesc() {
-        return logDesc;
-    }
-
-    public void setLogDesc(String logDesc) {
-        this.logDesc = logDesc;
-    }
-
-    public Date getLogCreateTime() {
-        return logCreateTime;
-    }
-
-    public void setLogCreateTime(Date logCreateTime) {
-        this.logCreateTime = logCreateTime;
-    }
-
-    public Date getLogUpdateTime() {
-        return logUpdateTime;
-    }
-
-    public void setLogUpdateTime(Date logUpdateTime) {
-        this.logUpdateTime = logUpdateTime;
-    }
-
-    public String getLogWarehouseName() {
-        return logWarehouseName;
-    }
-
-    public void setLogWarehouseName(String logWarehouseName) {
-        this.logWarehouseName = logWarehouseName;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/NoreasonBack.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Postage.java

@@ -29,7 +29,7 @@ public class Postage implements Serializable {
     //订单来源 销售渠道id
     private Integer postageOrderSource;
     //售后处理方式 3：换新  4：维修  5：补发  6：退货  7：无理由退货
-    private Integer postageTreatmentMethod;
+//    private Integer postageTreatmentMethod;
     //efast订单号
     private String salesOrderId;
     //客户姓名
@@ -119,14 +119,6 @@ public class Postage implements Serializable {
         this.postageOrderSource = postageOrderSource;
     }
 
-    public Integer getPostageTreatmentMethod() {
-        return postageTreatmentMethod;
-    }
-
-    public void setPostageTreatmentMethod(Integer postageTreatmentMethod) {
-        this.postageTreatmentMethod = postageTreatmentMethod;
-    }
-
     public String getSalesOrderId() {
         return salesOrderId;
     }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/PostageInfo.java

@@ -0,0 +1,92 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2019/1/19.
+ */
+public class PostageInfo implements Serializable{
+    private static final long serialVersionUID = -2801220465255192898L;
+    private Integer postageId;//
+    private Integer relationId;//处理方式id
+    private Integer postageStatus;//状态
+    private Integer postageAmount;//邮费金额
+    private String postageAlipay;//支付宝账户
+    private String postageAlipayName;//支付宝姓名
+    private String postageDesc;//备注
+    private Date postageCreateTime;//创建时间
+    private Date postageUpdateTime;//修改时间
+
+    public Integer getPostageId() {
+        return postageId;
+    }
+
+    public void setPostageId(Integer postageId) {
+        this.postageId = postageId;
+    }
+
+    public Integer getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Integer relationId) {
+        this.relationId = relationId;
+    }
+
+    public Integer getPostageStatus() {
+        return postageStatus;
+    }
+
+    public void setPostageStatus(Integer postageStatus) {
+        this.postageStatus = postageStatus;
+    }
+
+    public Integer getPostageAmount() {
+        return postageAmount;
+    }
+
+    public void setPostageAmount(Integer postageAmount) {
+        this.postageAmount = postageAmount;
+    }
+
+    public String getPostageAlipay() {
+        return postageAlipay;
+    }
+
+    public void setPostageAlipay(String postageAlipay) {
+        this.postageAlipay = postageAlipay;
+    }
+
+    public String getPostageAlipayName() {
+        return postageAlipayName;
+    }
+
+    public void setPostageAlipayName(String postageAlipayName) {
+        this.postageAlipayName = postageAlipayName;
+    }
+
+    public String getPostageDesc() {
+        return postageDesc;
+    }
+
+    public void setPostageDesc(String postageDesc) {
+        this.postageDesc = postageDesc;
+    }
+
+    public Date getPostageCreateTime() {
+        return postageCreateTime;
+    }
+
+    public void setPostageCreateTime(Date postageCreateTime) {
+        this.postageCreateTime = postageCreateTime;
+    }
+
+    public Date getPostageUpdateTime() {
+        return postageUpdateTime;
+    }
+
+    public void setPostageUpdateTime(Date postageUpdateTime) {
+        this.postageUpdateTime = postageUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ProcMethod.java

@@ -0,0 +1,112 @@
+package com.iamberry.rst.core.cm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  处理方式类
+ * @author Administrator
+ * @Date 2018-12-29
+ */
+public class ProcMethod  implements  Serializable{
+    private static final long serialVersionUID = 5459213798616020261L;
+    //处理方式id
+    private Integer procMethodId;
+    //处理方式类型id
+    private Integer procTypeId;
+    //处理方式名称
+    private String procMethodName;
+    //处理方式状态 1：使用中 2：未使用
+    private Integer procMethodStatus;
+    //处理方式描述
+    private String procMethodDesc;
+    //是否需要寄回 1:需要寄回 2:不需要寄回
+    private Integer procMethodIsBack;
+    //是否需要寄出 1:需要寄出 2:不需要寄出
+    private Integer procMethodIsSend;
+    //处理方式创建时间
+    private Date procMethodCreateTime;
+    //处理方式修改时间'
+    private Date procMethodUpdateTime;
+
+    private String procTypeName;
+
+    public Integer getProcMethodId(){
+        return procMethodId;
+    }
+
+    public void setProcMethodId(Integer  procMethodId){
+        this.procMethodId=procMethodId;
+    }
+
+    public Integer getProcTypeId(){
+        return procTypeId;
+    }
+
+    public void setProcTypeId(Integer  procTypeId){
+        this.procTypeId=procTypeId;
+    }
+
+    public String getProcMethodName(){
+        return procMethodName;
+    }
+
+    public void setProcMethodName(String  procMethodName){
+        this.procMethodName=procMethodName;
+    }
+
+    public Integer getProcMethodStatus(){
+        return procMethodStatus;
+    }
+
+    public void setProcMethodStatus(Integer  procMethodStatus){
+        this.procMethodStatus=procMethodStatus;
+    }
+
+    public String getProcMethodDesc(){
+        return procMethodDesc;
+    }
+
+    public void setProcMethodDesc(String  procMethodDesc){
+        this.procMethodDesc=procMethodDesc;
+    }
+
+    public Integer getProcMethodIsBack(){
+        return procMethodIsBack;
+    }
+
+    public void setProcMethodIsBack(Integer  procMethodIsBack){
+        this.procMethodIsBack=procMethodIsBack;
+    }
+
+    public Integer getProcMethodIsSend(){
+        return procMethodIsSend;
+    }
+
+    public void setProcMethodIsSend(Integer  procMethodIsSend){
+        this.procMethodIsSend=procMethodIsSend;
+    }
+
+    public Date getProcMethodCreateTime(){
+        return procMethodCreateTime;
+    }
+
+    public void setProcMethodCreateTime(Date  procMethodCreateTime){
+        this.procMethodCreateTime=procMethodCreateTime;
+    }
+
+    public Date getProcMethodUpdateTime(){
+        return procMethodUpdateTime;
+    }
+
+    public void setProcMethodUpdateTime(Date  procMethodUpdateTime){
+        this.procMethodUpdateTime=procMethodUpdateTime;
+    }
+
+    public String getProcTypeName() {
+        return procTypeName;
+    }
+
+    public void setProcTypeName(String procTypeName) {
+        this.procTypeName = procTypeName;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ProcType.java

@@ -0,0 +1,82 @@
+package com.iamberry.rst.core.cm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  处理方式类型类
+ * @author
+ * @Date 2018-12-28
+ */
+public class ProcType  implements  Serializable{
+    private static final long serialVersionUID = -3615790458273614264L;
+    //处理方式类型主键
+    private Integer procTypeId;
+    //处理方式类型名称
+    private String procTypeName;
+    //是否为售前  1:是  2:不是
+    private Integer procTypeSaleStatus;
+    //处理方式状态 1：使用中 2：未使用
+    private Integer procTypeStatus;
+    //处理方式描述
+    private String procTypeDesc;
+    //处理方式创建时间
+    private Date procTypeCreateTime;
+    //处理方式修改时间'
+    private Date procTypeUpdateTime;
+
+    public Integer getProcTypeId(){
+        return procTypeId;
+    }
+
+    public void setProcTypeId(Integer  procTypeId){
+        this.procTypeId=procTypeId;
+    }
+
+    public String getProcTypeName(){
+        return procTypeName;
+    }
+
+    public void setProcTypeName(String  procTypeName){
+        this.procTypeName=procTypeName;
+    }
+
+    public Integer getProcTypeStatus(){
+        return procTypeStatus;
+    }
+
+    public void setProcTypeStatus(Integer  procTypeStatus){
+        this.procTypeStatus=procTypeStatus;
+    }
+
+    public String getProcTypeDesc(){
+        return procTypeDesc;
+    }
+
+    public void setProcTypeDesc(String  procTypeDesc){
+        this.procTypeDesc=procTypeDesc;
+    }
+
+    public Date getProcTypeCreateTime(){
+        return procTypeCreateTime;
+    }
+
+    public void setProcTypeCreateTime(Date  procTypeCreateTime){
+        this.procTypeCreateTime=procTypeCreateTime;
+    }
+
+    public Date getProcTypeUpdateTime(){
+        return procTypeUpdateTime;
+    }
+
+    public void setProcTypeUpdateTime(Date  procTypeUpdateTime){
+        this.procTypeUpdateTime=procTypeUpdateTime;
+    }
+
+    public Integer getProcTypeSaleStatus() {
+        return procTypeSaleStatus;
+    }
+
+    public void setProcTypeSaleStatus(Integer procTypeSaleStatus) {
+        this.procTypeSaleStatus = procTypeSaleStatus;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/RelationOrder.java

@@ -27,10 +27,12 @@ public class RelationOrder  implements  Serializable{
         this.relationOrderId=relationOrderId;
     }
 
+    @Deprecated
     public Integer getRelationType(){
         return relationType;
     }
 
+    @Deprecated
     public void setRelationType(Integer  relationType){
         this.relationType=relationType;
     }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Renewed.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Repair.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -57,7 +57,8 @@ public class SalesOrder implements Serializable {
     private Integer salesCompanyId;         //销售公司id
     private Integer salesType;              //订单类型  1：购买2：租赁
     private String salesDealCode;           //交易号
-    private Integer salesOrderStatus;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发
+    private Integer salesOrderStatus;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发 -- TODO: 2019/1/4 改为 ProcTypeId
+    private String salesOrderStatusProcTypeName;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发 -- TODO: 2019/1/4 改为 ProcTypeId
     private Integer salesShippingStatus;    //发货状态 0(未发货)1(已发货,即已扫描出库)3(备货中)4（收货） 11(已通知配货，后加)
     private Integer salesDeliver;            //出库状态  1：未出库   2：已出库
     private Date salesDeliverTime;            //出库时间
@@ -77,6 +78,7 @@ public class SalesOrder implements Serializable {
     private String storeEfast;               //Efast 的店铺id
 
     private Integer orderDateType;   //时间类型  1：创建时间   2：打单时间  3：出库时间
+    private Integer isSelectCustomer;   //是否查询客诉订单 1是 2否
 
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
@@ -108,6 +110,7 @@ public class SalesOrder implements Serializable {
     private Integer salesAdminId;           //录入人id
     private String salesAdminName;           //录入人名称
 
+    private Integer isSalesCustomerId;           //是否绑定客诉（是否为售后订单）  1：不是  2：是
     private Integer salesCustomerId;           //客诉id
     //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
     private Integer customerIsSolve;
@@ -119,8 +122,26 @@ public class SalesOrder implements Serializable {
 
     private Integer isCustmerAddOrder;  //是否是客诉添加的订单  1：是   2：不是  只用于查询，不用于添加修改，为2查询所有不是客诉的订单
 
-    public Integer getStartOrderNO() {
-        return startOrderNO;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date salesDistributionTime;//通知配货时间
+
+    private String procTypeName;//
+    private String procTypeId;//
+
+    //处理方式id
+    private Integer procMethodId;
+    //处理方式名称
+    private String procMethodName;
+
+   private Integer salesWarehouseId;//所属仓库id
+
+   private Integer isDevelop;//产品项是否包含有水机 1是 2否
+
+    private Integer salesReturnStatus;//退货状态 1未退货、2已退货、3部分退货
+    private Integer itemReturnNum;   //退货数量
+ public Integer getStartOrderNO() {
+       return startOrderNO;
     }
 
     public void setStartOrderNO(Integer startOrderNO) {
@@ -694,4 +715,99 @@ public class SalesOrder implements Serializable {
     public void setIsCustmerAddOrder(Integer isCustmerAddOrder) {
         this.isCustmerAddOrder = isCustmerAddOrder;
     }
+
+    public Date getSalesDistributionTime() {
+        return salesDistributionTime;
+    }
+
+    public void setSalesDistributionTime(Date salesDistributionTime) {
+        this.salesDistributionTime = salesDistributionTime;
+    }
+
+    public Integer getIsSelectCustomer() {
+        return isSelectCustomer;
+    }
+
+    public void setIsSelectCustomer(Integer isSelectCustomer) {
+        this.isSelectCustomer = isSelectCustomer;
+    }
+
+    public String getProcTypeName() {
+        return procTypeName;
+    }
+
+    public void setProcTypeName(String procTypeName) {
+        this.procTypeName = procTypeName;
+    }
+  public Integer getSalesWarehouseId() {
+        return salesWarehouseId;
+    }
+
+    public void setSalesWarehouseId(Integer salesWarehouseId) {
+        this.salesWarehouseId = salesWarehouseId;
+    }
+
+    public String getProcMethodName() {
+        return procMethodName;
+    }
+
+    public void setProcMethodName(String procMethodName) {
+        this.procMethodName = procMethodName;
+    }
+
+    public String getSalesOrderStatusProcTypeName() {
+        return salesOrderStatusProcTypeName;
+    }
+
+    public void setSalesOrderStatusProcTypeName(String salesOrderStatusProcTypeName) {
+        this.salesOrderStatusProcTypeName = salesOrderStatusProcTypeName;
+    }
+
+    public String getProcTypeId() {
+        return procTypeId;
+    }
+
+    public void setProcTypeId(String procTypeId) {
+        this.procTypeId = procTypeId;
+    }
+
+    public Integer getProcMethodId() {
+        return procMethodId;
+    }
+
+    public void setProcMethodId(Integer procMethodId) {
+        this.procMethodId = procMethodId;
+    }
+
+    public Integer getIsSalesCustomerId() {
+        return isSalesCustomerId;
+    }
+
+    public void setIsSalesCustomerId(Integer isSalesCustomerId) {
+        this.isSalesCustomerId = isSalesCustomerId;
+    }
+
+    public Integer getIsDevelop() {
+        return isDevelop;
+    }
+
+    public void setIsDevelop(Integer isDevelop) {
+        this.isDevelop = isDevelop;
+    }
+
+    public Integer getSalesReturnStatus() {
+        return salesReturnStatus;
+    }
+
+    public void setSalesReturnStatus(Integer salesReturnStatus) {
+        this.salesReturnStatus = salesReturnStatus;
+    }
+
+    public Integer getItemReturnNum() {
+        return itemReturnNum;
+    }
+
+    public void setItemReturnNum(Integer itemReturnNum) {
+        this.itemReturnNum = itemReturnNum;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrderItem.java

@@ -32,6 +32,9 @@ public class SalesOrderItem implements Serializable {
 
     private Integer colorIsMachine; //是否是水机 1:水机 2;其它产品
 
+    private String salesDealCode;   //交易号
+    private Integer itemReturnNum;   //退货数量
+
     public Integer getItemIsSource() {
         return itemIsSource;
     }
@@ -175,4 +178,20 @@ public class SalesOrderItem implements Serializable {
     public void setColorIsMachine(Integer colorIsMachine) {
         this.colorIsMachine = colorIsMachine;
     }
+
+    public String getSalesDealCode() {
+        return salesDealCode;
+    }
+
+    public void setSalesDealCode(String salesDealCode) {
+        this.salesDealCode = salesDealCode;
+    }
+
+    public Integer getItemReturnNum() {
+        return itemReturnNum;
+    }
+
+    public void setItemReturnNum(Integer itemReturnNum) {
+        this.itemReturnNum = itemReturnNum;
+    }
 }