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

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/order/NumberBacklogDto.java

@@ -0,0 +1,44 @@
+package com.iamberry.wechat.core.entity.order;
+
+public class NumberBacklogDto {
+
+	private Integer sendTheGoods; //待发货数量
+
+	private Integer returnGoods; // 申请退款数量
+
+	private Integer returnRefund; // 申请退货数量
+
+	private Integer exchange; //申请换货数量
+
+	public Integer getSendTheGoods() {
+		return sendTheGoods;
+	}
+
+	public void setSendTheGoods(Integer sendTheGoods) {
+		this.sendTheGoods = sendTheGoods;
+	}
+
+	public Integer getReturnGoods() {
+		return returnGoods;
+	}
+
+	public void setReturnGoods(Integer returnGoods) {
+		this.returnGoods = returnGoods;
+	}
+
+	public Integer getReturnRefund() {
+		return returnRefund;
+	}
+
+	public void setReturnRefund(Integer returnRefund) {
+		this.returnRefund = returnRefund;
+	}
+
+	public Integer getExchange() {
+		return exchange;
+	}
+
+	public void setExchange(Integer exchange) {
+		this.exchange = exchange;
+	}
+}

tooth-common-core/tooth-common-core.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -13,9 +13,10 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="tooth-common-tool" />
+    <orderEntry type="module" module-name="tooth-common-tool" />
     <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -294,5 +294,7 @@ public class ResultInfo {
 	 */
 	/*public static String GET_MACHINE_INFO = "https://rst.iamberry.com/mcahine/getMachineInfo?barCode=";*/
 	public static String GET_MACHINE_INFO = "http://my.com:9797/mcahine/getMachineInfo?barCode=";
+	/*public static String GET_TOOTH_INFO = "https://rst.iamberry.com/mcahine/listToothInfo";*/
+	public static String GET_TOOTH_INFO = "http://my.com:9797/mcahine/listToothInfo";
 
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/order/AdminOrderService.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.face.order;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.member.CashLog;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.order.OrderRebackMoney;
@@ -221,5 +222,9 @@ public interface AdminOrderService {
 	 * @return
 	 */
 	Integer getNotSendCount(String openid);
-
+	/**
+	 * 首页查询待办数量
+	 * @return
+	 */
+	NumberBacklogDto selectNumberBacklog();
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/ImberryConfig.java

@@ -39,7 +39,8 @@ public class ImberryConfig {
 	public static String INFORM_SHIPPING = "";
 
 	public static String ORDER_UPDATE_STATUS_TEXT = "";
-	
+	/**发送待处理订单信息**/
+	public static String PENDING_ORDER_REMINDER = "";
 	static {
 		Properties pro = new Properties();
 		InputStream in = ImberryConfig.class.getClassLoader().getResourceAsStream("iamberry-app-service-config.properties");
@@ -66,7 +67,8 @@ public class ImberryConfig {
 			LEASE_ORDER_SUCCESS_TEXT = pro.getProperty("LEASE_ORDER_SUCCESS_TEXT");
 			INFORM_SHIPPING = pro.getProperty("INFORM_SHIPPING");
 			ORDER_UPDATE_STATUS_TEXT = pro.getProperty("ORDER_UPDATE_STATUS_TEXT");
-			
+			PENDING_ORDER_REMINDER = pro.getProperty("PENDING_ORDER_REMINDER");
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

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

@@ -6,6 +6,7 @@ import java.util.Map;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.drp.PlaceInfo;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.order.OrderRebackMoney;
@@ -210,4 +211,10 @@ public interface AdminOrderMapper {
 	 * @return
 	 */
 	Integer getNotSendCount(String openid);
+
+	/**
+	 * 首页查询待办数量
+	 * @return
+	 */
+	NumberBacklogDto selectNumberBacklog();
 }

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

@@ -1,15 +1,15 @@
 <?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:必须与对应的接口全类名一致
  -->
 <mapper namespace="com.iamberry.wechat.service.mapper.AdminOrderMapper">
 	<!-- 后台订单返利信息查询 -->
 	<select id="selectOrderRebackByOrderId" parameterType="String" resultType="OrderRebackMoney">
-
+		
 		SELECT ( SELECT place_openid FROM tb_iamberry_place_info b WHERE b.place_id = a.logs_place_id
 		) name ,
 		 (SELECT place_username FROM tb_iamberry_place_info b WHERE b.place_id = a.logs_place_id
@@ -18,19 +18,19 @@ PUBLIC
 		SELECT role_name FROM tb_iamberry_place_role WHERE role_id = (
 		SELECT Place_role_id FROM tb_iamberry_place_info b WHERE b.place_id = a.logs_place_id)
 		) role,
-		logs_num money,logs_create_date TIME,logs_introduction remark FROM tb_iamberry_place_logs a WHERE logs_introduction LIKE  CONCAT('%',#{orderId},'%')
+		logs_num money,logs_create_date TIME,logs_introduction remark FROM tb_iamberry_place_logs a WHERE logs_introduction LIKE  CONCAT('%',#{orderId},'%') 
 		UNION ALL
-		SELECT
+		SELECT 
 		(SELECT b.user_openid
 		 FROM   tb_iamberry_user_userinfo b WHERE b.user_openid = a.cash_logs_openid
 		) name,(SELECT b.user_nickname
 		 FROM   tb_iamberry_user_userinfo b WHERE b.user_openid = a.cash_logs_openid
 		)  account
 		,'微代理'  role
-		,cash_logs_num money,cash_logs_create_date TIME,cash_logs_introduction remark FROM tb_iamberry_user_cash_logs  a WHERE cash_logs_orderid =#{orderId}
+		,cash_logs_num money,cash_logs_create_date TIME,cash_logs_introduction remark FROM tb_iamberry_user_cash_logs  a WHERE cash_logs_orderid =#{orderId} 
 		AND cash_logs_type = 1
-		AND cash_logs_res_type = 4
-
+		AND cash_logs_res_type = 4 
+		
 	</select>
 
 	<!--查询未发货数量-->
@@ -45,48 +45,48 @@ 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
+		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
+		TB_IAMBERRY_SHOP_SALES_ORDER O
 		LEFT JOIN
-			TB_IAMBERRY_USER_USERINFO U
+		TB_IAMBERRY_USER_USERINFO U
 		ON
-			O.SALES_OPENID = U.USER_OPENID
-			<!-- 根据用户信息中的dealers查询对应的关系 -->
+		O.SALES_OPENID = U.USER_OPENID
+		<!-- 根据用户信息中的dealers查询对应的关系 -->
 		LEFT JOIN
-			TB_IAMBERRY_DEALERS D
+		TB_IAMBERRY_DEALERS D
 		ON
-			U.USER_DEALERS = D.DEALER_ID
-			<!-- 查询用户关系对应的商户 -->
+		U.USER_DEALERS = D.DEALER_ID
+		<!-- 查询用户关系对应的商户 -->
 		LEFT JOIN
-			TB_IAMBERRY_PLACE_INFO P
+		TB_IAMBERRY_PLACE_INFO P
 		ON
-			D.DEALER_ID = P.PLACE_PIDS
-			<!-- 查询商户的上级，也就是门店 -->
+		D.DEALER_ID = P.PLACE_PIDS
+		<!-- 查询商户的上级，也就是门店 -->
 		LEFT JOIN
-			TB_IAMBERRY_PLACE_INFO PP
+		TB_IAMBERRY_PLACE_INFO PP
 		ON
-			P.PLACE_PID = PP.PLACE_ID
+		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>
+		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>
@@ -105,15 +105,15 @@ PUBLIC
 
 	<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
+		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
+		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">
@@ -145,143 +145,143 @@ PUBLIC
 	<!-- 根据条件获取查询数量 -->
 	<select id="selectShopOrderCount" parameterType="Order" resultType="int">
 		SELECT
-			COUNT(O.SALES_ORDERID)
+		COUNT(O.SALES_ORDERID)
 		FROM
-			TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_USER_USERINFO U
+		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>
+		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,
-			O.SALES_YET_AMOUNT salesYetAmount, O.SALES_INTEGRAL_NUM salesIntegralNum, O.SALES_RATE_AMOUNT salesRateAmount,
-			O.SALES_POST_FIRM salesPostFirm, O.SALES_POST_NUM salesPostNum, O.SALES_CREATE_DATE salesCreateDate,
-			O.SALES_ADDRESS_POSTNUM salesAddressPostnum,  O.SALES_REWARD_INTEGRAL_NUM salesRewardIntegralNum,
-			O.SALES_ADDRESS_NAME salesAddressName, O.SALES_ADDRESS_TEL salesAddressTel, O.SALES_SEND_DATE salesSendDate,
-			O.SALES_USER_REMARK salesUserRemark, O.SALES_COLOR_TYPE salesColorType, O.SALES_ADMIN_REMARK salesAdminRemark,
+		SELECT O.SALES_ORDERID salesOrderid, U.USER_NICKNAME userNickname, O.SALES_STATUS salesStatus, 
+			O.SALES_YET_AMOUNT salesYetAmount, O.SALES_INTEGRAL_NUM salesIntegralNum, O.SALES_RATE_AMOUNT salesRateAmount, 
+			O.SALES_POST_FIRM salesPostFirm, O.SALES_POST_NUM salesPostNum, O.SALES_CREATE_DATE salesCreateDate, 
+			O.SALES_ADDRESS_POSTNUM salesAddressPostnum,  O.SALES_REWARD_INTEGRAL_NUM salesRewardIntegralNum, 
+			O.SALES_ADDRESS_NAME salesAddressName, O.SALES_ADDRESS_TEL salesAddressTel, O.SALES_SEND_DATE salesSendDate, 
+			O.SALES_USER_REMARK salesUserRemark, O.SALES_COLOR_TYPE salesColorType, O.SALES_ADMIN_REMARK salesAdminRemark, 
 			O.SALES_RETURN_DES salesReturnDes, O.SALES_ADDRESS_INFO salesAddressInfo, O.SALES_RETURN_DATE salesReturnDate,
-			O.SALES_AMOUNT salesAmount, O.SALES_TRANSACTION_DATE salesTransactionDate, O.SALES_OPENID salesOpenid,
+			O.SALES_AMOUNT salesAmount, O.SALES_TRANSACTION_DATE salesTransactionDate, O.SALES_OPENID salesOpenid, 
 			O.SALES_COUPON_RECEIVE_ID couponId, O.SALES_BALANCE_AMOUNT balancePayAmount, 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
-			O.SALES_ORDERID = #{0}
-		AND
-			O.SALES_ORDER_TYPE = 1
+		FROM 
+			TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_USER_USERINFO U 
+			ON O.SALES_OPENID = U.USER_OPENID 
+		WHERE 
+			O.SALES_ORDERID = #{0} 
+		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,
+		SELECT I.ITEM_PRODUCT_NAME itemProductName, I.ITEM_PRODUCT_PIC itemProductPic, I.ITEM_PRODUCT_PRICE itemProductPrice, 
 			I.ITEM_PRODUCT_DISCOUNT itemProductDiscount, I.ITEM_NUM itemNum, I.ITEM_TOTAL itemTotal, C.COLOR_NAME productColor,
 			C.COLOR_69CODE produectRemark, I.ITEM_PRODUCT_TYPE itemProductType
-		FROM
-			TB_IAMBERRY_SHOP_ORDER_ITEM I LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P
-			ON I.ITEM_PRODUCT_ID = P.PRODUCT_ID
-			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR C ON I.ITEM_COLOR_ID = C.COLOR_ID
-		WHERE
-			ITEM_SALES_ORDERID = #{0}
+		FROM 
+			TB_IAMBERRY_SHOP_ORDER_ITEM I LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P 
+			ON I.ITEM_PRODUCT_ID = P.PRODUCT_ID 
+			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR C ON I.ITEM_COLOR_ID = C.COLOR_ID 
+		WHERE 
+			ITEM_SALES_ORDERID = #{0} 
 		ORDER BY ITEM_ID DESC
 	</select>
 
 	<!-- 根据orderId查询订单状态 -->
 	<select id="selectOrderStatusByOrderId" parameterType="String" resultType="Order">
-		SELECT
-			SALES_STATUS salesStatus, SALES_PROXY_REWARD salesProxyReward,
+		SELECT 
+			SALES_STATUS salesStatus, SALES_PROXY_REWARD salesProxyReward, 
 			SALES_POST_FIRM salesPostFirm, SALES_POST_NUM salesPostNum ,
 			sales_openid salesOpenid, SALES_IS_RFUND salesIsRfund,
 			SALES_YET_AMOUNT salesYetAmount, sales_return_des salesReturnDes,
 			SALES_ADDRESS_INFO salesAddressInfo
-		FROM
+		FROM 
 			TB_IAMBERRY_SHOP_SALES_ORDER
-		WHERE
+		WHERE 
 			SALES_ORDERID = #{salesOrderid}
 	</select>
 
 	<!-- 根据orderId修改订单状态 -->
 	<update id="updateOrderStatusByOrderId" parameterType="Order">
 		UPDATE
-			TB_IAMBERRY_SHOP_SALES_ORDER
+		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}
+		<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}
+		SALES_ORDERID = #{salesOrderid}
 		AND
-			SALES_STATUS = #{oldStatus}
+		SALES_STATUS = #{oldStatus}
 	</update>
 
 	<!-- 根据orderId修改订单状态 -->
 	<update id="updateOrderStatusByOrderIdAndToStatus" parameterType="Order">
-		UPDATE
-			TB_IAMBERRY_SHOP_SALES_ORDER
-		SET
-			SALES_STATUS = #{salesStatus}
-		WHERE
+		UPDATE 
+			TB_IAMBERRY_SHOP_SALES_ORDER 
+		SET 
+			SALES_STATUS = #{salesStatus} 
+		WHERE 
 			SALES_ORDERID = #{salesOrderid} AND SALES_STATUS = #{salesOpenid}
 	</update>
 
 	<!-- 根据orderid添加发货信息并修改状态 -->
 	<update id="deliverOrderByOrderId" parameterType="Order">
-		UPDATE
-			TB_IAMBERRY_SHOP_SALES_ORDER
-		SET
-			SALES_STATUS = #{salesStatus},
-			SALES_POST_NUM = #{salesPostNum},
-			SALES_POST_FIRM = #{salesPostFirm},
-			SALES_SEND_DATE = NOW()
-		WHERE
+		UPDATE 
+			TB_IAMBERRY_SHOP_SALES_ORDER 
+		SET 
+			SALES_STATUS = #{salesStatus}, 
+			SALES_POST_NUM = #{salesPostNum}, 
+			SALES_POST_FIRM = #{salesPostFirm}, 
+			SALES_SEND_DATE = NOW() 
+		WHERE 
 			SALES_ORDERID = #{salesOrderid}
 	</update>
 
 	<!-- 根据orderid添加发货信息并修改状态 -->
 	<update id="updateOrderDeliver" parameterType="Order">
-		UPDATE
-			TB_IAMBERRY_SHOP_SALES_ORDER
-		SET
-			SALES_STATUS = #{salesStatus},
-			SALES_POST_NUM = #{salesPostNum},
-			SALES_POST_FIRM = #{salesPostFirm},
-			SALES_SEND_DATE = NOW()
-		WHERE
-			SALES_ORDERID = #{salesOrderid}
-		AND
+		UPDATE 
+			TB_IAMBERRY_SHOP_SALES_ORDER 
+		SET 
+			SALES_STATUS = #{salesStatus}, 
+			SALES_POST_NUM = #{salesPostNum}, 
+			SALES_POST_FIRM = #{salesPostFirm}, 
+			SALES_SEND_DATE = NOW() 
+		WHERE 
+			SALES_ORDERID = #{salesOrderid} 
+		AND 
 			SALES_STATUS = #{oldStatus}
 	</update>
 
 	<!-- 修改订单的备注信息 -->
 	<update id="updateOrderAdminRemarkByOrderId" parameterType="Order" >
 		UPDATE
-			TB_IAMBERRY_SHOP_SALES_ORDER
+		TB_IAMBERRY_SHOP_SALES_ORDER
 		<set>
 			<if test="salesColorType != null and salesColorType != ''">
 				SALES_COLOR_TYPE = #{salesColorType},
@@ -291,7 +291,7 @@ PUBLIC
 			</if>
 		</set>
 		WHERE
-			SALES_ORDERID = #{salesOrderid}
+		SALES_ORDERID = #{salesOrderid}
 	</update>
 
 	<!-- 修改订单退款状态 -->
@@ -309,20 +309,20 @@ PUBLIC
 
 	<!-- 查询订单中没有奖励积分的数据 -->
 	<select id="selectOrderByIntegral" resultType="Order" resultMap="orderMap">
-		SELECT
-			O.SALES_ORDERID,
-			O.SALES_OPENID,
-			O.SALES_AMOUNT,
-			O.SALES_REWARD_INTEGRAL_NUM
-		FROM
-			TB_IAMBERRY_SHOP_SALES_ORDER O
-		WHERE
-			O.SALES_PROXY_REWARD = 1
-		AND
+		SELECT 
+			O.SALES_ORDERID, 
+			O.SALES_OPENID, 
+			O.SALES_AMOUNT, 
+			O.SALES_REWARD_INTEGRAL_NUM  
+		FROM 
+			TB_IAMBERRY_SHOP_SALES_ORDER O 
+		WHERE 
+			O.SALES_PROXY_REWARD = 1 
+		AND 
 			<![CDATA[ TIMESTAMPDIFF(SECOND,O.SALES_SEND_DATE,NOW()) >= #{deadline} ]]>
-		AND
-			O.SALES_STATUS = 5
-		ORDER BY O.SALES_SEND_DATE ASC
+		AND 
+			O.SALES_STATUS = 5 
+		ORDER BY O.SALES_SEND_DATE ASC 
 		LIMIT ${page.recordBegin},${page.pageSize}
 	</select>
 
@@ -336,53 +336,53 @@ PUBLIC
 
 	<!-- 查询订单的订单项 -->
 	<select id="selectOrderItem" parameterType="String" resultType="com.iamberry.wechat.core.entity.order.OrderItem">
-		SELECT I.ITEM_ID itemId,
-			I.ITEM_SALES_ORDERID itemSalesOrderid, I.ITEM_PRODUCT_NAME itemProductName,
-			I.ITEM_NUM itemNum, I.ITEM_PRODUCT_TYPE itemProductType
-		FROM
-			TB_IAMBERRY_SHOP_ORDER_ITEM I
-		WHERE
-			I.ITEM_SALES_ORDERID = #{itemSalesOrderid}
+		SELECT I.ITEM_ID itemId, 
+			I.ITEM_SALES_ORDERID itemSalesOrderid, I.ITEM_PRODUCT_NAME itemProductName, 
+			I.ITEM_NUM itemNum, I.ITEM_PRODUCT_TYPE itemProductType 
+		FROM 
+			TB_IAMBERRY_SHOP_ORDER_ITEM I 
+		WHERE 
+			I.ITEM_SALES_ORDERID = #{itemSalesOrderid} 
 		ORDER BY I.ITEM_ID DESC
 	</select>
 
 
 	<!-- 通过openid查询用户购买商品的渠道 -->
 	<select id="getUserByOpenId" parameterType="String" resultType="Member">
-		SELECT
+		SELECT 
 			USER_RES_TYPE userResType,
-			USER_ID userId,
+			USER_ID userId, 
 			USER_OPENID userOpenid,
 			USER_INTEGRAL userIntegral,
 			USER_INCOME userIncome,
 			USER_DEALERS userDealers,
 			USER_TEMPLATE_ID templateId,
-			USER_SURPLUS_INTEGRAL userSurplusIntegral
-		FROM
-			TB_IAMBERRY_USER_USERINFO
-		WHERE
+			USER_SURPLUS_INTEGRAL userSurplusIntegral 
+		FROM 
+			TB_IAMBERRY_USER_USERINFO 
+		WHERE 
 			USER_OPENID = #{openId}
 	</select>
 
 	<!-- 根据推荐人id查询推荐人信息 -->
 	<select id="getUserByUserRefereeid" parameterType="Integer" resultType="Member">
-		SELECT
+		SELECT 
 			USER_OPENID userOpenid,
 			USER_INTEGRAL userIntegral,
 			USER_INCOME userIncome,
-			USER_SURPLUS_INTEGRAL userSurplusIntegral
-		FROM
-			TB_IAMBERRY_USER_USERINFO
-		WHERE
+			USER_SURPLUS_INTEGRAL userSurplusIntegral 
+		FROM 
+			TB_IAMBERRY_USER_USERINFO 
+		WHERE 
 			USER_ID = #{userId}
 	</select>
 
 	<!-- 根据userid修改会员表信息 -->
 	<update id="updateUserByUserId" parameterType="Member">
 		UPDATE
-			TB_IAMBERRY_USER_USERINFO
+		TB_IAMBERRY_USER_USERINFO
 		SET
-			USER_INCOME =(USER_INCOME + #{userIncome})
+		USER_INCOME =(USER_INCOME + #{userIncome})
 		<where>
 			<if test="userId != null and userId != ''">
 				USER_ID = #{userId}
@@ -394,18 +394,18 @@ PUBLIC
 	</update>
 
 	<update id="updatePlaceInfo" parameterType="PlaceInfo">
-	     update
-	     	tb_iamberry_place_info
-	     SET
-	          PLACE_AMOUNT =(PLACE_AMOUNT + #{amount})
-	      WHERE
+	     update 
+	     	tb_iamberry_place_info 
+	     SET 
+	          PLACE_AMOUNT =(PLACE_AMOUNT + #{amount}) 
+	      WHERE 
 	     	PLACE_ID = #{id}
 	      AND
 	      	<![CDATA[PLACE_AMOUNT + #{amount} >= 0]]>
 	</update>
 
-     <select id="getPlaceInfoByPlaceId" parameterType="integer" resultType="PlaceInfo">
-		SELECT
+	<select id="getPlaceInfoByPlaceId" parameterType="integer" resultType="PlaceInfo">
+		SELECT 
 			PLACE_ID id,
 			PLACE_SUPPER_ID supperId,
 			PLACE_NAME  name,
@@ -418,7 +418,7 @@ PUBLIC
 			PLACE_OPENID  openid,
 			PLACE_ROLE_ID roleId,
 			PLACE_PID  placePid ,
-			PLACE_INIT_CODE  initCode
+			PLACE_INIT_CODE  initCode 
         FROM tb_iamberry_place_info WHERE place_id = #{appid}
 	</select>
 
@@ -429,59 +429,59 @@ PUBLIC
 
 	<!-- 根据类型查询系统推责表信息 -->
 	<select id="getReluByRtype" parameterType="Integer" resultType="ShopSystemRule">
-		SELECT R_NUM ruleNum FROM TB_IAMBERRY_ADMIN_RELU WHERE R_TYPE = #{ruleType}
+		SELECT R_NUM ruleNum FROM TB_IAMBERRY_ADMIN_RELU WHERE R_TYPE = #{ruleType} 
 	</select>
 
 	<!-- 查询订单表中有多少是可以奖励积分的单的数量 -->
 	<select id="getOrderNum"  resultType="Integer" parameterType="Order">
-		SELECT
-			COUNT(SALES_ORDERID)
-		FROM
-			TB_IAMBERRY_SHOP_SALES_ORDER O
-		WHERE
-			O.SALES_PROXY_REWARD = 1
-		AND
-			<![CDATA[ TIMESTAMPDIFF(SECOND,O.SALES_SEND_DATE,NOW()) >= #{deadline} ]]>
-		AND
-			O.SALES_STATUS = 5
-		ORDER BY O.SALES_SEND_DATE ASC
+		SELECT 
+			COUNT(SALES_ORDERID) 
+		FROM 
+			TB_IAMBERRY_SHOP_SALES_ORDER O 
+		WHERE 
+			O.SALES_PROXY_REWARD = 1 
+		AND 
+			<![CDATA[ TIMESTAMPDIFF(SECOND,O.SALES_SEND_DATE,NOW()) >= #{deadline} ]]> 
+		AND 
+			O.SALES_STATUS = 5 
+		ORDER BY O.SALES_SEND_DATE ASC 
 	</select>
 
 	<!-- 对客户进行积分奖励 -->
 	<update id="updateOrderIntegral" parameterType="String">
-		UPDATE
-			TB_IAMBERRY_SHOP_SALES_ORDER
-		SET
-			SALES_PROXY_REWARD = 2,
-			SALES_STATUS = 12
-		WHERE
+		UPDATE 
+			TB_IAMBERRY_SHOP_SALES_ORDER 
+		SET 
+			SALES_PROXY_REWARD = 2, 
+			SALES_STATUS = 12 
+		WHERE 
 			SALES_ORDERID = #{0}
 	</update>
 
 	<!-- 根据规定的订单关闭时间查询大于该时间且是待支付的订单 -->
 	<select id="getOrderByCreateTime" resultType="Order" parameterType="Order">
-		SELECT
-			T.SALES_ORDERID salesOrderid,T.SALES_COUPON_RECEIVE_ID couponId,T.SALES_OPENID salesOpenid
-
-		FROM
-			TB_IAMBERRY_SHOP_SALES_ORDER T
-		WHERE
-			T.SALES_STATUS = 1
-		AND
+		SELECT 
+			T.SALES_ORDERID salesOrderid,T.SALES_COUPON_RECEIVE_ID couponId,T.SALES_OPENID salesOpenid 
+			
+		FROM 
+			TB_IAMBERRY_SHOP_SALES_ORDER T 
+		WHERE 
+			T.SALES_STATUS = 1 
+		AND 
 			<![CDATA[ TIMESTAMPDIFF(SECOND,T.SALES_CREATE_DATE,NOW()) >= #{deadline} ]]>
 	</select>
 
 	<!-- 根据规定的订单关闭时间查询大于该时间且是待支付的订单 -->
 	<select id="getOrderByCreateTimeAndFiveMinutes" resultType="Order" parameterType="Order">
-
-			SELECT
+		
+			SELECT 
 				T.SALES_ORDERID salesOrderid,T.SALES_OPENID salesOpenid ,
 				T.SALES_CREATE_DATE salesCreateDate
-			FROM
-				TB_IAMBERRY_SHOP_SALES_ORDER T
-			WHERE
-				T.SALES_STATUS = 1
-			AND
+			FROM 
+				TB_IAMBERRY_SHOP_SALES_ORDER T 
+			WHERE 
+				T.SALES_STATUS = 1 
+			AND 
 				<![CDATA[  #{deadline}-TIMESTAMPDIFF(SECOND,T.SALES_CREATE_DATE,NOW()) <= 900 ]]>
 	</select>
 
@@ -489,52 +489,52 @@ PUBLIC
 	<!-- 根据orderId修改订单状态，关闭订单 -->
 	<update id="updateOrderByOrderId" parameterType="java.util.List">
 		UPDATE
-			TB_IAMBERRY_SHOP_SALES_ORDER
+		TB_IAMBERRY_SHOP_SALES_ORDER
 		SET
-			SALES_STATUS = 0
+		SALES_STATUS = 0
 		WHERE
-			SALES_ORDERID  IN (
-				<foreach collection="list" item="item" separator=",">
-					#{item}
-		        </foreach>)
+		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
+	<select id="getItemsNumByOrderId"  parameterType="string" resultType="com.iamberry.wechat.core.entity.order.OrderItem">
+    select 
     	sum(g.item_num) itemNum,
-    	c.color_69code produectRemark
-    from
-    	tb_iamberry_shop_order_item g  LEFT JOIN tb_iamberry_product_color c on g.item_color_id = c.color_id
-    where
-		g.item_sales_orderid=#{id}
-	GROUP BY
+    	c.color_69code produectRemark 
+    from 
+    	tb_iamberry_shop_order_item g  LEFT JOIN tb_iamberry_product_color c on g.item_color_id = c.color_id 
+    where 
+		g.item_sales_orderid=#{id} 
+	GROUP BY 
 		c.color_69code
   </select>
 
-  <!-- 查询状态为待发货的所有订单号 -->
-  <select id="getOrderList" resultType="Order" parameterType="Order">
-  	SELECT
-  		SALES_ORDERID salesOrderid
-  	FROM
-  		TB_IAMBERRY_SHOP_SALES_ORDER
-  	WHERE
-  		SALES_STATUS = #{salesStatus}
+	<!-- 查询状态为待发货的所有订单号 -->
+	<select id="getOrderList" resultType="Order" parameterType="Order">
+  	SELECT 
+  		SALES_ORDERID salesOrderid 
+  	FROM 
+  		TB_IAMBERRY_SHOP_SALES_ORDER 
+  	WHERE 
+  		SALES_STATUS = #{salesStatus} 
   </select>
 
-  <!-- 批量修改订单状态 -->
-  <update id="updateOrderListStatus" parameterType="java.util.List">
-  		<foreach collection="list" item="item" index="index" separator=";" open="" close="">
+	<!-- 批量修改订单状态 -->
+	<update id="updateOrderListStatus" parameterType="java.util.List">
+		<foreach collection="list" item="item" index="index" separator=";" open="" close="">
 			UPDATE
-				TB_IAMBERRY_SHOP_SALES_ORDER
+			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}
+			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}
+			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>
@@ -701,66 +701,33 @@ PUBLIC
 			date_format(o.sales_create_date,'%Y-%m')
 	</select>
 
-
-	<select id="selectShopOrderByPolaById" parameterType="String" resultType="Order">
-		SELECT
-			O.SALES_ORDERID salesOrderid,
-			O.sales_openid salesOpenid,
-			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,
-			O.sales_return_des salesReturnDes,
-			U.USER_RES_TYPE userResource
-		FROM
-			TB_IAMBERRY_SHOP_SALES_ORDER O
-		LEFT JOIN TB_IAMBERRY_USER_USERINFO U ON O.SALES_OPENID = U.USER_OPENID
-		WHERE
-			O.SALES_ORDERID = #{salesOrderid}
-	</select>
-
 	<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,
-		O.sales_return_des salesReturnDes,
-			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">
@@ -769,10 +736,10 @@ PUBLIC
 		<if test="salesOrderid != null and salesOrderid!=''">
 			AND O.SALES_ORDERID = #{salesOrderid}
 		</if>
-		<if test="beginDate != null and beginDate!='' and selectDateType == 2">
+		<if test="beginDate != null and beginDate!=''">
 			AND O.sales_create_date &gt;= #{beginDate}
 		</if>
-		<if test="endDate != null and endDate!='' and selectDateType == 2">
+		<if test="endDate != null and endDate!=''">
 			AND O.sales_create_date &lt;= #{endDate}
 		</if>
 		ORDER BY O.SALES_CREATE_DATE DESC
@@ -785,7 +752,7 @@ PUBLIC
 		I.item_id itemId,
 		I.ITEM_PRODUCT_NAME itemProductName, I.ITEM_PRODUCT_PIC itemProductPic, I.ITEM_PRODUCT_PRICE itemProductPrice,
 		I.ITEM_PRODUCT_DISCOUNT itemProductDiscount, I.ITEM_NUM itemNum, I.ITEM_TOTAL itemTotal, C.COLOR_NAME productColor,
-		C.COLOR_69CODE produectRemark, C.COLOR_POLY_CODE colorPolyCode, I.ITEM_PRODUCT_TYPE itemProductType
+		C.COLOR_69CODE produectRemark, I.ITEM_PRODUCT_TYPE itemProductType
 		FROM
 		TB_IAMBERRY_SHOP_ORDER_ITEM I LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P
 		ON I.ITEM_PRODUCT_ID = P.PRODUCT_ID
@@ -795,44 +762,46 @@ PUBLIC
 		ORDER BY ITEM_ID DESC
 	</select>
 
-	<select id="selectOrderNum" parameterType="Order" resultType="Integer">
+	<select id="selectNumberBacklog" resultType="NumberBacklogDto">
 		SELECT
-			count(O.SALES_ORDERID)
+		(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
-		TB_IAMBERRY_SHOP_SALES_ORDER O
-		LEFT JOIN TB_IAMBERRY_USER_USERINFO U ON O.SALES_OPENID = U.USER_OPENID
+		(
+		(
+		SELECT
+		sum(1) AS sendTheGoods
+		FROM
+		tb_iamberry_shop_sales_order
 		WHERE
-		O.SALES_ORDER_TYPE = 1
-		AND O.SALES_STATUS !=  1
-		AND O.SALES_STATUS !=  0
-		<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>
-		<if test="beginDate != null and beginDate!=''">
-			AND O.sales_create_date &gt;= #{beginDate}
-		</if>
-		<if test="endDate != null and endDate!=''">
-			AND O.sales_create_date &lt;= #{endDate}
-		</if>
-		ORDER BY O.SALES_CREATE_DATE DESC
-		LIMIT ${page.recordBegin},${page.pageSize}
-	</select>
-
-	<!-- 根据orderId修改订单状态 -->
-	<update id="updateOrderByPola" parameterType="Order">
-		UPDATE
-			TB_IAMBERRY_SHOP_SALES_ORDER
-		SET
-		<if test="salesUserRemark != null and salesUserRemark != ''">
-			sales_user_remark = #{salesUserRemark}
-		</if>
+		sales_status = 2
+		) AS a
+		CROSS JOIN (
+		SELECT
+		sum(1) AS returnGoods
+		FROM
+		tb_iamberry_shop_sales_order
 		WHERE
-			SALES_ORDERID = #{salesOrderid}
-	</update>
-
-
-
+		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>

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

@@ -249,6 +249,9 @@
             <if test="userName!=null and userName != ''">
                 AND  u.user_name like CONCAT('%',#{userName},'%')
             </if>
+            <if test="stayStatus!=null and stayStatus != ''">
+                AND  i.stay_status = #{stayStatus}
+            </if>
             <if test="userNickName!=null and userNickName != ''">
                 AND  u.user_nickname like CONCAT('%',#{userNickName},'%')
             </if>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/AdminOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.service.order;
 import java.util.*;
 
 import com.iamberry.wechat.core.entity.agentInfo.OrderHint;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.statictics.StatisticsSalesOrder;
 import com.iamberry.wechat.service.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -778,4 +779,9 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	public Integer getNotSendCount(String openid) {
 		return adminOrderDao.getNotSendCount(openid);
 	}
+
+	@Override
+	public NumberBacklogDto selectNumberBacklog() {
+		return adminOrderDao.selectNumberBacklog();
+	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/dao/AdminOrderDao.java

@@ -7,6 +7,7 @@ import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.drp.PlaceInfo;
 import com.iamberry.wechat.core.entity.drp.PlaceLogs;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.order.OrderRebackMoney;
@@ -228,5 +229,9 @@ public interface AdminOrderDao {
 	 * @return
 	 */
 	Integer getNotSendCount(String openid);
-
+	/**
+	 * 首页查询待办数量
+	 * @return
+	 */
+	NumberBacklogDto selectNumberBacklog();
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/dao/impl/AdminOrderDaoImpl.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.service.order.dao.impl;
 import java.util.List;
 import java.util.Map;
 
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.statictics.StatisticsSalesOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -334,4 +335,9 @@ public class AdminOrderDaoImpl implements AdminOrderDao {
 	public Integer getNotSendCount(String openid) {
 		return adminOrderMapper.getNotSendCount(openid);
 	}
+
+	@Override
+	public NumberBacklogDto selectNumberBacklog() {
+		return adminOrderMapper.selectNumberBacklog();
+	}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminLoginHandler.java

@@ -103,7 +103,7 @@ public class AdminLoginHandler {
 			// 注册二级管理员的权限
 			request.getSession().setAttribute("permission", adminLoginService.selectAdminChildHavePermissionById(adminInfo.getAdminId()));
 		}
-		
+
 		// 登陆成功
 		mv.setViewName("admin/main/index"); // 转向home页
 		AdminUtils.addAdminUserToSession(object, request);

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -7,10 +7,7 @@ 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.MessageDto;
-import com.iamberry.wechat.core.entity.order.Order;
-import com.iamberry.wechat.core.entity.order.OrderActionDto;
-import com.iamberry.wechat.core.entity.order.OrderItem;
+import com.iamberry.wechat.core.entity.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;
@@ -1036,4 +1033,19 @@ public class AdminOrderHandlers {
             return "{\"status\":\"false\",\"info\":\"备注失败，请稍后重试!\"}";
         }
     }
+
+    /**
+     * 查询待发货事项、申请退款订单、申请退货订单、申请换货订单数量
+     */
+    @ResponseBody
+    @RequestMapping(value = "/selectTodo")
+    public ResultMsg selectTodo(HttpServletRequest request){
+        ResultMsg msg = new ResultMsg();
+        //查询待发货事项、申请退款订单、申请退货订单、申请换货订单 的数量
+        NumberBacklogDto numberBacklogDto = adminOrderService.selectNumberBacklog();
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
+        msg.setData(numberBacklogDto);
+        return msg;
+    }
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -1,15 +1,19 @@
 package com.iamberry.wechat.handles.mq;
 
 import java.lang.reflect.Method;
+import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
 import com.iamberry.wechat.face.integral.UseIntegralService;
+import com.iamberry.wechat.face.order.AdminOrderService;
+import com.iamberry.wechat.service.ImberryConfig;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.SendMessageUtil;
@@ -71,6 +75,8 @@ public class MQTask implements InitializingBean {
 	private AgentPurchaseOrderService agentPurchaseOrderService;
 	@Autowired
 	private UseIntegralService useIntegralService;
+	@Autowired
+	private AdminOrderService adminOrderService;
 	
 	private Lock lock = new ReentrantLock();
 
@@ -427,4 +433,19 @@ public class MQTask implements InitializingBean {
 		useIntegralService.updateIntegralStayToAlready();
 	}
 
+	/**
+	 * 待处理订单提醒（每天下午2:50点，短信提醒益霜、上朵运营一次（15814645335、13472545449）
+	 */
+	@SuppressWarnings(value = {"unchecked", "rawtypes"})
+	/*@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次*/
+	@Scheduled(cron = "0 50 14 * * ?")//每三分钟执行一次
+	public void pendingOrderReminder() {
+		//查询待发货事项、申请退款订单、申请退货订单、申请换货订单 的数量
+		NumberBacklogDto numberBacklogDto = adminOrderService.selectNumberBacklog();
+		Integer num = (numberBacklogDto.getExchange()+numberBacklogDto.getReturnGoods()+numberBacklogDto.getReturnRefund()+numberBacklogDto.getSendTheGoods());
+		String text = MessageFormat.format(ImberryConfig.PENDING_ORDER_REMINDER, num);
+		codeService.informShipping("15814645335", text);
+		codeService.informShipping("13472545449", text);
+	}
+
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/porduct/ProductHandler.java

@@ -10,12 +10,15 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.iamberry.app.tool.util.HttpUtility;
 import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.product.*;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.utils.Result;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -131,10 +134,33 @@ public class ProductHandler {
 	 * @return
 	 */
 	@RequestMapping("/toAdd")
-	public ModelAndView toAddProduct(){
+	public ModelAndView toAddProduct() throws Exception {
 		ModelAndView mv = new ModelAndView("admin/product/addProduct");
 		List<ProductType> list = productTypeService.getAll();
+		List<Object> toothInfoMap = new ArrayList<Object>();
+		List<Object> toothInfoJson = new ArrayList<Object>();
+		String json =  HttpUtility.httpsGet(ResultInfo.GET_TOOTH_INFO);
+		JSONObject toothJson = JSONObject.fromObject(json);
+		if(toothJson.get("resultCode").toString().equals("200")){
+			JSONObject message = JSONObject.fromObject(toothJson.get("message"));
+			if(message.size() > 0){
+				JSONArray produce = message.getJSONArray("produce");
+				for(int i=0;i<produce.size();i++){
+					JSONObject tooth = produce.getJSONObject(i);
+					Map<String,String> toothInfo = new HashMap<>();
+
+					toothInfo.put("produceId",tooth.get("produceId").toString());
+					toothInfo.put("produceName",tooth.get("produceName").toString());
+					JSONObject jsonObject = JSONObject.fromObject(toothInfo);
+					String result = jsonObject.toString();
+					toothInfoJson.add(result);
+					toothInfoMap.add(toothInfo);
+				}
+			}
+		}
 		mv.addObject("typeList", list);
+		mv.addObject("toothInfo", toothInfoMap);
+		mv.addObject("toothInfoJson", toothInfoJson);
 		return mv;
 	}
 	
@@ -592,4 +618,10 @@ public class ProductHandler {
             return msg;
         }
     }
+
+	public ResultMsg addProductColor(HttpServletRequest request,ProductColor productColor){
+		ResultMsg msg = new ResultMsg();
+
+		return msg;
+	}
 }

tooth-wechat-web/src/main/resources/iamberry-app-service-config.properties

@@ -24,3 +24,4 @@ PROBATION_SUCCESS_SECOND_TEXT=\u3010\u7F8E\u56FDWatero\u3011\u5C0A\u656C\u7684\u
 PROBATION_SUCCESS_THIRD_TEXT=\u3010\u7F8E\u56FDWatero\u3011\u5C0A\u656C\u7684\u4F1A\u5458\u60A8\u597D\uFF01\u60A8\u7684\u8BD5\u7528\u8BA2\u53552\u5929\u540E\u5C06\u5230\u671F\uFF0C\u540C\u65F6\uFF0C\u8FD8\u67091L\u7CBE\u7F8E\u91CF\u676F\u5F85\u9886\u53D6\uFF0C\u8BF7\u8FDB\u5165\u5FAE\u4FE1\u516C\u4F17\u53F7\u67E5\u770B\u8BA2\u5355\u3002
 INFORM_SHIPPING=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u4EB2\uFF0C\u60A8\u7684\u8BA2\u5355\u5DF2\u53D1\u8D27\u3002\u5173\u6CE8\u201C\u4E0A\u6735\u5FAE\u5546\u57CE\u201D\u516C\u4F17\u53F7\u53EF\u67E5\u8BE2\u7269\u6D41\u4FE1\u606F
 ORDER_UPDATE_STATUS_TEXT=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u6709\u4E00\u4E2A\u8BA2\u5355\u5F85{0}\uFF0C\u8BF7\u767B\u9646\u4E0A\u6735\u5FAE\u4FE1\u540E\u53F0\u5904\u7406\u3002
+PENDING_ORDER_REMINDER=\u3010soodo\u4E0A\u6735\u3011\u60A8\u6709{0}\u4E2A\u5F85\u53D1\u8D27\u8BA2\u5355\u5904\u7406\u3002

tooth-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -132,7 +132,8 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.ZTreeBean" alias="ZTreeBean"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.drp.ApplyPlaceLogs" alias="ApplyPlaceLogs"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.WechatShare" alias="WechatShare"/>
-	
+		<typeAlias type="com.iamberry.wechat.core.entity.order.NumberBacklogDto" alias="NumberBacklogDto"/>
+
 		<!-- 【门店关注统计报表类】 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.AttentionInfo" alias="AttentionInfo"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.MarketInfo" alias="MarketInfo"/>

tooth-wechat-web/src/main/resources/jdbc.properties

@@ -1,18 +1,18 @@
 jdbc.driver=com.mysql.jdbc.Driver
-#正式库
+#锟斤拷式锟斤拷
 #jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
 #jdbc.username=tooth
 #jdbc.password=Tooth123223
 
-#本地库
-#jdbc.url=jdbc:mysql://192.168.1.254:3306/tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=root
-#jdbc.password=root
+#锟斤拷锟截匡拷
+jdbc.url=jdbc:mysql://192.168.1.254:3306/tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=root
+jdbc.password=root
 
-#测试库
-jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/test_tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=tooth
-jdbc.password=Tooth123223
+#锟斤拷锟皆匡拷
+#jdbc.url=jdbc:mysql://watero2db.mysql.rds.aliyuncs.com/test_watero_pf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=test_watero
+#jdbc.password=waterO123
 
 #pool settings
 jdbc.pool.init=1

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/listStayIntegral.jsp

@@ -47,12 +47,22 @@
 				</select>
 			</span>
         </div>
-
+        <div class="formControls col-2">
+			 <span class="select-box">
+				<select id="stayStatus" name="stayStatus" class="select">
+					<option value="" >待入积分状态</option>
+					<option value="1" ${stayStatus=='1'?'selected':''}>待入账</option>
+					<option value="2" ${stayStatus=='2'?'selected':''}>已入账</option>
+					<option value="3" ${stayStatus=='3'?'selected':''}>订单取消/退货,撤回</option>
+					<option value="4" ${stayStatus=='4'?'selected':''}>取消</option>
+				</select>
+			</span>
+        </div>
         <input name="userName" id="userName" value="${userName }" placeholder="会员姓名搜索" style="width: 150px" class="input-text" type="text">
 
         <input name="userNickName" id="userNickName" value="${userNickName }" placeholder="微信昵称搜索" style="width: 150px" class="input-text" type="text">
 
-        <input  id="beginDate" value="<fmt:formatDate value="${stayRecordedTime}" pattern="yyyy-MM-dd"/>" name="stayRecordedTime" class="input-text Wdate" placeholder="请选择入账日期" style="width: 150px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'2020-10-01'})" readonly>
+        <input  id="beginDate" value="<fmt:formatDate value="${stayRecordedTime}" pattern="yyyy-MM-dd"/>" name="stayRecordedTime" class="input-text Wdate" placeholder="请选择入账日期" style="width: 150px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'2020-10-01'})" readonly><br>
         <input name="changeIntegralMin" id="changeIntegralMin" value="${changeIntegralMin }" placeholder="变动积分数量" style="width: 150px" class="input-text" type="text" onkeyup="value=value.replace(/[^\d]/g,'')">-
         <input name="changeIntegralMax" id="changeIntegralMax" value="${changeIntegralMax }" placeholder="变动积分数量" style="width: 150px" class="input-text" type="text" onkeyup="value=value.replace(/[^\d]/g,'')">
 

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/main/index.jsp

@@ -118,9 +118,20 @@
 			<div class="show_iframe">
 				<div style="display: none" class="loading"></div>
 				<%--<iframe scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/admin/orderStatistics/_sales_order_statistics"></iframe>--%>
-				<iframe scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/common/admin/welcome/welcome.html"></iframe>
+				<iframe id="indexframe" scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/common/admin/welcome/welcome.html"></iframe>
 			</div>
 		</div>
+
+		<div id="selectTodo" class="menu_dropdown bk_2" style="display:none">
+			<div>
+				<%--<a data-id="${pageContext.request.contextPath }/admin/order/selectShopOrder?orderStatus=paySuccess" data-title="订单管理" href="javascript:;" class="J_menuTab" ><span>（</span><span id="sendTheGoods" style="color: #f00">0</span><span>）待发货订单</span></a><br>--%>
+				<a onclick="toOrserList('${pageContext.request.contextPath }/admin/order/selectShopOrder?orderStatus=paySuccess')"  ><span>（</span><span id="sendTheGoods" style="color: #f00">0</span><span>）待发货订单</span></a><br>
+				<a onclick="toOrserList('${pageContext.request.contextPath }/admin/order/selectShopOrder?orderStatus=returnOrder')"  ><span>（</span><span id="returnGoods" style="color: #f00">0</span><span>）申请退款订单</span></a><br>
+				<a onclick="toOrserList('${pageContext.request.contextPath }/admin/order/selectShopOrder?orderStatus=returnOrderEtc')"  ><span>（</span><span id="returnRefund" style="color: #f00">0</span><span>）申请退货订单</span></a><br>
+				<a onclick="toOrserList('${pageContext.request.contextPath }/admin/order/selectShopOrder?orderStatus=inOrder')"  ><span>（</span><span id="exchange" style="color: #f00">0</span><span>）申请换货订单</span></a>
+			</div>
+		</div>
+
 	</section>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
@@ -130,6 +141,60 @@
 		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
-	
+
+<script>
+
+
+        $.ajax({
+            "type" : "post",
+            "url" : "/admin/order/selectTodo",
+            "dataType" : "json",
+            async:false,
+            "success" : function(data) {
+                if(data.status){
+					$("#sendTheGoods").html(data.data.sendTheGoods);
+                    $("#returnGoods").html(data.data.returnGoods);
+                    $("#returnRefund").html(data.data.returnRefund);
+                    $("#exchange").html(data.data.exchange);
+                }
+            },
+            "error":function(data){
+                alert("操作失败，请联系管理员！");
+            }
+        });
+    //页面层
+    layer.open({
+        type: 1,
+        area: ['300px', '180px'], //宽高
+        content: $("#selectTodo").html(),
+        offset: 'rb',
+        shade: 0
+    });
+    function toOrserList(url){
+        $("#min_title_list li").remove();
+        $("#min_title_list").append('<li class="active"><span data-href="/admin/order/selectShopOrder">订单管理</span><i></i><em></em></li>')
+
+		$("#indexframe").attr("src",url);
+
+
+	}
+
+        function Hui_admin_tab(obj){
+            if($(obj).attr('_href')){
+                var bStop=false;
+                var bStopIndex=0;
+                var _href = $(obj).attr('_href');
+                _href += "?" + index++;
+                var topWindow=$(window.parent.document);
+                var childs = obj.parentNode.parentNode.childNodes;//获得爷爷辈的节点
+                for (var i = childs.length - 1; i >= 0; i--) {//清除所有父节点级所有样式
+                    childs[i].className = "";
+                }
+                obj.parentNode.className="current";//把自己爹样式设置上
+                var iframe_box=topWindow.find("#iframe_box");//获取Iframe
+                iframe_box.find(".show_iframe").hide().eq(bStopIndex).show().find("iframe").attr("src",_href);//将连接的网页装载到Iframe
+            }
+        }
+</script>
 </body>
 </html>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/product/addProduct.jsp

@@ -24,29 +24,122 @@
 <div class="pd-20">
 	<form action="${pageContext.request.contextPath }/admin/product/add" class="form form-horizontal" id="form-addGoods" method="POST" enctype="multipart/form-data">
 		<div class="row cl">
-			<label class="form-label col-2"><span class="c-red">*</span>商品名称：</label>
+			<label class="form-label col-2"><span class="c-red">*</span>产品名称：</label>
 			<div class="formControls col-4">
 				<input id="productName" name="productName" type="text" class="input-text" value="" placeholder="" >
 			</div>
 		</div>
-		
+
 		<div class="row cl">
-			<label class="form-label col-2"><span class="c-red">*</span>商品简称：</label>
-			<div class="formControls col-4">
-				<input id="productAbbreviation" name="productAbbreviation" type="text" class="input-text" value="" placeholder="">
+			<label class="form-label col-2"><span class="c-red">*</span>产品类型：</label>
+			<div class="formControls col-2">
+				<span class="select-box">
+					<select id="typeId" name="productType.typeId" class="select">
+						<c:forEach items="${typeList}" var="type" varStatus="status">
+							<option value="${type.typeId}">${type.typeName }</option>
+						</c:forEach>
+		            </select>
+	            </span>
 			</div>
 		</div>
-
-
-		<div  class="row cl">
-			<label class="form-label col-2"><span class="c-red">*</span>介绍图：</label>
-			<div class="col-10 ">
-				<img alt="介绍图" src="" id="introduceImg" width="90" height="80">
-				<input type="hidden" id="productIntroduceImg" name="productIntroduceImg" value=""/>
-				<input id="insertfileIntroduce" class="btn btn-primary radius upload-btn" type="button" value="选择文件" />
+		<div class="row cl">
+			<label class="form-label col-2"><span class="c-red">*</span>产品颜色：</label>
+			<div class="formControls col-8">
+				<table class="table table-border table-bordered table-bg" id="example">
+					<thead>
+					<tr class="text-c">
+						<!-- <th width="25"><input type="checkbox" name="" value=""></th> -->
+						<th width="150">封面图</th>
+						<th width="150">颜色名称</th>
+						<th width="150">颜色简述</th>
+						<th width="150">状态</th>
+						<th width="100">市场价（元）</th>
+						<th width="100">销售价（元）</th>
+						<th width="100">69码</th>
+						<th width="100">PTS产品</th>
+					</tr>
+					</thead>
+					<tbody id="colorTableId">
+					<%--<tr class="text-c">
+						<td><img src=""></td>
+						<td>樱花粉</td>
+						<td>美妙不可方物</td>
+						<td>在售</td>
+						<td>499.00</td>
+						<td>399.00</td>
+						<td>3792387283</td>
+						<td>SD01-xx</td>
+					</tr>--%>
+					</tbody>
+				</table>
+				<input id="addColor" style="margin-top: 10px;" onclick="showAddColor();" class="btn btn-primary radius upload-btn" type="button" value="添加颜色" />
+				<input id="addColor2"  style="margin-top: 10px;display: none" onclick="hideAddColor();" class="btn btn-primary radius upload-btn" type="button" value="关闭添加颜色" />
+				<div id="addcolorDiv" style="display: none">
+				<div  class="row cl">
+					<label class="form-label col-2"><span class="c-red">*</span>产品图片：</label>
+					<div class="col-10 ">
+						<img alt="产品图片" src="" id="introduceImg" width="90" height="80">
+						<input type="hidden" id="productIntroduceImg" name="productIntroduceImg" value=""/>
+						<input id="insertfileIntroduce" class="btn btn-primary radius upload-btn" type="button" value="点击上传（330 px * 280 px）" />
+					</div>
+				</div>
+				<div  class="row cl">
+					<label class="form-label col-2 colorName"><span class="c-red">*</span>颜色名称：</label>
+					<div class="formControls col-3">
+						<input type="text" name="colorName" id="colorName" placeholder="" value="" class="input-text" style="width:150px;">
+					</div>
+					<label class="form-label col-2 colorName"><span class="c-red">*</span>颜色简述：</label>
+					<div class="formControls col-1">
+						<input type="text" name="colorPresent" id="colorPresent" placeholder="" value="" class="input-text" style="width:150px;">
+					</div>
+				</div>
+				<div  class="row cl">
+					<label class="form-label col-2 colorName"><span class="c-red">*</span>颜色状态：</label>
+					<div class="formControls col-3">
+						<select id="colorStatus" name="colorStatus" class="select">
+							<option value="1">在售</option>
+							<option value="2">停止销售</option>
+							<option value="3">删除</option>
+						</select>
+					</div>
+				</div>
+				<div  class="row cl">
+					<label class="form-label col-2 colorName"><span class="c-red">*</span>市场价：</label>
+					<div class="formControls col-3">
+						<input type="text" name="colorPrice" id="colorPrice" placeholder="" value="" class="input-text" style="width:150px;">
+					</div>
+					<label class="form-label col-2 colorName"><span class="c-red">*</span>销售价：</label>
+					<div class="formControls col-1">
+						<input type="text" name="colorDiscount" id="colorDiscount" placeholder="" value="" class="input-text" style="width:150px;">
+					</div>
+				</div>
+				<div  class="row cl">
+					<label class="form-label col-2 colorName"><span class="c-red">*</span>产品69码：</label>
+					<div class="formControls col-3">
+						<input type="text" name="color69Code" id="color69Code" placeholder="" value="" class="input-text" style="width:150px;">
+					</div>
+				</div>
+				<div  class="row cl">
+					<label class="form-label col-2 colorName"><span class="c-red">*</span>PTS产品：</label>
+					<div class="formControls col-3">
+						<select id="ptsProductid" name="ptsProductid" class="select">
+							<c:forEach items="${toothInfo}" var="toothInfo">
+								<option value="${toothInfo.produceId}">${toothInfo.produceName }</option>
+							</c:forEach>
+						</select>
+					</div>
+				</div>
+				<div class="row cl">
+					<div class="col-10 col-offset-2">
+						<!-- <button onClick="return admin_addGoods();" class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 保存</button> -->
+						<button onClick="addColorTable();" class="btn btn-primary radius" type="button">
+							<i class="Hui-iconfont">&#xe632;</i>确认添加
+						</button>
+					</div>
+				</div>
+				</div>
 			</div>
 		</div>
-
 		<div  class="row cl">
 			<label class="form-label col-2"><span class="c-red">*</span>产品banner图：</label>
 			<div class="col-10 " id="bannerInfo">
@@ -62,116 +155,25 @@
 			<label class="form-label col-2"></label>
 			<input id="addBannerimages" class="btn btn-primary radius upload-btn" type="button" value="新增banner图" />
 		</div>
-
-
-		<!-- <div class="row cl">
-			<label class="form-label col-2"><span class="c-red">*</span>商品原价：</label>
-			<div class="formControls col-2">
-				<input id="productPrice" type="text" name="productPrice" id="" placeholder="" value="" class="input-text" style="width:90%">元</div>
-			<label class="form-label col-2"><span class="c-red">*</span>商品折扣价：</label>
-			<div class="formControls col-2">
-				<input id="productDiscount" type="text" name="productDiscount" id="" placeholder="" value="" class="input-text" style="width:90%">元</div>
-		</div> -->
-		
-		
-		<div class="row cl">
-			<label class="form-label col-2"><span class="c-red">*</span>商品状态：</label>
-			<div class="formControls col-2">
-				<span class="select-box">
-				<select id="productStatus" name="productStatus" class="select">
-						<option value="1">在售</option>
-						<option value="2">停止销售</option>
-						<option value="3">删除</option>
-				</select>
-				</span>
-			</div>
-			<label class="form-label col-2"><span class="c-red">*</span>排序：</label>
-			<div class="formControls col-2">
-				<input id="productSortNum" name="productSortNum" type="text" class="input-text" value="" placeholder="">
-			</div>
-		</div>
-		
-		<div class="row cl">
-			<label class="form-label col-2"><span class="c-red">*</span>产品类型：</label>
-			<div class="formControls col-2">
-				<span class="select-box">
-					<select id="typeId" name="productType.typeId" class="select">
-						<option value="">请选择产品类型</option>
-						<c:forEach items="${typeList}" var="type" varStatus="status">
-		                	<option value="${type.typeId}">${type.typeName }</option>
-		                </c:forEach>
-		            </select>
-	            </span>
-            </div>
-            <label class="form-label col-2"><span class="c-red">*</span>产品销售类型：</label>
-			<div class="formControls col-2">
-				<span class="select-box">
-					<select id="productRentType" name="productRentType" class="select">
-							<option value="1">销售产品</option>
-							<option value="2">租赁产品</option>
-					</select>
-				</span>
-            </div>
-		</div>
-		
-		<div class="row cl">
-			<label class="form-label col-2"><span class="c-red">*</span>产品备注：</label>
-			<div class="formControls col-2">
-				<%--<textarea id="productRemark" name="productRemark" class="textarea-text" placeholder="" style="width:200px;height:60px;"></textarea>--%>
-				<input id="productRemark" name="productRemark" type="text" class="input-text" value="" placeholder="" >
-			</div>
-			<label class="form-label col-2"><span class="c-red">*</span>产品颜色释义：</label>
-			<div class="formControls col-2">
-				<input id="productColorDes" name="productColorDes" type="text" class="input-text" value="" placeholder="" >
-			</div>
-		</div>
-		
-		<div class="row cl colorListDiv">
-			<label class="form-label col-2 colorName"><span class="c-red">*</span>颜色名称：</label>
-			<div class="formControls col-1">
-				<input type="text" name="colorList[0].colorName" id="" placeholder="" value="" class="input-text" style="width:90%"></div>
-			<label class="form-label col-1"><span class="c-red">*</span>颜色69码：</label>
-			<div class="formControls col-1">
-				<input type="text" name="colorList[0].color69Code" id="" placeholder="" value="" class="input-text" style="width:90%"></div>
-			<label class="form-label col-1"><span class="c-red">*</span>原价(元)：</label>
-			<div class="formControls col-1">
-				<input  id="colorPrice" type="text" name="colorList[0].colorPrice" id="" placeholder="" value="" class="input-text" style="width:90%"></div>
-			<label class="form-label col-2"><span class="c-red">*</span>折扣价(元)：</label>
-			<div class="formControls col-1">
-				<input  id="colorDiscount" type="text" name="colorList[0].colorDiscount" id="" placeholder="" value="" class="input-text" style="width:90%"></div>
-			<span class="l" id="addColorBtn"><a href="javascript:;" onclick="toAddColorDiv(this)"
-				class="btn btn-danger radius">添加颜色</a>&nbsp;
-		    </span>
-		</div>
-		
 		<div class="row cl" id="iamgeTextDiv">
 			<label class="form-label col-2">商品图文：</label>
 			<div class="formControls col-5"> 
 				<textarea id="productsInfoProductdesc" name="productImageText.imagetextContext" cols="" rows="" class="textarea" ></textarea>
 			</div>
-		</div>		
-		
-		<!-- <div  class="row cl">
-		<label class="form-label col-2"><span class="c-red">*</span>产品参数图：</label>
-			<div class="col-10 ">
-				<img alt="" src="" id="parameterImg" width="90" height="80">
-				<input type="hidden" id="productParameterImg" name="productParameterImg" value=""/>
-				<input type="button" id="insertfileParameter" value="选择文件" />
-			</div>
-		</div> -->
+		</div>
 
 		<div class="row cl">
 			<div class="col-10 col-offset-2">
 				<!-- <button onClick="return admin_addGoods();" class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 保存</button> -->
-				<button onClick="return checkProduct();" class="btn btn-primary radius" type="submit">
+				<button onClick="checkProduct();" class="btn btn-primary radius" type="button">
 					<i class="Hui-iconfont">&#xe632;</i>保存
 				</button>
 			</div>
 		</div>
-		<!-- 已售数量 -->
+		<%--<!-- 已售数量 -->
 		<input type="hidden" name="productSalesnum" value="0">
 		<!-- 浏览量 -->
-		<input type="hidden" name="productAccessnum" value="0">
+		<input type="hidden" name="productAccessnum" value="0">--%>
 		</form>
 </div>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
@@ -198,33 +200,6 @@ KindEditor.ready(function(K) {
         });
 });
 
-//上传产品参数图
-/*
-KindEditor.ready(function(K) {
-	var editor = K.editor({
-    	fileManagerJson : '${pageContext.request.contextPath }/common/other/kingedit/jsp/file_manager_json.jsp',
-        uploadJson : '${pageContext.request.contextPath }/common/other/kingedit/jsp/upload_json.jsp',
-		allowFileManager : true
-	});
-	K('#insertfileParameter').click(function() {
-	     var imgid = $(this).attr("id");//获取当前ID
-		editor.loadPlugin('image', function() {
-			editor.plugin.imageDialog({
-				showRemote : false,
-				imageUrl : K('#productParameterImg').val(),
-				clickFn : function(url, title, width, height, border, align) {
-					K('#parameterImg').attr("src",url);
-					K('#productParameterImg').val(url);
-					editor.hideDialog();
-					return false; 
-				}
-			});
-		});
-	}); 
-	
-});
-*/
-
 //上传介绍图
 KindEditor.ready(function(K) {
 	var editor = K.editor({
@@ -423,103 +398,22 @@ function addBtnEvent(goodsimagess){
 		
 //数据校验
 function checkProduct(){
-	//商品名称数据验证
-	if(!commonLengthJdg('productName',1,60,null,true)){
-		layer.msg("商品名称不能为空!且长度为1-30位",{icon: 2,time:2000});
-		return false;
-	}
-	//商品简称数据验证
-	if(!commonLengthJdg('productAbbreviation',1,20,null,true)){
-		layer.msg("商品简称不能为空!且长度为1-10位",{icon: 2,time:2000});
-		return false;
-	}
-	 
-	//排序验证
-	if(!commonTypeJdg('productSortNum','pInteger',null,true)){
-		layer.msg("排序不能为空!且只能是数字",{icon: 2,time:2000});
-		return false;
-	}
-	
-	//产品类型验证
-	if(!commonTypeJdg('typeId',null,null,true)){
-		layer.msg("产品类型不能为空",{icon: 2,time:2000});
-		return false;
-	}
-	
-	//产品备注验证
-	if(!commonTypeJdg('productRemark',null,null,true)){
-		layer.msg("产品备注不能为空",{icon: 2,time:2000});
-		return false;
-	}
-	
-	//产品颜色释义验证
-	if(!commonTypeJdg('productColorDes',null,null,true)){
-		layer.msg("产品颜色释义不能为空",{icon: 2,time:2000});
-		return false;
-	}
 
-    var colorPrice = null;
-    var colorDiscountes = null;
-	try {
-        //产品颜色名称验证
-        var colorNames = $("input[name*='colorName']");
-		$.each(colorNames,function(n,index){
-			if($(this).val() == ''){
-				throw "产品颜色名称不能为空";
-			}
-		});
-		//产品颜色69码验证
-		var color69Codes = $("input[name*='color69Code']");
-		$.each(color69Codes,function(n,index){
-			if($(this).val() == ''){
-                throw "产品颜色69码不能为空";
-			}
-		});
-		//产品原价验证
-		colorPrice = $("input[name*='colorPrice']");
-		$.each(colorPrice,function(n,index){
-			if(!commonTypeJdg($(this).prop("id"),'money',null,true)){
-				throw "商品原价不能为空!且须为金钱格式";
-			}
-			if(!commonLengthJdg($(this).prop("id"),1,9,null,true)){
-				throw "商品原价长度为1-9位";
-			}
-		});
-		//产品颜色折扣价验证
-		colorDiscountes = $("input[name*='colorDiscount']");
-		$.each(colorDiscountes,function(n,index){
-			if(!commonTypeJdg($(this).prop("id"),'money',null,true)){
-				throw "商品折扣价不能为空!且须为金钱格式";
-			}
-			if(!commonLengthJdg($(this).prop("id"),1,9,null,true)){
-				throw "商品折扣价长度为1-9位";
-			}
-		});
-    }catch (e){
-        layer.msg(e,{icon: 2,time:2000});
-		return false;
+    //产品名称验证
+    var productName = $("#productName").val();
+    if(productName == '' || productName == null){
+        layer.msg("产品名称不能为空",{icon: 2,time:2000});
+        return;
     }
 
-	//产品参数图验证
-	/*
-	if(!commonTypeJdg('productParameterImg',null,null,true)){
-		layer.msg("产品参数图不能为空",{icon: 2,time:2000});
-		return false;
-	}
-	*/
-	
-	//产品介绍图验证
-	if(!commonTypeJdg('productIntroduceImg',null,null,true)){
-		layer.msg("产品介绍图不能为空",{icon: 2,time:2000});
-		return false;
-	}
-	
-	//产品banner图验证
-	if(!commonTypeJdg('productBannerImg',null,null,true)){
-		layer.msg("产品banner图不能为空",{icon: 2,time:2000});
-		return false;
-	}
-	//原价乘100 取整
+
+	//产品banner图名称验证
+    var productBannerImg = $("#productBannerImg").val();
+    if(productBannerImg == null || productBannerImg == ''){
+        layer.msg("产品banner图不能为空",{icon: 2,time:2000});
+        return;
+    }
+	/*//原价乘100 取整
 	$.each(colorPrice,function(n,index){
 		$(this).val(Math.round($(this).val() * 100));
 	});
@@ -527,8 +421,112 @@ function checkProduct(){
 	//折扣价乘100 取整
 	$.each(colorDiscountes,function(n,index){
 		$(this).val(Math.round($(this).val() * 100));
-	});
+	});*/
+
+	var colorList = new Array();
+
+
+    $.ajax({
+        url: '${pageContext.request.contextPath }/admin/product/add',
+        type: "POST",
+        dataType: "json",
+        data: {productId : $("#productName").val(),
+			   typeId : $("#typeId").val(),
+			   productBannerImg : $("#productBannerImg").val(),
+               productsInfoProductdesc : $("#productsInfoProductdesc").val(),
+
+        },
+        error:function(data){
+            layer.msg(data.status,{icon: 5,time:2000});
+        },
+        success:  function(data){
+            layer.msg(data.status,{icon: 1,time:2000});
+			/* $("#Goodstatus").val(obj.val()); */
+			/* window.location.href = '${pageContext.request.contextPath }/admin/goods/listGoodsUI'; */
+        }
+    });
+}
+function showAddColor() {
+    $("#addColor").hide();
+    $("#addColor2").show();
+    $("#addcolorDiv").show();
 }
+function hideAddColor() {
+    $("#addColor").show();
+    $("#addColor2").hide();
+    $("#addcolorDiv").hide();
+}
+function addColorTable(){
+	//产品图片名称验证
+    var productIntroduceImg = $("#productIntroduceImg").val();
+    if(productIntroduceImg == null || productIntroduceImg == ''){
+        layer.msg("产品图片不能为空",{icon: 2,time:2000});
+        return;
+	}
+    //产品颜色名称验证
+    var colorNames = $("#colorName").val();
+        if(colorNames == '' || colorNames == null){
+            layer.msg("产品颜色名称不能为空",{icon: 2,time:2000});
+            return;
+        }
+    //产品简述验证
+    var colorPresent = $("#colorPresent").val();
+        if(colorPresent == '' || colorPresent == null){
+            layer.msg("产品简述不能为空",{icon: 2,time:2000});
+            return;
+        }
+
+    //产品颜色69码验证
+    var color69Codes = $("#color69Code").val();
+        if(color69Codes == '' || color69Codes == null){
+            layer.msg("产品颜色69码不能为空",{icon: 2,time:2000});
+            return;
+        }
+    var r = /^\+?[1-9][0-9]*$/;　　//判断是否为正整数
+    //产品市场价验证
+    var colorPrice = $("#colorPrice").val();
+        if(!r.test(colorPrice)){
+            layer.msg("产品市场价不能为空!且须为金钱格式",{icon: 2,time:2000});
+            return;
+        }
+    //产品销售价验证
+    var colorDiscountes = $("#colorDiscount").val();
+		if(!r.test(colorDiscountes)){
+			layer.msg("产品销售价不能为空!且须为金钱格式",{icon: 2,time:2000});
+			return;
+		}
+
+    var ptsProductid = null;
+    var toothInfoJson = '${toothInfoJson}';
+
+    $.each(eval(toothInfoJson), function(index,item){
+        if(item.produceId == $("#ptsProductid").val()){
+            ptsProductid = item.produceName;
+		}
+    });
+    var colorStatus = null;
+    if($("#colorStatus").val() == 1){
+        colorStatus = "在售";
+	}
+    if($("#colorStatus").val() == 2){
+        colorStatus = "停止销售";
+    }
+    if($("#colorStatus").val() == 3){
+        colorStatus = "删除";
+    }
+    var colorTable = '<tr class="text-c">'+
+        '<td><img style="width: 50px;height: 50px;" src="'+$("#productIntroduceImg").val()+'"></td>'+
+        '<td>'+$("#colorName").val()+'</td>'+
+        '<td>'+$("#colorPresent").val()+'</td>'+
+        '<td>'+colorStatus+'</td>'+
+        '<td>'+$("#colorPrice").val()+'</td>'+
+        '<td>'+$("#colorDiscount").val()+'</td>'+
+        '<td>'+$("#color69Code").val()+'</td>'+
+        '<td>'+ptsProductid+'</td>'+
+        '</tr>';
+		$("#colorTableId").append(colorTable);
+}
+
 
 </script>
 </body>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/product/productList.jsp

@@ -64,15 +64,17 @@
 				<tr class="text-c">
 					<!-- <th width="25"><input type="checkbox" name="" value=""></th> -->
 					<th width="150">商品名称</th>
-					<th width="100">介绍图</th>
+					<%--<th width="100">介绍图</th>--%>
 					<!-- <th width="130">已售数量</th> -->
-					<th width="50">排序</th>
-					<th width="50">商品状态</th>
+					<%--<th width="50">排序</th>--%>
+					<%--<th width="50">商品状态</th>--%>
 					
 					<!-- <th width="100">产品颜色</th> -->
 					<th width="150">产品类型</th>
-					<th width="100">产品销售类型 </th>
-					<th width="150">备注</th>
+					<th width="150">颜色数量</th>
+					<th width="150">添加日期</th>
+					<%--<th width="100">产品销售类型 </th>--%>
+					<%--<th width="150">备注</th>--%>
 					<th width="100">操作</th>
 				</tr>
 			</thead>
@@ -83,12 +85,12 @@
 						<tr class="text-c">
 							<%-- <td><input type="checkbox" value="${product.productId }" name="productId"></td> --%>
 							<td>${product.productName }</td>
-							<td><img src="${product.productIntroduceImg }" width="50" height="50"></img></td>
+							<%--<td><img src="${product.productIntroduceImg }" width="50" height="50"></img></td>--%>
 							<%-- <td>${product.productSalesnum}</td> --%>
 							
-							<td>${product.productSortNum }</td>
-							<td>${product.productStatus==1?'在售':''}${product.productStatus==2?'停止销售':''}${product.productStatus==3?'删除':''}</td>
-							
+							<%--<td>${product.productSortNum }</td>--%>
+							<%--<td>${product.productStatus==1?'在售':''}${product.productStatus==2?'停止销售':''}${product.productStatus==3?'删除':''}</td>
+							--%>
 							<%-- <td>
 								${product.productColor=='1'?'品蓝':'' }${product.productColor=='2'?'品黑':'' }
 								${product.productColor=='3'?'苹果绿':'' }${product.productColor=='4'?'西瓜粉':'' }
@@ -97,21 +99,26 @@
 							<td>
 								${product.productType.typeName }
 							</td>
-							
 							<td>
+								${product.colorList.size() }
+							</td>
+							<td>
+								<fmt:formatDate value="${product.productCreateDate }" pattern="yyyy-MM-dd HH:mm:ss" />
+							</td>
+							<%--<td>
 								${product.productRentType == 1?'销售产品':''}
 								${product.productRentType == 2?'租赁产品':''}
-							</td>
-							<td>${product.productRemark } </td>
+							</td>--%>
+							<%--<td>${product.productRemark } </td>--%>
 							<td class="td-manage">
-								<span >
+								<%--<span >
 								<input id="productStatus" type="hidden" value="${product.productStatus }">
 								<select id="Goodstatus" name="" onchange="updateProductStatus(this,${product.productId })">
 									<option value="1" ${product.productStatus==1?'selected':''}>在售</option>
 									<option value="2" ${product.productStatus==2?'selected':''}>停止销售</option>
 									<option value="3" ${product.productStatus==3?'selected':''}>删除</option>
 								</select>
-								</span>
+								</span>--%>
 								<a onclick="goods_edit('${pageContext.request.contextPath }/admin/product/toUpdate/${product.productId }')" 
 								title="编辑" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6df;</i></a> 
 							</td>

tooth-wechat-web/src/main/webapp/common/other/kingedit/jsp/upload_json.jsp

@@ -14,7 +14,7 @@ String hostName = "";
 if (request.getRequestURL().indexOf("localhost") == -1) {
 	hostName = "https://w.iamberry.com";
 } else {
-	hostName = "https://localhost:" + request.getLocalPort();
+	hostName = "http://localhost:" + request.getLocalPort();
 }
 //文件保存目录路径
 String savePath = pageContext.getServletContext().getRealPath(saveServerPath);

tooth-wechat-web/src/main/webapp/view/view_logistics.html

@@ -142,7 +142,7 @@
 </div> -->
 <div class="mui-content" style="background: #fff;">
     <div style="position: relative;height: 100px;padding:20px 15px;background: #6bc5e3;">
-        <img style="float: left;" width="60px" src="//s.iamberry.com/tooth/new/images/logistics.png">
+        <img style="float: left;" width="60px" src="//s.iamberry.com/tooth/new/images/logistics.jpg">
         <ul style="display: inline-block;float: left;text-align: left;color: #fff;line-height: 30px;padding: 0 0 0 10px;">
             <li id="billName"></li>
             <li>单号：<span id="billCode"></span></li>