order refund status change - 2

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

@@ -833,6 +833,7 @@ func (self *OrderController) Operate() {
 			remark := fmt.Sprintf("取消订单退佣金")
 			new(balance_model.CashBalance).Create(o.WxUserId, o.PaiedCash, source, o.OrderId, remark)
 		}
+		o.Status = order_model.STATUS_CLOSED
 	} else if operate == order_model.OPERATE_CANCEL && o.Status == order_model.STATUS_PROCESSING {
 		//发起退款流程
 		refund := new(order_model.OrderRefund).Create(o.WxUserId, o.TotalPrice, o.PaiedPrice, o.OrderId, o.TradeNo)
@@ -845,8 +846,6 @@ func (self *OrderController) Operate() {
 	} else 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() {