38节日活动

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

@@ -328,11 +328,6 @@ public class OrderHandler {
 			return msg;
 		}
 		if (temp.getOrderUserRemark() != null && !temp.getOrderUserRemark().isEmpty()) {
-//			Pattern pattern = Pattern.compile("^[\u4e00-\u9fa5_a-zA-Z0-9]+$");
-//			if (!pattern.matcher(temp.getOrderUserRemark()).find()) {
-//				msg.setMessage(ResultInfo.paramFormatError);
-//				return msg;
-//			}
 			if (!(temp.getOrderUserRemark().length() >= 1 && temp.getOrderUserRemark().length() <= 100)) {
 				msg.setMessage(ResultInfo.paramFormatError);
 				return msg;
@@ -424,24 +419,6 @@ public class OrderHandler {
 				priceReduction += 10000*cartDto.getCartNum();
 			}
 			
-			//如果模板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 (cartDto.getProductStatus() != null && cartDto.getProductStatus().intValue() == 1) {
 				cartIds.add(cartDto.getCartId());
 				Integer subTotal = cartDto.getCartNum() * cartDto.getProductPrice(); // 小计
@@ -554,8 +531,14 @@ public class OrderHandler {
 			}else if(couponType.getCouponType()==3){
 				total=total-couponType.getCouponReduce();
 			}
-		
 		}
+
+		if(true){
+			if(total > 200000){
+				ProductColor productColor = productColorService.selectProductColorById(48);
+			}
+		}
+
 		if(total==0 || total<0){
 			total=0;
 			mustPay=0;