Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml
#	tooth-wechat-web/src/main/resources/jdbc.properties

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -1,8 +1,8 @@
 <?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">
+<!DOCTYPE mapper
+		PUBLIC
+		"-//mybatis.org//DTD Mapper 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- 命名，每一个映射对象不一样
 	namespace:必须与对应的接口全类名一致
  -->
@@ -44,50 +44,50 @@ PUBLIC
 
 	<!-- 后台订单列表查询 -->
 	<select id="selectShopOrder" parameterType="Order" resultType="Order">
-		SELECT O.SALES_ORDERID salesOrderid, O.SALES_ADDRESS_NAME salesAddressName, 
-			U.USER_NICKNAME userNickname, O.SALES_ADDRESS_TEL salesAddressTel,  
-			O.SALES_AMOUNT salesAmount, O.SALES_RATE_AMOUNT salesRateAmount, 
-			O.SALES_INTEGRAL_NUM salesIntegralNum, O.SALES_YET_AMOUNT salesYetAmount, 
-			O.SALES_STATUS salesStatus, O.SALES_CREATE_DATE salesCreateDate, 
-			O.SALES_POST_NUM salesPostNum,O.SALES_POST_FIRM salesPostFirm,
-			O.SALES_ADMIN_REMARK salesAdminRemark, O.SALES_COLOR_TYPE salesColorType, 
-			O.SALES_USER_REMARK salesUserRemark,O.SALES_IS_RFUND salesIsRfund,
-			P.PLACE_NAME storesName, 
-			PP.PLACE_NAME vipName,
-			PP.PLACE_ROLE_ID vipRole,
-			PP.PLACE_OPENID placeOpenID,
-			U.USER_RES_TYPE userResource,
-			(SELECT IFNULL(SUM(reback_money),0) FROM tb_iamberry_reback WHERE reback_orderid = O.SALES_ORDERID and Reback_status  = 2) placeId
-		FROM 
-			TB_IAMBERRY_SHOP_SALES_ORDER O 
-		LEFT JOIN 
-			TB_IAMBERRY_USER_USERINFO U 
-		ON 
-			O.SALES_OPENID = U.USER_OPENID 
-			<!-- 根据用户信息中的dealers查询对应的关系 -->
-		LEFT JOIN 
-			TB_IAMBERRY_DEALERS D 
-		ON 
-			U.USER_DEALERS = D.DEALER_ID
-			<!-- 查询用户关系对应的商户 -->
-		LEFT JOIN 
-			TB_IAMBERRY_PLACE_INFO P 
-		ON 
-			D.DEALER_ID = P.PLACE_PIDS
-			<!-- 查询商户的上级，也就是门店 -->
-		LEFT JOIN 
-			TB_IAMBERRY_PLACE_INFO PP 
+		SELECT O.SALES_ORDERID salesOrderid, O.SALES_ADDRESS_NAME salesAddressName,
+		U.USER_NICKNAME userNickname, O.SALES_ADDRESS_TEL salesAddressTel,
+		O.SALES_AMOUNT salesAmount, O.SALES_RATE_AMOUNT salesRateAmount,
+		O.SALES_INTEGRAL_NUM salesIntegralNum, O.SALES_YET_AMOUNT salesYetAmount,
+		O.SALES_STATUS salesStatus, O.SALES_CREATE_DATE salesCreateDate,
+		O.SALES_POST_NUM salesPostNum,O.SALES_POST_FIRM salesPostFirm,
+		O.SALES_ADMIN_REMARK salesAdminRemark, O.SALES_COLOR_TYPE salesColorType,
+		O.SALES_USER_REMARK salesUserRemark,O.SALES_IS_RFUND salesIsRfund,
+		P.PLACE_NAME storesName,
+		PP.PLACE_NAME vipName,
+		PP.PLACE_ROLE_ID vipRole,
+		PP.PLACE_OPENID placeOpenID,
+		U.USER_RES_TYPE userResource,
+		(SELECT IFNULL(SUM(reback_money),0) FROM tb_iamberry_reback WHERE reback_orderid = O.SALES_ORDERID and Reback_status  = 2) placeId
+		FROM
+		TB_IAMBERRY_SHOP_SALES_ORDER O
+		LEFT JOIN
+		TB_IAMBERRY_USER_USERINFO U
 		ON
-			P.PLACE_PID = PP.PLACE_ID
-		WHERE 
-			O.SALES_ORDER_TYPE = 1 
-			<if test="salesStatus != null and salesStatus != -1">
-				AND O.SALES_STATUS = #{salesStatus} 
-			</if>
-			<if test="salesOrderid != null and salesOrderid!=''">
-				AND O.SALES_ORDERID = #{salesOrderid} 
-			</if>
-		ORDER BY O.SALES_CREATE_DATE DESC 
+		O.SALES_OPENID = U.USER_OPENID
+		<!-- 根据用户信息中的dealers查询对应的关系 -->
+		LEFT JOIN
+		TB_IAMBERRY_DEALERS D
+		ON
+		U.USER_DEALERS = D.DEALER_ID
+		<!-- 查询用户关系对应的商户 -->
+		LEFT JOIN
+		TB_IAMBERRY_PLACE_INFO P
+		ON
+		D.DEALER_ID = P.PLACE_PIDS
+		<!-- 查询商户的上级，也就是门店 -->
+		LEFT JOIN
+		TB_IAMBERRY_PLACE_INFO PP
+		ON
+		P.PLACE_PID = PP.PLACE_ID
+		WHERE
+		O.SALES_ORDER_TYPE = 1
+		<if test="salesStatus != null and salesStatus != -1">
+			AND O.SALES_STATUS = #{salesStatus}
+		</if>
+		<if test="salesOrderid != null and salesOrderid!=''">
+			AND O.SALES_ORDERID = #{salesOrderid}
+		</if>
+		ORDER BY O.SALES_CREATE_DATE DESC
 		LIMIT ${page.recordBegin},${page.pageSize}
 	</select>
 
@@ -102,78 +102,78 @@ PUBLIC
 		LIMIT
 			0, 1
 	</select>
-	
+
 	<select id="selectShopOrderByOrderId" parameterType="Order" resultType="Order">
-		SELECT O.SALES_ORDERID salesOrderid, O.SALES_ADDRESS_NAME salesAddressName, 
-			U.USER_NICKNAME userNickname, O.SALES_ADDRESS_TEL salesAddressTel,  
-			O.SALES_AMOUNT salesAmount, O.SALES_RATE_AMOUNT salesRateAmount, 
-			O.SALES_INTEGRAL_NUM salesIntegralNum, O.SALES_YET_AMOUNT salesYetAmount, 
-			O.SALES_STATUS salesStatus, O.SALES_CREATE_DATE salesCreateDate, 
-			O.SALES_ADMIN_REMARK salesAdminRemark, O.SALES_COLOR_TYPE salesColorType,
-			o.sales_post_num salesPostNum,o.sales_post_firm salesPostFirm,
-			O.SALES_USER_REMARK salesUserRemark, O.SALES_IS_RFUND salesIsRfund
-		FROM 
-			TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_USER_USERINFO U 
-		ON O.SALES_OPENID = U.USER_OPENID 
+		SELECT O.SALES_ORDERID salesOrderid, O.SALES_ADDRESS_NAME salesAddressName,
+		U.USER_NICKNAME userNickname, O.SALES_ADDRESS_TEL salesAddressTel,
+		O.SALES_AMOUNT salesAmount, O.SALES_RATE_AMOUNT salesRateAmount,
+		O.SALES_INTEGRAL_NUM salesIntegralNum, O.SALES_YET_AMOUNT salesYetAmount,
+		O.SALES_STATUS salesStatus, O.SALES_CREATE_DATE salesCreateDate,
+		O.SALES_ADMIN_REMARK salesAdminRemark, O.SALES_COLOR_TYPE salesColorType,
+		o.sales_post_num salesPostNum,o.sales_post_firm salesPostFirm,
+		O.SALES_USER_REMARK salesUserRemark, O.SALES_IS_RFUND salesIsRfund
+		FROM
+		TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_USER_USERINFO U
+		ON O.SALES_OPENID = U.USER_OPENID
 		<where>
 			<if test="salesStatus != null and salesStatus != -1">
-				O.SALES_STATUS = #{salesStatus} 
+				O.SALES_STATUS = #{salesStatus}
 			</if>
 			<if test="salesOrderid != null and salesOrderid!=''">
-				AND O.SALES_ORDERID LIKE CONCAT('%',#{salesOrderid},'%') 
+				AND O.SALES_ORDERID LIKE CONCAT('%',#{salesOrderid},'%')
 			</if>
 			<if test="salesAddressName != null and salesAddressName != ''">
-				AND O.SALES_ADDRESS_NAME LIKE CONCAT('%',#{salesAddressName},'%') 
+				AND O.SALES_ADDRESS_NAME LIKE CONCAT('%',#{salesAddressName},'%')
 			</if>
 			<if test="salesAddressTel != null and salesAddressTel != ''">
-				AND O.SALES_ADDRESS_TEL LIKE CONCAT('%',#{salesAddressTel},'%') 
+				AND O.SALES_ADDRESS_TEL LIKE CONCAT('%',#{salesAddressTel},'%')
 			</if>
 			<if test="salesAddressInfo != null and salesAddressInfo != ''">
-				AND O.SALES_ADDRESS_INFO LIKE CONCAT('%',#{salesAddressInfo},'%') 
+				AND O.SALES_ADDRESS_INFO LIKE CONCAT('%',#{salesAddressInfo},'%')
 			</if>
 			<if test="beginDate != null">
-				<![CDATA[AND DATE_FORMAT(O.SALES_CREATE_DATE, '%Y-%m-%d') >= ]]>DATE_FORMAT(#{beginDate},'%Y-%m-%d') 
+				<![CDATA[AND DATE_FORMAT(O.SALES_CREATE_DATE, '%Y-%m-%d') >= ]]>DATE_FORMAT(#{beginDate},'%Y-%m-%d')
 			</if>
 			<if test="endDate != null">
-				<![CDATA[AND DATE_FORMAT(O.SALES_CREATE_DATE, '%Y-%m-%d') <= ]]>DATE_FORMAT(#{endDate},'%Y-%m-%d') 
+				<![CDATA[AND DATE_FORMAT(O.SALES_CREATE_DATE, '%Y-%m-%d') <= ]]>DATE_FORMAT(#{endDate},'%Y-%m-%d')
 			</if>
 		</where>
-		ORDER BY O.SALES_CREATE_DATE DESC 
+		ORDER BY O.SALES_CREATE_DATE DESC
 		LIMIT ${page.recordBegin},${page.pageSize}
 	</select>
-	
+
 	<!-- 根据条件获取查询数量 -->
 	<select id="selectShopOrderCount" parameterType="Order" resultType="int">
-		SELECT 
-			COUNT(O.SALES_ORDERID)  
-		FROM 
-			TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_USER_USERINFO U 
-		ON O.SALES_OPENID = U.USER_OPENID 
-		WHERE 
-			O.SALES_ORDER_TYPE = 1 
-			<if test="salesStatus != null and salesStatus != -1">
-				 AND O.SALES_STATUS = #{salesStatus} 
-			</if>
-			<if test="salesOrderid != null and salesOrderid!=''">
-				AND O.SALES_ORDERID LIKE CONCAT('%',#{salesOrderid},'%') 
-			</if>
-			<if test="salesAddressName != null and salesAddressName != ''">
-				AND O.SALES_ADDRESS_NAME LIKE CONCAT('%',#{salesAddressName},'%') 
-			</if>
-			<if test="salesAddressTel != null and salesAddressTel != ''">
-				AND O.SALES_ADDRESS_TEL LIKE CONCAT('%',#{salesAddressTel},'%') 
-			</if>
-			<if test="salesAddressInfo != null and salesAddressInfo != ''">
-				AND O.SALES_ADDRESS_INFO LIKE CONCAT('%',#{salesAddressInfo},'%') 
-			</if>
-			<if test="beginDate != null">
-				<![CDATA[AND DATE_FORMAT(O.SALES_CREATE_DATE, '%Y-%m-%d') >= ]]>DATE_FORMAT(#{beginDate},'%Y-%m-%d') 
-			</if>
-			<if test="endDate != null">
-				<![CDATA[AND DATE_FORMAT(O.SALES_CREATE_DATE, '%Y-%m-%d') <= ]]>DATE_FORMAT(#{endDate},'%Y-%m-%d') 
-			</if>
+		SELECT
+		COUNT(O.SALES_ORDERID)
+		FROM
+		TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_USER_USERINFO U
+		ON O.SALES_OPENID = U.USER_OPENID
+		WHERE
+		O.SALES_ORDER_TYPE = 1
+		<if test="salesStatus != null and salesStatus != -1">
+			AND O.SALES_STATUS = #{salesStatus}
+		</if>
+		<if test="salesOrderid != null and salesOrderid!=''">
+			AND O.SALES_ORDERID LIKE CONCAT('%',#{salesOrderid},'%')
+		</if>
+		<if test="salesAddressName != null and salesAddressName != ''">
+			AND O.SALES_ADDRESS_NAME LIKE CONCAT('%',#{salesAddressName},'%')
+		</if>
+		<if test="salesAddressTel != null and salesAddressTel != ''">
+			AND O.SALES_ADDRESS_TEL LIKE CONCAT('%',#{salesAddressTel},'%')
+		</if>
+		<if test="salesAddressInfo != null and salesAddressInfo != ''">
+			AND O.SALES_ADDRESS_INFO LIKE CONCAT('%',#{salesAddressInfo},'%')
+		</if>
+		<if test="beginDate != null">
+			<![CDATA[AND DATE_FORMAT(O.SALES_CREATE_DATE, '%Y-%m-%d') >= ]]>DATE_FORMAT(#{beginDate},'%Y-%m-%d')
+		</if>
+		<if test="endDate != null">
+			<![CDATA[AND DATE_FORMAT(O.SALES_CREATE_DATE, '%Y-%m-%d') <= ]]>DATE_FORMAT(#{endDate},'%Y-%m-%d')
+		</if>
 	</select>
-			
+
 	<!-- 根据orderId查询订单信息 -->
 	<select id="getShopOrderByOrderId" parameterType="String" resultType="Order">
 		SELECT O.SALES_ORDERID salesOrderid, U.USER_NICKNAME userNickname, O.SALES_STATUS salesStatus, 
@@ -193,7 +193,7 @@ PUBLIC
 		AND 
 			O.SALES_ORDER_TYPE = 1 
 	</select>
-	
+
 	<!-- 根据orderId获取订单项数据 -->
 	<select id="getShopOrderItemByOrderId" parameterType="String" resultType="OrderItem">
 		SELECT I.ITEM_PRODUCT_NAME itemProductName, I.ITEM_PRODUCT_PIC itemProductPic, I.ITEM_PRODUCT_PRICE itemProductPrice, 
@@ -207,7 +207,7 @@ PUBLIC
 			ITEM_SALES_ORDERID = #{0} 
 		ORDER BY ITEM_ID DESC
 	</select>
-	
+
 	<!-- 根据orderId查询订单状态 -->
 	<select id="selectOrderStatusByOrderId" parameterType="String" resultType="Order">
 		SELECT 
@@ -221,25 +221,25 @@ PUBLIC
 		WHERE 
 			SALES_ORDERID = #{salesOrderid}
 	</select>
-	
+
 	<!-- 根据orderId修改订单状态 -->
 	<update id="updateOrderStatusByOrderId" parameterType="Order">
-		UPDATE 
-			TB_IAMBERRY_SHOP_SALES_ORDER 
-		SET 
-			<if test="salesChangeOrderid != null and salesChangeOrderid != ''">
-				SALES_CHANGE_ORDERID = #{salesChangeOrderid},
-			</if>
-			<if test="salesAuditRemark != null and salesAuditRemark != ''">
-				SALES_AUDIT_REMARK = #{salesAuditRemark},
-			</if>
-			SALES_STATUS = #{salesStatus} 
-		WHERE 
-			SALES_ORDERID = #{salesOrderid} 
-		AND 
-			SALES_STATUS = #{oldStatus} 
+		UPDATE
+		TB_IAMBERRY_SHOP_SALES_ORDER
+		SET
+		<if test="salesChangeOrderid != null and salesChangeOrderid != ''">
+			SALES_CHANGE_ORDERID = #{salesChangeOrderid},
+		</if>
+		<if test="salesAuditRemark != null and salesAuditRemark != ''">
+			SALES_AUDIT_REMARK = #{salesAuditRemark},
+		</if>
+		SALES_STATUS = #{salesStatus}
+		WHERE
+		SALES_ORDERID = #{salesOrderid}
+		AND
+		SALES_STATUS = #{oldStatus}
 	</update>
-	
+
 	<!-- 根据orderId修改订单状态 -->
 	<update id="updateOrderStatusByOrderIdAndToStatus" parameterType="Order">
 		UPDATE 
@@ -249,7 +249,7 @@ PUBLIC
 		WHERE 
 			SALES_ORDERID = #{salesOrderid} AND SALES_STATUS = #{salesOpenid}
 	</update>
-	
+
 	<!-- 根据orderid添加发货信息并修改状态 -->
 	<update id="deliverOrderByOrderId" parameterType="Order">
 		UPDATE 
@@ -262,7 +262,7 @@ PUBLIC
 		WHERE 
 			SALES_ORDERID = #{salesOrderid}
 	</update>
-	
+
 	<!-- 根据orderid添加发货信息并修改状态 -->
 	<update id="updateOrderDeliver" parameterType="Order">
 		UPDATE 
@@ -277,21 +277,21 @@ PUBLIC
 		AND 
 			SALES_STATUS = #{oldStatus}
 	</update>
-	
+
 	<!-- 修改订单的备注信息 -->
 	<update id="updateOrderAdminRemarkByOrderId" parameterType="Order" >
-		UPDATE 
-			TB_IAMBERRY_SHOP_SALES_ORDER 
+		UPDATE
+		TB_IAMBERRY_SHOP_SALES_ORDER
 		<set>
 			<if test="salesColorType != null and salesColorType != ''">
-				SALES_COLOR_TYPE = #{salesColorType}, 
+				SALES_COLOR_TYPE = #{salesColorType},
 			</if>
 			<if test="salesAdminRemark != null and salesAdminRemark != ''">
 				SALES_ADMIN_REMARK = #{salesAdminRemark}
 			</if>
 		</set>
-		WHERE 
-			SALES_ORDERID = #{salesOrderid}
+		WHERE
+		SALES_ORDERID = #{salesOrderid}
 	</update>
 
 	<!-- 修改订单退款状态 -->
@@ -306,7 +306,7 @@ PUBLIC
 		WHERE
 		SALES_ORDERID = #{salesOrderid}
 	</update>
-	
+
 	<!-- 查询订单中没有奖励积分的数据 -->
 	<select id="selectOrderByIntegral" resultType="Order" resultMap="orderMap">
 		SELECT 
@@ -325,7 +325,7 @@ PUBLIC
 		ORDER BY O.SALES_SEND_DATE ASC 
 		LIMIT ${page.recordBegin},${page.pageSize}
 	</select>
-	
+
 	<resultMap type="com.iamberry.wechat.core.entity.order.Order" id="orderMap">
 		<id column="SALES_ORDERID" property="salesOrderid"/>
 		<result column="SALES_OPENID" property="salesOpenid"/>
@@ -333,7 +333,7 @@ PUBLIC
 		<result column="SALES_REWARD_INTEGRAL_NUM" property="salesRewardIntegralNum"/>
 		<collection property="orderItemList" column="SALES_ORDERID" ofType="com.iamberry.wechat.core.entity.order.OrderItem" select="selectOrderItem"/>
 	</resultMap>
-	
+
 	<!-- 查询订单的订单项 -->
 	<select id="selectOrderItem" parameterType="String" resultType="com.iamberry.wechat.core.entity.order.OrderItem">
 		SELECT I.ITEM_ID itemId, 
@@ -345,8 +345,8 @@ PUBLIC
 			I.ITEM_SALES_ORDERID = #{itemSalesOrderid} 
 		ORDER BY I.ITEM_ID DESC
 	</select>
-	
-	
+
+
 	<!-- 通过openid查询用户购买商品的渠道 -->
 	<select id="getUserByOpenId" parameterType="String" resultType="Member">
 		SELECT 
@@ -363,7 +363,7 @@ PUBLIC
 		WHERE 
 			USER_OPENID = #{openId}
 	</select>
-	
+
 	<!-- 根据推荐人id查询推荐人信息 -->
 	<select id="getUserByUserRefereeid" parameterType="Integer" resultType="Member">
 		SELECT 
@@ -376,23 +376,23 @@ PUBLIC
 		WHERE 
 			USER_ID = #{userId}
 	</select>
-	
+
 	<!-- 根据userid修改会员表信息 -->
 	<update id="updateUserByUserId" parameterType="Member">
-		UPDATE 
-			TB_IAMBERRY_USER_USERINFO 
-		SET 
-			USER_INCOME =(USER_INCOME + #{userIncome}) 
+		UPDATE
+		TB_IAMBERRY_USER_USERINFO
+		SET
+		USER_INCOME =(USER_INCOME + #{userIncome})
 		<where>
 			<if test="userId != null and userId != ''">
-				USER_ID = #{userId} 
+				USER_ID = #{userId}
 			</if>
 			<if test="userOpenid != null and userOpenid != ''">
 				AND USER_OPENID = #{userOpenid}
 			</if>
 		</where>
 	</update>
-	
+
 	<update id="updatePlaceInfo" parameterType="PlaceInfo">
 	     update 
 	     	tb_iamberry_place_info 
@@ -403,8 +403,8 @@ PUBLIC
 	      AND
 	      	<![CDATA[PLACE_AMOUNT + #{amount} >= 0]]>
 	</update>
-     
-     <select id="getPlaceInfoByPlaceId" parameterType="integer" resultType="PlaceInfo">
+
+	<select id="getPlaceInfoByPlaceId" parameterType="integer" resultType="PlaceInfo">
 		SELECT 
 			PLACE_ID id,
 			PLACE_SUPPER_ID supperId,
@@ -421,17 +421,17 @@ PUBLIC
 			PLACE_INIT_CODE  initCode 
         FROM tb_iamberry_place_info WHERE place_id = #{appid}
 	</select>
-	
+
 	<!-- 根据id查询系统规则表信息 -->
 	<select id="getReluByRid" parameterType="Integer" resultType="ShopSystemRule">
 		SELECT R_NUM ruleNum,r_desc ruleDesc, R_TYPE ruleType FROM TB_IAMBERRY_ADMIN_RELU WHERE R_ID = #{rId}
 	</select>
-	
+
 	<!-- 根据类型查询系统推责表信息 -->
 	<select id="getReluByRtype" parameterType="Integer" resultType="ShopSystemRule">
 		SELECT R_NUM ruleNum FROM TB_IAMBERRY_ADMIN_RELU WHERE R_TYPE = #{ruleType} 
 	</select>
-	
+
 	<!-- 查询订单表中有多少是可以奖励积分的单的数量 -->
 	<select id="getOrderNum"  resultType="Integer" parameterType="Order">
 		SELECT 
@@ -446,7 +446,7 @@ PUBLIC
 			O.SALES_STATUS = 5 
 		ORDER BY O.SALES_SEND_DATE ASC 
 	</select>
-	
+
 	<!-- 对客户进行积分奖励 -->
 	<update id="updateOrderIntegral" parameterType="String">
 		UPDATE 
@@ -457,7 +457,7 @@ PUBLIC
 		WHERE 
 			SALES_ORDERID = #{0}
 	</update>
-	
+
 	<!-- 根据规定的订单关闭时间查询大于该时间且是待支付的订单 -->
 	<select id="getOrderByCreateTime" resultType="Order" parameterType="Order">
 		SELECT 
@@ -468,9 +468,9 @@ PUBLIC
 		WHERE 
 			T.SALES_STATUS = 1 
 		AND 
-			<![CDATA[ TIMESTAMPDIFF(SECOND,T.SALES_CREATE_DATE,NOW()) >= #{deadline} ]]> 
+			<![CDATA[ TIMESTAMPDIFF(SECOND,T.SALES_CREATE_DATE,NOW()) >= #{deadline} ]]>
 	</select>
-	
+
 	<!-- 根据规定的订单关闭时间查询大于该时间且是待支付的订单 -->
 	<select id="getOrderByCreateTimeAndFiveMinutes" resultType="Order" parameterType="Order">
 		
@@ -482,26 +482,26 @@ PUBLIC
 			WHERE 
 				T.SALES_STATUS = 1 
 			AND 
-				<![CDATA[  #{deadline}-TIMESTAMPDIFF(SECOND,T.SALES_CREATE_DATE,NOW()) <= 900 ]]> 
+				<![CDATA[  #{deadline}-TIMESTAMPDIFF(SECOND,T.SALES_CREATE_DATE,NOW()) <= 900 ]]>
 	</select>
-	
-	
+
+
 	<!-- 根据orderId修改订单状态，关闭订单 -->
 	<update id="updateOrderByOrderId" parameterType="java.util.List">
-		UPDATE 
-			TB_IAMBERRY_SHOP_SALES_ORDER 
-		SET 
-			SALES_STATUS = 0 
-		WHERE 
-			SALES_ORDERID  IN (
-				<foreach collection="list" item="item" separator=",">
-					#{item} 
-		        </foreach>) 
+		UPDATE
+		TB_IAMBERRY_SHOP_SALES_ORDER
+		SET
+		SALES_STATUS = 0
+		WHERE
+		SALES_ORDERID  IN (
+		<foreach collection="list" item="item" separator=",">
+			#{item}
+		</foreach>)
 	</update>
-	
-		
+
+
 	<!-- 获取某个订单的所有产品的总个数 -->
-  <select id="getItemsNumByOrderId"  parameterType="string" resultType="com.iamberry.wechat.core.entity.order.OrderItem">
+	<select id="getItemsNumByOrderId"  parameterType="string" resultType="com.iamberry.wechat.core.entity.order.OrderItem">
     select 
     	sum(g.item_num) itemNum,
     	c.color_69code produectRemark 
@@ -512,9 +512,9 @@ PUBLIC
 	GROUP BY 
 		c.color_69code
   </select>
-  
-  <!-- 查询状态为待发货的所有订单号 -->
-  <select id="getOrderList" resultType="Order" parameterType="Order">
+
+	<!-- 查询状态为待发货的所有订单号 -->
+	<select id="getOrderList" resultType="Order" parameterType="Order">
   	SELECT 
   		SALES_ORDERID salesOrderid 
   	FROM 
@@ -522,19 +522,19 @@ PUBLIC
   	WHERE 
   		SALES_STATUS = #{salesStatus} 
   </select>
-  
-  <!-- 批量修改订单状态 -->
-  <update id="updateOrderListStatus" parameterType="java.util.List">
-  		<foreach collection="list" item="item" index="index" separator=";" open="" close="">
-			UPDATE 
-				TB_IAMBERRY_SHOP_SALES_ORDER 
-			SET 
-				SALES_STATUS = 5, 
-				SALES_POST_NUM = #{item.salesPostNum,jdbcType=VARCHAR}, 
-				SALES_POST_FIRM = #{item.salesPostFirm,jdbcType=VARCHAR}, 
-				SALES_SEND_DATE = #{item.salesSendDate,javaType=DATE} 
-			WHERE 
-				SALES_ORDERID  =  #{item.salesOrderid,jdbcType=VARCHAR} 
+
+	<!-- 批量修改订单状态 -->
+	<update id="updateOrderListStatus" parameterType="java.util.List">
+		<foreach collection="list" item="item" index="index" separator=";" open="" close="">
+			UPDATE
+			TB_IAMBERRY_SHOP_SALES_ORDER
+			SET
+			SALES_STATUS = 5,
+			SALES_POST_NUM = #{item.salesPostNum,jdbcType=VARCHAR},
+			SALES_POST_FIRM = #{item.salesPostFirm,jdbcType=VARCHAR},
+			SALES_SEND_DATE = #{item.salesSendDate,javaType=DATE}
+			WHERE
+			SALES_ORDERID  =  #{item.salesOrderid,jdbcType=VARCHAR}
 		</foreach>
 	</update>
 
@@ -545,13 +545,13 @@ PUBLIC
 		FROM tb_iamberry_shop_order_item TISOI
 		LEFT JOIN tb_iamberry_shop_sales_order TISSO ON TISOI.item_sales_orderid = TISSO.sales_orderid
 		where TISSO.sales_openid in (
-			SELECT TIUU.user_openid
-			FROM tb_iamberry_user_userinfo TIUU
-			WHERE TIUU.user_dealers = #{userDealers}
+		SELECT TIUU.user_openid
+		FROM tb_iamberry_user_userinfo TIUU
+		WHERE TIUU.user_dealers = #{userDealers}
 		)
 		AND TISOI.item_product_type IN
 		<foreach collection="itemProductType" item="item" open="(" separator="," close=")">
-				#{item}
+			#{item}
 		</foreach>
 		AND TISSO.sales_status in (2,5,12)
 	</select>
@@ -703,31 +703,31 @@ PUBLIC
 
 	<select id="selectShopOrderByPola" parameterType="Order" resultType="Order">
 		SELECT
-			O.SALES_ORDERID salesOrderid,
-			O.SALES_ADDRESS_NAME salesAddressName,
-			U.USER_NICKNAME userNickname,
-			O.SALES_ADDRESS_TEL salesAddressTel,
-			O.SALES_AMOUNT salesAmount,
-			O.SALES_RATE_AMOUNT salesRateAmount,
-			O.SALES_INTEGRAL_NUM salesIntegralNum,
-			O.SALES_YET_AMOUNT salesYetAmount,
-			O.SALES_STATUS salesStatus,
-			O.SALES_CREATE_DATE salesCreateDate,
-			O.SALES_POST_NUM salesPostNum,
-			O.SALES_POST_FIRM salesPostFirm,
-			O.SALES_ADMIN_REMARK salesAdminRemark,
-			O.SALES_COLOR_TYPE salesColorType,
-			O.SALES_USER_REMARK salesUserRemark,
-			O.SALES_IS_RFUND salesIsRfund,
-			O.sales_transaction_date salesTransactionDate,
-			O.sales_address_info salesAddressInfo,
-			O.sales_address_postnum salesAddressPostnum,
-			U.USER_RES_TYPE userResource
+		O.SALES_ORDERID salesOrderid,
+		O.SALES_ADDRESS_NAME salesAddressName,
+		U.USER_NICKNAME userNickname,
+		O.SALES_ADDRESS_TEL salesAddressTel,
+		O.SALES_AMOUNT salesAmount,
+		O.SALES_RATE_AMOUNT salesRateAmount,
+		O.SALES_INTEGRAL_NUM salesIntegralNum,
+		O.SALES_YET_AMOUNT salesYetAmount,
+		O.SALES_STATUS salesStatus,
+		O.SALES_CREATE_DATE salesCreateDate,
+		O.SALES_POST_NUM salesPostNum,
+		O.SALES_POST_FIRM salesPostFirm,
+		O.SALES_ADMIN_REMARK salesAdminRemark,
+		O.SALES_COLOR_TYPE salesColorType,
+		O.SALES_USER_REMARK salesUserRemark,
+		O.SALES_IS_RFUND salesIsRfund,
+		O.sales_transaction_date salesTransactionDate,
+		O.sales_address_info salesAddressInfo,
+		O.sales_address_postnum salesAddressPostnum,
+		U.USER_RES_TYPE userResource
 		FROM
-			TB_IAMBERRY_SHOP_SALES_ORDER O
+		TB_IAMBERRY_SHOP_SALES_ORDER O
 		LEFT JOIN TB_IAMBERRY_USER_USERINFO U ON O.SALES_OPENID = U.USER_OPENID
 		WHERE
-			O.SALES_ORDER_TYPE = 1
+		O.SALES_ORDER_TYPE = 1
 		AND O.SALES_STATUS !=  1
 		AND O.SALES_STATUS !=  0
 		<if test="salesStatus != null and salesStatus != -1">
@@ -762,4 +762,46 @@ PUBLIC
 		ORDER BY ITEM_ID DESC
 	</select>
 
+	<select id="selectNumberBacklog" resultType="NumberBacklogDto">
+		SELECT
+		(CASE WHEN a.sendTheGoods is null THEN 0 ELSE a.sendTheGoods END) as sendTheGoods,
+		(CASE WHEN b.returnGoods is null THEN 0 ELSE b.returnGoods END) as returnGoods,
+		(CASE WHEN c.returnRefund is null THEN 0 ELSE c.returnRefund END) as returnRefund,
+		(CASE WHEN d.exchange is null THEN 0 ELSE d.exchange END) as exchange
+		FROM
+		(
+		(
+		SELECT
+		sum(1) AS sendTheGoods
+		FROM
+		tb_iamberry_shop_sales_order
+		WHERE
+		sales_status = 2
+		) AS a
+		CROSS JOIN (
+		SELECT
+		sum(1) AS returnGoods
+		FROM
+		tb_iamberry_shop_sales_order
+		WHERE
+		sales_status = 3
+		) AS b
+		CROSS JOIN (
+		SELECT
+		sum(1) AS returnRefund
+		FROM
+		tb_iamberry_shop_sales_order
+		WHERE
+		sales_status = 6
+		) AS c
+		CROSS JOIN (
+		SELECT
+		sum(1) AS exchange
+		FROM
+		tb_iamberry_shop_sales_order
+		WHERE
+		sales_status = 11
+		) AS d
+		)
+	</select>
 </mapper>