watero母亲节活动

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

@@ -79,8 +79,8 @@ public final class ImageUtils {
         String newImg = "E:\\java-work\\iamberry-watero\\watero-wechat-web\\target\\watero-wechat-web-1.0.0\\common\\images\\movable\\1.jpg";
         String headImg = "E:\\java-work\\iamberry-watero\\watero-wechat-web\\target\\watero-wechat-web-1.0.0\\common\\images\\movable\\ff18fcf3_head.jpg";
         String codeImg = "E:\\java-work\\iamberry-watero\\watero-wechat-web\\target\\watero-wechat-web-1.0.0\\common\\images\\movable\\545e3eeb_code.jpg";
-        String text = "༄ཻོོ༣ུ柒๗๊࿐ོ༣ུ";
-        String alltext = "慈母手中线，游子身上衣。临行密密缝，意恐迟迟归。谁言寸草心，报得三春晖！报得三春晖！报得三春晖！报得三春晖！！！";
+        String text = "小茗同学";
+        String alltext = "一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十";
 //        String alltext = "You are the best mom,th,asssx had.\nSometimes it may not seem like it, but";
 
 

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

@@ -78,15 +78,15 @@ public class PosterNumUtils {
     /*文字位置 -- 昵称*/
     public  int TEXT_X = 107; //居中
     public  int TEXT_Y = 243;
-    public  int TEXT_FONT_SIZE = 18;
+    public  int TEXT_FONT_SIZE = 20;
 
     /*文字位置 -- 文本 - 起始位置*/
     public  int TEXT_CONTENT_X = 170; //居中
     public  int TEXT_CONTENT_Y = 478;
-    public  int TEXT_CONTENT_FONT_SIZE = 27;
+    public  int TEXT_CONTENT_FONT_SIZE = 32;
 
     /*每行文字字符限制数量,中文算两个字符，所以只能是双数*/
-    public  int FONT_NUMBER = 28;
+    public  int FONT_NUMBER = 26;
 
     //每行间距 - 行距
     public  int FONT_LINE_SPACING = 48;

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

@@ -309,6 +309,7 @@ public class ResultInfo {
 	public static String COUPON_OUTOFDATE="优惠券过期";
 	public static String COUPON_INVALID="优惠券无效";
 	public static String COUPON_CONSUME_NO_ENOUGH="消费额度不足,优惠券无法使用";
+	public static String COUPON_T1_T2_NO_MSG="请购买指定商品";
 	public static String COUPON_NO_MEET_DEMAND="此优惠券只能兑换T1/T2滤芯，请选择一个T1滤芯或者T2滤芯";
 
 	public static String COUPONITEMSTATUS_NORMAL = "normal";

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

@@ -70,7 +70,7 @@
         FROM
           tb_iamberry_access_statistics t
         WHERE
-          date_format(t.acce_stat_create_time,'%Y-%m-%d') = date_format(#{acceStatCreateTime},'%Y-%m-%d')
+          date_format(t.acce_stat_create_time,'%Y-%m-%d') = date_format(#{judgeTime},'%Y-%m-%d')
         AND t.acce_stat_open_id = #{acceStatOpenId}
         AND t.acce_stat_type = #{acceStatType}
     </select>

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/mothMovable/MothMovableHandler.java

@@ -134,32 +134,7 @@ public class MothMovableHandler {
         ResultMsg msg = new ResultMsg();
 
         Member member = WechatUtils.getUserBySession(request);
-
-        JSONObject jsonObject = WeixinUtil.getUserInfo(member.getUserOpenid());
-        String sex = jsonObject.getString("sex");//值为1时是男性，值为2时是女性，值为0时是未知
-        String city = jsonObject.getString("city");
-        String country = jsonObject.getString("country");
-        String province = jsonObject.getString("province");
-        String nickname = jsonObject.getString("nickname");
-        String headimgurl = jsonObject.getString("headimgurl");
-        try {
-            nickname = URLEncoder.encode(jsonObject.getString("nickname"), "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            nickname = "";
-        }
         member = memberService.getMemberByUserOpenId(member.getUserOpenid());
-        //赋值&更新会员数据
-        if (member != null && member.getUserId() != null) {
-            member.setUserOpenid(member.getUserOpenid());
-            member.setUserNickname(nickname);
-            member.setUserSex(Integer.parseInt(sex));
-            member.setUserAddr(country+"-"+province+"-"+city);
-            member.setUserHead(headimgurl);
-            //userIsBought 暂存旧的关注状态
-            member.setUserIsBought(member.getUserStatus() == null ? 1 : member.getUserStatus());
-            member.setUserStatus(2); // 已关注
-            homeService.updateWechatMemberInfoByByOpenid(member);
-        }
 
         //进入活动的UV埋点
         AcceStatistics acceStatistics = new AcceStatistics();
@@ -169,6 +144,34 @@ public class MothMovableHandler {
         Integer count = acceStatisticsService.getAcceStatiCount(acceStatistics);
         if(count <= 0){  //添加UV访问
             Integer flag = acceStatisticsService.save(acceStatistics);
+
+            JSONObject jsonObject = WeixinUtil.getUserInfo(member.getUserOpenid());
+            String sex = jsonObject.getString("sex");//值为1时是男性，值为2时是女性，值为0时是未知
+            String city = jsonObject.getString("city");
+            String country = jsonObject.getString("country");
+            String province = jsonObject.getString("province");
+            String nickname = jsonObject.getString("nickname");
+            String headimgurl = jsonObject.getString("headimgurl");
+            try {
+                nickname = URLEncoder.encode(jsonObject.getString("nickname"), "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                nickname = "";
+            }
+
+            Member mb = new Member();
+            //赋值&更新会员数据
+            if (member != null && member.getUserId() != null) {
+                mb.setUserId(member.getUserId());
+                mb.setUserOpenid(member.getUserOpenid());
+                mb.setUserNickname(nickname);
+                mb.setUserSex(Integer.parseInt(sex));
+                mb.setUserAddr(country+"-"+province+"-"+city);
+                mb.setUserHead(headimgurl);
+                //userIsBought 暂存旧的关注状态
+                mb.setUserIsBought(member.getUserStatus() == null ? 1 : member.getUserStatus());
+                mb.setUserStatus(2); // 已关注
+                homeService.updateWechatMemberInfoByByOpenid(mb);
+            }
         }
 
         MothMovable mothMovable = new MothMovable();

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

@@ -389,14 +389,14 @@ public class OrderHandler {
 		int orderNum = cartService.selectOrderCount(shopSalesOrderDto);
 		
 		int total = 0; // 需要支付的总额, 单位为分
-		
-		
+
 		//查询金牌会员模板id
 		int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
 		UserGiftDto userGift = null;
-		int giftNum = 0;
 		//vip会员买年套滤芯减价，此表示为减价金额
 		int priceReduction = 0;
+
+		boolean isCludeT1ORT2 = false;	//是否包含T1/T2
 		
 		/** 提前准备订单项数据 */
 		/** 准备数据 */
@@ -413,17 +413,16 @@ public class OrderHandler {
 					userGiftDto.setUserLevel(3);
 					userGiftDto.setUserProductId(cartDto.getCartProductId());
 					userGiftDto.setUserColorId(cartDto.getCartColorId());
-					//根据商品id和会员等级查询礼品信息
-//					userGiftDto = productInfoService.selectUserGift(userGiftDto);
-//					if (userGiftDto != null) {
-//						cartDto.setProductPrice(userGiftDto.getUserDiscount());
-//					}
 				}
 			}
 			//VIP用户滤芯年套减一百
 			if(cartDto.getCartColorId() == 5 && member.getUserIsVip() == 2){
 				priceReduction += 10000*cartDto.getCartNum();
 			}
+
+			if(7 == cartDto.getCartColorId() || 8 == cartDto.getCartColorId()){
+				isCludeT1ORT2 = true;
+			}
 			
 			if (cartDto.getProductStatus() != null && cartDto.getProductStatus().intValue() == 1) {
 				cartIds.add(cartDto.getCartId());
@@ -444,27 +443,6 @@ public class OrderHandler {
 			}
 		}
 
-		//如果模板id等于金牌会模板id，来源是3，则该用户为金牌会员直接下线，直接下线送三年滤芯
-		if (member.getUserDealers() != null && member.getTemplateId() != null && 
-				templateId == member.getTemplateId().intValue() && member.getUserResType().intValue() == 3) {
-			//当userGift不为空时，说明该用户购买的商品有奖励礼品，奖励礼品取第一个产品的，不适用于多个产品有不同奖励礼品的情况
-			if (userGift != null && userGift.getUserGiftId() != null && !"".equals(userGift.getUserGiftId())) {
-				Product product = productInfoService.getProductByProductId(userGift.getUserGiftId(),userGift.getUserGiftColor());
-				OrderItem orderItem = new OrderItem();
-				orderItem.setItemNum(userGift.getUserGiftCount() * giftNum);
-				orderItem.setItemProductDiscount(0);
-				orderItem.setItemProductId(userGift.getUserGiftId());
-				orderItem.setItemProductName(product.getProductName());
-				orderItem.setItemProductPic(product.getProductIntroduceImg());
-				orderItem.setItemSalesOrderid(order.getSalesOrderid());
-				orderItem.setItemTotal(0);
-				orderItem.setItemProductType(product.getProductType().getTypeId());
-				orderItem.setItemProductPrice(0);
-				orderItem.setItemColorId(userGift.getUserColorId());
-				list.add(orderItem);
-			}
-		}
-		
 		// 准备订单对象
 		order.setSalesOpenid(member.getUserOpenid()); // openid 
 		order.setSalesAmount(total); // 订单金额
@@ -504,6 +482,13 @@ public class OrderHandler {
 				return msg;
 			}
 
+			if(couponType.getCouponId() == 10001){
+				if(!isCludeT1ORT2){
+					msg.setMessage(ResultInfo.COUPON_T1_T2_NO_MSG); //未购买指定商品
+					return msg;
+				}
+			}
+
 			if(3 == couponType.getCouponType()){
 				//判断抵扣券的是否能够使用
 				Exchange exchange = new Exchange();