添加内购空气净化器券

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

@@ -35,6 +35,8 @@ public class TempOrderDto implements java.io.Serializable{
 	private String orderUserRemark; // 备注
 	
 	private String couponId; //优惠券id
+
+	private String couponTypeId; //优惠券类型id
 	
 	private int balancePayAmount ; //账户余额支付额度
 
@@ -120,6 +122,14 @@ public class TempOrderDto implements java.io.Serializable{
 		this.useCouponPrizeColorId = useCouponPrizeColorId;
 	}
 
+	public String getCouponTypeId() {
+		return couponTypeId;
+	}
+
+	public void setCouponTypeId(String couponTypeId) {
+		this.couponTypeId = couponTypeId;
+	}
+
 	@Override
 	public String toString() {
 		return "TempOrderDto [orderAddressInfo=" + orderAddressInfo

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

@@ -129,48 +129,48 @@ public class ResultInfo {
 	public static String recommend_use_coupon="";
 
 	// 返现到账通知消息模版
-	public static String REWARDSREMINDTEMP =  "{'first':{'color':'#173177','value':'firstValueIamberry'}, order:{'color':'#173177','value':'orderValueIamberry'}, 'money':{'color':'#173177', 'value':'moneyValueIamberry'}, 'remark':{'color':'#173177','value':'remarkValueIamberry'}}";
+	public static String REWARDSREMINDTEMP =  "{'first':{'color':'#000000','value':'firstValueIamberry'}, order:{'color':'#000000','value':'orderValueIamberry'}, 'money':{'color':'#000000', 'value':'moneyValueIamberry'}, 'remark':{'color':'#000000','value':'remarkValueIamberry'}}";
 	
 	// 包裹通知
-	public static String ORDERPACKAGETEMP = "{'first':{'color':'#173177', 'value':'firstValueOrder'}, 'order_id':{'color':'#173177','value':'orderIdValueOrder'}, 'package_id':{'color':'#173177','value':'orderValuePackageId'}, 'remark':{'color':'#173177', 'value':'orderRemarkValue'}}";
+	public static String ORDERPACKAGETEMP = "{'first':{'color':'#000000', 'value':'firstValueOrder'}, 'order_id':{'color':'#000000','value':'orderIdValueOrder'}, 'package_id':{'color':'#000000','value':'orderValuePackageId'}, 'remark':{'color':'#000000', 'value':'orderRemarkValue'}}";
 	
 	//账户变更通知
-	public static String INCOMEREMINDTEMP = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'account':{'color':'#173177','value':'accountValueIamberry'}, 'time':{'color':'#173177', 'value':'timeValueIamberry'}, 'type':{'color':'#173177','value':'typeValueIamberry'},'remark':{'color':'#173177','value':'remarkValueIamberry'}}";
+	public static String INCOMEREMINDTEMP = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'account':{'color':'#000000','value':'accountValueIamberry'}, 'time':{'color':'#000000', 'value':'timeValueIamberry'}, 'type':{'color':'#000000','value':'typeValueIamberry'},'remark':{'color':'#000000','value':'remarkValueIamberry'}}";
 	
 	//订单未支付（5分钟）通知
-	public static String ORDERWEIZHIFU = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'ordertape':{'color':'#173177','value':'ordertapeValue'}, 'ordeID':{'color':'#173177', 'value':'ordeIDVALUE'},'remark':{'color':'#173177','value':'remarkValueIamberry'}}";
+	public static String ORDERWEIZHIFU = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'ordertape':{'color':'#000000','value':'ordertapeValue'}, 'ordeID':{'color':'#000000', 'value':'ordeIDVALUE'},'remark':{'color':'#000000','value':'remarkValueIamberry'}}";
 
 	/**	  订单支付成功	 */
-	public static String PROBATIONPAYSUCCESS = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177', 'value':'keyword3Value'},'keyword4':{'color':'#173177', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
+	public static String PROBATIONPAYSUCCESS = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'keyword3':{'color':'#000000', 'value':'keyword3Value'},'keyword4':{'color':'#000000', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
 	/** 	试用订单关闭通知		*/
-	//public static String PROBATIONSHUTDOWN = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'transid':{'color':'#173177','value':'transidValue'}, 'fee':{'color':'#173177', 'value':'feeValue'}, 'pay_time':{'color':'#173177','value':'pay_timeValue'},'remark':{'color':'#173177','value':'remarkValue'}}";
+	//public static String PROBATIONSHUTDOWN = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'transid':{'color':'#000000','value':'transidValue'}, 'fee':{'color':'#000000', 'value':'feeValue'}, 'pay_time':{'color':'#000000','value':'pay_timeValue'},'remark':{'color':'#000000','value':'remarkValue'}}";
 
 	/**  用户申请退款提醒 */
-	public static String APPLYREFUND= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'}, 'keyword4':{'color':'#173177', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
+	public static String APPLYREFUND= "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'}, 'keyword3':{'color':'#000000', 'value':'keyword3Value'}, 'keyword4':{'color':'#000000', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
 	/**  用户 申请退货 提醒 */
-	public static String APPLYRETURN= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'}, 'keyword4':{'color':'#173177', 'value':'keyword4Value'}, 'keyword5':{'color':'#173177', 'value':'keyword5Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
+	public static String APPLYRETURN= "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'}, 'keyword3':{'color':'#000000', 'value':'keyword3Value'}, 'keyword4':{'color':'#000000', 'value':'keyword4Value'}, 'keyword5':{'color':'#000000', 'value':'keyword5Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
 	/**  用户 申请换货 提醒 */
-	public static String APPLYBARTER= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
+	public static String APPLYBARTER= "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
 	/**  发货后 提醒 */
-	public static String SENDSUCCESS= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'}, 'keyword4':{'color':'#173177', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
+	public static String SENDSUCCESS= "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'}, 'keyword3':{'color':'#000000', 'value':'keyword3Value'}, 'keyword4':{'color':'#000000', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
 	/** 	服务推送 	*/
-	public static String SERVICEPUSH = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
+	public static String SERVICEPUSH = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 
 	/** 退款申请通知 **/
-	//public static String ORDERREFUNDMSG= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
+	//public static String ORDERREFUNDMSG= "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'}, 'keyword3':{'color':'#000000', 'value':'keyword3Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
 	/** 	会员积分 	*/
-	public static String MEMBERACTIVATION = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
+	public static String MEMBERACTIVATION = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 
 	/** 	注册成为会员 	*/
-	public static String REGISTERMEMBER = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
+	public static String REGISTERMEMBER = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'keyword1':{'color':'#000000','value':'keyword1Value'}, 'keyword2':{'color':'#000000', 'value':'keyword2Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 	/** 	推荐用户使用优惠券 	*/
-	public static String RECOMMENDUSECOUPON = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'Good':{'color':'#173177','value':'keyword1Value'}, 'contentType':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
+	public static String RECOMMENDUSECOUPON = "{'first':{'color':'#000000','value':'firstValueIamberry'}, 'Good':{'color':'#000000','value':'keyword1Value'}, 'contentType':{'color':'#000000', 'value':'keyword2Value'},'remark':{'color':'#000000','value':'remarkValue'}}";
 
 	//微信模板消息提示语
 	public static final String REWARDSWILLMESSAGE = "尊敬的客户您好~您有新的返现即将入账~";

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/ism/IntegralLogServiceImpl.java

@@ -301,7 +301,7 @@ public class IntegralLogServiceImpl  implements IntegralLogService {
             throw  new RuntimeException("inteLogType积分类型不正确");
         }
 
-        logger.info("积分调整-类型："+integralLog.getInteLogType()+";数量："+integralLog.getInteLogChangeNum()+";userOpenId:"+integralLog.getUserOpenId());
+        logger.info("积分调整-类型："+integralConfig.getInteConfName()+";数量："+integralLog.getInteLogChangeNum()+";userOpenId:"+integralLog.getUserOpenId());
 
         integralLog.setInteLogName(integralConfig.getInteConfName());
         flag = integralLogMapper.save(integralLog);

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/member/MemberServiceImpl.java

@@ -266,9 +266,12 @@ public class MemberServiceImpl implements MemberService {
 
 		try {
 			sendMessageUtil.recommendUseCoupon(
-					"亲爱的用户，恭喜您注册成功！现在就可享受专属会员折扣（购买滤芯产品88折，非滤芯产品95折），100会员积分、单支滤芯买一送一优惠券已发放至您的账户。",
-					"会员积分+会员专享折扣+滤芯买赠优惠券",
-					"单支滤芯买一送一优惠券有效期3个月",
+					"亲爱的用户，恭喜您注册成功！现在就可享受专属会员权益：\\\\r\\\\n" +
+							"1.专属折扣（购买滤芯88折，其他产品95折）\\\\r\\\\n" +
+							"2.单支滤芯买一送一\\\\r\\\\n" +
+							"3.注册即送100积分，下单可抵扣10元",
+					"会员专享折扣+单支滤芯买一送一+会员积分",
+					"单支滤芯买一送一有效期3个月",
 					"可在“我的爱贝源-会员中心”查看积分及优惠券，请及时使用优惠券。",
 					member.getUserOpenid(),
 					ResultInfo.COUPON_URL);

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java

@@ -508,12 +508,13 @@ public class CouponTypeHandler {
 		List<CouponItemDto> couponItemDtoList = couponItemService.getCouponItemDtoList(couponItemDto);
 		if(couponItemDtoList != null && couponItemDtoList.size() >= couponType.getCouponGetLimit()){
 			rm.setStatus(false);
-			rm.setMessage("已经领取过该优惠券了！");
+			rm.setMessage("已领取了优惠券！");
 			return rm;
 		}
 
 		Calendar calendar = Calendar.getInstance();
-		calendar.set(2019,10,11,23,59,57);
+//		calendar.set(2019,10,11,23,59,57);
+		calendar.add(Calendar.DATE,couponType.getCouponGetDays());
 		synchronized (lock) {
 			//创建优惠券
 			CouponItem couponItem = new CouponItem();

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -408,7 +408,7 @@ public class MQTask implements InitializingBean {
 						member.getUserTel(),
 						String.valueOf(member.getUserSurplusIntegral()),
 						"1、免费领取50元代金券，满99元即可使用，在会员中心-券包即可查看使用。\\\\r\\\\n" +
-								"2、会员生日当天下单购买产品，即可享受3倍积分。" +
+								"2、会员生日当天下单购买产品，即可享受3倍积分。\\\\r\\\\n" +
 								"生日福利仅限生日当天领取和使用，赶快享受你的专属生日礼包吧！",
 						member.getUserOpenid(),
 						ResultInfo.COUPON_URL);
@@ -498,7 +498,10 @@ public class MQTask implements InitializingBean {
 			for (Member m:memberList) {
 				try {
 					sendMessageUtil.registerMember(
-							"欢迎关注Aiberle爱贝源公众号。现在注册会员可赠送100积分，享受会员折扣，购买滤芯产品88折，非滤芯产品95折优惠，还赠送单支滤芯买一送一优惠券！",
+							"欢迎关注Aiberle爱贝源。现在注册会员可享受多重好礼：\\\\r\\\\n" +
+									"1.专属折扣（购买滤芯88折，其他产品95折）\\\\r\\\\n" +
+									"2.单支滤芯买一送一\\\\r\\\\n" +
+									"3.注册即送100积分，下单可抵扣10元",
 							"我的爱贝源-会员中心-成为会员",
 							"400-8006692",
 							"赶紧注册会员吧！更多惊喜等你来！",
@@ -511,7 +514,7 @@ public class MQTask implements InitializingBean {
 			}
 			logger.info("---------------- 关注用户过一个月还未注册，推送注册信息-结束 ---------------");
 		}
-	}
+ 	}
 
 	/**
 	 * 注册会员但未使用优惠券
@@ -536,8 +539,8 @@ public class MQTask implements InitializingBean {
 			for (CouponItemDto couponItemDto:couponItemDtoList) {
 				try {
 					sendMessageUtil.recommendUseCoupon(
-							"亲爱的用户，您的单支滤芯买一送一优惠券有效期还有45天",
-							"单支滤芯买一送一优惠券",
+							"亲爱的用户，您的单支滤芯买一送一优惠券即将到期",
+							"单支滤芯买一送一",
 							"45天后失效",
 							"可在“服务中心-会员中心-券包”查看，请尽快使用。",
 							couponItemDto.getUseropenid(),
@@ -564,7 +567,7 @@ public class MQTask implements InitializingBean {
 				try {
 					sendMessageUtil.recommendUseCoupon(
 							"亲爱的用户，您的单支滤芯买一送一优惠券即将到期",
-							"单支滤芯买一送一优惠券",
+							"单支滤芯买一送一",
 							"5天后失效",
 							"可在“服务中心-会员中心-券包”查看，请尽快使用。",
 							couponItemDto.getUseropenid(),

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

@@ -349,6 +349,8 @@ public class OrderHandler {
 		//添加赠品，秒杀
 		activityUtil.preferential(cartDtos);
 
+		Double kqjhj_amount_50000 = 0.00;
+
 		OrderItem paizeItem = new OrderItem();
 		boolean hasPrizeProduct = false;//含有买一赠一的颜色
 		boolean satisfyPrizeProduct = false;//满足买一赠一的方式
@@ -356,11 +358,13 @@ public class OrderHandler {
 			if (cartDto.getProductStatus() != null && cartDto.getProductStatus().intValue() == 1) {
 				cartIds.add(cartDto.getCartId());
 				Integer productDiscount = cartDto.getProductDiscount();
-				if(cartDto.getColorType() == 1 && member.getUserIsVip() == 2){	//商品类型  1:产品  2:滤芯
+				if(cartDto.getColorType() == 1 && member.getUserIsVip() == 2 &&
+						!"40001".equals(temp.getCouponTypeId()) && !"50000".equals(temp.getCouponTypeId())){
 					Double doubleProductDiscount = productDiscount.doubleValue();
 					doubleProductDiscount = doubleProductDiscount * 0.95;
 					productDiscount = doubleProductDiscount.intValue();
-				}else if((cartDto.getColorType() == 2 || cartDto.getColorType() == 3) && member.getUserIsVip() == 2){
+				}else if((cartDto.getColorType() == 2 || cartDto.getColorType() == 3) && member.getUserIsVip() == 2 &&
+						!"40001".equals(temp.getCouponTypeId()) && !"50000".equals(temp.getCouponTypeId())){
 					Double doubleProductDiscount = productDiscount.doubleValue();
 					doubleProductDiscount = doubleProductDiscount * 0.88;
 					productDiscount = doubleProductDiscount.intValue();
@@ -393,6 +397,9 @@ public class OrderHandler {
 						satisfyPrizeProduct = true;
 					}
 				}
+				if(item.getItemColorId() == 58){
+					kqjhj_amount_50000 += cartDto.getCartNum() * productDiscount;
+				}
 			}
 		}
 		//含有该优惠抵扣产品并且该产品是可抵扣产品
@@ -433,9 +440,7 @@ public class OrderHandler {
 			
 			//消费达到指定额度
 			CouponType couponType = couponTypeService.getCouponTypeById(couponItemDto.getCouponId());
-//System.out.println(couponType.getCouponConsumeEnough()+"================"+total);
-			if(couponType.getCouponConsumeEnough()>total){
-//System.out.println("==========未达到消费额！");
+			if(couponType.getCouponConsumeEnough()>total && couponType.getCouponId() != 40001){
 				msg.setMessage(ResultInfo.COUPON_CONSUME_NO_ENOUGH); //消费额度不足
 				return msg;
 			}
@@ -449,7 +454,17 @@ public class OrderHandler {
 			if(couponType.getCouponType()==1){
 				total=total-couponType.getCouponReduce();
 			}else if(couponType.getCouponType()==2){
-				total=total*couponType.getCouponReduce()/100;
+				Double totalDouble = Double.valueOf(total);
+				switch (couponItemDto.getCouponId()){
+					case 50000:
+						Double reduce = Double.valueOf(couponType.getCouponReduce())/100;
+						totalDouble = totalDouble-kqjhj_amount_50000*(1-reduce);
+						total=totalDouble.intValue();
+						break;
+					default:
+						total=total*couponType.getCouponReduce()/100;
+						break;
+				}
 			}else if(couponType.getCouponType()==3){
 				//赠送一个滤芯，上面直接添加到订单项
 			}
@@ -690,7 +705,6 @@ public class OrderHandler {
 	/**
 	 * 校验一个购物车字符串
 	 * @param cartIds 购物车ID字符串
-	 * @param cartId 接受数据数组
 	 * @return
 	 * @throws Exception 
 	 */

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

@@ -394,179 +394,4 @@ public class ResponseWechatPayHandler {
 		return msg;
 	}
 
-	@ResponseBody
-	@RequestMapping(value = "/test_accountEntry")
-	public void accountEntry() throws Exception {
-		ratFWLogger.info("---------------- 待入账转为已入账-开始 ---------------");
-		List<IntegralLog> integralLogList = integralLogService.getIntegralLogListByWaitUser();
-		if(integralLogList!=null && integralLogList.size()>0){
-			ratFWLogger.info("---------------- 当前待入账的处理数量-"+ integralLogList.size() +" ---------------");
-			for (IntegralLog integralLog:integralLogList) {
-				try {
-					integralLogService.waitUser(integralLog);
-				}catch (Exception e){
-					ratFWLogger.info("--待入账转为已入账失败；待入账积分记录id："+integralLog.getInteLogId()+"；" +
-							"订单编号："+ integralLog.getInteLogWaitingOrderId() +";失败原因："+e.getMessage());
-					e.printStackTrace();
-				}
-			}
-			ratFWLogger.info("---------------- 待入账转为已入账-结束 ---------------");
-		}
-	}
-
-	@ResponseBody
-	@RequestMapping(value = "/test_birthDatePromptCoupon")
-	public void birthDatePromptCoupon() throws Exception {
-		ratFWLogger.info("---------------- 生日提醒-赠送优惠券-开始 ---------------");
-		List<Member> memberList = memberService.getNowBirthDate();
-		ratFWLogger.info("---今日生日的用户数量："+memberList.size());
-		Integer couponId = 40000;
-		for (Member member:memberList) {
-			CouponType couponType = couponTypeService.getCouponTypeById(couponId);
-
-			Calendar calendar = Calendar.getInstance();
-			calendar.set(Calendar.HOUR_OF_DAY,23);
-			calendar.set(Calendar.MINUTE,59);
-			calendar.set(Calendar.SECOND,50);
-			//创建优惠券
-			CouponItem couponItem = new CouponItem();
-			String uuidStr = StrUtils.getUUID();
-			couponItem.setCouponItemId(uuidStr);
-			couponItem.setCouponItemUseropenid(member.getUserOpenid());
-			couponItem.setCouponId(couponType.getCouponId());
-			couponItem.setCouponReceiveDate(new Date());
-			couponItem.setCouponUseEndDate(calendar.getTime());
-			couponItem.setCouponUseStatus(1);
-			couponItem.setCouponItemRemark(couponType.getCouponRemark());
-			Integer flag = couponItemService.insertCouponItem(couponItem);
-			if(flag < 1){
-				ratFWLogger.info("---生日优惠券领取失败，userOpenId："+member.getUserOpenid() + "");
-			}else{
-				ratFWLogger.info("---生日优惠券领取成功，userOpenId："+member.getUserOpenid() + "");
-			}
-		}
-		ratFWLogger.info("---------------- 生日提醒-赠送优惠券-结束 ---------------");
-	}
-
-	@ResponseBody
-	@RequestMapping(value = "/test_birthDatePrompt")
-	public void birthDatePrompt() throws Exception {
-		ratFWLogger.info("---------------- 生日提醒-提醒用户-开始 ---------------");
-		List<Member> memberList = memberService.getNowBirthDate();
-		ratFWLogger.info("---今日生日的用户数量："+memberList.size());
-		for (Member member:memberList) {
-			//推送微信模板消息
-			try {
-				sendMessageUtil.memberActivation(
-						"尊敬的会员，祝您生日快乐，特送上一份生日礼包。",
-						member.getUserTel(),
-						String.valueOf(member.getUserSurplusIntegral()),
-						"1、免费领取50元代金券，满99元即可使用，在会员中心-券包即可查看使用。\\\\r\\\\n" +
-								"2、会员生日当天下单购买产品，即可享受3倍积分。" +
-								"生日福利仅限生日当天领取和使用，赶快享受你的专属生日礼包吧！",
-						member.getUserOpenid(),
-						ResultInfo.COUPON_URL);
-			}catch (Exception e){
-				ratFWLogger.info("推送今日生日的用户消息失败，失败openId：" + member.getUserOpenid());
-				e.printStackTrace();
-			}
-		}
-		ratFWLogger.info("---------------- 生日提醒-提醒用户-结束 ---------------");
-	}
-
-	@ResponseBody
-	@RequestMapping(value = "/register_member")
-	public void registerMember() throws Exception {
-		ratFWLogger.info("---------------- 关注用户过一个月还未注册，推送注册信息-开始 ---------------");
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(new Date());
-		calendar.add(Calendar.DATE, -30);//30天前
-
-		Member member = new Member();
-		member.setUserSubDate(calendar.getTime());
-		List<Member> memberList = memberService.getNoRegister(member);
-
-		if(memberList!=null && memberList.size()>0){
-			ratFWLogger.info("---------------- 当前任务处理数量-"+ memberList.size() +" ---------------");
-			for (Member m:memberList) {
-				try {
-					sendMessageUtil.registerMember(
-							"欢迎关注Aiberle爱贝源公众号。现在注册会员可赠送100积分，享受会员折扣，购买滤芯产品88折，非滤芯产品95折优惠，还赠送单支滤芯买一送一优惠券！",
-							"我的爱贝源-会员中心-成为会员",
-							"400-8006692",
-							"赶紧注册会员吧！更多惊喜等你来！",
-							m.getUserOpenid(),
-							ResultInfo.HUIYUAN_URL);
-				}catch (Exception e){
-					ratFWLogger.info("推送今日生日的用户消息失败，失败openId：" + member.getUserOpenid());
-					e.printStackTrace();
-				}
-			}
-			ratFWLogger.info("---------------- 关注用户过一个月还未注册，推送注册信息-结束 ---------------");
-		}
-	}
-
-	@ResponseBody
-	@RequestMapping(value = "/mq_recommend_use_coupon")
-	public void mqRecommendUseCoupon() throws Exception {
-		ratFWLogger.info("---------------- 注册会员未使用优惠券提醒-开始 ---------------");
-
-		//45天未使用优惠券的券
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(new Date());
-		calendar.add(Calendar.DATE, -45);//45天前
-		CouponItem couponItem = new CouponItem();
-		couponItem.setCouponId(40001);
-		couponItem.setCouponReceiveDate(calendar.getTime());
-		List<CouponItemDto> couponItemDtoList = couponItemService.getNoUseCouponList(couponItem);
-		if(couponItemDtoList!=null && couponItemDtoList.size()>0){
-			ratFWLogger.info("---------------- 45天未使用优惠券的券 - 前当前任务处理数量-"+ couponItemDtoList.size() +" ---------------");
-			for (CouponItemDto couponItemDto:couponItemDtoList) {
-				try {
-					sendMessageUtil.recommendUseCoupon(
-							"亲爱的用户，您的单支滤芯买一送一优惠券有效期还有45天",
-							"单支滤芯买一送一优惠券",
-							"45天后失效",
-							"可在“服务中心-会员中心-券包”查看，请尽快使用。",
-							couponItemDto.getUseropenid(),
-							ResultInfo.COUPON_URL);
-				}catch (Exception e){
-					ratFWLogger.info("注册成功提醒使用优惠券失败，失败openId：" + couponItemDto.getUseropenid()+",优惠券ID："+couponItemDto.getCouponItemId());
-					e.printStackTrace();
-				}
-			}
-			ratFWLogger.info("---------------- 注册会员未使用优惠券提醒-结束 ---------------");
-		}
-
-		//85天未使用优惠券的券
-		Calendar nowcalendar = Calendar.getInstance();
-		nowcalendar.setTime(new Date());
-		nowcalendar.add(Calendar.DATE, -85);//45天前
-		CouponItem nowcouponItem = new CouponItem();
-		nowcouponItem.setCouponId(40001);
-		nowcouponItem.setCouponReceiveDate(nowcalendar.getTime());
-		List<CouponItemDto> nowcouponItemDtoList = couponItemService.getNoUseCouponList(nowcouponItem);
-		if(nowcouponItemDtoList!=null && nowcouponItemDtoList.size()>0){
-			ratFWLogger.info("---------------- 85天未使用优惠券的券 - 前当前任务处理数量-"+ nowcouponItemDtoList.size() +" ---------------");
-			for (CouponItemDto couponItemDto:nowcouponItemDtoList) {
-				try {
-					sendMessageUtil.recommendUseCoupon(
-							"亲爱的用户，您的单支滤芯买一送一优惠券即将到期",
-							"单支滤芯买一送一优惠券",
-							"5天后失效",
-							"可在“服务中心-会员中心-券包”查看，请尽快使用。",
-							couponItemDto.getUseropenid(),
-							ResultInfo.COUPON_URL);
-				}catch (Exception e){
-					ratFWLogger.info("注册成功提醒使用优惠券失败，失败openId：" + couponItemDto.getUseropenid()+",优惠券ID："+couponItemDto.getCouponItemId());
-					e.printStackTrace();
-				}
-			}
-		}
-		ratFWLogger.info("---------------- 注册会员未使用优惠券提醒-结束 ---------------");
-	}
-
-
-
-
 }