Sfoglia il codice sorgente

增加退款使用金额

abiao 3 anni fa
parent
commit
9fe2d8f954

+ 1 - 1
go/gopath/src/fohow.com/apps/controllers/cron_controller/init.go

@@ -80,7 +80,7 @@ func exec(name string) {
 	case "cancel_order": //下单24h未支付改为已取消
 		go OrderCancelAutomatically()
 	case "cancel_order_once": //下单24h未支付改为已取消
-		go OnceOrderCancelAutomatically()
+		//go OnceOrderCancelAutomatically()
 	case "send_cent": //补发积分执行一次
 		//go patchCent()
 	case "clear_update_orders": //清理过期物流数据

+ 13 - 0
go/gopath/src/fohow.com/apps/controllers/cron_controller/order_receive_automatically.go

@@ -96,6 +96,19 @@ func OrderCancelAutomatically() {
 				remark := fmt.Sprintf("取消订单退款")
 				new(balance_model.Balance).Create(order.WxUserId, order.UserId, order.CouponPrice, source, orderId, remark)
 			}
+			//返还会员银豆账户
+			if order.PaiedSilver > int64(0) {
+				source := balance_model.BALANCE_SOURCE_ALL_REFUNDED_NAME
+				remark := fmt.Sprintf("取消订单退银豆")
+				new(balance_model.Balance).Create(order.WxUserId, order.UserId, order.PaiedSilver, source, order.OrderId, remark)
+			}
+
+			//返还会员佣金账户
+			if order.PaiedCash > int64(0) {
+				source := balance_model.BALANCE_SOURCE_ALL_REFUNDED_NAME
+				remark := fmt.Sprintf("取消订单退佣金")
+				new(balance_model.CashBalance).Create(order.WxUserId, order.PaiedCash, source, order.OrderId, remark)
+			}
 			order.Status = order_model.STATUS_CLOSED
 			order.Save()
 			lib_redis.ThrowOutRedisList(key, orderId)

+ 13 - 0
go/gopath/src/fohow.com/apps/controllers/order_controller/order_controller.go

@@ -769,6 +769,19 @@ func (self *OrderController) Operate() {
 			remark := fmt.Sprintf("取消订单退款")
 			new(balance_model.Balance).Create(o.WxUserId, o.UserId, o.CouponPrice, source, o.OrderId, remark)
 		}
+		//返还会员银豆账户
+		if o.PaiedSilver > int64(0) {
+			source := balance_model.BALANCE_SOURCE_ALL_REFUNDED_NAME
+			remark := fmt.Sprintf("取消订单退银豆")
+			new(balance_model.Balance).Create(o.WxUserId, o.UserId, o.PaiedSilver, source, o.OrderId, remark)
+		}
+
+		//返还会员佣金账户
+		if o.PaiedCash > int64(0) {
+			source := balance_model.BALANCE_SOURCE_ALL_REFUNDED_NAME
+			remark := fmt.Sprintf("取消订单退佣金")
+			new(balance_model.CashBalance).Create(o.WxUserId, o.PaiedCash, source, o.OrderId, remark)
+		}
 	}
 
 	if operate == order_model.OPERATE_CONFIRM && o.Status == order_model.STATUS_DISPATCH {

+ 15 - 1
go/gopath/src/fohow.com/apps/controllers/railsadmin_controller/order_refund_controller.go

@@ -72,10 +72,24 @@ func (self *RailsadminController) OrderRefund() {
 		//返还会员提货券账户
 		if o.CouponPrice > int64(0) {
 			source := balance_model.BALANCE_SOURCE_ALL_REFUNDED_NAME
-			remark := fmt.Sprintf("取消订单退")
+			remark := fmt.Sprintf("取消订单退提货券")
 			new(balance_model.Balance).Create(o.WxUserId, o.UserId, o.CouponPrice, source, o.OrderId, remark)
 		}
 
+		//返还会员银豆账户
+		if o.PaiedSilver > int64(0) {
+			source := balance_model.BALANCE_SOURCE_ALL_REFUNDED_NAME
+			remark := fmt.Sprintf("取消订单退银豆")
+			new(balance_model.Balance).Create(o.WxUserId, o.UserId, o.PaiedSilver, source, o.OrderId, remark)
+		}
+
+		//返还会员佣金账户
+		if o.PaiedCash > int64(0) {
+			source := balance_model.BALANCE_SOURCE_ALL_REFUNDED_NAME
+			remark := fmt.Sprintf("取消订单退佣金")
+			new(balance_model.CashBalance).Create(o.WxUserId, o.PaiedCash, source, o.OrderId, remark)
+		}
+
 		//微信支付金额原路退款
 		if o.PaiedPrice > int64(0) {
 			outTradeNo := fmt.Sprintf("%s-%d", refund.OrderId, refund.Id)