abiao лет назад: 5
Родитель
Сommit
026fbdbb29

+ 13 - 2
go/gopath/src/fohow.com/apps/controllers/railsadmin_controller/order_refund_controller.go

@@ -40,7 +40,7 @@ func (self *RailsadminController) OrderRefund() {
 		if err != nil {
 			self.ReturnError(404, apps.OrderRefundError, "", nil)
 		}
-		//退上级佣金
+		//扣除上级佣金
 		source := balance_model.CASH_SOURCE_PRODUCT_BENEFIT
 		cash := balance_model.GetCashBalanceBySourceAndRId(source, refund.OrderId)
 		if cash != nil {
@@ -52,12 +52,23 @@ func (self *RailsadminController) OrderRefund() {
 				cb = new(balance_model.CashBalance).Create(cash.WxUId, -cash.Count, refund_source, refund.OrderId, remark)
 			}
 		}
-		//退款至代金券账户
+
+		//返还上级代金券
+		balance_source := balance_model.BALANCE_FREND_BUY
+		balance := balance_model.GetBalanceBySourceAndRId(balance_source, refund.OrderId)
+		if balance != nil {
+			source := balance_model.BALANCE_SOURCE_ALL_REFUNDED
+			remark := fmt.Sprintf("取消订单退款")
+			new(balance_model.Balance).Create(balance.WxUserId, balance.UserId, balance.Count, source, refund.OrderId, remark)
+		}
+
+		//返还会员代金券账户
 		if o.CouponPrice > int64(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.PaiedPrice > int64(0) {
 			outTradeNo := fmt.Sprintf("%s-%d", refund.OrderId, refund.Id)