客诉修改

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-wechat-interface/.classpath

@@ -1,27 +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.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.7">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

watero-wechat-interface/.project

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>watero-wechat-interface</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>

watero-wechat-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-wechat-interface/.settings/org.eclipse.jdt.core.prefs

@@ -1,13 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7

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

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

watero-wechat-interface/.settings/org.eclipse.wst.common.component

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="watero-wechat-interface">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-    </wb-module>
-</project-modules>

watero-wechat-interface/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.7"/>
-</faceted-project>

watero-wechat-interface/.settings/org.eclipse.wst.validation.prefs

@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1

watero-wechat-interface/pom.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.iamberry</groupId>
-    <artifactId>iamberry-parent</artifactId>
-    <version>1.0.0</version>
-  </parent>
-  
-  <artifactId>watero-wechat-interface</artifactId>
-  
-  <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-wechat-interface/src/main/java/com/iamberry/wechat/face/admin/AdminAdministratorService.java

@@ -1,80 +0,0 @@
-package com.iamberry.wechat.face.admin;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.admin.AdminChildInfo;
-import com.iamberry.wechat.core.entity.admin.AdminInfo;
-
-public interface AdminAdministratorService {
-	/**
-	 * 新增二級管理員
-	 * @param adminchildinfo
-	 * @throws Exception
-	 */
-	public void insertadmin(AdminChildInfo adminchildinfo) throws Exception;
-	
-	/**
-	 * 根據用戶名查詢是否有重複用戶
-	 * @param adminLoginName
-	 * @return
-	 * @throws Exception
-	 */
-	public AdminChildInfo selectAdminChildInfoByName(String adminLoginName) throws Exception;
-	
-	/**
-	 * 查詢所有二級管理員
-	 * @return
-	 * @throws Exception
-	 */
-	public List<AdminChildInfo> selectAdminChildInfoByList(Integer pageNO, Integer pageSize) throws Exception;
-	
-	/**
-	 * 模糊查詢二級管理員
-	 * @return
-	 * @throws Exception
-	 */
-	public List<AdminChildInfo> selectAdminChildInfoByNameList(String adminLoginName,Integer pageNO, Integer pageSize) throws Exception;
-	
-	/**
-	 * 删除二级管理员
-	 * @throws Exception
-	 */
-	public int deleteAdminChildInfoById(String adminid) throws Exception;
-	
-	/**
-	 * 根据id查找二级管理员
-	 * @throws Exception
-	 */
-	public AdminChildInfo selectAdminChildInfoById(String adminid) throws Exception;
-	
-	/**
-	 * 根据id修改二级管理员
-	 * @throws Exception
-	 */
-	public Integer updateAdminChildInfoById(AdminChildInfo adminchildinfo) throws Exception;
-	
-	/**
-	 * 根据id修改二级管理员权限
-	 * @throws Exception
-	 */
-	public Integer updatePermissionsById(String adminid,String adminStatus) throws Exception;
-
-	/**
-	 * 获取二级管理员的总数量
-	 */
-	public int selectAdminChildInfoByCount(int pageSize);
-	
-	/**
-	 * 模糊查询二级管理员的数量
-	 */
-	public int selectAdminChildInfoByNameCount(String adminLoginName,int pageSize);
-	/**
-	 * 修改二级管理员密码
-	 */
-	public void updateAdminByPwd(AdminChildInfo adminchildinfo);
-	
-	/**
-	 * 修改超级管理员密码
-	 */
-	public void updateSuperAdminByPwd(AdminInfo admininfo);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/admin/AdminLogService.java

@@ -1,12 +0,0 @@
-package com.iamberry.wechat.face.admin;
-
-import com.iamberry.wechat.core.entity.admin.AdminLog;
-
-/**
- * description ： 后台日志记录功能，service层 
- * @author 何秀刚
- * create date：2016年2月18日
- */
-public interface AdminLogService {
-	public void insertOne(AdminLog log);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/admin/AdminLoginService.java

@@ -1,33 +0,0 @@
-package com.iamberry.wechat.face.admin;
-
-import java.util.List;
-
-import com.iamberry.app.tool.des.MD5;
-import com.iamberry.wechat.core.entity.admin.AdminChildPermissionErmissions;
-import com.iamberry.wechat.core.entity.admin.AdminChildPermissions;
-import com.iamberry.wechat.core.entity.admin.AdminLoginDTO;
-
-public interface AdminLoginService {
-
-	/**
-	 * 根据用户名、密码查询用户信息
-	 * @param dto
-	 * @return
-	 */
-	public Object selectAdminInfoByNameAndPwd(AdminLoginDTO dto) throws Exception;
-
-	/**
-	 * 根据二级管理ID，获取此二级管理员所有的权限
-	 * @param id
-	 * @return
-	 */
-	public List<AdminChildPermissionErmissions> selectAdminChildHavePermissionById(Integer id);
-
-	/**
-	 * 获取管理员的菜单信息
-	 * @param id
-	 * @param flag 如果为超级管理员使用true，反之false
-	 * @return
-	 */
-	public List<AdminChildPermissions> selectMenusById(Integer id, boolean flag);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/admin/AdminPermissionsService.java

@@ -1,30 +0,0 @@
-package com.iamberry.wechat.face.admin;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.iamberry.wechat.core.entity.admin.AdminChildHavePermission;
-
-public interface AdminPermissionsService {
-	
-	/**
-	 * 根据二级管理ID，获取此二级管理员所有的权限
-	 * @param id
-	 * @return
-	 */
-	public List<AdminChildHavePermission> selectPermissionById(Integer id);
-	
-	/**
-	 * 根据二级管理ID，保存二级管理员权限
-	 * @param id
-	 * @return
-	 */
-	public Integer insertPermissionById(AdminChildHavePermission adminChildHavePermission);
-	/**
-	 * 根据二级管理ID，删除所有二级权限
-	 * @param id
-	 * @return
-	 */
-	public Integer deletePermissionById(Integer adminChildId);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/admin/SystemService.java

@@ -1,20 +0,0 @@
-package com.iamberry.wechat.face.admin;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
-
-public interface SystemService {
-
-	/**
-	 * 根据ID，获取一条系统规则
-	 * @param id
-	 */
-	public ShopSystemRule selectOneShopRuleById(Integer id);
-	
-	/**
-	 * 查询所有系统规则
-	 * 2016年5月4日
-	 */
-	public List<ShopSystemRule> selectAllShopRule();
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/agent/AgentMemberService.java

@@ -1,46 +0,0 @@
-package com.iamberry.wechat.face.agent;
-
-import java.util.List;
-import java.util.Map;
-
-import com.iamberry.wechat.core.entity.agent.AgentMemberDto;
-import com.iamberry.wechat.core.entity.member.Member;
-
-/**
- * 微代理会员中心	service
- * 2016年4月20日
- * @author 穆再兴
- *
- */
-public interface AgentMemberService {
-	/**
-	 * 根据openid获取该用户 各种状态的订单数量
-	 * 2016年4月20日
-	 * @author 穆再兴
-	 * @param openid
-	 * @return
-	 */
-	public List<Map<String, Integer>> getMyOrderStatusCount(String openid);
-	/**
-	 * 获取当前用户微代理信息
-	 * 2016年4月20日
-	 * @author 穆再兴
-	 * @return
-	 */
-	public AgentMemberDto getAgentMemberInfo(String openid);
-	
-	/**
-	 * 查询当前用户<微代理>的待返还金额 <包括下线将返的100 及下线的下线将返还的40>
-	 * 2016年5月19日
-	 * @author mzx
-	 * @return
-	 */
-	public Integer getWillIncomeByOpenId(String openid);
-	
-	/**
-	 * 根据openid 获取用户信息、各种状态订单的数量、待返金额 
-	 * @param member
-	 * @return
-	 */
-	public AgentMemberDto getMemberInfo(Member member);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/agent/AgentOrderService.java

@@ -1,70 +0,0 @@
-package com.iamberry.wechat.face.agent;
-
-import java.util.List;
-import java.util.Map;
-
-import com.iamberry.wechat.core.entity.agent.AgentOrderDto;
-
-/**
- * 微代理订单 service
- * @author 穆再兴
- *
- */
-public interface AgentOrderService {
-
-	/**
-	 * 根据当前用户<微代理>openid<AgentOrderDto.openid> 查询所有订单
-	 * @author 穆再兴
-	 * @return
-	 */
-	public List<AgentOrderDto> getAgentOrderListByOpenId(AgentOrderDto agentOrderDto); 
-	
-	/**
-	 * 根据当前用户<微代理>userid<AgentOrderDesc.userid> 查询所有订单 总数
-	 * @author 穆再兴
-	 * @param agentOrderDesc
-	 * @return
-	 */
-	public Integer getAgentOrderCountByUserId(AgentOrderDto agentOrderDto);
-	
-	/**
-	 * 根据当前用户<微代理>openId 查询所有订单 商品总数
-	 * @param userId
-	 * @return
-	 */
-	public Integer getProductCountByOpenId(String openId);
-	
-	/**
-	 * 根据openid查询 完成的订单总数
-	 * 2016年5月11日
-	 * @param openid
-	 * @return
-	 */
-	public Integer selectCountOrderByOpenId(String openid);
-	
-	/**
-	 * 根据openid 查询 状态是：已支付、已发货、换货完成 的 第一条订单
-	 * 2016年6月3日
-	 * @author 穆再兴
-	 * @param openid
-	 * @return
-	 */
-	public String getPayedOrderByOpenId(String openid);
-	
-	/**
-	 * 根据openid 修改订单的锁定状态
-	 * 2016年6月3日
-	 * @author 穆再兴
-	 * @param openid
-	 * @return
-	 */
-	public Integer updateOrderLockTypeByOrderId(String orderid);
-	
-	/**
-	 * 查代理订单和销售总数
-	 * @param orderDto
-	 * @return
-	 */
-	
-	public Map<String, Object> getOrderListAndCountByOpenid(AgentOrderDto orderDto);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/banner/AdminBannerService.java

@@ -1,80 +0,0 @@
-package com.iamberry.wechat.face.banner;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.banner.ActionBanner;
-import com.iamberry.wechat.core.entity.banner.ActionBannerImage;
-
-/**
- * @author 何秀刚
- * Introduction to the ： 后台-banner管理service接口
- * create date: 2016年1月9日
- */
-public interface AdminBannerService {
-
-	/**
-	 * 查询banner列表，集成搜索
-	 * @param bean
-	 * @return
-	 */
-	public List<ActionBanner> selectBannerListByPaper(String str, int pageSize, int pageNO);
-
-	/**
-	 * 查询banner的数据
-	 */
-	public int selectBannerCountByPaper(String str, int pageSize, int pageNO);
-
-	/**
-	 * 添加banner控制
-	 */
-	public boolean insertBanner(ActionBanner actionBanner);
-
-	/**
-	 * 暂停banner的使用
-	 */
-	public boolean stopBannerById(Integer bannerId);
-
-	/**
-	 * 根据ID获取一个banner
-	 */
-	public ActionBanner selectBannerById(Integer bannerId);
-
-	/**
-	 * 根据ID，修改banner
-	 */
-	public boolean updateBannerById(ActionBanner actionBanner);
-
-	/**
-	 * 根据bannerID，获取所属图片
-	 */
-	public List<ActionBannerImage> selectBannerImgByBannerId(Integer bannerId);
-
-	/**
-	 * 添加banner图片
-	 */
-	public boolean insertBannerImg(ActionBannerImage actionBannerImage);
-
-	/**
-	 * 根据图片ID，删除banner图片
-	 */
-	public boolean deleteBannerImgById(Integer id);
-
-	/**
-	 * 根据类型id，获取数据 （当前不适用类型id，只是为了以后扩展）
-	 */
-	public List<ActionBannerImage> selectNowBannerByType(Integer id);
-	
-	/**
-	 * 根据类型id，缓存数据 （当前不适用类型id，只是为了以后扩展）
-	 */
-	public void selectNowBannerByTypeToCache(Integer id);
-	
-	/**
-	 * 排序(其实本质是修改时间)
-	 * @param list
-	 * @return
-	 * @author 献
-	 * @Time   2016年12月12日
-	 */
-	public boolean sort(List<ActionBannerImage> list);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/bindingapp/BindingMacService.java

@@ -1,57 +0,0 @@
-package com.iamberry.wechat.face.bindingapp;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.bindingApp.BindingMac;
-import com.iamberry.wechat.core.entity.bindingApp.BindingMacInfo;
-
-/***
- * @description 绑定对象sql映射
- * @author 欧阳明
- * @date 2016-06-12
- */
-public interface BindingMacService {
-
-	/*
-	 * 通过id 获取绑定对象
-	 */
-	public BindingMac getOneById(int id);
-	/**
-	 * 插入对象
-	 * @param bindingMac
-	 * @return
-	 */
-	public int insert(BindingMac bindingMac);
-	/**
-	 * 更新对象
-	 * @param bindingMac
-	 * @return
-	 */
-	public int update(BindingMac bindingMac);
-	
-	/**
-	 * 后台列表
-	 * @param bindingMac
-	 * @return
-	 */
-	public  List<BindingMacInfo> selectAll(BindingMacInfo bindingMacInfo);
-	/**
-	 * 查询返回个数
-	 * @param bindingMac
-	 * @return
-	 */
-	public  int getAllCount(BindingMacInfo bindingMacInfo);
-	/**
-	 * 查询机器码是否绑定了
-	 * @param macId
-	 * @return
-	 */
-	public  int testExist(String macId);
-	
-	/**
-	 * 根据 id 删除单条记录
-	 * @param id
-	 * @return
-	 */
-	public int deleteBindingById(Integer id);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/CartService.java

@@ -1,140 +0,0 @@
-package com.iamberry.wechat.face.cart;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.PaperBean;
-import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
-import com.iamberry.wechat.core.entity.cart.CartDto;
-import com.iamberry.wechat.core.entity.cart.ShopOrderAndItemDto;
-import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
-import com.iamberry.wechat.core.entity.cart.ShopSalesOrderDto;
-import com.iamberry.wechat.core.entity.coupon.CouponItem;
-import com.iamberry.wechat.core.entity.coupon.CouponType;
-import com.iamberry.wechat.core.entity.mq.MQMessage;
-import com.iamberry.wechat.core.entity.order.Order;
-import com.iamberry.wechat.core.entity.order.OrderItem;
-
-public interface CartService {
-	
-	//根据用户id查询购物车
-	public List<CartDto> selectCartByOpenId(String openId);
-	
-	//根据用户id查询购物车数量
-	public Integer getCartNumByCartOpenId(String openId);
-	
-	//修改购物车数量
-	public Integer updateCartByOpenId(CartDto cartDto);
-	
-	//根据商品id和openid查询购物车数量
-	public Integer getCartNumByOpenId(CartDto cartDto);
-
-	//根据商品id和用户openid查询购物车是否有该商品
-	public CartDto getCartByCartProductId(CartDto cartDto);
-	
-	//添加商品到购物车
-	public Integer addProductToCart(CartDto cartDto);
-	
-	//根据cartid删除购物车信息
-	public Integer deleteCartByCartId(CartDto cartDto);
-	
-	//分页查询订单信息
-	public List<ShopOrderAndItemDto> selectShopOrder(PaperBean paperBean);
-	
-	//根据openid查询订单数量
-	public Integer getOrderNumByOpenId(PaperBean paperBean);
-	
-	//根据订单id查询订单项
-	public List<ShopOrderItemDto> selectShopOrderItem(String itemSalesOrderid);
-	
-	//根据订单号查询订单信息
-	public ShopSalesOrderDto getShopOrderByOrderId(String salesOrderId, String salesOpenId);
-
-	/**
-	 * 根据购物车ID，获取购物项
-	 * @param carts
-	 * @return
-	 */
-	public List<CartDto> selectCartItemByListId(Integer[] carts);
-	
-	/**
-	 * 保存订单、订单项
-	 * @param order
-	 * @param items
-	 * @return
-	 */
-	public boolean addOrderAndSaveOrderItem(Order order, List<OrderItem> items, List<Integer> cartIds)  throws Exception;
-
-	/**
-	 * 修改订单信息
-	 * @param order
-	 * @return
-	 */
-	public Integer updateOrderStatus(Order order);
-
-	/**
-	 * 根据订单号，获取订单的状态
-	 * @param orderId
-	 * @return
-	 */
-	public Integer selectOrderStatusByOrderId(String orderId);
-	
-	//根据orderid查询用户openid和订单状态
-	public ShopSalesOrderDto getOpenIdAndStatus(String salesOrderid);
-	
-	//修改订单状态和添加备注
-	public Integer updateOrderByOrderId(Order order);
-
-	/**
-	 * 根据订单号、用户openid，获取订单信息
-	 * @param order
-	 * @return
-	 */
-	public Order selectOrderInfoById(Order order);
-	
-	//根据rId查询规则表数据
-	public ShopSystemRule getReluByRid(Integer rId);
-	
-	/**
-	 * 根据单号查询该订单的产品总数 
-	 * 2016年5月18日
-	 * @param orderid
-	 * @return
-	 */
-	public Integer getItemNumByOrderId(String orderid);
-	
-	/**
-	 * 修改支付完之后，订单的状态，及插入订单状态
-	 * 2016年7月7日
-	 * @param QMessage
-	 * @return
-	 */
-	public Boolean supdateStateByOrderId(MQMessage QMessage);
-	
-	/**
-	 *  根据优惠券id获取优惠券优惠价格
-	 * @param couponId
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public CouponType getCouponReduceByItemId(CouponItem couponItem);
-	
-	/**
-	 * 根据openid查看订单列表，不分页
-	 * @param shopSalesOrderDto
-	 * @return
-	 */
-	public List<ShopSalesOrderDto> getOrderList(ShopSalesOrderDto shopSalesOrderDto);
-	/**
-	 * 通过openid 获取历史订货记录的最近收货地址
-	 * @param openid
-	 * @return
-	 */
-	public Order getOrderRecentAddress(String openid);
-	
-	/**
-	 * 根据openid和订单状态查询订单个数
-	 * @param shopSalesOrderDto
-	 * @return
-	 */
-	public Integer selectOrderCount(ShopSalesOrderDto shopSalesOrderDto);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/ProductInfoService.java

@@ -1,54 +0,0 @@
-package com.iamberry.wechat.face.cart;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.cart.UserGiftDto;
-import com.iamberry.wechat.core.entity.product.Product;
-
-public interface ProductInfoService {
-
-	//分页查询商品信息
-	public List<Product> selectPageProduct(Product product);
-	
-	/**
-	 * 根据条件查询产品集合
-	 * @param product
-	 * @return
-	 */
-	public List<Product> listSelectProduct(Product product);
-	
-	//根据productID查询商品信息
-	public Product getProductByProductId(Integer productId, Integer colorId);
-	
-	//根据商品名称查询商品信息
-	public List<Product> getProductByProductName(String productName);
-	
-	//查询在售商品总条目数
-	public Integer selectProductCount(Product product);
-
-	//查询租赁产品信息
-	public Product getLeaseProduct(Integer productId);
-	/**
-	 * 获取10条产品信息
-	 * @return
-	 */
-	public List<Product> selectIndexPageProduct();
-	
-	/**
-	 * 更新首页产品信息缓存
-	 */
-	public void cacheIndexPageProduct();
-	
-	/**
-	 * 批量修改产品购买数量
-	 * @return
-	 */
-	public Integer updateProductNumList(String orderId);
-	
-	/**
-	 * 根据商品id查询礼品信息
-	 * @param userProductId
-	 * @return
-	 */
-	public UserGiftDto selectUserGift (UserGiftDto userGiftDto);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/coupon/AdminCouponItemService.java

@@ -1,40 +0,0 @@
-package com.iamberry.wechat.face.coupon;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.coupon.AdminCouponItemDto;
-
-
-public interface AdminCouponItemService {
-	
-	/**
-	 * 分页查询所有优惠券使用表
-	 * @param adminCouponItemDto
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public List<AdminCouponItemDto> getAllCouponItem(AdminCouponItemDto adminCouponItemDto);
-	
-	/**
-	 * 按条件查询优惠券详情表数据总数
-	 * @param adminCouponItemDto
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public Integer getCouponItemCount(AdminCouponItemDto adminCouponItemDto);
-	
-	/**
-	 * 根据couponId查询优惠券详情
-	 * @param couponId
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public AdminCouponItemDto getCouponItemByCouponItemId(String couponItemId);
-	
-	/**
-	 * 修改优惠券使用详情
-	 * @param couponItemDto
-	 * @return
-	 */
-	public Integer updateCouponItem(AdminCouponItemDto adminCouponItemDto);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/coupon/CouponItemService.java

@@ -1,63 +0,0 @@
-package com.iamberry.wechat.face.coupon;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.coupon.CouponItem;
-import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
-/**
- * 优惠券详情 service
- * 2016年7月6日
- * @author Administrator
- *
- */
-public interface CouponItemService {
-	/**
-	 * 分页查询所有优惠券详情列表
-	 * 2016年7月6日
-	 * @author 穆再兴
-	 * @param couponItem
-	 * @return
-	 */
-	public List<CouponItemDto> getCouponItemDtoList(CouponItemDto couponItemDto);
-	
-	/**
-	 * 查询所有符合条件的优惠券详情总数
-	 * 2016年7月7日
-	 * @param couponItem
-	 * @return
-	 */
-	public Integer getCouponItemCount(CouponItemDto couponItemDto);
-	
-	/**
-	 * 添加一张优惠券
-	 * 2016年7月7日
-	 * @author 穆再兴
-	 * @param couponItem
-	 * @return
-	 */
-	public Integer insertCouponItem(CouponItem couponItem);
-	
-	/**
-	 * 根据id查询一张优惠券
-	 * 2016年7月7日
-	 * @param couponItemId
-	 * @return
-	 */
-	public CouponItemDto getCouponItemById(String couponItemId);
-	
-	/**
-	 * 根据id修改优惠券信息
-	 * 2016年7月7日
-	 * @param couponItem
-	 * @return
-	 */
-	public Integer updateCouponItemById(CouponItem couponItem);
-	
-	/**
-	 * 批量修改优惠券信息
-	 * @param couponItemList
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public Integer updateCouponItemList(List<CouponItem> couponItemList);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/coupon/CouponTypeService.java

@@ -1,74 +0,0 @@
-package com.iamberry.wechat.face.coupon;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.coupon.CouponType;
-
-/**
- * 优惠券类型 service
- * 2016年7月6日
- * @author Administrator
- *
- */
-public interface CouponTypeService {
-	/**
-	 * 查询优惠券类型列表并分页
-	 * 2016年7月6日
-	 * @author 穆再兴
-	 * @return
-	 */
-	public List<CouponType> getCouponTypeList(CouponType couponType);
-	
-	/**
-	 * 查询优惠券类型总数
-	 * 2016年7月6日
-	 * @author 穆再兴
-	 * @return
-	 */
-	public Integer getCouponTypeCount();
-	
-	/**
-	 * 添加一个优惠券类型
-	 * 2016年7月6日
-	 * @author 穆再兴
-	 * @param couponType
-	 * @return
-	 */
-	public Integer insertCouponType(CouponType couponType);
-	
-	/**
-	 * 根据id查询一个优惠券类型
-	 * 2016年7月6日
-	 * @param couponId
-	 * @return
-	 */
-	public CouponType getCouponTypeById(Integer couponId);
-	
-	/**
-	 * 获取未领的优惠券
-	 * @param openid
-	 * @return
-	 */
-	public List<CouponType> getUnGetCoupon(String openid);
-	/**
-	 * 领取优惠券时 优惠券类型减一
-	 * 2016年7月7日
-	 * @return
-	 */
-	public Integer updateCouponTypeForItem(Integer couponId);
-
-	/**
-	 * 根据id修改一条优惠券信息
-	 * 2016年7月8日
-	 * @return
-	 */
-	public Integer updateCouponTypeById(CouponType couponType);
-	
-	/**
-	 * 根据id 删除一个优惠券类型
-	 * 2016年7月8日
-	 * @param couponId
-	 * @return
-	 */
-	public Integer deleteCouponTypeById(Integer couponId);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/coupon/ExchangeItemService.java

@@ -1,37 +0,0 @@
-package com.iamberry.wechat.face.coupon;
-
-import com.iamberry.wechat.core.entity.coupon.ExchangeItem;
-
-import java.util.List;
-
-/**
- *  兑换子表接口
- * @author
- * @Date 2018-12-11
- */
-public interface ExchangeItemService {
-    /**
-     * 获取集合
-     * @param  exchangeItem
-     * @return List
-     */
-    List<ExchangeItem> getExchangeItemList(ExchangeItem  exchangeItem);
-    /**
-     * 查询单条数据
-     * @param  id
-     * @return  exchangeItem
-     */
-    ExchangeItem  getExchangeItemById(Integer  id);
-    /**
-     * 增加数据
-     * @param  exchangeItem
-     * @return Integer
-     */
-    Integer  save(ExchangeItem exchangeItem);
-    /**
-     * 修改数据
-     * @param  exchangeItem
-     * @return Integer
-     */
-    Integer  update(ExchangeItem  exchangeItem);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/coupon/ExchangeService.java

@@ -1,37 +0,0 @@
-package com.iamberry.wechat.face.coupon;
-
-import com.iamberry.wechat.core.entity.coupon.Exchange;
-
-import java.util.List;
-
-/**
- *  兑换表接口
- * @author
- * @Date 2018-12-11
- */
-public interface ExchangeService {
-    /**
-     * 获取集合
-     * @param  exchange
-     * @return List
-     */
-    List<Exchange> getExchangeList(Exchange  exchange);
-    /**
-     * 查询单条数据
-     * @param  id
-     * @return  exchange
-     */
-    Exchange getExchangeById(Integer  id);
-    /**
-     * 增加数据
-     * @param  exchange
-     * @return Integer
-     */
-    Integer  save(Exchange  exchange);
-    /**
-     * 修改数据
-     * @param  exchange
-     * @return Integer
-     */
-    Integer  update(Exchange  exchange);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/drp/DrpRoleInfoService.java

@@ -1,68 +0,0 @@
-package com.iamberry.wechat.face.drp;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.drp.PlaceRoleInfo;
-
-public interface DrpRoleInfoService {
-
-	/**
-	 * 分页获取分销角色表信息
-	 * @param drpRoleInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public List<PlaceRoleInfo> getDrpRoleList(PlaceRoleInfo drpRoleInfo);
-	
-	/**
-	 * 获取状态是使用中的角色信息(没有分页)
-	 * @param drpRoleInfo
-	 * @return roleId、roleName
-	 */
-	public List<PlaceRoleInfo> getDrpRoleList2();
-	
-	/**
-	 * 获取分销角色表数据总条目数
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public int selectDrpRoleCount(PlaceRoleInfo drpRoleInfo);
-	
-	/**
-	 * 添加角色信息
-	 * @param drpRoleInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public Integer addDrpRoleInfo(PlaceRoleInfo drpRoleInfo);
-	
-	/**
-	 * 根据条件查询角色信息
-	 * @param drpRoleInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public PlaceRoleInfo selectDrpRoleInfo(PlaceRoleInfo drpRoleInfo);
-	
-	/**
-	 * 修改分销角色表数据
-	 * @param drpRoleInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public Integer updateDrpRoleInfo(PlaceRoleInfo drpRoleInfo);
-	
-	/**
-	 * 修改分销角色状态
-	 * @param drpRoleInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public Integer updateDrpRoleStatus(PlaceRoleInfo drpRoleInfo);
-	
-	/**
-	 * 查询所有在用状态的角色信息
-	 * @return
-	 */
-	public List<PlaceRoleInfo> getDrpRoleListByState();
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/drp/PlaceInfoService.java

@@ -1,252 +0,0 @@
-package com.iamberry.wechat.face.drp;
-
-import java.util.ArrayList;
-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.core.entity.ResultMsg;
-import com.iamberry.wechat.core.entity.drp.ApplyPlaceLogs;
-import com.iamberry.wechat.core.entity.drp.ApplyUserInfo;
-import com.iamberry.wechat.core.entity.drp.PlaceInfo;
-import com.iamberry.wechat.core.entity.order.ProbationOrderDto;
-import com.iamberry.wechat.tools.ResponseJson;
-
-
-/**
- * 
- * @author 欧阳明
- * @Description: 代理者信息服务-业务处理
- * @Date:2016年4月19日
- *
- */
-public interface PlaceInfoService {
-
-	/**
-	 * 新增一个商户	(实现类有其他代码)
-	 * @param placeInfo
-	 * @return
-	 */
-	public ResultMsg addOne(PlaceInfo placeInfo);
-	
-	/**
-	 * 新增一个分销商
-	 * @param placeInfo
-	 * @return
-	 */
-	public ResultMsg update(PlaceInfo placeInfo);
-		
-	/**
-	 * 通过id 获取单个分销商的详情
-	 */
-	public PlaceInfo getPlaceInfoById(int id);
-	
-	/**
-	 * 通过openid 获取单个分销商的详情
-	 */
-	public PlaceInfo getPlaceInfoByOpenId(String openid);
-	
-	/**
-	 * 	通过placeInfo获取placeInfo对象
-	 * @param placeInfo
-	 * @return
-	 */
-	public PlaceInfo getOnePlaceInfoByInitcode(PlaceInfo placeInfo);
-	
-	/**
-	 * 获取所有使用中的商户  (用在添加商户时搜索父级)
-	 * 支持模糊条件查询：name userName roleId tel userNickname placePid
-	 * 				supperId parentName
-	 * 根据 place_create_date降序	分页
-	 */
-	public Map<String, Object> SearchPlaceInfo(PlaceInfo placeInfo);
-	
-	/**
-	 * 分页综合查询
-	 * @param page
-	 * @return
-	 */
-	public Map SearchPlaceInfoPage(PageBean page);
-	
-	/**
-	 * 根据用户openid，获取对应的代理商信息
-	 */
-	public Integer selectPlaceIdByOpenId(String openId);
-	
-	/**
-	 * 查询分销信息用于下载
-	 * @param map
-	 * @return
-	 */
-	public List<PlaceInfo> selectPlaceInfosForDownLoad(Map map);
-	
-	/**
-	 * 批量更新分銷商信息
-	 * @param placeInfos
-	 * @return
-	 */
-	public int batchUpdate(List<PlaceInfo> placeInfos);
-	
-	/**
-	 * 根据条件获取placeId
-	 * @param placeInfo
-	 * @return
-	 */
-	public List<PlaceInfo> getPlaceId(PlaceInfo placeInfo);
-
-	/**
-	 * 获取某一页的代理商申请修改信息记录
-	 * @param bean
-	 * @return
-	 */
-	public List<ApplyPlaceLogs> selectApplyPlaceLogs(int pageNO, int pageSize);
-
-	/**
-	 * 获取待处理的申请记录总条数
-	 * @return
-	 */
-	public int getCount(int pageSize);
-
-	/**
-	 * 根据applyID更新信息
-	 * @param applyID
-	 * @return
-	 */
-	public int updateApplyStatus(ApplyPlaceLogs logs);
-	
-	/**
-	 * 获取某一个用户的最近申请记录
-	 * @param placeID
-	 * @return
-	 */
-	public ApplyPlaceLogs selectApplyLogsByPlaceID(Integer placeID);
-	
-	/**
-	 * 根据openid获取某一个用户的最近申请记录
-	 * @param placeID
-	 * @return
-	 */
-	public ApplyPlaceLogs selectApplyLogsByOpenID(String openID);
-	
-	/**
-	 * 根据id，处理申请,后台
-	 * @param applyID
-	 * @param status
-	 * @return
-	 */
-	public boolean handlerApplyLogs(Integer applyID, Integer status);
-	
-	/**
-	 * 根据openid，处理商户是否需要完善信息
-	 * @param openID
-	 * @return
-	 */
-	public ResponseJson handlerPlaceInfo(String openID);
-	
-	/**
-	 * 添加申请更新信息的处理
-	 * @param applyPlaceLogs
-	 * @return
-	 */
-	public ResponseJson addApplyPlaceLogs(ApplyPlaceLogs applyPlaceLogs);
-	
-	/**
-	 * 根据openid获取一个正在使用的商户的信息(详情页面、修改页面)
-	 * 2016年10月10日
-	 * @param openid
-	 * @return
-	 */
-	public ResponseJson selectPlaceInfoDetailByOpenId(String openid);
-	
-	/**
-	 * 根据code，获取代理信息（ID）
-	 * @param code
-	 * @return
-	 */
-	public PlaceInfo selectOnePlaceInfoByCode(String code);
-	
-	/**
-	 * 修改代理商的openid
-	 * @param info
-	 * @return
-	 */
-	public Integer updateOpenidById(PlaceInfo info);
-	
-	/**
-	 * 添加申请代理信息
-	 * @param info
-	 * @return
-	 */
-	public Integer addApplyAgent(ApplyUserInfo applyUserInfo);
-	
-	/**
-	 * 查询是否已存在申请代理信息
-	 * @param info
-	 * @return
-	 */
-	public Integer selectApplyAgentByTel(String userTel);
-	
-	/**
-	 * 查询申请记录信息
-	 * @param info
-	 * @return
-	 */
-	public List<ApplyUserInfo> getApplyAgentList(ApplyUserInfo applyUserInfo);
-	
-	/**
-	 * 查询申请记录信息条数
-	 * @param info
-	 * @return
-	 */
-	public Integer getApplyAgentCount(ApplyUserInfo applyUserInfo);
-	
-	/**
-	 * 通过placepids查询商户信息
-	 * @param placePids
-	 * @return
-	 */
-	public PlaceInfo selectPlaceByPlacePids(Integer placePids);
-	
-	/**
-	 * 查询VIP会员和金牌会员下线试用订单列表
-	 * @param openId
-	 * @return
-	 */
-	public List<ProbationOrderDto> selectVipProbationList(ProbationOrderDto probationOrderDto);
-	
-	/**
-	 * 查询门店和钻石会员下线试用订单列表
-	 * @param openId
-	 * @return
-	 */
-	public List<ProbationOrderDto> selectStoreProbationList(ProbationOrderDto probationOrderDto);
-	
-	/**
-	 * 查询合伙人下线试用订单列表
-	 * @param openId
-	 * @return
-	 */
-	public List<ProbationOrderDto> selectPartnerProbationList(ProbationOrderDto probationOrderDto);
-	
-	/**
-	 * 查询VIP会员和金牌会员下线试用订单数量
-	 * @param openId
-	 * @return
-	 */
-	public Integer selectVipProbationNum(String openId);
-	
-	/**
-	 * 查询门店和钻石会员下线试用订单数量
-	 * @param openId
-	 * @return
-	 */
-	public Integer selectStoreProbationNum(String openId);
-	
-	/**
-	 * 查询合伙人下线试用订单数量
-	 * @param openId
-	 * @return
-	 */
-	public Integer selectPartnerProbationNum(String openId);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/drp/PlaceLogsService.java

@@ -1,20 +0,0 @@
-package com.iamberry.wechat.face.drp;
-
-import java.util.Map;
-
-import com.iamberry.wechat.core.entity.PageBean;
-
-/**
- * @decription 商户现金记录
- * @author 欧阳明
- * @date 2016-4-19
- */
-public interface PlaceLogsService {
-	
-	/**
-	 * 获取分销商收入支出 现金记录综合查询-分页
-	 * @param page
-	 * @return
-	 */
-	public Map SearchPlaceLogsPage(PageBean page);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/drp/PlaceWithDrawalsLogsService.java

@@ -1,49 +0,0 @@
-package com.iamberry.wechat.face.drp;
-
-import java.util.List;
-import java.util.Map;
-
-import com.iamberry.wechat.core.entity.PageBean;
-import com.iamberry.wechat.core.entity.ResultMsg;
-import com.iamberry.wechat.core.entity.drp.PlaceWithDrawalsLogs;
-
-
-/**
- * @description 提现申请表业务处理
- * @author 欧阳明
- * @date 2016-4-19
- */
-public interface PlaceWithDrawalsLogsService {
-
-	//提现规则
-	public String getTheRule();
-	
-	//根据id获取提现记录
-	public PlaceWithDrawalsLogs getOne(int id);
-	
-	//调整申请提交页面
-	public Map apply(String openid);
-	
-	//提现申请提交
-	public ResultMsg submitApply(PlaceWithDrawalsLogs placeWithDrawalsLogs);
-	
-	//处理提现申请
-	public ResultMsg dealApply(PlaceWithDrawalsLogs placeWithDrawalsLogs);
-	
-	//历史提现记录
-	public Map HistoryRecords(String openid);
-	
-	//获取下一页提现记录
-	public Map HistoryRecordsNext(PlaceWithDrawalsLogs pwd);
-	
-	//后台提现记录的查询
-	public Map HistoryRecordsManager(PageBean pag);
-	
-	//插入数据
-	public void insertTest(PlaceWithDrawalsLogs pwd);
-	//获取单个用户提现总额
-	public int getTotalMoneyByPlaceId(int placeId);
-	
-	//获取所有的提现记录  可支持条件查询
-	public List<PlaceWithDrawalsLogs> selectAllMore(PlaceWithDrawalsLogs placeWithDrawalsLogs);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/flow/TemplateFlowInfoService.java

@@ -1,46 +0,0 @@
-package com.iamberry.wechat.face.flow;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.flow.TemplateFlowInfo;
-
-public interface TemplateFlowInfoService {
-
-	/**
-	 * 根据条件查看返利节点表数据
-	 * @param templateFlowInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public TemplateFlowInfo getTemplateFlowInfo(TemplateFlowInfo templateFlowInfo);
-	
-	/**
-	 * 批量添加返利节点内容
-	 * @param templateFlowList
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public Integer addTemplateFlowList(List<TemplateFlowInfo> templateFlowList);
-	
-	/**
-	 * 根据模板id查询返利节点内容
-	 * @param templateId
-	 * @return
-	 */
-	public List<TemplateFlowInfo> getFlowInfoListByTemplateId(Integer templateId);
-	
-	/**
-	 * 批量修改返利节点内容
-	 * @param templateFlowList
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public Integer updateTemplateFlowInfo(List<TemplateFlowInfo> templateFlowList);
-
-	/**
-	 * 根据模板id，获取已经添加了的产品类型ID
-	 * @param tid
-	 * @return
-	 */
-	public List<Integer> getTypeId(Integer tid);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/flow/TemplateInfoService.java

@@ -1,61 +0,0 @@
-package com.iamberry.wechat.face.flow;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.flow.TemplateInfo;
-
-
-/**
- * 返利流程模板
- * @author ouyang
- * @date 2016-7-4
- */
-public interface TemplateInfoService {
-
-	/**
-	 * 获取状态是“使用中”的模板信息(用于下拉框选择框)
-	 * @return	templateId、templateName
-	 */
-	public List<TemplateInfo> getSelectTemplateInfo();
-	
-	/**
-	 * 按条件获取模板列表
-	 * @param templateInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public List<TemplateInfo> getTemplateList(TemplateInfo templateInfo);
-	
-	/**
-	 * 按条件获取模板数据数量
-	 * @param templateInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public Integer getTemplateCount(TemplateInfo templateInfo);
-	
-	/**
-	 * 添加模板数据
-	 * @param templateInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public Integer addTemplateInfo(TemplateInfo templateInfo);
-	
-	/**
-	 * 根据模板id查询模板信息
-	 * @param templateInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public TemplateInfo getTemplateInfoById(TemplateInfo templateInfo);
-	
-	/**
-	 * 修改流程模板信息
-	 * @param templateInfo
-	 * @return
-	 * @author liuzhiwei
-	 */
-	public Integer updateTemplateInfo(TemplateInfo templateInfo);
-	
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/game/GameService.java

@@ -1,76 +0,0 @@
-package com.iamberry.wechat.face.game;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.ResultMsg;
-import com.iamberry.wechat.core.entity.game.GameLogsDto;
-import com.iamberry.wechat.core.entity.game.GamePrizeDto;
-import com.iamberry.wechat.core.entity.game.GameSystemDto;
-import com.iamberry.wechat.core.entity.order.Order;
-
-public interface GameService {
-	
-	/**
-	 * 通过游戏类型查询游戏信息
-	 * @param gameSystemDto
-	 * @return
-	 */
-	public GameSystemDto selectGameByGameType(GameSystemDto gameSystemDto);
-	
-	/**
-	 * 通过游戏id查询游戏信息
-	 * @param gameSystemDto
-	 * @return
-	 */
-	public GameSystemDto selectGameByGameId(GameSystemDto gameSystemDto);
-	
-	/**
-	 * 通过游戏id查询游戏奖品信息
-	 * @param gamePrizeDto
-	 * @return
-	 */
-	public List<GamePrizeDto> selectGamePrizeByGameId(GamePrizeDto gamePrizeDto);
-	
-	/**
-	 * 根据openid和订单id和游戏id查询游戏日志信息
-	 * @param gameLogsDto
-	 * @return
-	 */
-	public List<GameLogsDto> selectGameLogsByGameId(GameLogsDto gameLogsDto);
-	
-	/**
-	 * 根据openid和订单id和游戏id查询游戏日志数量
-	 * @param gameLogsDto
-	 * @return
-	 */
-	public Integer selectGameLogsCount(GameLogsDto gameLogsDto);
-	
-	/**
-	 * 抽奖
-	 * @param gameId
-	 * @return
-	 */
-	public ResultMsg getPrize(Integer gameId, String orderId, String openID);
-	
-	/**
-	 * 根据gameid获取当前用户所有中奖纪录
-	 * 2016年9月28日
-	 * @param logDto
-	 * @return
-	 */
-	public List<GameLogsDto> selectWinningLogsByGameId(GameLogsDto logDto);
-	
-	/**
-	 * 根据gameid获取当前用户所有中奖纪录数量
-	 * @param logDto
-	 * @return
-	 */
-	public Integer selectWinningCount(GameLogsDto logDto);
-	
-	/**
-	 * 根据时间和openid查询订单条目数
-	 * @param order
-	 * @return
-	 */
-	public Integer selectOrderByCreateDate(Order order);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/giftCard/AgentMachineService.java

@@ -1,78 +0,0 @@
-package com.iamberry.wechat.face.giftCard;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.giftCard.AgentMachine;
-
-/**
- * 兑物流信息Service 接口
- * @company	深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author 	LJK
- * @date	2017年2月16日
- */
-public interface AgentMachineService {
-
-	/**
-	 * 新增物流信息
-	 * @param agentMachine
-	 * @return
-	 */
-	public Integer insertAgentMachine(AgentMachine agentMachine);
-	/**
-	 * 根据物流记录ID查询物流信息（代理商赠送机器记录）
-	 * @param agentMachineId
-	 * @return
-	 */
-	public AgentMachine selectAgentMachine(Integer agentMachineId);
-	
-	/**
-	 * 修改物流信息状态
-	 * @param agentMachine
-	 * @return
-	 */
-	public Integer updateAgentMachine(AgentMachine agentMachine);
-	
-	/**
-	 * 查询所有物流信息（代理商赠送机器记录）
-	 * @param agentMachine
-	 * @return
-	 */
-	public List<AgentMachine> selectAllAgentMachine(AgentMachine agentMachine); 
-
-	/**
-	 * 查询所有物流信息（代理商赠送机器记录）总数
-	 * @param agentMachine
-	 * @return
-	 */
-	public Integer selectAllAgentMachineCount(AgentMachine agentMachine);
-
-	/**
-	 * 添加代理商物流信息
-	 * 2017年3月2日17:17:18
-	 * @author LJK
-	 * @return 当前代理商物流记录id
-	 */
-	public String addAgentLogisticsMachine(AgentMachine agentMachine);
-	
-	/**
-	 * 根据openid查询所有物流信息（代理商赠送机器记录）
-	 * @param agentMachine
-	 * @return
-	 */
-	public List<AgentMachine> selectAllAgentMachineById(AgentMachine agentMachine); 
-	
-	/**
-	 * 根据openid查询所有物流信息（代理商赠送机器记录）总数
-	 * @param agentMachine
-	 * @return
-	 */
-	public Integer selectAllAgentMachineByIdCount(AgentMachine agentMachine);
-
-	/**
-	 * 根据物流记录ID与openid查询物流信息（确认该机器是否属于当前用户）
-	 * @param agentMachine
-	 * @return
-	 */
-	Integer selectAgentMachineByOpenId(AgentMachine agentMachine);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/giftCard/AgentService.java

@@ -1,127 +0,0 @@
-package com.iamberry.wechat.face.giftCard;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.CommonDto;
-import com.iamberry.wechat.core.entity.ResultMsg;
-import com.iamberry.wechat.core.entity.giftCard.AgentInfo;
-import com.iamberry.wechat.core.entity.giftCard.AgentMachine;
-import com.iamberry.wechat.core.entity.giftCard.AgentPayLogs;
-import com.iamberry.wechat.core.entity.giftCard.GiftCardPayCode;
-import com.iamberry.wechat.core.entity.member.Member;
-
-/**
- * 付费代理商	service
- * @author muzx
- * create date : 2017年2月16日
- */
-public interface AgentService {
-	/**
-	 * 查询被推荐人
-	 * @param agentInfo
-	 * @return
-	 */
-	public List<AgentInfo> beRefereesList(AgentInfo agentInfo);
-	
-	/**
-	 * 获取当前用户未支付订单(可根据支付状态)
-	 * 2017年2月16日
-	 * @author muzx
-	 * @param openId
-	 * @return
-	 */
-	public AgentPayLogs selectPayLogByOpenid(AgentPayLogs agentPayLogs);
-	
-	/**
-	 * 根据ID查询支付记录
-	 * 2017年2月16日
-	 * @author muzx
-	 * @param id
-	 * @return
-	 */
-	public AgentPayLogs selectPayLogById(Integer id);
-	
-	/**
-	 * 修改支付状态、微信支付订单号、微信支付时间
-	 * 2017年2月17日
-	 * @author muzx
-	 * @return
-	 */
-	public boolean updatePayLogsById(AgentPayLogs payLogs);
-	
-	
-	/**
-	 * 根据openId 修改付费代理推荐人openid
-	 * 2017年3月2日
-	 * @author muzx
-	 * @param agentInfo
-	 * @return
-	 */
-	boolean updateAgentInfoByOpenId(AgentInfo agentInfo);
-
-	/**
-	 * 根据openid查询当前付费代理信息
-	 * @param openId
-	 * @return
-	 */
-	public AgentInfo selectAgentByOpenId(String openId);
-	
-	/**
-	 * 获取当前用户未支付订单
-	 * 2017年2月16日
-	 * @author LJK
-	 * @param openId
-	 * @return
-	 */
-	public List<AgentPayLogs> selectPayLogHasByOpenid(String openId);
-	
-	/**
-	 * 查询所有付费代理商信息
-	 * @return
-	 */
-	public List<AgentInfo> selectAgentList();
-	 /**
-     * 1.添加付费代理信息<没有则添加,有则不变>
-     * 2.添加支付记录
-     * 3.添加付费代理赠送机器信息
-     * 2017年3月2日
-     * @author muzx
-     * @return  AOID_支付记录id
-     *          格式如：AOID_15_23
-     */
-    String insertAgentInfoAndAgentPayLogAndAgentMachine(CommonDto commonDto,  Member member, AgentMachine agentMachine);
-    
-	/**
-     * 1. 修改付费代理支付记录状态为已支付
-     * 2. 修改付费代理商的推荐人
-     * 3. 修改抵扣密码的使用状态和使用人
-     * @param payId    支付记录id
-     * @param openId   当前用户openid
-     * @param payCode  使用的支付码信息
-     * @return         推荐人赠送记录id
-     */
-    public String updatePayLogStatusAndReferrerAndPayCodeStatus(String payId, String openId, GiftCardPayCode payCode);
-    /**
-     * 1. 修改付费代理支付记录状态为已支付
-     * 2. 修改抵扣密码的使用状态和使用人
-     * @param payId    支付记录id
-     * @param openId   当前用户openid
-     * @param payCode  使用的支付码信息
-     * @return        
-     */
-    public String updatePayLogStatus(String payId, String openId, GiftCardPayCode payCode);
-    
-    /**
-     * 万元小代理/百台代理 续费
-     * @time 2017年4月1日
-     * @author muzx
-     * @param openId
-     * @param agentMachine
-     * @param agentNickname
-     * @param agentTel
-     * @param payPassword
-     * @return
-     * @throws Exception
-     */
-    public ResultMsg toPayAgain(AgentMachine agentMachine, String agentNickname, String agentTel, String payPassword) throws Exception;
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/giftCard/GiftCardPayCodeService.java

@@ -1,40 +0,0 @@
-package com.iamberry.wechat.face.giftCard;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.giftCard.GiftCardPayCode;
-
-public interface GiftCardPayCodeService {
-    /**
-     * 批量添加抵扣密码记录
-     * 2017年3月3日
-     * @author muzx
-     * @param payCode
-     * @return
-     */
-    boolean insertPayCodeList(String openid, int num);
-    /**
-     * 根据id或支付密码 查询一个支付密码信息
-     * 2017年3月1日
-     * @author muzx
-     * @param payCode
-     * @return
-     */
-    GiftCardPayCode getPayCodeByIdOrPassword(GiftCardPayCode payCode);
-    
-    /**
-     * 获取所有支付密码并分页
-     * 2017年3月15日
-     * @author muzx
-     * @return
-     */
-    List<GiftCardPayCode> listPayCode(GiftCardPayCode payCode);
-    
-    /**
-     * 查询所有支付密码总数
-     * 2017年3月15日
-     * @author muzx
-     * @return
-     */
-    int countPayCode();
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/giftCard/GiftCardService.java

@@ -1,177 +0,0 @@
-package com.iamberry.wechat.face.giftCard;
-
-import java.util.List;
-import java.util.Map;
-
-import com.iamberry.wechat.core.entity.giftCard.AgentInfo;
-import com.iamberry.wechat.core.entity.giftCard.CardCashInfo;
-import com.iamberry.wechat.core.entity.giftCard.GiftCardDto;
-import com.iamberry.wechat.core.entity.giftCard.GiftCardInfo;
-import com.iamberry.wechat.core.entity.giftCard.UserMachineInfo;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-
-/**
- * 兑换卡Service 接口
- * @company	深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author 	献
- * @tel		18271840547
- * @date	2017年2月16日
- */
-public interface GiftCardService {
-
-	/**
-	 * 根据兑换卡密码获取兑换卡信息
-	 * @param card
-	 * @return
-	 * @author 献
-	 * @Time   2017年2月16日
-	 */
-	public GiftCardInfo get(String card);
-
-	/**
-	 * 万元小代理信息 提货卡提货
-	 * @param cardInfo	提货卡信息
-	 * @param cardPwd	礼品卡唯一兑换密码
-	 * @param  agentInfo   当前万元小代理信息
-	 * @return
-	 * @author 献
-	 * @Time   2017年2月16日
-	 */
-	public Map<String,Object> salesCard(GiftCardInfo cardInfo, UserMachineInfo info, AgentInfo agentInfo)throws Exception ;
-
-	/**
-	 * 
-	 * @param productId
-	 * @return
-	 * @author 献
-	 * @Time   2017年2月16日
-	 */
-	public List<ProductColor> getColor(Integer productId);
-
-	/**
-	 * 根据用户的openid 获取兑换记录
-	 * @param openid
-	 * @return
-	 * @author 献
-	 * @Time   2017年2月16日
-	 */
-	public List<UserMachineInfo> list(String openid);
-	
-	/**
-	 * 获取一页的待发货的兑换数据
-	 * @param min
-	 * @param max
-	 * @return
-	 * @author 献
-	 * @Time   2017年2月16日
-	 */
-	public List<UserMachineInfo> page(int pageNO, int pageSize);
-
-	/**
-	 * 获取总的待处理兑换记录条数
-	 * @return
-	 * @author 献
-	 * @Time   2017年2月16日
-	 */
-	public int count();
-
-	/**
-	 * 修改兑换信息
-	 * @param info
-	 * @return
-	 * @author 献
-	 * @Time   2017年2月17日
-	 */
-	public int update(UserMachineInfo info);
-	
-	/**
-	 * 批量添加礼品卡信息和添加机器物流信息
-	 * @param cardList
-	 * @param agentMachine
-	 * @return
-	 */
-	public Integer insertCardAndMachine(List<GiftCardInfo> cardList, Integer userMachineId, Integer referrerMachineId);
-	
-	/**
-	 * 批量添加礼品卡信息和修改机器物流信息
-	 * @param rechargeType     充值类型    1：普通充值      2：百台代理充值<需生成100张提货卡>
-	 * @param openId   当前用户openid
-	 * @param userMachineId    当前付费代理赠送机器记录id
-	 * @param referrerMachineId    赠送推荐人机器记录id
-	 * @return
-	 */
-	public boolean saveCardAndMachine(int rechargeType, String openId, Integer userMachineId, Integer referrerMachineId) throws Exception;
-	
-	/**
-	 * 批量添加礼品卡信息
-	 * @param openId
-	 * @param cardNum
-	 * @return
-	 */
-	public boolean saveCardList (String openId, int cardNum);
-	
-	/**
-	 * 根据礼品卡密码查询该密码是否已经存在
-	 * @param cardPassword
-	 * @return
-	 */
-	public Integer selectCardByPassward(String cardPassword);
-	
-	/**
-	 * 通过cardId和openId查询礼品卡详情
-	 * @param giftCardDto
-	 * @return
-	 */
-	public GiftCardDto selectCardInfo(GiftCardDto giftCardDto);
-	
-	/**
-	 * 根据礼品卡旧状态修改新状态
-	 * @param giftCardDto
-	 * @return
-	 */
-	public Integer updateCardStatus(GiftCardDto giftCardDto);
-	
-	/**
-	 * 申请兑现，修改礼品卡状态，在礼品卡兑现表添加记录
-	 * @param giftCardDto
-	 * @param cardCashInfo
-	 * @return
-	 */
-	public boolean applyCash(GiftCardDto giftCardDto, CardCashInfo cardCashInfo);
-	
-	/**
-	 * 分页查询礼品卡兑现列表
-	 * @param cardCashInfo
-	 * @return
-	 */
-	public List<CardCashInfo> selectCardCashList(CardCashInfo cardCashInfo);
-	
-	/**
-	 * 查询礼品卡兑现的总页数
-	 * @param cardCashInfo
-	 * @return
-	 */
-	public Integer selectCardCashCount(CardCashInfo cardCashInfo);
-	
-	/**
-	 * 根据状态和id修改兑现记录状态
-	 * @param cardCashInfo
-	 * @return
-	 */
-	public Integer updateCardCashStatus(CardCashInfo cardCashInfo);
-	
-	/**
-	 * 分页查询个人所有礼品卡数据
-	 * @param giftCardDto
-	 * @return
-	 */
-	public List<GiftCardDto> selectCardList(GiftCardDto giftCardDto);
-	
-	/**
-     * 查询个人所有礼品卡总数
-     * @param giftCardDto
-     * @return
-     */
-    public int countCard(GiftCardDto giftCardDto);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/home/HomeService.java

@@ -1,84 +0,0 @@
-package com.iamberry.wechat.face.home;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.banner.ActionBannerImage;
-import com.iamberry.wechat.core.entity.member.Member;
-
-/**
- * @author 何秀刚
- * Class Description: 首页业务逻辑处理Service接口
- * Create Date:2016年4月18日
- * Update Date:2016年4月18日
- */
-public interface HomeService {
-	
-	/**
-	 * 获取现在正在使用的Banner以及广告位
-	 */
-	public List<ActionBannerImage> selectNowBannerByType();
-
-	/**
-	 * 根据用户Openid，获取会员信息
-	 * @param openid
-	 * @return
-	 */
-	public Member selectMemberInfoByOpenId(String openid);
-
-
-	/**
-	 * 根据用户Openid，修改微信获取到的信息
-	 * @param member 会员信息实体类
-	 * @return
-	 */
-	public Integer updateWechatMemberInfoByByOpenid(Member member);
-
-	/**
-	 * 添加会员信息
-	 * @param member
-	 * @return
-	 */
-	public Integer insertMemberInfo(Member member);
-
-	/**
-	 * 根据用户openid，更新用户的上线
-	 * @param member
-	 * @return
-	 */
-	public Integer updateUserResAndTypeByOpenid(Member member);
-
-	/**
-	 * 根据Openid，更新用户状态为取消关注状态
-	 * @param openid
-	 * @return
-	 */
-	public Integer updateMemberStatusByOpenId(String openid);
-
-	/**
-	 * 根据用户Openid获取用户二维码(不一定有)
-	 * @param openid
-	 * @return
-	 */
-	public Member selectMemberQrcodeUrlByOpenid(String openid);
-
-	/**
-	 * 修改用户所属二维码
-	 * @param member
-	 * @return
-	 */
-	public Integer updateMemberQrcodeByOpenid(Member member);
-
-	/**
-	 * 根据代理商ID，获取激活此代理商的用户信息
-	 * @param placeId
-	 * @return
-	 */
-	public Member selectUserInfoByPlaceId(Integer placeId);
-	
-	/**
-	 * 根据Openid，更新绑定状态
-	 * @param member
-	 * @return
-	 */
-	public Integer updateMemberIsFlagByOpenid(Member member);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/lease/LeaseMachineService.java

@@ -1,23 +0,0 @@
-package com.iamberry.wechat.face.lease;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.machine.MachineDto;
-import com.iamberry.wechat.core.entity.machine.MachineShareRecord;
-
-public interface LeaseMachineService {
-	
-	/**
-	 * 根据openId查询机器列表信息
-	 * @param machineDto
-	 * @return
-	 */
-	public List<MachineDto> selectMachineList(MachineDto machineDto); 
-	
-	/**
-	 * 生成分享记录
-	 * @param machineShare
-	 * @return
-	 */
-	public Integer insertShareRecord(MachineShareRecord machineShare);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/lease/LeaseOrderService.java

@@ -1,68 +0,0 @@
-package com.iamberry.wechat.face.lease;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.lease.LeaseOrder;
-import com.iamberry.wechat.core.entity.machine.Machine;
-import com.iamberry.wechat.core.entity.rent.RentApply;
-
-/**
- * 租用订单接口 Service
- * 2017年2月7日
- * @author 刘志伟
- *
- */
-public interface LeaseOrderService {
-
-	/**
-	 * 保存租用订单详情
-	 * @param leaseOrder
-	 * @return
-	 */
-	public boolean saveLeaseOrder(LeaseOrder leaseOrder, List<Integer> cartIds) throws Exception;
-	
-	/**
-	 * 支付完成后修改状态和激活码
-	 * @param leaseOrder
-	 * @return
-	 */
-	public Integer updateLeaseOrderInfo(LeaseOrder leaseOrder, Machine machine);
-	
-	/**
-	 * 根据orderId查询租金和电话
-	 * @param orderId
-	 * @return
-	 */
-	public LeaseOrder selectDepositByOrderId(String orderId);
-	/**
-	 *  查询租用订单详情
-	 * @param orderId
-	 * @return
-	 */
-	public List<LeaseOrder> selectLeaseOrderInfo(String openId);
-	
-	/**
-	 * 修改订单状态（退款）
-	 * @param leaseOrder
-	 * @return
-	 */
-	public Integer updateLeaseOrderStatus(LeaseOrder leaseOrder);
-
-	/**
-	 * 添加申请记录
-	 * @param apply
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月16日
-	 */
-	Integer addApply(RentApply apply);
-	
-	/**
-	 * 修改申请记录为已支付
-	 * @param applyId
-	 * @return
-	 * @author 献
-	 * @Time   2017年3月16日
-	 */
-	Integer updateApply(RentApply apply);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/member/CashLogService.java

@@ -1,40 +0,0 @@
-package com.iamberry.wechat.face.member;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.member.CashLog;
-
-/**
- * 用户现金记录 Service
- * 2016年5月3日
- * @author 穆再兴
- *
- */
-public interface CashLogService {
-	/**
-	 * 查出符合条件的所有现金记录
-	 * 2016年5月3日
-	 * @author 穆再兴
-	 * @param cashLog
-	 * @return
-	 */
-	public List<CashLog> getAllCashLog(CashLog cashLog); 
-	
-	/**
-	 * 添加一条现金记录
-	 * 2016年5月4日
-	 * @author 穆再兴
-	 * @param cashLog
-	 * @return
-	 */
-	public Integer addCashLog(CashLog cashLog);
-	
-	/**
-	 * 根据 cashLogsOrderid 删除类型是提现的 现金记录
-	 * create date 2016年5月14日
-	 * @author mzx
-	 * @param cashLogsId
-	 * @return
-	 */
-	public Integer deleteCashLogs(Integer cashLogsOrderid);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/member/MemberService.java

@@ -1,129 +0,0 @@
-package com.iamberry.wechat.face.member;
-
-import java.util.List;
-import java.util.Map;
-
-import com.iamberry.wechat.core.entity.Page;
-import com.iamberry.wechat.core.entity.member.Member;
-
-/**
- * 会员信息 service
- * 2016年4月21日
- * @author Administrator
- *
- */
-public interface MemberService{
-	/**
-	 * 根据id获取会员信息
-	 * @param userId
-	 * @return
-	 */
-	Member getMemberByUserId(Integer userId);
-	
-	/**
-	 * 根据 openid 查询一个member
-	 * 2016年4月28日
-	 * @author 穆再兴
-	 * @return
-	 */
-	public Member getMemberByUserOpenId(String openid);
-	/**
-	 * 获取所有会员数量
-	 * @return
-	 */
-	Integer getCount();
-	/**
-	 * 分页显示用户信息
-	 * @param pageSize
-	 * @param PageNo
-	 * @return
-	 */
-	List<Member> getMemberByPage(Page page);
-	
-	/**
-	 * 根据 userid 修改会员信息
-	 * 2016年4月21日
-	 * @author 穆再兴
-	 * @param userId
-	 * @return
-	 */
-	public Integer updateMemberByUserId(Member member);
-	
-	/**
-	 * 修改用户已用积分
-	 * @param member
-	 * @return
-	 */
-	public Integer updateUserUseIntegral(Member member);
-
-	/**
-	 * 分页查询微代理下线信息
-	 * @param page
-	 * @return
-	 */
-	public List<Member> selectUserIntegralByWechatProxyId(Page page);
-
-	/**
-	 * 根据用户ID，获取用户身份、用户二维码信息
-	 * @param openid
-	 * @return
-	 */
-	public Member selectUserIdentityAndQrcodeByOpenId(String openid);
-
-	/**
-	 * 根据用户openid，获取用户来源、用户身份
-	 * @param openid
-	 * @return
-	 */
-	public Member selectUserResAndIdSByOpenId(String openid);
-	
-	/**
-	 * 根据 openid 修改用户可用金额
-	 * 2016年5月4日
-	 * @param member
-	 * @return
-	 */
-	public Integer updateUserIncomeByOpenId(Member member);
-
-	
-	/**
-	 * 根据用户openid，修改用户绑定状态
-	 * @param openId
-	 * @return
-	 */
-	public boolean updateUserFlagByOpenId(String openId);
-	
-	/**
-	 * 根据userid获取当前用户的“下线人数”和“已购买人数”
-	 * 2016年5月11日
-	 * @param openId
-	 * @return
-	 */
-	public List<Integer> selectDownCountByUserId(Integer userId);
-	
-	/**
-	 * 绑定用户关系
-	 * @param shareOpenid	分享人openid
-	 * @param member		当前用户信息
-	 * @param userType 		userType = 1 ： 属于微代理	type=2:属于代理商
-	 * @param orderType	  订单类型，1：购买，2：租赁
-	 * @return
-	 */
-	public boolean buildChildUser(String shareOpenid,Member member,int userType,int orderType);
-	
-	/**
-	 * 根据用户userid获取用户下线信息和总数，以及总购买人数
-	 * @param page
-	 * @return
-	 */
-	public Map<String, Object> getDownInfoAndBuyedCount(Page page);
-	
-	/**
-	 * 根据openid 修改用户的是否购买状态
-	 * 若当前状态已经是要修改的状态 则不修改
-	 * 2016年11月2日
-	 * mzx
-	 * @return
-	 */
-	public boolean updateIsBaughtByOpenid(String openid, int userIsBaught);
-}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/member/WithdrawService.java

@@ -1,87 +0,0 @@
-package com.iamberry.wechat.face.member;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.Page;
-import com.iamberry.wechat.core.entity.member.ApplyDto;
-import com.iamberry.wechat.core.entity.member.Member;
-import com.iamberry.wechat.core.entity.member.Withdraw;
-
-/**
- * 
- * description: 微代理提现接口
- * 	    author： 张应真
- * 	createDate： 2016年4月18日
- */
-public interface WithdrawService {
-	
-	
-
-	
-	/**
-	 * 查询总条数，和总金额
-	 * @return
-	 */
-	List<Withdraw> selectWithDrawAllSumMoney(Page page);
-	
-	
-	/**
-	 * 根据用户条件查找
-	 * @return
-	 */
-	List<Withdraw> selectWithDraw(Page page);
-	
-	/**
-	 * 获取所有提现记录数
-	 * @return
-	 */
-	Integer getCount();
-	/**
-	 * 更新提现信息
-	 * @param withdraw
-	 */
-	void updateWithdraw(Withdraw withdraw );
-	
-	/**
-	 * 申请提现	<现金>
-	 * 添加提现申请 修改用户可用金额 添加现金记录
-	 * @param dto
-	 * @return
-	 */
-	public boolean addApplyCashWithdraw(ApplyDto dto, Member member) throws Exception;
-
-	/**
-	 * 分页查询提现记录
-	 * @param page
-	 * @return
-	 */
-	public List<Withdraw> selectLogsByOpenid(Page page);
-	
-	/**
-	 * 分页的总数据
-	 */
-	public Integer selectLogsCountByOpenid(Page page);
-
-	/**
-	 * 根据ID，查询提现记录
-	 * @param id
-	 * @return
-	 */
-	public Withdraw selectWithdrawLogsById(Integer id);
-	
-	/**
-	 * 处理提现申请	<现金>
-	 * @param wid
-	 * @param status
-	 * @return
-	 * @throws Exception
-	 */
-	public boolean handleWithdrawCashStatus(Integer status, Withdraw withdraw) throws Exception;
-	
-	/**
-	 * 根据用户openid，获取当月申请提现记录次数
-	 * @param withdraw
-	 * @return
-	 */
-	public int selectUseLogsCount(Withdraw withdraw);
-}