Merge branch 'dev/v2.4.31_dx' of jianyu/qmx_admin into feature/v2.4.31

src/order/orderManageController.go

@@ -2537,18 +2537,6 @@ func CreateSupplyOrder(context *admin.Context) (interface{}, error) {
 			"contractStatus": contractStatus,
 			"serverArr":      param.ServerArr,
 		}
-		if param.BuySubject == "1" { //个人补充包 获取老权益
-			var oldServiceArr []map[string]interface{}
-			sqls := "select a.s_serviceid,b.s_name from bigmember_service_user a LEFT JOIN bigmember_service b on a.s_serviceid = b.id where  a.s_userid = ? and a.i_status = 0"
-			serverUser := util.JysqlDB.SelectBySql(sqls, userId)
-			if serverUser != nil && len(*serverUser) > 0 {
-				for _, m := range *serverUser {
-					oldServiceArr = append(oldServiceArr, map[string]interface{}{
-						"id": m["s_serviceid"], "name": m["s_name"]})
-				}
-			}
-			filter_map["old_serverArr"] = oldServiceArr
-		}
 		filter, _ := json.Marshal(filter_map)
 		startdate := time.Unix(bigStart, 0)
 		enddate := time.Unix(bigEnd, 0)
@@ -2862,18 +2850,6 @@ func UpdateSupplyOrder(context *admin.Context) (interface{}, error) {
 			"remark":         param.Remark,
 			"contractStatus": contractStatus,
 		}
-		if param.BuySubject == "1" { //个人补充包 获取老权益
-			var oldServiceArr []map[string]interface{}
-			sqls := "select a.s_serviceid,b.s_name from bigmember_service_user a LEFT JOIN bigmember_service b on a.s_serviceid = b.id where  a.s_userid = ? and a.i_status = 0"
-			serverUser := util.JysqlDB.SelectBySql(sqls, userId)
-			if serverUser != nil && len(*serverUser) > 0 {
-				for _, m := range *serverUser {
-					oldServiceArr = append(oldServiceArr, map[string]interface{}{
-						"id": m["s_serviceid"], "name": m["s_name"]})
-				}
-			}
-			filter_map["old_serverArr"] = oldServiceArr
-		}
 		// 如果本来就包含人工审核字段就在filter里面赋值人工审核字段
 		if strings.Contains(oldFilter, "人工审核") {
 			filter_map["audit_type"] = "人工审核"
@@ -3093,18 +3069,6 @@ func MyUpdateSupplySubOrder(context *admin.Context) (interface{}, error) {
 				"remark":         param.Remark,
 				"contractStatus": contractStatus,
 			}
-			if param.BuySubject == "1" { //个人补充包 获取老权益
-				var oldServiceArr []map[string]interface{}
-				sqls := "select a.s_serviceid,b.s_name from bigmember_service_user a LEFT JOIN bigmember_service b on a.s_serviceid = b.id where  a.s_userid = ? and a.i_status = 0"
-				serverUser := util.JysqlDB.SelectBySql(sqls, userId)
-				if serverUser != nil && len(*serverUser) > 0 {
-					for _, m := range *serverUser {
-						oldServiceArr = append(oldServiceArr, map[string]interface{}{
-							"id": m["s_serviceid"], "name": m["s_name"]})
-					}
-				}
-				filter_map["old_serverArr"] = oldServiceArr
-			}
 			// 如果本来就包含人工审核字段就在filter里面赋值人工审核字段
 			if strings.Contains(oldFilter, "人工审核") {
 				filter_map["audit_type"] = "人工审核"

src/order/orderManageService.go

@@ -1282,35 +1282,67 @@ func BigVipOrderDetails(res *map[string]interface{}) map[string]interface{} {
 		// 获取基础服务信息
 		serverData := util.JysqlDB.FindOne("bigmember_service", map[string]interface{}{"id": 1}, "s_new_name", "")
 		if serverData != nil {
-			var serName string
-			serName = qutil.InterfaceToStr((*serverData)["s_new_name"])
-			if qutil.InterfaceToStr((*res)["product_type"]) == "大会员-补充包" {
-				supplys, _ := filterMap["supplys"].([]interface{})
+			//基础服务名称修改
+			serName := qutil.InterfaceToStr((*serverData)["s_new_name"])
+			supplys, _ := filterMap["supplys"].([]interface{})
+			if len(supplys) > 0 {
 				for _, m1 := range qutil.ObjArrToMapArr(supplys) {
 					if strings.Contains(qutil.InterfaceToStr(m1["name"]), serName) {
 						m1["name"] = "基础服务"
 						break
 					}
 				}
-				serverArr, _ := filterMap["serverArr"].([]interface{})
+				filterMap["supplys"] = supplys
+			}
+			serversName := qutil.InterfaceToStr(filterMap["serversName"])
+			serversNameArr := strings.Split(serversName, ",")
+			for k, s := range serversNameArr {
+				if strings.Contains(s, serName) {
+					serversNameArr[k] = "基础服务"
+					filterMap["serversName"] = strings.Join(serversNameArr, ",")
+					break
+				}
+			}
+
+			serverArr, _ := filterMap["serverArr"].([]interface{})
+			if len(serverArr) > 0 {
 				for _, m1 := range qutil.ObjArrToMapArr(serverArr) {
 					if strings.Contains(qutil.InterfaceToStr(m1["name"]), serName) {
 						m1["name"] = "基础服务"
 						break
 					}
 				}
-				filterMap["supplys"] = supplys
 				filterMap["supplys"] = serverArr
-			} else {
-				serversName := qutil.InterfaceToStr(filterMap["serversName"])
-				serversNameArr := strings.Split(serversName, ",")
-				for k, s := range serversNameArr {
-					if strings.Contains(s, serName) {
-						serversNameArr[k] = "基础服务"
-						filterMap["serversName"] = strings.Join(serversNameArr, ",")
-						break
+			}
+		}
+		//大会员--补充服务
+		if qutil.InterfaceToStr((*res)["product_type"]) == "大会员" &&
+			qutil.InterfaceToStr(filterMap["createType"]) == "2" &&
+			qutil.InterfaceToStr(filterMap["serversId"]) != "" {
+			var (
+				oldSerName, newSerName []string
+			)
+			new_serverArr := strings.Split(qutil.InterfaceToStr(filterMap["new_serverArr"]), ",")
+			serverDataArr := util.JysqlDB.SelectBySql(`SELECT id, CASE
+    WHEN id = 1 THEN "基础服务"
+    ELSE s_new_name
+  END AS s_new_name FROM bigmember_service WHERE id in (%s)`, qutil.InterfaceToStr(filterMap["serversId"]))
+			if serverDataArr != nil && len(*serverDataArr) > 0 {
+				for _, m2 := range *serverDataArr {
+					var isNew bool
+					for _, s := range new_serverArr {
+						if qutil.InterfaceToStr(m2["id"]) == s {
+							isNew = true
+							newSerName = append(newSerName, qutil.InterfaceToStr(m2["s_new_name"]))
+							break
+						}
+					}
+					if !isNew {
+						oldSerName = append(oldSerName, qutil.InterfaceToStr(m2["s_new_name"]))
 					}
 				}
+				filterMap["oldSerName"] = strings.Join(oldSerName, ",")
+				filterMap["newSerName"] = strings.Join(newSerName, ",")
 			}
 		}
 	}
@@ -4668,6 +4700,29 @@ func SupplyBigOrder(subStatus, pay_sub_num, free_sub_num, dateType int, now, sta
 		isAll = 1
 	}
 	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
+	if param.BuySubject == "1" {
+		//补充服务记录新增服务
+		var oldServiceArr []map[string]interface{}
+		sqls := "select a.s_serviceid,b.s_name from bigmember_service_user a LEFT JOIN bigmember_service b on a.s_serviceid = b.id where  a.s_userid = ? and a.i_status = 0"
+		serverUser := util.JysqlDB.SelectBySql(sqls, userId)
+		if serverUser != nil && len(*serverUser) > 0 {
+			oldServiceArr = *serverUser
+		}
+		var newSer []string
+		for _, m2 := range strings.Split(param.ServersId, ",") {
+			var isNewSer bool
+			for _, i2 := range oldServiceArr {
+				if m2 == qutil.InterfaceToStr(i2["s_serviceid"]) {
+					isNewSer = true
+					break
+				}
+			}
+			if !isNewSer {
+				newSer = append(newSer, m2)
+			}
+		}
+		filterMap["new_serverArr"] = strings.Join(newSer, ",")
+	}
 	filter, _ := json.Marshal(filterMap)
 	serverMap := GetServerPid()
 	agreementTime := time.Unix(param.AgreementTime, 0)

src/order/orderService.go

@@ -300,6 +300,29 @@ func MyUpdateOrder(oldFilter string, subStatus, dateType int, now, startdate, en
 		isAll = 1
 	}
 	filter_map := ParamToFilter(param, enddate, isAll, contractStatus)
+	if param.BuySubject == "1" && param.CreateType == 2 {
+		//补充服务记录新增服务
+		var oldServiceArr []map[string]interface{}
+		sqls := "select a.s_serviceid,b.s_name from bigmember_service_user a LEFT JOIN bigmember_service b on a.s_serviceid = b.id where  a.s_userid = ? and a.i_status = 0"
+		serverUser := util.JysqlDB.SelectBySql(sqls, userId)
+		if serverUser != nil && len(*serverUser) > 0 {
+			oldServiceArr = *serverUser
+		}
+		var newSer []string
+		for _, m2 := range strings.Split(param.ServersId, ",") {
+			var isNewSer bool
+			for _, i2 := range oldServiceArr {
+				if m2 == qutil.InterfaceToStr(i2["s_serviceid"]) {
+					isNewSer = true
+					break
+				}
+			}
+			if !isNewSer {
+				newSer = append(newSer, m2)
+			}
+		}
+		filter_map["new_serverArr"] = strings.Join(newSer, ",")
+	}
 	// 如果本来就包含人工审核字段就在filter里面赋值人工审核字段
 	if strings.Contains(oldFilter, "人工审核") {
 		filter_map["audit_type"] = "人工审核"

src/order/otherOrderService.go

@@ -644,14 +644,6 @@ func updateEntnicheOrder(oldFilter string, param *CreateOtherOrderParams, code s
 
 // 创建VIP订单
 func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
-	if param.VipType == 2 {
-		var areas []string
-		if param.NewArea != "" {
-			areas = append(areas, param.NewArea)
-		}
-		param.Area = strings.Join(areas, ",")
-	}
-
 	var contractStatus int
 	if param.ContractFileUrl != "" && len(param.ContractFileUrl) > 0 {
 		contractStatus = 1