test

md/day_luck_draw_order_jackpot.go

@@ -6,5 +6,5 @@ type DayLuckDrawOrderJackpotReq struct {
 	Pvd        string `json:"pvd"`
 	Amount     string `json:"amount"`
 	Commission string `json:"commission" `
-	Reward     string `json:"reward" `
+	Bili       string `json:"bili"`
 }

svc/svc_day_luck_draw_reward.go

@@ -115,8 +115,6 @@ func GetUserReward(eg *xorm.Engine, mid string, isTask bool) error {
 	sum := db.GetSettleAllOrderSum(sess, "0")
 	if setting.Source == "amount" {
 		sum = zhios_day_luck_draw_utils.StrToFloat64(setting.Amount)
-	} else {
-		sum = sum * zhios_day_luck_draw_utils.StrToFloat64(setting.CommissionBili) / 100
 	}
 	if sum == 0 { //没金额中断了
 		setting.OpenTime = time.Unix(now+int64(setting.CycleDay)*86400, 0)

svc/svc_day_luck_draw_settle_order.go

@@ -3,6 +3,7 @@ package svc
 import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_day_luck_draw.git/db"
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_day_luck_draw.git/md"
+	zhios_day_luck_draw_utils "code.fnuoos.com/go_rely_warehouse/zyos_go_day_luck_draw.git/utils"
 	"xorm.io/xorm"
 )
 
@@ -11,6 +12,9 @@ func AddSettleOrder(eg *xorm.Engine, req md.DayLuckDrawOrderJackpotReq) error {
 	if setting == false {
 		return nil
 	}
+	drawSetting := db.GetDayLuckDrawSetting(eg)
+	req.Bili = drawSetting.CommissionBili
+	req.Commission = zhios_day_luck_draw_utils.Float64ToStrByPrec(zhios_day_luck_draw_utils.StrToFloat64(req.Commission)*(zhios_day_luck_draw_utils.StrToFloat64(req.Bili)/100), 7)
 	err := db.AddSettle(eg, req)
 	if err != nil {
 		return err
@@ -22,6 +26,9 @@ func AddSettleOrderSess(sess *xorm.Session, req md.DayLuckDrawOrderJackpotReq) e
 	if setting == false {
 		return nil
 	}
+	drawSetting := db.GetDayLuckDrawSettingSess(sess)
+	req.Bili = drawSetting.CommissionBili
+	req.Commission = zhios_day_luck_draw_utils.Float64ToStrByPrec(zhios_day_luck_draw_utils.StrToFloat64(req.Commission)*(zhios_day_luck_draw_utils.StrToFloat64(req.Bili)/100), 7)
 	err := db.AddSettleSess(sess, req)
 	if err != nil {
 		return err