|
|
@@ -167,18 +167,18 @@ WHERE a.status = 1 and b.user_phone = ? and a.product_type like '%大会员%' O
|
|
|
productCode = gconv.String(itemMap.Map()["code"])
|
|
|
}
|
|
|
serviceArrMap = append(serviceArrMap, map[string]interface{}{
|
|
|
- "vipExist": vipExist, //当前服务是否在有限期内
|
|
|
- "name": param.ProductType, //产品名称
|
|
|
- "productCode": productCode, //产品code
|
|
|
- "serviceEndTime": endTime, //服务结束时间
|
|
|
- "serviceStartTime": startTime, //服务开始时间
|
|
|
- "empowerCount": paySubNum, //服务授权数
|
|
|
- "provinceCount": areaCount, //订阅省份
|
|
|
- "buySubject": 1, //个体
|
|
|
- "comboId": comboId, //套餐id
|
|
|
- "serviceList": serviceList, //大会员服务id
|
|
|
- "linkedId": linkedId, //关联id
|
|
|
- "linkedOrder": orderArr, //关联订单
|
|
|
+ "vipExist": vipExist, //当前服务是否在有限期内
|
|
|
+ "name": gconv.String(m["product_type"]), //产品名称
|
|
|
+ "productCode": productCode, //产品code
|
|
|
+ "serviceEndTime": endTime, //服务结束时间
|
|
|
+ "serviceStartTime": startTime, //服务开始时间
|
|
|
+ "empowerCount": paySubNum, //服务授权数
|
|
|
+ "provinceCount": areaCount, //订阅省份
|
|
|
+ "buySubject": 1, //个体
|
|
|
+ "comboId": comboId, //套餐id
|
|
|
+ "serviceList": serviceList, //大会员服务id
|
|
|
+ "linkedId": linkedId, //关联id
|
|
|
+ "linkedOrder": orderArr, //关联订单
|
|
|
})
|
|
|
} else {
|
|
|
if !entRec.IsEmpty() {
|
|
|
@@ -236,9 +236,9 @@ WHERE a.status = 1 and b.user_phone = ? and a.product_type like '%VIP订阅%' OR
|
|
|
serviceArrMap = append(serviceArrMap, map[string]interface{}{
|
|
|
"vipExist": vipExist, //当前服务是否在有限期内
|
|
|
"nationwide": nationwide,
|
|
|
- "name": param.ProductType, //产品名称
|
|
|
- "serviceEndTime": endTime, //服务结束时间
|
|
|
- "serviceStartTime": startTime, //服务开始时间
|
|
|
+ "name": gconv.String(m["product_type"]), //产品名称
|
|
|
+ "serviceEndTime": endTime, //服务结束时间
|
|
|
+ "serviceStartTime": startTime, //服务开始时间
|
|
|
"productCode": productCode,
|
|
|
"newVip": newVip,
|
|
|
"empowerCount": paySubNum, //服务授权数
|
