watero 618活动

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

@@ -72,6 +72,24 @@ public class ResultInfo {
 	 * 母亲节回复文本内容
 	 */
 	public  static String messageMothMsg = "";									// 母亲节回复文本内容
+
+	/**
+	 * 活动过期
+	 */
+	public  static String eventExpiredMsg = "";
+	/**
+	 * 618 重复领取
+	 */
+	public  static String repeatCollectionMsg = "";
+	/**
+	 * 618 领取失败
+	 */
+	public  static String failedReceiveMsg = "";
+	/**
+	 * 618 领取成功
+	 */
+	public  static String successReceiveMsg = "";
+
 	/**
 	 * 异常时回复信息
 	 */
@@ -148,6 +166,10 @@ public class ResultInfo {
 	 */
 	public static String SERVICE_PUSH_URL = "";
 	/**
+	 * 首页
+	 */
+	public static String INDEX_URL = "https://s.iamberry.com/watero/wechat/20190618.html";
+	/**
 	 * <礼品卡>推荐人推送消息 跳转页面
 	 */
 	public static String AGENT_REFERRER_MACHINE_PAGE = "";

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

@@ -56,7 +56,12 @@ public class loadResultUtil {
 			ResultInfo.messageMothMsg=prop.getProperty("messageMothMsg");
 			ResultInfo.tryCatchDefaultResponseText=prop.getProperty("tryCatchDefaultResponseText");
 			ResultInfo.rebateOrderText=prop.getProperty("rebateOrderText");
-			
+
+			ResultInfo.eventExpiredMsg=prop.getProperty("eventExpiredMsg");
+			ResultInfo.repeatCollectionMsg=prop.getProperty("repeatCollectionMsg");
+			ResultInfo.failedReceiveMsg=prop.getProperty("failedReceiveMsg");
+			ResultInfo.successReceiveMsg=prop.getProperty("successReceiveMsg");
+
 			ResultInfo.PAGE_SHIPMENT = prop.getProperty("PAGE_SHIPMENT"); 			// 订单发货的界面
 			ResultInfo.TUIHUI_SHIPMENT = prop.getProperty("TUIHUI_SHIPMENT"); 		//收益退回的界面
 			ResultInfo.ORDER_GUOQI = prop.getProperty("ORDER_GUOQI"); 				//订单即将过期提醒

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

@@ -45,7 +45,8 @@
 			TB_IAMBERRY_PRODUCT_INFO 
 		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR ON PRODUCT_ID = COLOR_PRODUCT_ID 
 		WHERE 
-			PRODUCT_STATUS = 1 
+			PRODUCT_STATUS = 1
+		AND color_status = 1
 			<if test="productName != null and productName != ''">
 				AND PRODUCT_NAME like CONCAT('%',#{productName},'%') 
 			</if>

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

@@ -9,6 +9,7 @@ import java.util.*;
 import com.iamberry.wechat.core.entity.activity.ActivityDate;
 import com.iamberry.wechat.core.entity.admin.FullReduction;
 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.coupon.CouponItemService;
@@ -497,24 +498,33 @@ public class WeChatServiceImpl implements WeChatService {
 		if (fromUserName == null) {
 			return NameUtils.getConfig("FEMALE_LADY_ERROR");
 		}
-
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Date date = new Date();
 		Calendar endCalendar = Calendar.getInstance();
-		endCalendar.set(2019,6,18,23,59,59);
+		endCalendar.set(2019,5,18,23,59,59);
 		Date endDate = endCalendar.getTime();
+		logger.info("活动截止时间："+formatter.format(endCalendar.getTime()) );
 		if(endDate.before(date)){//date>endDate?true：false
-			return "活动已过期，请稍后重试！";
+			return ResultInfo.eventExpiredMsg;
+		}
+
+		CouponItemDto couponItemDto = new CouponItemDto();
+		couponItemDto.setUseropenid(fromUserName);	//useropenid
+		couponItemDto.setCouponId(10002);
+		Integer count = couponItemService.getCouponItemCount(couponItemDto);
+		if(count > 0){
+			return ResultInfo.repeatCollectionMsg;
 		}
 
 		Integer couponId = 10002;
 		CouponType couponType = couponTypeService.getCouponTypeById(couponId);
 		Calendar calendar = Calendar.getInstance();
 		calendar.set(Calendar.YEAR, 2019);
-		calendar.set(Calendar.MONTH, 6);
+		calendar.set(Calendar.MONTH, 5);
 		calendar.set(Calendar.DAY_OF_MONTH, 18);
 		calendar.set(Calendar.HOUR_OF_DAY,23);
 		calendar.set(Calendar.MINUTE,59);
-		calendar.set(Calendar.SECOND,59);
+		calendar.set(Calendar.SECOND,50);
 		CouponItem couponItem = new CouponItem();
 		String uuidStr = StrUtils.getUUID();
 		couponItem.setCouponItemId(uuidStr);
@@ -526,7 +536,7 @@ public class WeChatServiceImpl implements WeChatService {
 		couponItem.setCouponItemRemark(couponType.getCouponRemark());
 		Integer flag = couponItemService.insertCouponItem(couponItem);
 		if(flag < 1){
-			return "领取优惠券失败，请稍后重试！";
+			return ResultInfo.failedReceiveMsg;
 		}
 
 		// 推送信息
@@ -537,12 +547,12 @@ public class WeChatServiceImpl implements WeChatService {
 					"有效期至2019-06-18",
 					"可在“会员中心—券包”查看，请尽快使用。",
 					fromUserName,
-					ResultInfo.SERVICE_PUSH_URL);
+					ResultInfo.INDEX_URL);
 		}catch (Exception e){
 			logger.info("推送消息失败，失败openId："+fromUserName);
 			e.printStackTrace();
 		}
-		return "";
+		return ResultInfo.successReceiveMsg;
 	}
 
 	/**

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

@@ -781,23 +781,24 @@ public class OrderHandler {
 			}
 		}
 
+		List<CartDto> newGiftList = new ArrayList<>();
 		if(giftList != null && giftList.size() > 0){
 			for (CartDto carD:giftList) {
-				boolean flag = false;
-				for (CartDto cd:cartDtoList) {
-					if(Objects.equals(cd.getCartColorId(), carD.getCartColorId())){
-						flag = true;
-						cd.setCartNum(cd.getCartNum() + carD.getCartNum());
-						cd.setProductDiscount(cd.getProductDiscount() +  carD.getProductDiscount());
-						cd.setProductPrice( cd.getProductPrice() + carD.getProductPrice());
-						cd.setTotal(cd.getTotal() + carD.getTotal());
+				boolean fl = false;
+				for(CartDto newCarD:newGiftList) {
+					if(Objects.equals(newCarD.getCartColorId(), carD.getCartColorId())){	//赠品相同，合并
+						fl = true;
+						newCarD.setCartNum(newCarD.getCartNum() + carD.getCartNum());
+						newCarD.setProductDiscount(newCarD.getProductDiscount() +  carD.getProductDiscount());
+						newCarD.setProductPrice( newCarD.getProductPrice() + carD.getProductPrice());
+						newCarD.setTotal(newCarD.getTotal() + carD.getTotal());
 					}
 				}
-				if(!flag){
+				if(!fl){
 					Product product = productInfoService.selectProductByColorId(carD.getCartColorId());
 					carD.setCartId(1);
 					carD.setCartProductId(product.getProductId());
-					carD.setProductName(product.getProductName());
+					carD.setProductName("【赠品】"+product.getProductName());
 					carD.setProductType(product.getProductTypeId());
 					carD.setProductStatus(1);
 					carD.setProductIntroduceImg(product.getColorImg());
@@ -806,10 +807,13 @@ public class OrderHandler {
 					carD.setColorImg(product.getColorImg());
 					CartDto newCartDto = new CartDto();
 					BeanUtils.copyProperties(carD,newCartDto);
-					cartDtoList.add(newCartDto);
+					newGiftList.add(newCartDto);
 				}
 			}
 		}
+		if(newGiftList != null && newGiftList.size() > 0){
+			cartDtoList.addAll(newGiftList);
+		}
 	}