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

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

@@ -81,8 +81,8 @@ public class AdminUtils {
 		Cookie cookie = new Cookie(name, value);
 		// 有效期为(三天减一分钟)
 		cookie.setMaxAge(60 * 60 * 24 * 3 - 60);
-//		cookie.setPath("/" + NameUtils.getConfig("ROOT_PATH"));
-		cookie.setPath("/");
+		cookie.setPath("/" + NameUtils.getConfig("ROOT_PATH"));
+//		cookie.setPath("/");
 		cookie.setHttpOnly(true);
 		cookie.setDomain(NameUtils.getConfig("DO_MAIN"));
 		response.addCookie(cookie);

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

@@ -26,6 +26,10 @@ public class ImberryConfig {
 	public static String INTER_SMS_RENT_TYPE3_TEXT="";
 	/**   发送验证码      */
 	public static String PROBATION_VERIFICATION_CODE="";
+	/**   先打电话然后发短信      */
+	public static String PROBATION_THANKGIVING_PHONE_BEFORE="";
+	/**   不打电话直接发短信      */
+	public static String PROBATION_THANKGIVING_NO_PHONE="";
 	/**		云片key	*/
 	public static String INTER_SMS_KEY=""; 
 	/**		发送给收货人的试用进度提醒	7天		*/
@@ -62,6 +66,8 @@ public class ImberryConfig {
 			PROBATION_SUCCESS_THIRD_TEXT = pro.getProperty("PROBATION_SUCCESS_THIRD_TEXT");
 			LEASE_ORDER_SUCCESS_TEXT = pro.getProperty("LEASE_ORDER_SUCCESS_TEXT");
 			PROBATION_VERIFICATION_CODE = pro.getProperty("PROBATION_VERIFICATION_CODE");
+			PROBATION_THANKGIVING_PHONE_BEFORE = pro.getProperty("PROBATION_THANKGIVING_PHONE_BEFORE");
+			PROBATION_THANKGIVING_NO_PHONE = pro.getProperty("PROBATION_THANKGIVING_NO_PHONE");
 
 		} catch (Exception e) {
 			e.printStackTrace();

watero-wechat-service/src/main/java/com/iamberry/wechat/service/MessageManager.java

@@ -26,7 +26,7 @@ public class MessageManager {
 		article.setDescription(imageTextInfo.getDigest());//图文消息描述
 		article.setPicUrl(picUrl);//图片URL
 		article.setUrl(clickUrl);//点击图文消息跳转链接
-	
+
 		if(imageTextInfo.getClickOutUrl() != null && !"".equals(imageTextInfo.getClickOutUrl())){
 			article.setUrl(imageTextInfo.getClickOutUrl()+ "?openid=" + requestMap.get("FromUserName")); //如果外链不为空则为外链
 		}

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -103,7 +103,7 @@ public class OrderHandler {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "/payBefore", method = RequestMethod.POST)
-	public ResultMsg payBefore(HttpServletRequest request) throws Exception {
+	public ResultMsg payBefore(HttpServletRequest request) {
 		
 		ResultMsg msg = new ResultMsg();
 		msg.setResultCode(ResultInfo.ERRORCODE);
@@ -306,7 +306,7 @@ public class OrderHandler {
 	public ResultMsg requestPay(
 			TempOrderDto temp,
 			HttpServletRequest request
-			) throws Exception {
+			)  {
 		
 		ResultMsg msg = new ResultMsg();
 		msg.setResultCode(ResultInfo.ERRORCODE);
@@ -366,6 +366,8 @@ public class OrderHandler {
 		int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
 		UserGiftDto userGift = null;
 		int giftNum = 0;
+		//vip会员买年套滤芯减价，此表示为减价金额
+		int priceReduction = 0;
 		
 		/** 提前准备订单项数据 */
 		/** 准备数据 */
@@ -391,7 +393,7 @@ public class OrderHandler {
 			}
 			//VIP用户滤芯年套减一百
 			if(cartDto.getCartColorId() == 5 && member.getUserIsVip() == 2){
-				cartDto.setProductPrice(cartDto.getProductPrice()-10000);
+				priceReduction += 10000*cartDto.getCartNum();
 			}
 			
 			//如果模板id等于金牌会模板id，则该用户为金牌会员下线
@@ -430,7 +432,7 @@ public class OrderHandler {
 				list.add(item);
 			}
 		}
-		
+
 		//如果模板id等于金牌会模板id，来源是3，则该用户为金牌会员直接下线，直接下线送三年滤芯
 		if (member.getUserDealers() != null && member.getTemplateId() != null && 
 				templateId == member.getTemplateId().intValue() && member.getUserResType().intValue() == 3) {
@@ -455,6 +457,7 @@ public class OrderHandler {
 		// 准备订单对象
 		order.setSalesOpenid(member.getUserOpenid()); // openid 
 		order.setSalesAmount(total); // 订单金额
+		total -= priceReduction;
 		
 		int mustPay=0;
 		

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

@@ -66,5 +66,4 @@ probation_apply_notice=RLCwG8r7poANQgdoJCZN46NbFctrhahbczu-LgPhC_k
 probation_apply_success=-2mhs7Y0aUFtas4rnatcGj3xYv0XyFjnfaEqf4PJJvo
 probation_pay_success=BWudEQXeAwon2BTa-RQO3X_sVP6AkmDGngKhi92KDc0
 probation_shut_down=qAn04oDBfK4VSB8bROeR-5BhhYri1oUK51FVlh6KwU4
-prize_receive_push=7d_r3XJsY5MAISYCDxrjdnPXgNm3IU8XLRYWXbCJjbs
-
+prize_receive_push=7d_r3XJsY5MAISYCDxrjdnPXgNm3IU8XLRYWXbCJjbs

watero-wechat-web/src/main/resources/platform.properties

@@ -193,3 +193,5 @@ SUCCESSINFO=SUCCESS
 RESERVE_PAY_CALLBACK=http//test.iamberry.com/watero/callback/reserver_back
 reserve_pay_money=1
 DO_MAIN=test.iamberry.com
+
+IMAGE_URL=https://w.iamberry.com

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/free_collection.html

@@ -56,13 +56,14 @@
 				<div style="border-top: 1px solid rgba(0,0,0,.1);margin: 20px 0;"></div>
 				<ul>
 					<li style="color:#59c0d9;padding-bottom: 10px;">活动说明：</li>
-					<li class="mui-h6">1、此活动福利仅针对watero老客户</li>
-					<li class="mui-h6">2、每个手机号限领一次，会员中心可查看</li>
-					<li class="mui-h6">3、如您为老客户，已更换手机号，请联系客服处理</li>
-					<li style="color:#59c0d9;padding:10px 0;">活动福利：</li>
+					<li class="mui-h6">1,此福利仅针对购买过WaterO产品的老顾客</li>
+					<li class="mui-h6">2,如您现在使用的手机号码与购买下单的手机号码不同，请联系官方客服</li>
+					<li class="mui-h6">3,每个手机号码仅限领取一次</li>
+					<li class="mui-h6">4,领取成功之后，即可在会员中心查看您的兑换券及优惠权益。</li>
+					<!--<li style="color:#59c0d9;padding:10px 0;">活动福利：</li>
 					<li class="mui-h6">1、免费赠送WateroT1或T2滤芯一支</li>
 					<li class="mui-h6">2、此后凡购买滤芯套装，均享立减100元优惠</li>
-					<li class="mui-h6">3、尊享watero一对一客服售后服务</li>
+					<li class="mui-h6">3、尊享watero一对一客服售后服务</li>-->
 				</ul>
 			</div>
 		</div>