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

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

@@ -11,13 +11,13 @@ import (
 	"github.com/astaxie/beego"
 	// "github.com/astaxie/beego/context"
 	"fohow.com/apps"
-	// "fohow.com/apps/controllers/user_controller"
-	// "fohow.com/apps/models/activity_model"
+
 	"fohow.com/apps/models/balance_model"
 	"fohow.com/apps/models/merchant_model"
 	"fohow.com/apps/models/order_model"
 	"fohow.com/apps/models/product_model"
 	"fohow.com/apps/models/user_model"
+
 	"strings"
 	"sync"
 	"time"
@@ -355,15 +355,18 @@ func (self *OrderController) Operate() {
 		beego.BeeLogger.Error("wx_user[%d] complete order[%s] fail", wxUId, oId)
 	}
 
-	if operate == order_model.OPERATE_CANCEL && o.Status == order_model.STATUS_UNPAY && o.CouponPrice > 0 {
-		//退款至代金券账户
-		source := balance_model.BALANCE_SOURCE_ALL_REFUNDED_NAME
-		remark := fmt.Sprintf("取消订单退款")
-		new(balance_model.Balance).Create(o.WxUserId, o.UserId, o.CouponPrice, source, o.OrderId, remark)
+	if operate == order_model.OPERATE_CANCEL && o.Status == order_model.STATUS_UNPAY {
 		//已支付订单移除未支付队列
 		cancelKey := helpers.GetOrderCancelList()
 		helpers.ThrowOutRedisList(cancelKey, o.OrderId)
+		if o.CouponPrice > 0 {
+			//退款至代金券账户
+			source := balance_model.BALANCE_SOURCE_ALL_REFUNDED_NAME
+			remark := fmt.Sprintf("取消订单退款")
+			new(balance_model.Balance).Create(o.WxUserId, o.UserId, o.CouponPrice, source, o.OrderId, remark)
+		}
 	}
+
 	//已确认收货的订单、发放代销金给卖方
 	//if o.Status == order_model.STATUS_COMPLETE && o.OrderType == order_model.ORDER_TYPE_SALE {
 	//helpers.SendBalanceWhileSaleOrderCompleteHandler(o)