|
|
@@ -1826,6 +1826,7 @@ func KcOrderFormat(orderCode string) *OrderInfo {
|
|
|
a.ent_id,
|
|
|
a.company_name,
|
|
|
a.create_person,
|
|
|
+ b.filter as productFilter,
|
|
|
SUM( c.return_money ) AS return_money ,
|
|
|
TIMESTAMPDIFF(DAY, b.service_starttime, b.service_endtime) as difference
|
|
|
FROM
|
|
|
@@ -1846,8 +1847,8 @@ func KcOrderFormat(orderCode string) *OrderInfo {
|
|
|
product_type := gconv.String(orderData["product_type"])
|
|
|
serviceList := []string{}
|
|
|
if product_type == "大会员" {
|
|
|
- product_type_name, _, level := GetOrderProduct(product_type, gconv.String(orderData["filter"]))
|
|
|
- product_type += product_type_name
|
|
|
+ product_type_name, _, level := GetOrderProduct(product_type, gconv.String(orderData["productFilter"]))
|
|
|
+ product_type = product_type_name
|
|
|
if level == 0 {
|
|
|
for _, serversId := range strings.Split(gconv.String(gconv.Map(orderData["serversId"])), ",") {
|
|
|
if serviceName := bigmemberService[common.Int64All(serversId)]; serviceName != "" {
|
|
|
@@ -1982,7 +1983,6 @@ func GetOrderProduct(productType string, file string) (string, int64, int64) {
|
|
|
if level == 0 {
|
|
|
level = gconv.Int64(fileJson["level"])
|
|
|
}
|
|
|
- // {1: "专家版", 2: "智慧版", 3: "商机版", 4: "试用版", 5: "定制版", 6: "商机版2.0", 7: "专家版2.0"}
|
|
|
switch level {
|
|
|
case 0:
|
|
|
productName = "大会员自定义"
|
WH01243