abiao лет назад: 5
Родитель
Сommit
b2327c6e7f

+ 2 - 2
go/gopath/src/fohow.com/apps/controllers/pay_controller/after_pay_controller.go

@@ -360,10 +360,10 @@ func (self *PayController) wxPayExchangeAsync() {
 	} else {
 		productId = order_model.SEND_PRODUCT_ID
 	}
-	saleList := order_model.GetWxUserOrders(wxUser.Id)
+	//saleList := order_model.GetWxUserOrders(wxUser.Id)
 	//beego.BeeLogger.Error("en(saleList)=%d", len(saleList))
 	//	七月注册会员首单赠送赠品
-	if order.TotalPrice >= order_model.PROMOTION_TOTAL && len(saleList) == 1 {
+	if order.TotalPrice >= order_model.PROMOTION_TOTAL {
 		product := product_model.GetProductById(productId, false)
 		go order_model.SendCreate(order.OrderId, order.Id, productId, product.Price, product.Price, product.Name, int64(1))
 	}

+ 2 - 2
go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -151,10 +151,10 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source s
 			} else {
 				productId = order_model.SEND_PRODUCT_ID
 			}
-			saleList := order_model.GetWxUserOrders(wxUser.Id)
+			//saleList := order_model.GetWxUserOrders(wxUser.Id)
 			//beego.BeeLogger.Error("en(saleList)=%d", len(saleList))
 			//	七月注册会员首单赠送赠品
-			if order.TotalPrice >= order_model.PROMOTION_TOTAL && len(saleList) == 1 {
+			if order.TotalPrice >= order_model.PROMOTION_TOTAL {
 				product := product_model.GetProductById(productId, false)
 				go order_model.SendCreate(order.OrderId, order.Id, productId, product.Price, product.Price, product.Name, int64(1))
 			}

+ 2 - 2
go/gopath/src/fohow.com/apps/models/order_model/order.go

@@ -48,8 +48,8 @@ const (
 
 	FREIGHT_LIMIT    = int64(9900)
 	FREIGHT          = int64(500)
-	PROMOTION_TOTAL  = int64(9900)
-	SEND_PRODUCT_ID  = int64(79)
+	PROMOTION_TOTAL  = int64(19800)
+	SEND_PRODUCT_ID  = int64(155)
 	SHOP_BENETFIT_BL = float64(0.08)
 
 	ZT_PASSWORD = "pQtIjP"