上朵双旦活动，更改规则

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/WechatUtils.java

@@ -77,7 +77,7 @@ public class WechatUtils {
 	public static Member getUserBySession(HttpServletRequest request) {
 
 // 		Member m = new Member();
-//		m.setUserId(15752);
+//		m.setUserId(1);
 // 		m.setUserOpenid("oZ9pv02WMRQgyDVRY1a_daYecwHI");
 //		if(true){
 //			return m;

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

@@ -1161,12 +1161,20 @@ public class OrderHandler {
 					giftList.add(cartDto);
 				}else if(nownum >= 1){
 					CartDto cartDto = new CartDto();
-					cartDto.setCartColorId(316);
-					cartDto.setCartNum(1);
+					cartDto.setCartColorId(361);
+					cartDto.setCartNum(3);
 					cartDto.setProductDiscount(0);
 					cartDto.setProductPrice(0);
 					cartDto.setTotal(0);
 					giftList.add(cartDto);
+
+					CartDto nowcartDto = new CartDto();
+					nowcartDto.setCartColorId(316);
+					nowcartDto.setCartNum(nownum - 1);
+					nowcartDto.setProductDiscount(0);
+					nowcartDto.setProductPrice(0);
+					nowcartDto.setTotal(0);
+					giftList.add(nowcartDto);
 				}
 			}
 		}
@@ -1280,11 +1288,13 @@ public class OrderHandler {
 					if(num == 1){
 						promotionAmout = 9000;
 					}else if(num >= 2){
+						sunAmount -= 29900;
 						Double amount = Double.valueOf(sunAmount);
 						BigDecimal bd1 = new BigDecimal(Double.toString(amount));
 						BigDecimal bd2 = new BigDecimal(Double.toString(0.35));
 						amount = bd1.multiply(bd2).doubleValue();
 						promotionAmout = amount.intValue();
+						promotionAmout+=9000;
 					}
 				}