七夕活动提交

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

@@ -18,7 +18,7 @@ public class OrderUtil {
 			{
 				"quitOrder", "etcOrder", "paySuccess", "returnOrder",
 				"returnOrderSuccess", "sendOrder", "returnOrderEtc", "returnOrderEtcAdmin", "returnOrderThe",
-				"theOrderSuccess", "theOrderSuccessAdmin", "inOrder", "inFinish"
+				"theOrderSuccess", "theOrderSuccessAdmin", "inOrder", "inFinish","paidInFull","fullDeposit","spelling"
 			};
 		
 		public String[] getOrderStatusStrList() {
@@ -30,7 +30,7 @@ public class OrderUtil {
 			{
 				"取消订单", "待支付", "已支付、待发货", "退款申请中",
 				"已退款", "已发货", "申请退货中", "退货中", "订单退货，订单关闭" ,
-				"换货中", "换货完成", "申请换货中", "已完成"
+				"换货中", "换货完成", "申请换货中", "已完成","已支付，全额付款","待支付定金全款","正在拼单"
 			};
 		
 		// 订单操作状态
@@ -48,7 +48,8 @@ public class OrderUtil {
 				"insertPostInfoAndSend", 	// 录入物流信息并发货
 				"rejectedReturn",			//拒绝退货
 				"rejectedInOrder",			//拒绝换货
-				"select_efast_order"		//同步订单状态
+				"select_efast_order",		//同步订单状态
+				"spell"		//系统拼单
 			};
 		
 		public String[] getOrderActin() {
@@ -227,7 +228,13 @@ public class OrderUtil {
 				return operations;
 				
 			case 12://已完成
-				
+
+			case 15://已完成
+				/*OrderOperation spell = new OrderOperation("", "系统拼单",
+						"/admin/order/" + orderActin[13] + "/" + orderId);*/
+				OrderOperation spell = new OrderOperation("", "系统拼单",
+						"#");
+				operations.add(spell);// 系统拼单
 				return operations;
 			default:
 				break;

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

@@ -49,6 +49,13 @@ public class CartDto implements Serializable{
 
 	private String colorImg;			//产品颜色图片
 
+	/**
+	 * 2019-07-29新增
+	 * @return
+	 */
+	private Integer productIsSpell;//是否可拼团 1：不可拼团 2：可拼团
+	private Integer colorSpellAmount;//拼团价 单位为分
+
 
 	
 	public String getProductColor() {
@@ -188,4 +195,20 @@ public class CartDto implements Serializable{
 	public void setColorImg(String colorImg) {
 		this.colorImg = colorImg;
 	}
+
+	public Integer getProductIsSpell() {
+		return productIsSpell;
+	}
+
+	public void setProductIsSpell(Integer productIsSpell) {
+		this.productIsSpell = productIsSpell;
+	}
+
+	public Integer getColorSpellAmount() {
+		return colorSpellAmount;
+	}
+
+	public void setColorSpellAmount(Integer colorSpellAmount) {
+		this.colorSpellAmount = colorSpellAmount;
+	}
 }

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

@@ -69,7 +69,8 @@ private String salesOrderid;								//订单id
 	private boolean efficacious;							//是否存在下架商品
 	
 	private List<OrderItem> orderItemList = new ArrayList<OrderItem>();	//订单项实体类
-
+	private Integer salesIsSpellOrder;		//是否拼团订单
+	private Integer salesSpellOrderId;		//拼团订单id
 
 
 	public boolean isEfficacious() {
@@ -271,6 +272,20 @@ private String salesOrderid;								//订单id
 	public void setSalesColorType(Integer salesColorType) {
 		this.salesColorType = salesColorType;
 	}
-	
-	
+
+	public Integer getSalesIsSpellOrder() {
+		return salesIsSpellOrder;
+	}
+
+	public void setSalesIsSpellOrder(Integer salesIsSpellOrder) {
+		this.salesIsSpellOrder = salesIsSpellOrder;
+	}
+
+	public Integer getSalesSpellOrderId() {
+		return salesSpellOrderId;
+	}
+
+	public void setSalesSpellOrderId(Integer salesSpellOrderId) {
+		this.salesSpellOrderId = salesSpellOrderId;
+	}
 }

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

@@ -83,7 +83,9 @@ public class ShopSalesOrderDto implements Serializable{
 	private PageBean page = new PageBean();		//分页
 	
 	private boolean efficacious;							//是否存在下架商品
-	
+	private Integer salesIsSpellOrder;		//是否拼团订单
+	private Integer salesSpellOrderId;		//拼团订单id
+
 	
 
 	public boolean isEfficacious() {
@@ -325,6 +327,20 @@ public class ShopSalesOrderDto implements Serializable{
 	public void setOrderItemList(List<ShopOrderItemDto> orderItemList) {
 		this.orderItemList = orderItemList;
 	}
-	
-	
+
+	public Integer getSalesIsSpellOrder() {
+		return salesIsSpellOrder;
+	}
+
+	public void setSalesIsSpellOrder(Integer salesIsSpellOrder) {
+		this.salesIsSpellOrder = salesIsSpellOrder;
+	}
+
+	public Integer getSalesSpellOrderId() {
+		return salesSpellOrderId;
+	}
+
+	public void setSalesSpellOrderId(Integer salesSpellOrderId) {
+		this.salesSpellOrderId = salesSpellOrderId;
+	}
 }

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

@@ -40,6 +40,10 @@ public class TempOrderDto implements java.io.Serializable{
 
 	private String exchangeColorId ; //需要兑换的颜色id
 
+	private Integer isSpell ; //是否拼单 1是 2否
+
+	private String spellOrderId ; //拼单好友orderid
+
 	public String getOrderAddressInfo() {
 		return orderAddressInfo;
 	}
@@ -120,6 +124,22 @@ public class TempOrderDto implements java.io.Serializable{
 		this.exchangeColorId = exchangeColorId;
 	}
 
+	public Integer getIsSpell() {
+		return isSpell;
+	}
+
+	public void setIsSpell(Integer isSpell) {
+		this.isSpell = isSpell;
+	}
+
+	public String getSpellOrderId() {
+		return spellOrderId;
+	}
+
+	public void setSpellOrderId(String spellOrderId) {
+		this.spellOrderId = spellOrderId;
+	}
+
 	@Override
 	public String toString() {
 		return "TempOrderDto [orderAddressInfo=" + orderAddressInfo

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

@@ -71,7 +71,14 @@ public class Order implements java.io.Serializable{
 	
 	private String salesPorderid;		//试用订单id
 	private Integer salesOrderType;		//订单类型		1：正常订单（默认）	2：试用订单
-	
+
+	/**
+	 * 2019-07-29新增
+	 * @return
+	 */
+	private Integer salesIsSpellOrder;		//是否拼团订单		1：是	2：否
+	private String salesSpellOrderId;		//拼团订单id
+
 	// -------------------------------------------- 新增
 	private String storesName;			// 用户第二级上线
 	
@@ -385,4 +392,20 @@ public class Order implements java.io.Serializable{
 	public void setSalesExchangeDes(String salesExchangeDes) {
 		this.salesExchangeDes = salesExchangeDes;
 	}
+
+	public Integer getSalesIsSpellOrder() {
+		return salesIsSpellOrder;
+	}
+
+	public void setSalesIsSpellOrder(Integer salesIsSpellOrder) {
+		this.salesIsSpellOrder = salesIsSpellOrder;
+	}
+
+	public String getSalesSpellOrderId() {
+		return salesSpellOrderId;
+	}
+
+	public void setSalesSpellOrderId(String salesSpellOrderId) {
+		this.salesSpellOrderId = salesSpellOrderId;
+	}
 }

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

@@ -0,0 +1,44 @@
+package com.iamberry.wechat.core.entity.order;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ShopSpellInfo implements Serializable{
+    private static final long serialVersionUID = 4801794331888807351L;
+    private Integer spellId;
+    private Integer spellOrderid;
+    private String spellOpenid;
+    private Date spellCreateTime;
+
+    public Integer getSpellId() {
+        return spellId;
+    }
+
+    public void setSpellId(Integer spellId) {
+        this.spellId = spellId;
+    }
+
+    public Integer getSpellOrderid() {
+        return spellOrderid;
+    }
+
+    public void setSpellOrderid(Integer spellOrderid) {
+        this.spellOrderid = spellOrderid;
+    }
+
+    public String getSpellOpenid() {
+        return spellOpenid;
+    }
+
+    public void setSpellOpenid(String spellOpenid) {
+        this.spellOpenid = spellOpenid;
+    }
+
+    public Date getSpellCreateTime() {
+        return spellCreateTime;
+    }
+
+    public void setSpellCreateTime(Date spellCreateTime) {
+        this.spellCreateTime = spellCreateTime;
+    }
+}

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

@@ -55,6 +55,14 @@ public class Product implements java.io.Serializable{
 	private String colorPresent;	//颜色介绍
 	private Integer colorDiscount;	//优惠价
 	private Integer colorPrice;	//原价
+	//20190801 新增
+	private Integer colorSpellAmount;	//拼团价 分
+
+	/**
+	 * 2019-07-29新增
+	 * @return
+	 */
+	private Integer productIsSpell;//是否可拼团 1：不可拼团 2：可拼团
 
 	public Integer getColorId() {
 		return colorId;
@@ -312,6 +320,22 @@ public class Product implements java.io.Serializable{
 		this.colorPrice = colorPrice;
 	}
 
+	public Integer getProductIsSpell() {
+		return productIsSpell;
+	}
+
+	public void setProductIsSpell(Integer productIsSpell) {
+		this.productIsSpell = productIsSpell;
+	}
+
+	public Integer getColorSpellAmount() {
+		return colorSpellAmount;
+	}
+
+	public void setColorSpellAmount(Integer colorSpellAmount) {
+		this.colorSpellAmount = colorSpellAmount;
+	}
+
 	@Override
 	public String toString() {
 		return "Product [productId=" + productId + ", productName="

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

@@ -33,6 +33,7 @@ public class ProductColor implements java.io.Serializable{
 
 	//1:使用中 2：未使用'
 	private Integer colorStatus;
+	private Integer colorSpellAmount;//拼团价(分)
 
 	private PageBean page = new PageBean();		//分页
 	
@@ -148,6 +149,14 @@ public class ProductColor implements java.io.Serializable{
 		this.colorStatus = colorStatus;
 	}
 
+	public Integer getColorSpellAmount() {
+		return colorSpellAmount;
+	}
+
+	public void setColorSpellAmount(Integer colorSpellAmount) {
+		this.colorSpellAmount = colorSpellAmount;
+	}
+
 	@Override
 	public String toString() {
 		return "ProductColor [colorId=" + colorId + ", colorProductId="

watero-common-core/src/main/java/com/iamberry/wechat/sendMsg/SendMessageUtil.java

@@ -65,6 +65,9 @@ public class SendMessageUtil {
 			case 11:  //11、母亲节活动，推送模板
 				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.service_push, date, url);
 				break;
+			case 12:  //12、拼单活动
+				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.probation_spell_success, date, url);
+				break;
 			default: 
 				break;
 			}
@@ -223,4 +226,22 @@ public class SendMessageUtil {
 				.replaceFirst("remarkValue",remark);
 			sendTemplateMessageToOpenid(temp, openId, url,11);
 	 }
+
+	/**
+	 * 拼单成功推送
+	 * @param first
+	 * @param keyword1
+	 * @param keyword2
+	 * @param remark
+	 * @param openId
+	 * @param url
+	 */
+	 public void spellPush(String first,String keyword1,String keyword2,String remark,String openId,String url){
+		String temp = ResultInfo.PROBATIONSPELLSUCCESS;
+		 temp = temp.replaceFirst("firstValueIamberry", first)
+				 .replaceFirst("keyword1Value",keyword1)
+				 .replaceFirst("keyword2Value",keyword2)
+				 .replaceFirst("remarkValue",remark);
+			sendTemplateMessageToOpenid(temp, openId, url,12);
+	 }
 }

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

@@ -170,6 +170,10 @@ public class ResultInfo {
 	 */
 	public static String INDEX_URL = "https://s.iamberry.com/watero/wechat/20190618.html";
 	/**
+	 * 团购活动首页
+	 */
+	public static String INDEX_BULK_URL = "https://s.iamberry.com/watero/wechat/20190807.html";
+	/**
 	 * <礼品卡>推荐人推送消息 跳转页面
 	 */
 	public static String AGENT_REFERRER_MACHINE_PAGE = "";
@@ -221,6 +225,16 @@ public class ResultInfo {
 	 * 	2019 38 妇女节回复语
 	 */
 	public static String female_lady_reply="";
+	/**
+	 * 	2019 0729 团购模板id
+	 */
+	public static String probation_spell_success="";
+	/**
+	 * 	2019 0729 七夕活动 公众号回复抽奖链接
+	 */
+	public static String chineseLottery="";
+	public static String chineseLotteryFailure="";
+
 
 
 
@@ -258,6 +272,8 @@ public class ResultInfo {
 
 	/** 	服务推送 	*/
 	public static String SERVICEPUSH = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'Good':{'color':'#173177','value':'GoodValue'}, 'contentType':{'color':'#173177', 'value':'contentTypeValue'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+	/** 	拼单成功推送 	*/
+	public static String PROBATIONSPELLSUCCESS = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
 
 
 
@@ -353,4 +369,9 @@ public class ResultInfo {
 	public static String PROBATION_START_FIRST = "感谢您申请试用美国Watero净饮水一体机";
 	public static String PROBATION_END_FIRST = "您的订单正在安排配送员派送中，请继续留意关注申请详情，谢谢。";
 
+	/**
+	 * 拼单失败提示
+	 */
+	public static String spellErrorMsg = "";
+
 }

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

@@ -83,6 +83,10 @@ public class loadResultUtil {
 			ResultInfo.prize_receive_push = prop.getProperty("prize_receive_push");			//付费代理商支付后推送推荐人通知  	模版id
 			ResultInfo.female_lady_reply = prop.getProperty("female_lady_reply");			//2019 38 妇女节活动回复语
 			ResultInfo.service_push = prop.getProperty("service_push");			//服务推送模板
+			ResultInfo.probation_spell_success = prop.getProperty("probation_spell_success");			//拼单成功推送模板
+			ResultInfo.spellErrorMsg = prop.getProperty("spellErrorMsg");			//拼单成功推送模板
+			ResultInfo.chineseLottery = prop.getProperty("chineseLottery");			//七夕回复url
+			ResultInfo.chineseLotteryFailure = prop.getProperty("chineseLotteryFailure");			//七夕回复失败
 
 
 

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/CartService.java

@@ -139,4 +139,14 @@ public interface CartService {
 	 * @return
 	 */
 	public Integer selectOrderCount(ShopSalesOrderDto shopSalesOrderDto);
+	/**
+	 * 修改拼团订单id
+	 * @return
+	 */
+	public Integer updateOrderSpellOrderId(Order order);
+	/**
+	 * 根据openid查询客户是否在8.6-8.12下单 （20190807团购活动）
+	 * @return
+	 */
+	public Integer selectIsOrder(String oprnId);
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -261,6 +261,16 @@ public class CartServiceImpl implements CartService {
 		// TODO Auto-generated method stub
 		return cartDao.selectOrderCount(shopSalesOrderDto);
 	}
-	
-	
+
+	@Override
+	public Integer updateOrderSpellOrderId(Order order) {
+		return cartDao.updateOrderSpellOrderId(order);
+	}
+
+	@Override
+	public Integer selectIsOrder(String oprnId) {
+		return cartDao.selectIsOrder(oprnId);
+	}
+
+
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/CartDao.java

@@ -139,4 +139,15 @@ public interface CartDao {
 	 * @return
 	 */
 	public Integer selectOrderCount(ShopSalesOrderDto shopSalesOrderDto);
+	/**
+	 * 修改拼团订单id
+	 * @return
+	 */
+	public Integer updateOrderSpellOrderId(Order order);
+
+	/**
+	 * 根据openid查询客户是否在8.6-8.12下单 （20190807团购活动）
+	 * @return
+	 */
+	public Integer selectIsOrder(String oprnId);
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/impl/CartDaoImpl.java

@@ -203,4 +203,14 @@ public class CartDaoImpl implements CartDao{
 		// TODO Auto-generated method stub
 		return cartMapper.selectOrderCount(shopSalesOrderDto);
 	}
+
+	@Override
+	public Integer updateOrderSpellOrderId(Order order) {
+		return orderMapper.updateOrderSpellOrderId(order);
+	}
+
+	@Override
+	public Integer selectIsOrder(String oprnId) {
+		return orderMapper.selectIsOrder(oprnId);
+	}
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/OrderMapper.java

@@ -64,5 +64,17 @@ public interface OrderMapper {
 	 * @return
 	 */
 	public Order getOrderAddressInfo(String openid);
+
+	/**
+	 * 修改拼团订单id
+	 * @return
+	 */
+	public Integer updateOrderSpellOrderId(Order order);
+
+	/**
+	 * 根据openid查询客户是否在8.6-8.12下单 （20190807团购活动）
+	 * @return
+	 */
+	public Integer selectIsOrder(String oprnId);
 	
 }

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

@@ -48,8 +48,10 @@ PUBLIC
 			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 
+			(SELECT IFNULL(SUM(reback_money),0) FROM tb_iamberry_reback WHERE reback_orderid = O.SALES_ORDERID and Reback_status  = 2) placeId,
+            O.sales_is_spell_order salesIsSpellOrder,
+            O.sales_spell_order_id salesSpellOrderId
+		FROM
 			TB_IAMBERRY_SHOP_SALES_ORDER O 
 		LEFT JOIN 
 			TB_IAMBERRY_USER_USERINFO U 
@@ -175,7 +177,8 @@ PUBLIC
 			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_COUPON_RECEIVE_ID couponId, O.SALES_BALANCE_AMOUNT balancePayAmount 
+			O.SALES_COUPON_RECEIVE_ID couponId, O.SALES_BALANCE_AMOUNT balancePayAmount,O.sales_is_spell_order salesIsSpellOrder,
+			O.sales_spell_order_id salesSpellOrderId
 		FROM 
 			TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_USER_USERINFO U 
 			ON O.SALES_OPENID = U.USER_OPENID 

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

@@ -125,7 +125,8 @@ PUBLIC
 			O.SALES_ADDRESS_INFO, O.SALES_ADDRESS_NAME, 
 			O.SALES_USER_REMARK, O.SALES_POST_NUM, O.SALES_POST_FIRM, 
 			O.SALES_SEND_DATE, O.SALES_ADDRESS_POSTNUM, 
-			O.SALES_ADDRESS_TEL ,  45*60-TIMESTAMPDIFF(SECOND,O.SALES_CREATE_DATE,NOW())   SALES_ADMIN_REMARK
+			O.SALES_ADDRESS_TEL ,  45*60-TIMESTAMPDIFF(SECOND,O.SALES_CREATE_DATE,NOW())   SALES_ADMIN_REMARK,
+			O.sales_is_spell_order salesIsSpellOrder,O.sales_spell_order_id salesSpellOrderId
 		FROM 
 			 TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_SHOP_ORDER_ITEM I 
 			 ON O.SALES_ORDERID = I.ITEM_SALES_ORDERID 
@@ -162,6 +163,8 @@ PUBLIC
 		<result column="SALES_ADMIN_REMARK" property="salesAdminRemark"/>
 		<result column="SALES_ADDRESS_POSTNUM" property="salesAddressPostnum"/>
 		<result column="SALES_ADDRESS_TEL" property="salesAddressTel"/>
+		<result column="sales_is_spell_order" property="salesIsSpellOrder"/>
+		<result column="sales_spell_order_id" property="salesSpellOrderId"/>
 		<collection property="orderItemList" column="SALES_ORDERID" ofType="OrderItem" select="getOrderItemByOrderId"/>
 	</resultMap>
 	
@@ -179,7 +182,7 @@ PUBLIC
 		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR c ON i.ITEM_COLOR_ID = c.COLOR_ID 
 		WHERE 
 			I.ITEM_SALES_ORDERID = #{itemSalesOrderid} 
-		ORDER BY I.ITEM_ID DESC
+		ORDER BY I.ITEM_ID
 	</select>
 	
 	<!-- 根据openid查询订单数量 -->
@@ -210,9 +213,9 @@ PUBLIC
 			O.SALES_USER_REMARK salesUserRemark, O.SALES_POST_NUM salesPostNum, O.SALES_POST_FIRM salesPostFirm, 
 			O.SALES_SEND_DATE salesSendDate, O.SALES_ADDRESS_POSTNUM salesAddressPostnum,O.SALES_ADDRESS_TEL salesAddressTel, 
 			O.SALES_LOCK_TYPE salesLockType,O.SALES_COUPON_RECEIVE_ID salesCouponReceiveId, 
-			O.SALES_BALANCE_AMOUNT balancePayAmount 
+			O.SALES_BALANCE_AMOUNT balancePayAmount,O.sales_is_spell_order salesIsSpellOrder,O.sales_spell_order_id salesSpellOrderId
 		FROM 
-			TB_IAMBERRY_SHOP_SALES_ORDER O 
+			TB_IAMBERRY_SHOP_SALES_ORDER O
 		WHERE 
 			O.SALES_ORDERID = #{0} 
 		AND 
@@ -256,7 +259,7 @@ PUBLIC
 			C.CART_ID cartId, G.PRODUCT_ID cartProductId, pc.COLOR_ID cartColorId, G.PRODUCT_STATUS productStatus, 
 			C.CART_NUM cartNum, G.PRODUCT_NAME productName, pc.COLOR_DISCOUNT productPrice, 
 			G.PRODUCT_INTRODUCE_IMG productIntroduceImg, pc.COLOR_PRICE productDiscount, PC.COLOR_69CODE productRemark, 
-			pc.COLOR_NAME productColor, G.PRODUCT_TYPE productType ,G.product_color_des,PC.color_img AS colorImg
+			pc.COLOR_NAME productColor, G.PRODUCT_TYPE productType ,G.product_color_des,PC.color_img AS colorImg,G.product_is_spell AS productIsSpell,PC.color_spell_amount AS colorSpellAmount
 		FROM 
 			TB_IAMBERRY_SHOP_CART C 
 		LEFT JOIN TB_IAMBERRY_PRODUCT_INFO G ON C.CART_PRODUCT_ID = G.PRODUCT_ID 
@@ -291,12 +294,12 @@ PUBLIC
 		        </foreach>
 			)
 	</delete>
-	
+
 	<!-- 根据orderId修改订单状态 -->
 	<update id="updateOrderByOrderId" parameterType="Order">
 		UPDATE 
 			TB_IAMBERRY_SHOP_SALES_ORDER 
-		SET 
+		SET
 			SALES_STATUS = #{salesStatus},
 			SALES_RETURN_DATE = NOW()
 			<if test="couponId!=null and couponId!=''" >

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

@@ -17,7 +17,7 @@ PUBLIC
 			 		SALES_INTEGRAL_NUM, SALES_RATE_AMOUNT, SALES_CREATE_DATE,
 			 		SALES_REWARD_INTEGRAL_NUM, SALES_ADDRESS_INFO, SALES_ADDRESS_POSTNUM,
 			 		SALES_ADDRESS_TEL, SALES_ADDRESS_NAME, SALES_USER_REMARK, SALES_STATUS, 
-			 		SALES_PROXY_REWARD, SALES_REWARD_NUM,SALES_COUPON_RECEIVE_ID, Sales_balance_amount
+			 		SALES_PROXY_REWARD, SALES_REWARD_NUM,SALES_COUPON_RECEIVE_ID, Sales_balance_amount,sales_is_spell_order,sales_spell_order_id
 				)
 		 VALUES 
 		  	( 
@@ -38,7 +38,9 @@ PUBLIC
 			  1,
 			  #{salesRewardNum},
 			  #{couponId},
-			  #{balancePayAmount}
+			  #{balancePayAmount},
+			  #{salesIsSpellOrder},
+			  #{salesSpellOrderId}
 		  	)
 	</insert>
 	
@@ -93,8 +95,10 @@ PUBLIC
 			SALES_INTEGRAL_NUM salesIntegralNum, SALES_AMOUNT salesAmount, SALES_YET_AMOUNT salesYetAmount, 
 			SALES_BALANCE_AMOUNT balancePayAmount,
 			SALES_OPENID  salesOpenid,
-			SALES_COUPON_RECEIVE_ID couponId
-		FROM 
+			SALES_COUPON_RECEIVE_ID couponId,
+			sales_is_spell_order salesIsSpellOrder,
+			sales_spell_order_id salesSpellOrderId
+		FROM
 			TB_IAMBERRY_SHOP_SALES_ORDER 
 		WHERE 
 			SALES_ORDERID = #{salesOrderid} 
@@ -134,7 +138,46 @@ PUBLIC
     order by sales_create_date desc
     limit 0,1
 	</select>
-	
-	
-	
+
+	<!-- 修改订单拼团id  -->
+	<update id="updateOrderSpellOrderId" parameterType="Order">
+		UPDATE
+		TB_IAMBERRY_SHOP_SALES_ORDER
+		SET
+		sales_spell_order_id = #{salesSpellOrderId},
+		SALES_STATUS = #{salesStatus}
+		WHERE
+		SALES_ORDERID = #{salesOrderid}
+	</update>
+
+	<!--<insert id="addSpell" parameterType="ShopSpellInfo">
+		INSERT INTO tb_iamberry_shop_spell
+		(
+		spell_orderid,
+		spell_openid
+		)
+		 VALUES
+		 (
+		#{spellOrderid},
+		#{spellOpenid}
+		)
+	</insert>
+	<select id="getSpell" parameterType="Integer" resultType="ShopSpellInfo">
+		SELECT * from tb_iamberry_shop_spell WHERE spell_orderid = #{spellOrderid}
+	</select>
+	<select id="listSpell" parameterType="Integer" resultType="ShopSpellInfo">
+		SELECT * from tb_iamberry_shop_spell WHERE spell_id = #{spellId}
+	</select>-->
+
+	<select id="selectIsOrder" parameterType="String" resultType="Integer">
+		SELECT
+		count(*)
+		FROM
+		tb_iamberry_shop_sales_order
+		WHERE
+		sales_openid = #{openId}
+		AND sales_status IN (2, 5, 9, 10, 11, 12, 13, 14, 15)
+		AND sales_transaction_date &gt; '2019-08-06 00:00:00'
+		AND sales_transaction_date &lt; '2019-08-12 23:59:59'
+	</select>
 </mapper>

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

@@ -11,7 +11,8 @@
 		COLOR_IMG colorImg,
 		COLOR_69CODE color69Code,
 		COLOR_CRETAE_TIME colorCretaeTime,
-		COLOR_UPDATE_TIME colorUpdateTime
+		COLOR_UPDATE_TIME colorUpdateTime,
+		color_spell_amount colorSpellAmount
 	</sql>
 	
 	<!-- 添加一个产品颜色 -->

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

@@ -7,7 +7,7 @@
 		 PRODUCT_SALESNUM productSalesnum, PRODUCT_ACCESSNUM productAccessnum, PRODUCT_STATUS productStatus, 
 		PRODUCT_INTRODUCE_IMG productIntroduceImg, PRODUCT_PARAMETER_IMG productParameterImg, PRODUCT_CREATE_DATE productCreateDate, 
 		PRODUCT_SORT_NUM productSortNum, PRODUCT_COLOR_DES productColorDes, PRODUCT_REMARK productRemark,
-		PRODUCT_TYPE "productType.typeId", PRODUCT_RENT_TYPE productRentType 
+		PRODUCT_TYPE "productType.typeId", PRODUCT_RENT_TYPE productRentType,product_is_spell productIsSpell
 	</sql>
 	
 	<sql id="userGift">
@@ -29,7 +29,8 @@
 		COLOR_NAME colorName,
 		COLOR_DISCOUNT colorDiscount,
 		COLOR_PRICE colorPrice,
-		COLOR_69CODE color69Code 
+		COLOR_69CODE color69Code,
+		color_spell_amount colorSpellAmount
 	</sql>
 	
 	<!-- 分页查询商品信息 -->
@@ -40,8 +41,9 @@
 			COLOR_PRICE productPrice, 
 			COLOR_NAME productColor, 
 			COLOR_ID colorId,
-			color_img colorImg
-		FROM 
+			color_img colorImg,
+			color_spell_amount colorSpellAmount
+		FROM
 			TB_IAMBERRY_PRODUCT_INFO 
 		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR ON PRODUCT_ID = COLOR_PRODUCT_ID 
 		WHERE 
@@ -59,6 +61,9 @@
 			<if test="productRentType != null and productRentType != ''">
 				AND PRODUCT_RENT_TYPE = #{productRentType} 
 			</if>
+			<if test="productIsSpell != null and productIsSpell != ''">
+				AND product_is_spell = #{productIsSpell}
+			</if>
 			ORDER BY color_sort
 			<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
 		     	LIMIT ${page.recordBegin},${page.pageSize}
@@ -72,7 +77,8 @@
 			COLOR_DISCOUNT productDiscount,
 			COLOR_PRICE productPrice, 
 			COLOR_NAME productColor, 
-			COLOR_ID colorId  
+			COLOR_ID colorId,
+			color_spell_amount colorSpellAmount
 		FROM 
 			TB_IAMBERRY_PRODUCT_INFO 
 		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR ON PRODUCT_ID = COLOR_PRODUCT_ID 
@@ -83,6 +89,9 @@
 			<if test="productRentType != null and productRentType != ''">
 				AND PRODUCT_RENT_TYPE = #{productRentType} 
 			</if>
+			<if test="productIsSpell != null and productIsSpell != ''">
+				AND product_is_spell = #{productIsSpell}
+			</if>
 		</where>
 	</select>
 	
@@ -128,8 +137,10 @@
 			COLOR_DISCOUNT productDiscount,
 			COLOR_PRICE productPrice, 
 			COLOR_NAME productColor, 
-			COLOR_ID colorId  
-		FROM 
+			COLOR_ID colorId,
+			product_is_spell productIsSpell,
+			color_spell_amount colorSpellAmount
+		FROM
 			TB_IAMBERRY_PRODUCT_INFO 
 		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR ON PRODUCT_ID = COLOR_PRODUCT_ID 
 		WHERE 
@@ -155,8 +166,10 @@
 			COLOR_DISCOUNT productDiscount,
 			COLOR_PRICE productPrice, 
 			COLOR_NAME productColor, 
-			COLOR_ID colorId  
-		FROM 
+			COLOR_ID colorId,
+			product_is_spell productIsSpell,
+			color_spell_amount colorSpellAmount
+		FROM
 			TB_IAMBERRY_PRODUCT_INFO 
 		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR ON PRODUCT_ID = COLOR_PRODUCT_ID 
 		WHERE 
@@ -242,7 +255,8 @@
 		PC.color_img,
 		PC.color_discount,
 		PC.color_price,
-		PC.color_69code
+		PC.color_69code,
+		PC.color_spell_amount colorSpellAmount
 		FROM tb_iamberry_product_info PI
 		LEFT JOIN tb_iamberry_product_color PC ON PC.color_product_id=PI.PRODUCT_ID
 		WHERE PC.color_id=#{colorId}

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

@@ -618,5 +618,4 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		return cashLogDao.addCashLog(cashLog);
 	}
 	
-	
 }

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

@@ -12,6 +12,7 @@ import com.iamberry.wechat.core.entity.coupon.CouponItem;
 import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
 import com.iamberry.wechat.core.entity.coupon.CouponType;
 import com.iamberry.wechat.core.entity.thanksgiving.ThanksGiving;
+import com.iamberry.wechat.face.cart.CartService;
 import com.iamberry.wechat.face.coupon.CouponItemService;
 import com.iamberry.wechat.face.coupon.CouponTypeService;
 import com.iamberry.wechat.face.mothMovable.MothMovableService;
@@ -97,6 +98,8 @@ public class WeChatServiceImpl implements WeChatService {
 	private CouponItemService couponItemService;
 	@Autowired
 	private SendMessageUtil sendMessageUtil;
+	@Autowired
+	private CartService cartService;
 	/**
 	 * 处理微信发来的请求
 	 * @return
@@ -150,6 +153,18 @@ public class WeChatServiceImpl implements WeChatService {
 					respContent = ResultInfo.messageIsNullResponseText;
 				}
 
+				/**
+				 * 团购活动日期判断 8-13 0点 到 8月13 24点
+				 */
+				Date date = new Date();
+				Calendar stateCalendar = Calendar.getInstance();
+				stateCalendar.set(2019,7,13,00,00,00);
+				Date stateDate = stateCalendar.getTime();
+				stateCalendar.set(2019,7,13,23,59,59);
+				Date endDate = stateCalendar.getTime();
+
+
+
 				if(QQFace.isQqFace(content)){// QQ表情的处理
 					String xml = "<xml>"+
 							"<ToUserName><![CDATA[" + fromUserName + "]]></ToUserName>" +
@@ -163,6 +178,8 @@ public class WeChatServiceImpl implements WeChatService {
 						respContent = bulidPlace(content, fromUserName);
 				}else if ("618".equals(content)) {// 618
 					respContent = add618Reduction(fromUserName);
+				}else if (stateDate.before(date) && endDate.after(date) && "七夕抽奖".equals(content)) {// 20190807七夕抽奖
+					respContent = isOrder(fromUserName);
 				}else {
 					// 文本类型的消息处理
 					Status status = messageHandler(content, requestMap, fromUserName, toUserName, createTime+"");
@@ -991,5 +1008,22 @@ public class WeChatServiceImpl implements WeChatService {
 		}
 		return status;
 	}
-	
+
+	/**
+	 * 20190807七夕团购活动
+	 * @param fromUserName openid
+	 * @return
+	 */
+	public String isOrder(String fromUserName) {
+		logger.info("七夕公众号回复Openid:"+fromUserName);
+		if (fromUserName == null) {
+			return "网络故障，请稍后再试！";
+		}
+		Integer num = cartService.selectIsOrder(fromUserName);
+		if(num > 0){
+			return ResultInfo.chineseLottery;
+		}else{
+			return ResultInfo.chineseLotteryFailure;
+		}
+	}
 }