开通权益修改

src/order/orderManageService.go

@@ -3747,7 +3747,11 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 		returnStatus = 1
 		isAll = 1
 	}
-	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
+	isServiceOpen := 0
+	if param.StartTime < time.Now().Unix() {
+		isServiceOpen = 1
+	}
+	filterMap := ParamToFilter(param, enddate, isAll, contractStatus, isServiceOpen)
 	// p238 大会员省份版处理省份数量
 	if param.AreaCount != 0 {
 		filterMap["areaCount"] = param.AreaCount
@@ -4189,7 +4193,11 @@ func UpdateNewBigOrder(oldFilter string, subStatus, dateType int, now, startdate
 		return_status = 1
 		isAll = 1
 	}
-	filter_map := ParamToFilter(param, enddate, isAll, contractStatus)
+	isServiceOpen := 0
+	if param.StartTime < time.Now().Unix() {
+		isServiceOpen = 1
+	}
+	filter_map := ParamToFilter(param, enddate, isAll, contractStatus, isServiceOpen)
 	// p238 大会员省份版处理省份数量
 	if param.AreaCount != 0 {
 		filter_map["areaCount"] = param.AreaCount
@@ -4696,7 +4704,11 @@ func SupplyBigOrder(subStatus, pay_sub_num, free_sub_num, dateType int, now, sta
 		return_status = 1
 		isAll = 1
 	}
-	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
+	isServiceOpen := 0
+	if param.StartTime < time.Now().Unix() {
+		isServiceOpen = 1
+	}
+	filterMap := ParamToFilter(param, enddate, isAll, contractStatus, isServiceOpen)
 	if param.BuySubject == "1" {
 		//补充服务记录新增服务
 		var oldServiceArr []map[string]interface{}
@@ -5008,7 +5020,11 @@ func ExtendBigOrder(subStatus, pay_sub_num, free_sub_num int, now, startdate, en
 		returnStatus = 1
 		isAll = 1
 	}
-	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
+	isServiceOpen := 0
+	if param.StartTime < time.Now().Unix() {
+		isServiceOpen = 1
+	}
+	filterMap := ParamToFilter(param, enddate, isAll, contractStatus, isServiceOpen)
 	if param.AreaCount > 0 {
 		filterMap["areaCount"] = param.AreaCount
 	}
@@ -5305,7 +5321,7 @@ func ExtendBigOrder(subStatus, pay_sub_num, free_sub_num int, now, startdate, en
 	return nil
 }
 
-func ParamToFilter(param *Params, enddate time.Time, isAll, contractStatus int) map[string]interface{} {
+func ParamToFilter(param *Params, enddate time.Time, isAll, contractStatus, isServiceOpen int) map[string]interface{} {
 	filterMap := map[string]interface{}{
 		"source":            "qmx",
 		"cycle":             param.PayCycle,
@@ -5326,7 +5342,7 @@ func ParamToFilter(param *Params, enddate time.Time, isAll, contractStatus int)
 		"paybackWorkDayNum": param.PaybackWorkDayNum,
 		"paybackExpectDate": param.PaybackExpectDate,
 		"paybackOpenServer": param.PaybackOpenServer,
-		"isServiceOpen":     0,
+		"isServiceOpen":     isServiceOpen,
 	}
 	return filterMap
 }

src/order/orderService.go

@@ -312,7 +312,11 @@ func MyUpdateOrder(oldFilter string, subStatus, dateType int, now, startdate, en
 		return_status = 1
 		isAll = 1
 	}
-	filter_map := ParamToFilter(param, enddate, isAll, contractStatus)
+	isServiceOpen := 0
+	if param.StartTime < time.Now().Unix() {
+		isServiceOpen = 1
+	}
+	filter_map := ParamToFilter(param, enddate, isAll, contractStatus, isServiceOpen)
 	if param.BuySubject == "1" && param.CreateType == 2 {
 		//补充服务记录新增服务
 		var oldServiceArr []map[string]interface{}