提交

@@ -4,7 +4,6 @@ import (
 	"context"
 	"context"
 	"os"
 	"os"
 	"os/signal"
 	"os/signal"
-	"sync"
 	"syscall"
 	"syscall"
 
 
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego"
@@ -28,11 +27,9 @@ func main() {
 	if err := consumerRun.InitConsumer(); err != nil {
 	if err := consumerRun.InitConsumer(); err != nil {
 		logs.Error("启动kafka消息消费者失败:%s", err)
 		logs.Error("启动kafka消息消费者失败:%s", err)
 	}
 	}
-	wg := &sync.WaitGroup{}
-	wg.Add(1)
+
 	go func() {
 	go func() {
 		consumerRun.Start(ctx)
 		consumerRun.Start(ctx)
-		wg.Done()
 	}()
 	}()
 	go func() {
 	go func() {
 		<-consumerRun.IsReady()
 		<-consumerRun.IsReady()
@@ -47,7 +44,6 @@ func main() {
 		select {
 		select {
 		case <-sigs:
 		case <-sigs:
 			cancel()
 			cancel()
-			wg.Wait()
 			return
 			return
 		default:
 		default:
 		}
 		}

@@ -923,10 +923,10 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord
 			"paymentStatus":    orderBase.Goods[i].BonusStatus,
 			"paymentStatus":    orderBase.Goods[i].BonusStatus,
 			"partnerRatio":     orderBase.Goods[i].PartnerBonusPercent,
 			"partnerRatio":     orderBase.Goods[i].PartnerBonusPercent,
 		}
 		}
-		// if orderBase.Goods[i].PartnerBonusPercent >= 0 {
-		// 	hasPartnerBonusPercent = true
-		// 	detail["partnerRatio"] = fmt.Sprint(orderBase.Goods[i].PartnerBonusPercent)
-		// }
+		if orderBase.Goods[i].PartnerBonusPercent >= 0 {
+			hasPartnerBonusPercent = true
+			// detail["partnerRatio"] = fmt.Sprint(orderBase.Goods[i].PartnerBonusPercent)
+		}
 		goodBestshopId := orderBase.Goods[i].DataFrom.DataId
 		goodBestshopId := orderBase.Goods[i].DataFrom.DataId
 		if v, ok := orderGoodBestshopMap[goodBestshopId]; ok {
 		if v, ok := orderGoodBestshopMap[goodBestshopId]; ok {
 			detail["productCodes"] = v.Sn
 			detail["productCodes"] = v.Sn