order refund status change

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

@@ -838,12 +838,10 @@ func (self *OrderController) Operate() {
 	} else if operate == order_model.OPERATE_CANCEL && o.Status == order_model.STATUS_PROCESSING {
 		//发起退款流程
 		self.httpRequest(o.WxUserId, o.TotalPrice, o.PaiedPrice, o.OrderId, o.TradeNo)
-	}
-
-	if operate == order_model.OPERATE_CONFIRM && o.Status == order_model.STATUS_DISPATCH {
+	} 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_PROCESSING) {
+	} else if operate == order_model.OPERATE_CANCEL && o.Status == order_model.STATUS_UNPAY {
 		o.Status = order_model.STATUS_CLOSED
 	}