|
@@ -176,14 +176,11 @@ func (p jyBigProduct) GetPrice() (price int64, err error) {
|
|
|
//if err != nil {
|
|
|
// return 0, fmt.Errorf("查询关联订单异常")
|
|
|
//}
|
|
|
- filter, _, entTime, err := common2.GetLinkBigCycleFilter(context.Background(), p.param.LinkedOrderId)
|
|
|
+ _, _, entTime, err := common2.GetLinkBigCycleFilter(context.Background(), p.param.LinkedOrderId)
|
|
|
if err != nil {
|
|
|
return 0, fmt.Errorf("查询关联订单异常")
|
|
|
}
|
|
|
- var finalAccountCount int //需要计费的子账号数量
|
|
|
- if p.param.Filter.BuyAccountCount > 0 || p.param.Filter.GiftAccountCount > 0 {
|
|
|
- finalAccountCount = filter.FinalAccountCount + p.param.Filter.BuyAccountCount + p.param.Filter.GiftAccountCount - 1 - filter.CutAccount
|
|
|
- }
|
|
|
+ finalAccountCount := p.param.Filter.BuyAccountCount + p.param.Filter.GiftAccountCount
|
|
|
var (
|
|
|
now = time.Now()
|
|
|
)
|