38节日活动

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/product/ProductColor.java

@@ -28,7 +28,9 @@ public class ProductColor implements java.io.Serializable{
 	private String color69Code;			//产品69码
 	private Date colorCretaeTime;		//创建时间
 	private Date colorUpdateTime;	//修改时间
-	
+
+	private String colorImg;	//图片
+
 	private PageBean page = new PageBean();		//分页
 	
 	public Integer getColorProductType() {
@@ -127,6 +129,14 @@ public class ProductColor implements java.io.Serializable{
 		this.page = page;
 	}
 
+	public String getColorImg() {
+		return colorImg;
+	}
+
+	public void setColorImg(String colorImg) {
+		this.colorImg = colorImg;
+	}
+
 	@Override
 	public String toString() {
 		return "ProductColor [colorId=" + colorId + ", colorProductId="

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

@@ -9,10 +9,12 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.iamberry.wechat.core.entity.activity.ActivityDate;
 import com.iamberry.wechat.core.entity.coupon.*;
 import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.face.coupon.ExchangeService;
 import com.iamberry.wechat.face.porduct.ProductColorService;
+import com.iamberry.wechat.service.ActivityUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -256,7 +258,13 @@ public class OrderHandler {
 		dto.setMeonyProportion(0);
 		dto.setBalance(member.getUserIncome());
 
-		dto.setUser38Interests(1);	//有权益
+		ActivityDate activityDate = activityUtil.doubleTwelve();
+		if(activityDate.isStatus()&& activityUtil.getFullReduction(member.getUserOpenid())){
+			dto.setUser38Interests(1);	//有权益
+		}else{
+			dto.setUser38Interests(2);	//无权益
+		}
+
 		
 		dto.setDisable(disable);
 		
@@ -529,9 +537,22 @@ public class OrderHandler {
 			}
 		}
 
-		if(true){
+		ActivityDate activityDate = activityUtil.doubleTwelve();
+		if(activityDate.isStatus()&& activityUtil.getFullReduction(member.getUserOpenid())){
 			if(total > 200000){
 				ProductColor productColor = productColorService.selectProductColorById(48);
+				OrderItem item = new OrderItem();
+				item.setItemNum(1);
+				item.setItemProductDiscount(0);
+				item.setItemProductId(productColor.getColorProductId());
+				item.setItemProductName(productColor.getColorProductName());
+				item.setItemProductPic(productColor.getColorImg());
+				item.setItemSalesOrderid(order.getSalesOrderid());
+				item.setItemTotal(0);
+				item.setItemProductType(productColor.getColorProductType());
+				item.setItemProductPrice(0);
+				item.setItemColorId(productColor.getColorId());
+				list.add(item);
 			}
 		}