Merge branch 'master' into feature/live

* master:
  order logic edit
  cron debug
  cron debug

go/gopath/src/fohow.com/apps/controllers/cron_controller/init.go

@@ -30,7 +30,7 @@ func (self *CronController) Init(ctx *context.Context, controllerName, actionNam
 func (self *CronController) Cron() {
 	name := self.Ctx.Input.Param(":name")
 	ip := self.Ctx.Input.IP()
-	//beego.BeeLogger.Error("get ip: %s", ip)
+	beego.BeeLogger.Error("get ip: %s", ip)
 	beego.BeeLogger.Info("Request ip ", strings.Split(beego.AppConfig.String("inetIp"), ","))
 	// 该接口要指定的ip列表访问
 	if inAllowedList, _ := tool.Contain(ip, strings.Split(beego.AppConfig.String("inetIp"), ",")); inAllowedList {

go/gopath/src/fohow.com/apps/controllers/cron_controller/order_receive_automatically.go

@@ -53,7 +53,7 @@ func OrderCompleteDispatchTime(isUpdateTime bool) {
 
 //下单超24h未支付，自动取消订单
 func OrderCancelAutomatically() {
-	beego.BeeLogger.Info("payTime=%d", 12345)
+	beego.BeeLogger.Warn("payTime=%d", 12345)
 
 	payTime, err := beego.AppConfig.Int("PayTime")
 	if err != nil {
@@ -72,9 +72,11 @@ func OrderCancelAutomatically() {
 	})
 	defer client.Close() //最后关闭
 	key := lib_redis.GetOrderCancelList()
+	beego.BeeLogger.Warn("key=%s", key)
+
 	list, _ := client.LRange(key, -1000, -1).Result()
 	for _, orderId := range list {
-		beego.BeeLogger.Info("orderId=%s", orderId)
+		beego.BeeLogger.Warn("orderId=%s", orderId)
 
 		order := order_model.GetOrderById(orderId, false)
 		if order == nil {
@@ -85,9 +87,9 @@ func OrderCancelAutomatically() {
 			lib_redis.ThrowOutRedisList(key, orderId)
 			continue
 		}
-		beego.BeeLogger.Info("payTime=%d", payTime)
-		beego.BeeLogger.Info("time.Now().Unix()=%d", time.Now().Unix())
-		beego.BeeLogger.Info("order.CreatedAt.Unix()=%d", order.CreatedAt.Unix())
+		beego.BeeLogger.Warn("payTime=%d", payTime)
+		beego.BeeLogger.Warn("time.Now().Unix()=%d", time.Now().Unix())
+		beego.BeeLogger.Warn("order.CreatedAt.Unix()=%d", order.CreatedAt.Unix())
 
 		//如果下单时间超过一天，则取消订单
 		if order.Status == order_model.STATUS_UNPAY && order.CreatedAt.Unix()+int64(payTime) < time.Now().Unix() {

go/gopath/src/fohow.com/apps/controllers/order_controller/order_controller.go

@@ -285,30 +285,25 @@ func (self *OrderController) MultCentCreate() {
 		self.ReturnError(403, apps.NoExist, "", nil)
 	}
 	totalPrice := int64(0)
-	//创建订单
-	order := new(order_model.Order).CreateNew(wxUId, uId,
-		totalPrice, int64(0), order_model.ORDER_TYPE_CENT, wxUser.Depart, order_model.SOURCE_XCX)
-	if order == nil {
-		self.ReturnError(403, apps.CreateOrderFail, "", nil)
-	}
+	//计算订单总额
 	c_arr := strings.Split(ids, ",")
 	c_nums := strings.Split(nums, ",")
 	for key, s_item := range c_arr {
 		pId, _ := strconv.ParseInt(s_item, 10, 64)
 		cNums := int64(1)
 		cNums, _ = strconv.ParseInt(c_nums[key], 10, 64)
-		product := product_model.GetProductById(pId, false)
+		product := product_model.GetProductById(pId, true)
 		if product == nil {
 			self.ReturnError(403, apps.NoExist, "", nil)
 		}
 		if product.Ptype != product_model.CENT_SALE {
 			self.ReturnError(403, apps.NoShopSale, "", nil)
 		}
-
-		//创建订单明细
+		//计算订单总额
 		totalPrice += product.Price * cNums
-		CreateOrderDetails(product, order, cNums)
 	}
+
+	//订单合法性判断
 	freight := base_config.GetFreight()
 	if totalPrice < base_config.GetOrderLimit() {
 		self.ReturnError(403, []string{apps.OrderNotEnough[0], fmt.Sprintf("订单金额不能低于%d积分", base_config.GetOrderLimit()/int64(100))}, "", nil)
@@ -320,6 +315,24 @@ func (self *OrderController) MultCentCreate() {
 	if userLeftCent < totalPrice {
 		self.ReturnError(403, apps.CentNotEnough, "", nil)
 	}
+
+	//创建订单
+	order := new(order_model.Order).CreateNew(wxUId, uId,
+		totalPrice, int64(0), order_model.ORDER_TYPE_CENT, wxUser.Depart, order_model.SOURCE_XCX)
+	if order == nil {
+		self.ReturnError(403, apps.CreateOrderFail, "", nil)
+	}
+	//创建订单明细
+	for key, s_item := range c_arr {
+		pId, _ := strconv.ParseInt(s_item, 10, 64)
+		cNums := int64(1)
+		cNums, _ = strconv.ParseInt(c_nums[key], 10, 64)
+		product := product_model.GetProductById(pId, true)
+		if product == nil {
+			self.ReturnError(403, apps.NoExist, "", nil)
+		}
+		CreateOrderDetails(product, order, cNums)
+	}
 	order.TotalPrice = totalPrice
 	order.Freight = freight
 	order.Save()