老用户感恩回馈活动

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

@@ -317,6 +317,7 @@ public class OrderHandler {
 		SendPayDto dto = new SendPayDto();
 		dto.setSuccess(false);
 		Member member = WechatUtils.getUserBySession(request); // 当前用户
+		member = memberService.getMemberByUserId(member.getUserId());
 		/** 数据格式校验 */
 		if (member == null || member.getUserOpenid() == null) {// 校验当前用户信息是否丢失
 			msg.setMessage(ResultInfo.loginOutError);
@@ -382,30 +383,34 @@ public class OrderHandler {
 					userGiftDto.setUserProductId(cartDto.getCartProductId());
 					userGiftDto.setUserColorId(cartDto.getCartColorId());
 					//根据商品id和会员等级查询礼品信息
-					userGiftDto = productInfoService.selectUserGift(userGiftDto);
-					if (userGiftDto != null) {
-						cartDto.setProductPrice(userGiftDto.getUserDiscount());
-					}
+//					userGiftDto = productInfoService.selectUserGift(userGiftDto);
+//					if (userGiftDto != null) {
+//						cartDto.setProductPrice(userGiftDto.getUserDiscount());
+//					}
 				}
 			}
+			//VIP用户滤芯年套减一百
+			if(cartDto.getCartColorId() == 5 && member.getUserIsVip() == 2){
+				cartDto.setProductPrice(cartDto.getProductPrice()-10000);
+			}
 			
 			//如果模板id等于金牌会模板id，则该用户为金牌会员下线
-			if (member.getUserDealers() != null && member.getTemplateId() != null 
-					&& templateId == member.getTemplateId().intValue() && member.getUserResType().intValue() == 3) {
-				UserGiftDto userGiftDto = new UserGiftDto();
-				userGiftDto.setUserLevel(2);
-				userGiftDto.setUserProductId(cartDto.getCartProductId());
-				userGiftDto.setUserColorId(cartDto.getCartColorId());
-				//根据商品id和会员等级查询礼品信息
-				userGiftDto = productInfoService.selectUserGift(userGiftDto);
-				if (userGiftDto != null) {
-					cartDto.setProductPrice(userGiftDto.getUserDiscount());
-					giftNum += cartDto.getCartNum();
-					if (userGift == null) {
-						userGift = userGiftDto;
-					}
-				}
-			}
+//			if (member.getUserDealers() != null && member.getTemplateId() != null
+//					&& templateId == member.getTemplateId().intValue() && member.getUserResType().intValue() == 3) {
+//				UserGiftDto userGiftDto = new UserGiftDto();
+//				userGiftDto.setUserLevel(2);
+//				userGiftDto.setUserProductId(cartDto.getCartProductId());
+//				userGiftDto.setUserColorId(cartDto.getCartColorId());
+//				//根据商品id和会员等级查询礼品信息
+//				userGiftDto = productInfoService.selectUserGift(userGiftDto);
+//				if (userGiftDto != null) {
+//					cartDto.setProductPrice(userGiftDto.getUserDiscount());
+//					giftNum += cartDto.getCartNum();
+//					if (userGift == null) {
+//						userGift = userGiftDto;
+//					}
+//				}
+//			}
 			
 			if (cartDto.getProductStatus() != null && cartDto.getProductStatus().intValue() == 1) {
 				cartIds.add(cartDto.getCartId());