promotion add cash and cent

go/gopath/src/fohow.com/apps/helpers/promotion_helper.go

@@ -89,13 +89,14 @@ func SetOrderPromotion(orderId string, wxUid int64) {
 		if nums == int64(99) || nums == int64(0) {
 			numsFlag = false
 		}
-		/*	beego.Warn("item_name-1%d", item.Name)
+
+		//满足促销条件
+		if firstFlag && totalFlag && numsFlag {
+			beego.Warn("item_name-1%d", item.Name)
 			beego.Warn("firstFlag%v", firstFlag)
 			beego.Warn("totalFlag%v", totalFlag)
 			beego.Warn("numsFlag%v", numsFlag)
-			beego.Warn("nums%d", nums)*/
-		//满足促销条件
-		if firstFlag && totalFlag && numsFlag {
+			beego.Warn("nums%d", nums)
 			if item.SendProd1 > 0 && item.SendNums1 > 0 {
 				sendNums1 := nums * item.SendNums1
 				//赠送赠品1