|
|
@@ -354,10 +354,10 @@ WHERE a.ent_id = '%s' %s and a.product_type like '%s' ORDER BY a.end_time desc
|
|
|
|
|
|
func SpecialService(ctx context.Context, phone, productType string, buySubject int) map[string]interface{} {
|
|
|
var (
|
|
|
- linkedId int
|
|
|
- orderArr []map[string]interface{}
|
|
|
- vipExist bool
|
|
|
- endTime, startTime string
|
|
|
+ linkedId int
|
|
|
+ orderArr []map[string]interface{}
|
|
|
+ vipExist bool
|
|
|
+ endTime, startTime, productCode string
|
|
|
)
|
|
|
//serviceArrMap = append(serviceArrMap, map[string]interface{}{
|
|
|
// "name": gconv.String(m["product_type"]), //产品名称
|
|
|
@@ -373,7 +373,7 @@ func SpecialService(ctx context.Context, phone, productType string, buySubject i
|
|
|
// "linkedOrder": orderArr, //关联订单
|
|
|
// })
|
|
|
|
|
|
- orderData, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT jod.service_endtime,jod.id,jod.service_starttime,jod.service_type,jod.order_code,dor.create_time FROM dataexport_order dor
|
|
|
+ orderData, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT jod.product_code,jod.service_endtime,jod.id,jod.service_starttime,jod.service_type,jod.order_code,dor.create_time FROM dataexport_order dor
|
|
|
INNER JOIN jy_order_detail jod on dor.order_code = jod.order_code
|
|
|
WHERE %s and dor.product_type = '%s' ORDER BY dor.create_time desc `, phone, productType))
|
|
|
if !orderData.IsEmpty() {
|
|
|
@@ -381,6 +381,9 @@ WHERE %s and dor.product_type = '%s' ORDER BY dor.create_time desc `, phone, pro
|
|
|
if linkedId == 0 {
|
|
|
linkedId = gconv.Int(m2["id"])
|
|
|
}
|
|
|
+ if product_code := gconv.String(m2["product_code"]); product_code != "" {
|
|
|
+ productCode = product_code
|
|
|
+ }
|
|
|
if gconv.String(m2["service_endtime"]) > time.Now().String() {
|
|
|
vipExist = true
|
|
|
}
|
|
|
@@ -398,9 +401,10 @@ WHERE %s and dor.product_type = '%s' ORDER BY dor.create_time desc `, phone, pro
|
|
|
})
|
|
|
}
|
|
|
return map[string]interface{}{
|
|
|
- "name": fmt.Sprintf("%s标准版", productType), //产品名称
|
|
|
- "vipExist": vipExist, //当前服务是否在有限期内
|
|
|
- "serviceEndTime": common.If(endTime != "", endTime, nil), //服务结束时间
|
|
|
+ "name": fmt.Sprintf("%s标准版", productType), //产品名称
|
|
|
+ "vipExist": vipExist, //当前服务是否在有限期内
|
|
|
+ "serviceEndTime": common.If(endTime != "", endTime, nil), //服务结束时间
|
|
|
+ "productCode": productCode,
|
|
|
"serviceStartTime": startTime, //服务开始时间
|
|
|
"buySubject": buySubject, //个体
|
|
|
"empowerCount": common.If(productType == "数据流量包", "1", "-"), //B.产品属性为“资源包”，则为“1”； C.产品属性非“会员服务”且非“资源包”，则展示-
|
