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

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

@@ -39,9 +39,18 @@ public class ProductColor implements java.io.Serializable{
 	private Integer colorStatus;		//状态
 	private PageBean page = new PageBean();		//分页
 	private String productName;			//商品名称
+	private String colorPresent;		//简介
 
 	private Integer productType;		//产品类型
 
+	public String getColorPresent() {
+		return colorPresent;
+	}
+
+	public void setColorPresent(String colorPresent) {
+		this.colorPresent = colorPresent;
+	}
+
 	public Integer getProductType() {
 		return productType;
 	}

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

@@ -102,6 +102,10 @@ public class ResultInfo {
 	 */
 	public static String RENT_ORDER_DETAIL = "";
 	/**
+	 * 订单详情
+	 */
+	public static String ORDER_DETAIL = "http://s.iamberry.com/soodo/wechat/order-details.html?orderId=";
+	/**
 	 * <礼品卡>推荐人推送消息 跳转页面
 	 */
 	public static String AGENT_REFERRER_MACHINE_PAGE = "";
@@ -236,6 +240,7 @@ public class ResultInfo {
 	
 	public static final String PAYSUCCESS = "尊敬的用户，您好，您已成功支付";
 	public static final String PAYSUCCESSFOOT = "感谢您的支持，祝您使用愉快!";
+	public static final String sendRemark1 = "如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）";
 	
 	//购物车活动
 	public static String ISSHOW="是";											//是否需要在页面显示

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

@@ -31,7 +31,8 @@
 		COLOR_PRICE colorPrice,
 		COLOR_69CODE color69Code,
 		COLOR_IMG color_img,
-		COLOR_STATUS color_status
+		COLOR_STATUS colorStatus,
+		COLOR_PRESENT colorPresent
 	</sql>
 	<!-- 产品类型 -->
 	<sql id="allTypeField">
@@ -62,7 +63,8 @@
 		COLOR_69CODE color69Code,
 		COLOR_CRETAE_TIME colorCretaeTime,
 		COLOR_UPDATE_TIME colorUpdateTime,
-		PRODUCT_NAME productName
+		PRODUCT_NAME productName,
+		COLOR_PRESENT colorPresent
 		FROM tb_iamberry_product_info PI
 		LEFT JOIN tb_iamberry_product_color PC ON PC.color_product_id=PI.PRODUCT_ID
 		WHERE PI.PRODUCT_TYPE=#{productType} AND PC.COLOR_STATUS=1
@@ -213,7 +215,8 @@
 			COLOR_DISCOUNT productDiscount,
 			COLOR_PRICE productPrice, 
 			COLOR_NAME productColor, 
-			COLOR_ID colorId  
+			COLOR_ID colorId,
+			COLOR_PRESENT colorPresent
 		FROM 
 			TB_IAMBERRY_PRODUCT_INFO 
 		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR ON PRODUCT_ID = COLOR_PRODUCT_ID 

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/ResponseWechatPayHandler.java

@@ -264,6 +264,18 @@ public class ResponseWechatPayHandler {
 					} catch (Exception e) {
 //System.out.println("===========pay 201  插入返利到百胜失败==============");
 					}
+					//推送消息到微信
+					try {
+						sendMessageUtil.probationPaySuccess(
+								ResultInfo.PAYSUCCESS,
+								or.getSalesYetAmount()/100 + "元",
+								orderItemList.get(0).getItemProductName()+"...",
+								ResultInfo.sendRemark1,
+								order.getSalesOpenid(),
+								ResultInfo.ORDER_DETAIL+order.getSalesOrderid());
+					} catch (Exception e) {
+						System.out.println("推送支付成功消息失败!");
+					}
 //System.out.println("===========pay 201  插入返利到百胜完成==============");		
 					try {	//修改用户购买记录为已购买
 						memberService.updateIsBaughtByOpenid(wpr.getOpenid(), 2);