优化交易创建流程，客户管理新增折扣与来源字段及功能

web/services/bill.go

@@ -3,8 +3,6 @@ package services
 import (
 	m "platform/web/models"
 	q "platform/web/queries"
-
-	"github.com/shopspring/decimal"
 )
 
 var Bill = &billService{}
@@ -23,12 +21,12 @@ func (s *billService) CreateForBalance(q *q.Query, uid, tradeId int32, detail *T
 	})
 }
 
-func (s *billService) CreateForResourceByTrade(q *q.Query, uid, tradeId, resourceId int32, detail *TradeDetail) error {
+func (s *billService) CreateForResource(q *q.Query, uid, resourceId int32, tradeId *int32, detail *TradeDetail) error {
 	return q.Bill.Create(&m.Bill{
 		UserID:     uid,
 		BillNo:     ID.GenReadable("bil"),
 		ResourceID: &resourceId,
-		TradeID:    &tradeId,
+		TradeID:    tradeId,
 		CouponID:   detail.CouponId,
 		Type:       m.BillTypeConsume,
 		Info:       &detail.Subject,
@@ -36,16 +34,3 @@ func (s *billService) CreateForResourceByTrade(q *q.Query, uid, tradeId, resourc
 		Actual:     detail.Actual,
 	})
 }
-
-func (s *billService) CreateForResourceByBalance(q *q.Query, uid, resourceId int32, couponId *int32, subject string, amount, actual decimal.Decimal) error {
-	return q.Bill.Create(&m.Bill{
-		UserID:     uid,
-		BillNo:     ID.GenReadable("bil"),
-		ResourceID: &resourceId,
-		CouponID:   couponId,
-		Type:       m.BillTypeConsume,
-		Info:       &subject,
-		Amount:     amount,
-		Actual:     actual,
-	})
-}