|
|
@@ -8,6 +8,7 @@ import (
|
|
|
"fmt"
|
|
|
"jyOrderManager/internal/jyutil"
|
|
|
"log"
|
|
|
+ "strings"
|
|
|
|
|
|
"github.com/gogf/gf/v2/frame/g"
|
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
|
@@ -127,11 +128,16 @@ func (p jyBigProduct) BigMemberBuyTry(ctx context.Context, serviceOpenTime time.
|
|
|
)
|
|
|
//获取套餐名称
|
|
|
if p.param.Filter.ComboId != 0 && p.param.Filter.ComboId != 5 {
|
|
|
- serviceIds, err := BigMemberComboServiceIds(ctx, p.param.Filter.ComboId)
|
|
|
- if err != nil {
|
|
|
- return errors.New("套餐id失效")
|
|
|
+ comboData, err := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf(`SELECT s_name,s_servers FROM bigmember_combo WHERE id=%d`, p.param.Filter.ComboId))
|
|
|
+ if err != nil || comboData.IsEmpty() {
|
|
|
+ serviceIds, err := BigMemberComboServiceIds(ctx, p.param.Filter.ComboId)
|
|
|
+ if err != nil {
|
|
|
+ return errors.New("套餐id失效")
|
|
|
+ }
|
|
|
+ comboName = gconv.String(comboData.Map()["s_name"])
|
|
|
+ p.param.Filter.ServiceIds = strings.Split(gconv.String(comboData.Map()["s_servers"]), ",")
|
|
|
+ p.param.Filter.ServiceIds = serviceIds
|
|
|
}
|
|
|
- p.param.Filter.ServiceIds = serviceIds
|
|
|
}
|
|
|
entService, userCount = jyutil.EntServiceOpen(gconv.Int(userData["entId"]), p.param.Phone)
|
|
|
//orderId := p.param.OrderCode
|
