|
|
@@ -60,14 +60,16 @@ func Detail(ctx context.Context, param model.OrderDetailParams) (map[string]inte
|
|
|
m["activityName"] = gconv.String(activityData.Map()["name"])
|
|
|
}
|
|
|
}
|
|
|
- productItem, _ := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT jpi.name,jpc.auto FROM jy_product_item jpi
|
|
|
+ productItem, _ := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT jpi.name,jpc.auto,jpc.code FROM jy_product_item jpi
|
|
|
INNER JOIN jy_product_class jpc on jpi.product_class_id = jpc.id WHERE jpi.code = '%s'`, gconv.String(m["product_code"])))
|
|
|
if !productItem.IsEmpty() {
|
|
|
m["productName"] = productItem.Map()["name"]
|
|
|
+ m["productItemCode"] = productItem.Map()["code"]
|
|
|
m["auto"] = productItem.Map()["auto"]
|
|
|
} else {
|
|
|
m["productName"] = productItem.Map()["product_type"]
|
|
|
}
|
|
|
+
|
|
|
if gconv.String(m["product_type"]) == "大会员" && gconv.Int(gconv.Map(m["filter"])["comboId"]) == 0 {
|
|
|
supMap := make(map[string]bool)
|
|
|
for _, s := range gconv.Strings(gconv.Map(m["filter"])["supServiceIds"]) {
|
