1

go.sum

@@ -2,20 +2,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5 h1:dqvWJqlJi0WXCwTxbWPLvSOsKPjP+iEDBVgLcAl9nOE=
 code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5/go.mod h1:TTcCnFn/LhBGapnutpezlW+GXkLRNPMWkziOoCsXQqY=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240812063422-6380c884a38b h1:RIDin5L2JusKXSZrWu9ThMtf5QSAHdlws/ukGPY83MI=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240812063422-6380c884a38b/go.mod h1:nT2x13YFgrS3tS1fDyUR6q/GNIK+hPw7bdzZXz99SM0=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240815013805-e7235e2d4d7e h1:XkIx6T9yJi3pnaZ1MNeVei/VqUZxrL9tZP7PjkqBt/Q=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240815013805-e7235e2d4d7e/go.mod h1:nT2x13YFgrS3tS1fDyUR6q/GNIK+hPw7bdzZXz99SM0=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240816012431-432a50e554e4 h1:DOPRTEFY8bKmAk+soM5t/hdnEaMI+UCNATX5y64sy7Q=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240816012431-432a50e554e4/go.mod h1:nT2x13YFgrS3tS1fDyUR6q/GNIK+hPw7bdzZXz99SM0=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240816014008-a236ebf42395 h1:xM3v+GLMYQMYeyp48SzJOXvylsbNRbdlvWRMXViWwFI=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240816014008-a236ebf42395/go.mod h1:nT2x13YFgrS3tS1fDyUR6q/GNIK+hPw7bdzZXz99SM0=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240830093306-94cbf0dfb7bd h1:dGyT+A2w9WXkThZdxZods3cYQQjGebqksKjBxuTAK74=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240830093306-94cbf0dfb7bd/go.mod h1:nT2x13YFgrS3tS1fDyUR6q/GNIK+hPw7bdzZXz99SM0=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20241010102102-5676d4b8436f h1:hllCUup8mVTllbA9afbtdRLKy1rektV8mccWqfyTpJQ=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20241010102102-5676d4b8436f/go.mod h1:nT2x13YFgrS3tS1fDyUR6q/GNIK+hPw7bdzZXz99SM0=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20241011013237-040263075a38 h1:UdYxMWbzUYbIX8YkrWHLFioWvkd7YsVNWHpAovlRkDE=
-code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20241011013237-040263075a38/go.mod h1:nT2x13YFgrS3tS1fDyUR6q/GNIK+hPw7bdzZXz99SM0=
 code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20241017011352-f7f92494c0f4 h1:bixWmzOO5D7XtR30/xl6rR1KiMbwrqc+snRJ6aQyWWI=
 code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20241017011352-f7f92494c0f4/go.mod h1:nT2x13YFgrS3tS1fDyUR6q/GNIK+hPw7bdzZXz99SM0=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=

rule/consume_integral_settlement.go

@@ -442,7 +442,7 @@ func DealUserConsumeIntegral(session *xorm.Session, subsidyWithUser *model.Subsi
 	if err != nil {
 		return err
 	}
-	if updateAffected <= 0 && subsidyWithUser.BalanceAmount != balanceAmount1.String() {
+	if updateAffected <= 0 && zhios_order_relate_utils.StrToFloat64(subsidyWithUser.BalanceAmount) != zhios_order_relate_utils.StrToFloat64(balanceAmount1.String()) {
 		return errors.New("修改 subsidy_with_user 记录失败")
 	}
 	if isEnd == 1 {
@@ -527,7 +527,7 @@ func DealUserExperienceIntegral(session *xorm.Session, subsidyWithUser *model.Su
 	if err != nil {
 		return err
 	}
-	if updateAffected <= 0 && subsidyWithUser.BalanceAmount != balanceAmount1.String() {
+	if updateAffected <= 0 && zhios_order_relate_utils.StrToFloat64(subsidyWithUser.BalanceAmount) != zhios_order_relate_utils.StrToFloat64(balanceAmount1.String()) {
 		return errors.New("修改 subsidy_with_user 记录失败")
 	}
 	if isEnd == 1 {
@@ -604,7 +604,7 @@ func DealUserStoreIntegral(session *xorm.Session, subsidyWithUser *model.Subsidy
 	if err != nil {
 		return err
 	}
-	if updateAffected <= 0 && subsidyWithUser.BalanceAmount != balanceAmount.String() {
+	if updateAffected <= 0 && zhios_order_relate_utils.StrToFloat64(subsidyWithUser.BalanceAmount) != zhios_order_relate_utils.StrToFloat64(balanceAmount.String()) {
 		return errors.New("修改 subsidy_with_user 记录失败")
 	}