Merge branch 'master' of http://git.iamberry.com/wangxiaoming/iamberry-aiberle

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/Product.java

@@ -52,8 +52,12 @@ public class Product implements java.io.Serializable{
 											//			5：青色	6：蓝色	7：紫色	8：白色
 	private ProductType productType;			//商品类型
 
+	private String productTypeName;			//商品类型名称
+
 	private String productChildType;		//产品关联小类
 
+	private String productChildTypeName;			//商品小类类型名称
+
 	private Integer productChoiceness;		//精选类型0：非精选1：精选置顶2：精选排后
 
 	private String productChoicenessIm;		//精选图片
@@ -291,6 +295,22 @@ public class Product implements java.io.Serializable{
 		this.productChildType = productChildType;
 	}
 
+	public String getProductTypeName() {
+		return productTypeName;
+	}
+
+	public void setProductTypeName(String productTypeName) {
+		this.productTypeName = productTypeName;
+	}
+
+	public String getProductChildTypeName() {
+		return productChildTypeName;
+	}
+
+	public void setProductChildTypeName(String productChildTypeName) {
+		this.productChildTypeName = productChildTypeName;
+	}
+
 	@Override
 	public String toString() {
 		return "Product [productId=" + productId + ", productName="

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/ProductColor.java

@@ -33,6 +33,8 @@ public class ProductColor implements java.io.Serializable {
     private Integer cartId; //购物车id
     private Integer cartNum;//购物车数量
 
+    private String colorCode; //颜色代码
+
     public Integer getColorStatus() {
         return colorStatus;
     }
@@ -176,4 +178,12 @@ public class ProductColor implements java.io.Serializable {
     public void setCartNum(Integer cartNum) {
         this.cartNum = cartNum;
     }
+
+    public String getColorCode() {
+        return colorCode;
+    }
+
+    public void setColorCode(String colorCode) {
+        this.colorCode = colorCode;
+    }
 }

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

@@ -139,6 +139,8 @@ public class ResultInfo {
 	public static final String returnAgreeRemark =  "请您尽快联系客服人员处理，根据客服人员指引将机器寄回。如有问题请致电400-800-6692或直接在微信留言，Aiberle爱贝源将第一时间为您服务！";
 
 	public static final String exchangeRemark =  "请确认您的换货申请信息填写无误！如有问题请致电400-800-6692或直接在微信留言，Aiberle爱贝源将第一时间为您服务！";
+	public static final String exchangeRejectRemark =  "请确认您的换货申请信息填写无误！如有问题请致电400-800-6692或直接在微信留言，Aiberle爱贝源将第一时间为您服务！";
+	public static final String exchangeAgreeRemark =  "请您尽快联系客服人员处理，根据客服人员指引将机器寄回。如有问题请致电400-800-6692或直接在微信留言，Aiberle爱贝源将第一时间为您服务！";
 
 	/**
 	 * 订单详情连接

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

@@ -144,10 +144,11 @@ Reback_status  = 2) placeId
 	<select id="getShopOrderItemByOrderId" parameterType="String" resultType="OrderItem">
 		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, P.PRODUCT_COLOR productColor,
-			P.PRODUCT_REMARK produectRemark 
+			pc.color_69code produectRemark
 		FROM 
-			TB_IAMBERRY_SHOP_ORDER_ITEM I LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P 
-			ON I.ITEM_PRODUCT_ID = P.PRODUCT_ID 
+			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 pc ON i.item_color_id = pc.color_id
 		WHERE 
 			ITEM_SALES_ORDERID = #{0} 
 		ORDER BY ITEM_ID DESC

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

@@ -10,20 +10,21 @@
 	</sql>
 
 	<resultMap id="productMap" type="Product">
-	<id column="product_id" property="productId"/>
-	<result column="product_name" property="productName"/>
-	<result column="product_abbreviation" property="productAbbreviation"/>
-	<result column="product_salesnum" property="productSalesnum"/>
-	<result column="product_accessnum" property="productAccessnum"/>
-	<result column="product_status" property="productStatus"/>
-	<result column="product_parameter_img" property="productParameterImg"/>
-	<result column="PRODUCT_CREATE_DATE" property="productCreateDate"/>
-	<result column="PRODUCT_SORT_NUM" property="productSortNum"/>
-	<result column="PRODUCT_COLOR_DES" property="productColorDes"/>
-	<result column="PRODUCT_REMARK" property="productRemark"/>
-	<result column="PRODUCT_CHOICENESS" property="productChoiceness"/>
-	<result column="product_choiceness_im" property="productChoicenessIm"/>
-	<result column="product_child_type" property="productChildType"/>
+		<id column="product_id" property="productId"/>
+		<result column="product_name" property="productName"/>
+		<result column="product_abbreviation" property="productAbbreviation"/>
+		<result column="product_salesnum" property="productSalesnum"/>
+		<result column="product_accessnum" property="productAccessnum"/>
+		<result column="product_status" property="productStatus"/>
+		<result column="product_parameter_img" property="productParameterImg"/>
+		<result column="PRODUCT_CREATE_DATE" property="productCreateDate"/>
+		<result column="PRODUCT_SORT_NUM" property="productSortNum"/>
+		<result column="PRODUCT_COLOR_DES" property="productColorDes"/>
+		<result column="PRODUCT_REMARK" property="productRemark"/>
+		<result column="PRODUCT_CHOICENESS" property="productChoiceness"/>
+		<result column="product_choiceness_im" property="productChoicenessIm"/>
+		<result column="product_child_type" property="productChildType"/>
+		<result column="child_type_name" property="productChildTypeName"/>
 	<collection property="productColorList" column="product_id" ofType="colorMap" select="selectProductColor"/>
 </resultMap>
 
@@ -59,7 +60,8 @@
 		PRODUCT_REMARK,
 		PRODUCT_CHOICENESS,
 		product_child_type,
-		product_choiceness_im
+		product_choiceness_im,
+		tb_iamberry_product_child_type.child_type_name
 		FROM 
 			TB_IAMBERRY_PRODUCT_INFO
 		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR on TB_IAMBERRY_PRODUCT_INFO.product_id = TB_IAMBERRY_PRODUCT_COLOR.color_product_id

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java

@@ -89,7 +89,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				if(orderByaddress.getSalesStatus() == 2){
 					try {
 						sendMessageUtil.orderSendSuccess(
-								"尊敬的朵粉，您的订单已发货，物流信息:",
+								"尊敬的用户，您的订单已发货，物流信息:",
 								order.getSalesOrderid(),
 								SendMessageUtil.hashmap.get(respData.getString("shipping_name")),
 								respData.getString("invoice_no"),

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

@@ -332,7 +332,7 @@ public class AdminOrderHandlers {
 		// 判断当前的订单，是否支持希望进行的操作
 		Order currentOrder = adminOrderService.selectOrderStatusByOrderId(orderId);
 		//获取当前订单订单项
-		List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(currentOrder.getSalesOrderid());
+		List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(orderId);
 
 		Integer orderStatus = currentOrder.getSalesStatus();
 		order.setOldStatus(orderStatus);
@@ -397,15 +397,22 @@ public class AdminOrderHandlers {
 					}
 					//给用户发送消息-已发货的通知
 					
-					
-					//消息内容
-					String data = ResultInfo.ORDERPACKAGETEMP;
-					data = data.replaceFirst("firstValueOrder", ResultInfo.SHIPMENTMESSAGE)
-						.replaceFirst("orderIdValueOrder",  orderId)
-						.replaceFirst("orderValuePackageId",SendMessageUtil.hashmap.get(actionDto.getPostFirm())+":"+actionDto.getPostNum())
-						.replaceFirst("orderRemarkValue", ResultInfo.INTOSHOP);
-					sendMessageUtil.sendTemplateMessageToOpenid(data, currentOrder.getSalesOpenid(), ResultInfo.PAGE_SHIPMENT+orderId, 2);
-					
+					/*发货推送*/
+					Order newOrder = adminOrderService.selectOrderStatusByOrderId(orderId);
+					try {
+						sendMessageUtil.orderSendSuccess(
+								"尊敬的用户，您的订单已发货，物流信息:",
+								orderId,
+								SendMessageUtil.hashmap.get(newOrder.getSalesPostFirm()),
+								newOrder.getSalesPostNum(),
+								newOrder.getSalesAddressInfo(),
+								ResultInfo.sendRemark1,
+								newOrder.getSalesOpenid(),
+								ResultInfo.ORDER_DETAIL+order.getSalesOrderid()
+						);
+					} catch (Exception e) {
+						logger.info("订单号："+ order.getSalesOrderid() +"的订单已发货，发送微信消息失败!");
+					}
 					return mv;
 				} else {
 					mv.addObject("msgObj", new MessageDto(false, "对不起，取消订单失败", "对不起，取消订单失败，请稍后重试！"));
@@ -660,6 +667,24 @@ public class AdminOrderHandlers {
 					} catch (Exception e) {
 						System.out.println("===========pay 201  插入返利到百胜失败==============");		
 					}
+
+					/*换货推送与发货一致*/
+					Order newOrder = adminOrderService.selectOrderStatusByOrderId(orderId);
+					try {
+						sendMessageUtil.orderSendSuccess(
+								"尊敬的用户，您的订单已发货，物流信息:",
+								orderId,
+								SendMessageUtil.hashmap.get(newOrder.getSalesPostFirm()),
+								newOrder.getSalesPostNum(),
+								newOrder.getSalesAddressInfo(),
+								ResultInfo.sendRemark1,
+								newOrder.getSalesOpenid(),
+								ResultInfo.ORDER_DETAIL+order.getSalesOrderid()
+						);
+					} catch (Exception e) {
+						logger.info("订单号："+ order.getSalesOrderid() +"的订单已发货，发送微信消息失败!");
+					}
+
 					return mv;
 				} else {
 					mv.addObject("msgObj", new MessageDto(false, "对不起，订单发货失败", "对不起，订单发货失败，请稍后重试！"));
@@ -697,12 +722,12 @@ public class AdminOrderHandlers {
 									"尊敬的用户，您的退货申请已通过。",
 									orderId,
 									itemList.get(0).getItemProductName(),
-									ResultInfo.exchangeRemark,
+									ResultInfo.exchangeAgreeRemark,
 									currentOrder.getSalesOpenid(),
 									ResultInfo.ORDER_DETAIL+orderId
 							);
 						} catch (Exception e) {
-							logger.info("订单号："+ orderId +"的订单申请换货，发送微信消息失败!");
+							logger.info("订单号："+ orderId +"的订单退货申请已通过，发送微信消息失败!");
 						}
 
 					}else{
@@ -712,12 +737,12 @@ public class AdminOrderHandlers {
 									"尊敬的用户，您的换货申请被退回。",
 									orderId,
 									itemList.get(0).getItemProductName(),
-									ResultInfo.exchangeRemark,
+									ResultInfo.exchangeRejectRemark,
 									currentOrder.getSalesOpenid(),
 									ResultInfo.ORDER_DETAIL+orderId
 							);
 						} catch (Exception e) {
-							logger.info("订单号："+ orderId +"的订单申请换货，发送微信消息失败!");
+							logger.info("订单号："+ orderId +"的订单换货申请被退回，发送微信消息失败!");
 						}
 
 					}

iamberry-wechat-web/src/main/resources/ResultInfo.properties

@@ -77,9 +77,4 @@ order_apply_refund=PbTdaDa4payS_Iq6PE7xQRSaG1S21HW0lncnU4dfbYI
 order_apply_return=pnxucPuUygE6epyyC3oPGhjxm2o7mK_B2vLzYxIYXRo
 order_apply_barter=qmj2m-BVyZtEKsKCSBbPlJVSykOr2YScr9pRkPA909w
 order_send_success=Nd6MapQ80Ye4PsQOwJdYljxyPGz6N5gfmGip_KztnhY
-
-order_refund_msg=KNMyO9uDRrXlhJtdQuqCwH1T_AoMFYBCQUhQrlR1EdQ
-
-
-
-
+order_refund_msg=KNMyO9uDRrXlhJtdQuqCwH1T_AoMFYBCQUhQrlR1EdQ

iamberry-wechat-web/src/main/webapp/WEB-INF/views/admin/main/login.jsp

@@ -30,12 +30,12 @@
 	<input type="hidden" id="TenantId" name="TenantId" value="" />
 	<div class="header"></div>
 	<div class="loginWraper">
-		<div id="loginform" class="loginBox bk-gray radius box-shadow">
+		<div id="loginform" class="loginBox">
 			<form class="form form-horizontal"
 				action="${pageContext.request.contextPath }/login" method="post">
 				<input type="hidden"
 					value="<%=session.getAttribute("loginToken")%>" name="loginToken">
-				<c:if test="${!empty isShowDiv}">
+				<%--<c:if test="${!empty isShowDiv}">
 				<c:choose>
 					<c:when test="${isShowDiv == true }">
 						<div id="errorDiv"
@@ -54,57 +54,78 @@
 						</div>
 					</c:otherwise>
 				</c:choose>
-				</c:if>
+				</c:if>--%>
 				<div class="row cl">
-					<label class="form-label col-3"><i class="Hui-iconfont">&#xe60d;</i></label>
-					<div class="formControls col-8">
+					<h4 class="formControls col-12">欢迎登录</h4>
+				</div>
+				<div class="row cl">
+					<label class="form-label col-1"><i class="Hui-iconfont">&#xe60d;</i></label>
+					<div class="formControls col-9">
 						<input id="adminLoginName" autocomplete="off" name="adminLoginName" type="text"
 							value="${loginName }" placeholder="请输入账号" class="input-text size-L">
 					</div>
 				</div>
 				<div class="row cl">
-					<label class="form-label col-3"><i class="Hui-iconfont">&#xe60e;</i></label>
-					<div class="formControls col-8">
+					<label class="form-label col-1"><i class="Hui-iconfont">&#xe60e;</i></label>
+					<div class="formControls col-9">
 						<input id="adminLoginPwd" autocomplete="off" name="adminLoginPwd" type="password"
 							value="${loginPwd }" placeholder="请输入密码" class="input-text size-L">
 					</div>
 				</div>
 				<div class="row cl">
-					<div class="formControls col-8 col-offset-3">
+					<label class="form-label col-1"><i class="Hui-iconfont">&#xe60e;</i></label>
+					<div class="formControls col-11">
 						<input class="input-text size-L" autocomplete="off" id="verifyCode" name="verifyCode"
 							type="text" placeholder="验证码"
 							onblur="if(this.value==''){this.value='验证码:'}"
 							onclick="if(this.value=='验证码:'){this.value='';}" value="验证码:"
 							style="width: 150px;"> <img
 							src="${pageContext.request.contextPath }/verify.image"
-							id="verifyCode"> <a id="kanbuq" href="javascript:;">看不清，换一张</a>
+							id="verifyCode"> <a id="kanbuq" href="javascript:;">换一张</a>
 					</div>
 				</div>
 				<div class="row">
-			        <div class="formControls col-8 col-offset-3">
+			        <div class="formControls col-11 col-offset-1">
 			          <label for="online">
 			            <input type="checkbox" name="online" id="online" value="true">使我保持登录状态
 			          </label>
 			        </div>
 		      	</div>
 				<div class="row">
-					<div class="formControls" style="margin: 0 auto;text-align: center;">
+					<div class="formControls col-11 col-offset-1">
 						<input name="" type="submit" class="btn btn-iamberry"
 							onsubmit="checkLogin()"
 							value="立即登录"> <input
-							name="" type="reset" class="btn btn-default radius size-L"
+							name="" type="reset" class="btn btn-default size-L"
 							value="&nbsp;取&nbsp;&nbsp;&nbsp;&nbsp;消&nbsp;" style="display:none;">
 					</div>
 				</div>
 			</form>
 		</div>
+		<div class="right-box">
+
+		</div>
+	</div>
+	<div class="left-bg">
+
 	</div>
-	<div class="footer">Copyright 深圳爱贝源科技有限公司</div>
+	<div class="right-bg">
+
+	</div>
+	<div class="bottom-bg">
+
+	</div>
+	<%--<div class="footer">Copyright 深圳爱贝源科技有限公司</div>--%>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/iamberry/common/js/utils/md5.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/js/utils/md5.js"></script>
 	<script type="text/javascript">
+
+		var  errorMsg = '${divText }';
+		if(errorMsg!=null){
+            alert(errorMsg);
+		}
 		$(function() {
 			$("#kanbuq").click(
 					function() {

iamberry-wechat-web/src/main/webapp/common/admin/css/H-ui.login.css

@@ -9,18 +9,21 @@ Created & Modified by guojunhui.
 body{font-size:14px}
 
 .header,.footer{ position:absolute; left:0; right:0; width:100%; z-index:99}
-.header{top:0; height:60px; background:#e9004c url(../images/logo.png) no-repeat 0 center}
-.btn-iamberry{background:#e9004c;color:#fff;border:0;border-radius: 25px;padding: 6px 12px;width: 150px;height:35px;}
-.btn-iamberry:hover{background:#cf0044;}
-.loginWraper{ position:absolute;width:100%; left:0; top:0; bottom:0; right:0; z-index:1; background:#3283AC url(../images/admin-login-bg.jpg) no-repeat center;}
-.loginBox{ position:absolute; width:617px; height:374px; background-color: rgba(255,255,255,0.8);border:1px solid #e9004c\9;border:1px solid rgba(230,0,76,.3); left:50%; top:50%; margin-left:-309px; margin-top:-184px; padding-top:38px;border-radius:10px;-webkit-box-shadow: 0 0 4px rgba(230,0,76,0.3);
-    box-shadow: 0 0 4px rgba(230,0,76,0.3);}
+.header{top:0; height:60px; background:url(../images/logo.png) no-repeat  center bottom;background-size:auto 80% ;}
+.btn-iamberry{background:#e5e5e6;color:#fff;border:0;padding: 6px 0;width: 100%;height:45px;}
+.btn-iamberry:hover{background:#666;}
+.left-bg{position: absolute;left: 0;top: 0;width: 150px;height: 150px;background: url(../images/left-1.png) top left no-repeat;background-size: 100%;}
+.right-bg{position: absolute;right: 0;top: 50%;margin-top: -71px; width: 44px;height: 142px;background: url(../images/right-1.png) right center no-repeat;background-size:auto 100%;}
+.bottom-bg{position: absolute;bottom: 0;left: 50%;margin-left: -140px; width: 271px;height: 66px;background: url(../images/bottom-1.png) center bottom no-repeat;background-size:100% auto;}
+.loginWraper{ position:absolute;width:100%; left:0; top:0; bottom:0; right:0; z-index:1;}
+.loginBox{ position:absolute; width:400px; height:374px; right:52%; top:50%; margin-left:0; margin-top:-184px; padding-top:0;}
+.right-box{position: absolute;width: 500px;height: 400px;left: 52%;top: 50%;margin-left: 0;margin-top: -200px;padding-top: 16px;background: url(../images/login-1.png) center center no-repeat;background-size: 100%;}
 @media (max-width:617px) {
 	.loginbox{ width:100%; position:static; margin-top:0; margin-left:0;}
 }
 .loginBox .row{margin-top:20px;}
 .loginBox .row .form-label .Hui-iconfont{ font-size:24px}
-.loginBox .input-text{ width:360px;border-radius: 25px;border:1px solid rgba(230,0,76,.3);}
+.loginBox .input-text{ width:360px;}
 @media (max-width:617px) {
 	.loginBox .input-text{ width:80%}
 }