订单增加未支付退款退单队列

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

@@ -343,14 +343,7 @@ func (self *OrderController) Operate() {
 	if operate != order_model.OPERATE_CONFIRM && operate != order_model.OPERATE_CANCEL {
 		self.ReturnError(403, apps.ParamsError, "", nil)
 	}
-	if operate == order_model.OPERATE_CONFIRM && o.Status == order_model.STATUS_DISPATCH {
-		o.Status = order_model.STATUS_COMPLETE
-		o.ReceiveTime = time.Now()
-	} else if operate == order_model.OPERATE_CANCEL && o.Status == order_model.STATUS_UNPAY {
-		o.Status = order_model.STATUS_CLOSED
-
-	}
-
+	//先处理退单
 	if operate == order_model.OPERATE_CANCEL && o.Status == order_model.STATUS_UNPAY {
 		//已支付订单移除未支付队列
 		cancelKey := helpers.GetOrderCancelList()
@@ -363,6 +356,13 @@ func (self *OrderController) Operate() {
 		}
 	}
 
+	if operate == order_model.OPERATE_CONFIRM && o.Status == order_model.STATUS_DISPATCH {
+		o.Status = order_model.STATUS_COMPLETE
+		o.ReceiveTime = time.Now()
+	} else if operate == order_model.OPERATE_CANCEL && o.Status == order_model.STATUS_UNPAY {
+		o.Status = order_model.STATUS_CLOSED
+	}
+
 	if !o.Save() {
 		beego.BeeLogger.Error("wx_user[%d] complete order[%s] fail", wxUId, oId)
 	}