fix:配置调整

internal/controller/orderServiceOpen.go

@@ -25,7 +25,7 @@ func OrderServiceOpen(r *ghttp.Request) {
 		return err
 	}()
 	if err != nil {
-		g.Log().Errorf(r.Context(), "订单list异常 %v", err)
+		g.Log().Errorf(r.Context(), "服务开通异常 %v", err)
 	}
 	r.Response.WriteJson(NewResult(nil, err))
 }

internal/logic/order/detail.go

@@ -106,8 +106,15 @@ func Detail(ctx context.Context, param model.OrderDetailParams) (map[string]inte
 					}
 				}
 			}
-			if common.InterfaceToStr(m["redType"]) == "金额红冲" ||
-				common.InterfaceToStr(m["redType"]) == "费用红冲" {
+			if strings.Contains(common.InterfaceToStr(m["redType"]), "主体") {
+				isEnt = true
+				if common.InterfaceToStr(m["newSigningSubject"]) != "" {
+					m["signingSubject"] = m["newSigningSubject"]
+				}
+				if newSigningSubject := common.InterfaceToStr(m["newSigningSubject"]); newSigningSubject != "" && newEntName == "" {
+					newEntName = newSigningSubject
+				}
+			} else {
 				if common.IntAll(m["payMoney"]) != 0 {
 					isCash = true
 				}
@@ -120,14 +127,6 @@ func Detail(ctx context.Context, param model.OrderDetailParams) (map[string]inte
 				if common.InterfaceToStr(m["signingSubject"]) == "" {
 					m["signingSubject"] = subject
 				}
-			} else if strings.Contains(common.InterfaceToStr(m["redType"]), "主体") {
-				isEnt = true
-				if common.InterfaceToStr(m["newSigningSubject"]) != "" {
-					m["signingSubject"] = m["newSigningSubject"]
-				}
-				if newSigningSubject := common.InterfaceToStr(m["newSigningSubject"]); newSigningSubject != "" && newEntName == "" {
-					newEntName = newSigningSubject
-				}
 			}
 			moneyCorrectionArr = append(moneyCorrectionArr, m)
 		}

internal/logic/order/editBatchReturn.go

@@ -190,6 +190,7 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 						m["reqCompanyName"] = value["company_name"]
 						m["amount"] = m["final_price"]
 						m["reqSubject"] = value["buy_subject"]
+						m["linked_orderId"] = m["linked_detail_id"]
 						productCode := gconv.String(m["product_code"])
 						pFunc, err := product.JyProFunc.GetProductInitFuncByCode(productCode)
 						if err != nil {

internal/logic/order/examine.go

@@ -154,6 +154,7 @@ func OrdersExamine(ctx context.Context, param model.OrdersExamine) error {
 						m["reqCompanyName"] = orderData.Map()["company_name"]
 						m["amount"] = m["final_price"]
 						m["reqSubject"] = orderData.Map()["buy_subject"]
+						m["linked_orderId"] = m["linked_detail_id"]
 						productCode := gconv.String(m["product_code"])
 						pFunc, err := product.JyProFunc.GetProductInitFuncByCode(productCode)
 						if err != nil {

internal/logic/order/redPunch.go

@@ -156,6 +156,7 @@ func OperateOrderRedPunch(ctx context.Context, params model.OrderRedPunchParams)
 						m["reqCompanyName"] = orderData.Map()["company_name"]
 						m["amount"] = m["final_price"]
 						m["reqSubject"] = orderData.Map()["buy_subject"]
+						m["linked_orderId"] = m["linked_detail_id"]
 						productCode := gconv.String(m["product_code"])
 						pFunc, err := product.JyProFunc.GetProductInitFuncByCode(productCode)
 						if err != nil {

internal/logic/order/serviceOpen.go

@@ -51,6 +51,7 @@ func ServiceOpen(ctx context.Context, param model.OrderOpenServiceParams) error
 			m["reqCompanyName"] = orderData.Map()["company_name"]
 			m["amount"] = m["final_price"]
 			m["reqSubject"] = orderData.Map()["buy_subject"]
+			m["linked_orderId"] = m["linked_detail_id"]
 			productCode := gconv.String(m["product_code"])
 			pFunc, err := product.JyProFunc.GetProductInitFuncByCode(productCode)
 			if err != nil {

internal/logic/product/subvip/service.go

@@ -118,7 +118,7 @@ func (p jySubVipProduct) OpenService(ctx context.Context, serviceOpenTime time.T
 				Num:  filter.GiftCycle,
 				Unit: filter.GiftType,
 			})
-			_, err := vipEntPower(ctx, entId, identity.EntUserId, doType, filter.FinalAccountCount, filter.FinalAreaCount, p.OrderDetail.Id, vipStartTime, vipEndTime)
+			_, err := vipEntPower(ctx, entId, identity.EntUserId, doType, filter.FinalAccountCount, filter.FinalAreaCount, p.OrderDetail.Id, p.OrderDetail.LinkedOrderId, vipStartTime, vipEndTime)
 			if err != nil {
 				return errors.Wrap(err, fmt.Sprintf("企业超级订阅开通服务异常：vipEntPower 创建企业授权信息失败：%s", companyName))
 			}
@@ -142,7 +142,7 @@ func (p jySubVipProduct) OpenService(ctx context.Context, serviceOpenTime time.T
 				Num:  filter.GiftCycle,
 				Unit: filter.GiftType,
 			})
-			_, err = vipEntPower(ctx, entId, identity.EntUserId, doType, filter.FinalAccountCount, filter.FinalAreaCount, p.OrderDetail.Id, vipStartTime, vipEndTime)
+			_, err = vipEntPower(ctx, entId, identity.EntUserId, doType, filter.FinalAccountCount, filter.FinalAreaCount, p.OrderDetail.Id, p.OrderDetail.LinkedOrderId, vipStartTime, vipEndTime)
 			if err != nil {
 				return errors.Wrap(err, fmt.Sprintf("企业超级订阅续费服务异常：vipEntPower 创建企业授权信息失败：%s", companyName))
 			}
@@ -152,7 +152,7 @@ func (p jySubVipProduct) OpenService(ctx context.Context, serviceOpenTime time.T
 			if err != nil {
 				return err
 			}
-			_, err = vipEntPower(ctx, entId, identity.EntUserId, doType, filter.FinalAccountCount, filter.FinalAreaCount, p.OrderDetail.Id, vipStartTime, vipEndTime)
+			_, err = vipEntPower(ctx, entId, identity.EntUserId, doType, filter.FinalAccountCount, filter.FinalAreaCount, p.OrderDetail.Id, p.OrderDetail.LinkedOrderId, vipStartTime, vipEndTime)
 			if err != nil {
 				return errors.Wrap(err, fmt.Sprintf("企业超级订阅续费服务异常：vipEntPower 创建企业授权信息失败：%s", companyName))
 			}
@@ -190,7 +190,7 @@ func (p jySubVipProduct) OpenService(ctx context.Context, serviceOpenTime time.T
 }
 
 // entPower 企业超级订阅
-func vipEntPower(ctx context.Context, entId, entUserId int64, doType, empowerCount, provinceCount int, orderDetailId int64, st, et time.Time) (pid int64, err error) {
+func vipEntPower(ctx context.Context, entId, entUserId int64, doType, empowerCount, provinceCount int, orderDetailId, linkedOrderId int64, st, et time.Time) (pid int64, err error) {
 	count, err := g.DB().GetCount(ctx, "SELECT * FROM entniche_order WHERE order_detail_id = ? ", orderDetailId)
 	if err != nil {
 		return 0, fmt.Errorf("查询异常")
@@ -253,7 +253,7 @@ func vipEntPower(ctx context.Context, entId, entUserId int64, doType, empowerCou
 		if orderDetailId == 0 {
 			return 0, fmt.Errorf("缺少关联订单字段")
 		}
-		record, err := g.DB().GetOne(ctx, "SELECT wait_empower_id FROM entniche_order WHERE order_detail_id = ? order by create_time desc", orderDetailId)
+		record, err := g.DB().GetOne(ctx, "SELECT wait_empower_id FROM entniche_order WHERE order_detail_id = ? order by create_time desc", linkedOrderId)
 		if err != nil {
 			return -1, errors.Wrap(err, "获取关联订单异常")
 		}