fix: profit

internal/api/mobile/order_preview/normal_create.go

@@ -105,7 +105,7 @@ func CreatePreviewNormalOrder(c *gin.Context) {
 			return
 		}
 		if gs.IsVipGoods() {
-			if (myInfo.Level == 2 && myInfo.IsOffline) || myInfo.Level == 10 {
+			if myInfo.Level == 10 {
 				err = errors.New("身份不合适")
 				back.Err(c, err.Error())
 				return

internal/model/order/jyy.go

@@ -32,6 +32,7 @@ const (
 	All
 	Sale
 	Share
+	Vip
 )
 
 var profitStr = map[IncomeType]string{
@@ -43,6 +44,7 @@ var profitStr = map[IncomeType]string{
 	All:     "子公司自购导购收益",
 	Sale:    "批发收益",
 	Share:   "子公司分享",
+	Vip:     "vip穿透收益",
 }
 
 func (o IncomeType) GetStr() string {
@@ -58,6 +60,7 @@ var profitMap = map[IncomeType]decimal.Decimal{
 	All:     decimal.NewFromFloat(1),
 	Sale:    decimal.NewFromFloat(1),
 	Share:   decimal.NewFromFloat(1),
+	Vip:     decimal.NewFromFloat(0.2),
 }
 
 func (o IncomeType) GetProfit() decimal.Decimal {

internal/service/app/shop/benefit.go

@@ -74,9 +74,19 @@ func OrderProfit(od order.Information, tx *gorm.DB) error {
 			//	return err
 			//}
 
-			if err := tx.Create(order.CreateProfit(u1.ParentID, order.Shop, base, od.ID)).Error; err != nil {
-				return err
+			// 上级可能不是店铺(因为vip卡临时升级)
+			var pu user.Information
+			tx.First(&pu, "id = ?", u1.ParentID)
+			if pu.Level == 2 {
+				if err := tx.Create(order.CreateProfit(u1.ParentID, order.Shop, base, od.ID)).Error; err != nil {
+					return err
+				}
+			} else {
+				if err := tx.Create(order.CreateProfit(u1.RootID, order.Vip, base, od.ID)).Error; err != nil {
+					return err
+				}
 			}
+
 			// 30%店铺补贴
 			if err := tx.Create(order.CreateProfit(u1.RootID, order.Company, base, od.ID)).Error; err != nil {
 				return err