订单详情修改

src/order/orderManageController.go

@@ -512,6 +512,14 @@ func OrderDetails(context *admin.Context) (interface{}, error) {
 		if ct.Unix() > config.SysConfigs.ReleaseTime {
 			(*res)["isNewOrder"] = 1
 		}
+		isServiceOpen := 0
+		if qutil.ObjToString((*res)["vip_starttime"]) != "" && (qutil.ObjToString((*res)["product_type"]) == "大会员" || qutil.ObjToString((*res)["product_type"]) == "VIP订阅") {
+			st, _ := time.Parse(qutil.Date_Full_Layout, qutil.ObjToString((*res)["vip_starttime"]))
+			if st.Unix() < time.Now().Unix() {
+				isServiceOpen = 1
+			}
+		}
+		(*res)["isNewOrder"] = isServiceOpen
 		orderCode := (*res)["order_code"]
 		//用户手机号处理
 		u, ok := util.MQFW.FindById("user", qutil.ObjToString((*res)["user_id"]), `{"s_phone":1,"s_m_phone":1}`)

src/order/orderManageService.go

@@ -3747,11 +3747,8 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 		returnStatus = 1
 		isAll = 1
 	}
-	isServiceOpen := 0
-	if param.StartTime < time.Now().Unix() {
-		isServiceOpen = 1
-	}
-	filterMap := ParamToFilter(param, enddate, isAll, contractStatus, isServiceOpen)
+
+	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
 	// p238 大会员省份版处理省份数量
 	if param.AreaCount != 0 {
 		filterMap["areaCount"] = param.AreaCount
@@ -4193,11 +4190,8 @@ func UpdateNewBigOrder(oldFilter string, subStatus, dateType int, now, startdate
 		return_status = 1
 		isAll = 1
 	}
-	isServiceOpen := 0
-	if param.StartTime < time.Now().Unix() {
-		isServiceOpen = 1
-	}
-	filter_map := ParamToFilter(param, enddate, isAll, contractStatus, isServiceOpen)
+
+	filter_map := ParamToFilter(param, enddate, isAll, contractStatus)
 	// p238 大会员省份版处理省份数量
 	if param.AreaCount != 0 {
 		filter_map["areaCount"] = param.AreaCount
@@ -4707,11 +4701,8 @@ func SupplyBigOrder(subStatus, pay_sub_num, free_sub_num, dateType int, now, sta
 		return_status = 1
 		isAll = 1
 	}
-	isServiceOpen := 0
-	if param.StartTime < time.Now().Unix() {
-		isServiceOpen = 1
-	}
-	filterMap := ParamToFilter(param, enddate, isAll, contractStatus, isServiceOpen)
+
+	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
 	if param.BuySubject == "1" {
 		//补充服务记录新增服务
 		var oldServiceArr []map[string]interface{}
@@ -5023,11 +5014,8 @@ func ExtendBigOrder(subStatus, pay_sub_num, free_sub_num int, now, startdate, en
 		returnStatus = 1
 		isAll = 1
 	}
-	isServiceOpen := 0
-	if param.StartTime < time.Now().Unix() {
-		isServiceOpen = 1
-	}
-	filterMap := ParamToFilter(param, enddate, isAll, contractStatus, isServiceOpen)
+
+	filterMap := ParamToFilter(param, enddate, isAll, contractStatus)
 	if param.AreaCount > 0 {
 		filterMap["areaCount"] = param.AreaCount
 	}
@@ -5324,7 +5312,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, isServiceOpen int) map[string]interface{} {
+func ParamToFilter(param *Params, enddate time.Time, isAll, contractStatus int) map[string]interface{} {
 	filterMap := map[string]interface{}{
 		"source":            "qmx",
 		"cycle":             param.PayCycle,
@@ -5345,7 +5333,6 @@ func ParamToFilter(param *Params, enddate time.Time, isAll, contractStatus, isSe
 		"paybackWorkDayNum": param.PaybackWorkDayNum,
 		"paybackExpectDate": param.PaybackExpectDate,
 		"paybackOpenServer": param.PaybackOpenServer,
-		"isServiceOpen":     isServiceOpen,
 	}
 	return filterMap
 }

src/order/orderManageStruct.go

@@ -31,7 +31,6 @@ type VipSimpleMsg struct {
 	PaybackWorkDayNum     int                      `json:"paybackWorkDayNum"`       // 回款所需工作日
 	PaybackExpectDate     string                   `json:"paybackExpectDate"`       // 回款预计时间
 	PaybackOpenServer     bool                     `json:"paybackOpenServer"`       // 回款后开通服务
-	IsServiceOpen         int                      `json:"isServiceOpen"`           //
 }
 
 // 购买内容

src/order/orderService.go

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

src/order/otherOrderService.go

@@ -1682,7 +1682,7 @@ func UpdateBatchReturnInfo(transactionData *map[string]interface{}, orderArr map
 					paybackOpenServer = v
 				}
 				//修改成功，判断是否全额回款并且创建订单勾选回款开通权益 paybackOpenServer
-				if qutil.IntAll(updateData["return_status"]) == 1 && qutil.IntAll((*filterMap)["isServiceOpen"]) == 0 && paybackOpenServer {
+				if qutil.IntAll(updateData["return_status"]) == 1 && paybackOpenServer {
 					err := OpenUserService(tx, key, value)
 					if err != nil {
 						return false
@@ -1765,7 +1765,7 @@ func ManualUpdateBatchReturnInfo(orderArr map[string]map[string]interface{}, ope
 					paybackOpenServer = v
 				}
 				//修改成功，判断是否全额回款并且创建订单勾选回款开通权益 paybackOpenServer
-				if qutil.IntAll(updateData["return_status"]) == 1 && qutil.IntAll((*filterMap)["isServiceOpen"]) == 0 && paybackOpenServer {
+				if qutil.IntAll(updateData["return_status"]) == 1 && paybackOpenServer {
 					err := OpenUserService(tx, key, value)
 					if err != nil {
 						return false

src/task/returnMoneyTask.go

@@ -87,7 +87,7 @@ func StartTask1() {
 								if v, ok := ((*filterMap)["paybackOpenServer"]).(bool); ok {
 									paybackOpenServer = v
 								}
-								if qu.IntAll(o["return_status"]) == 1 && qu.IntAll((*filterMap)["isServiceOpen"]) == 0 && paybackOpenServer {
+								if qu.IntAll(o["return_status"]) == 1 && paybackOpenServer {
 									err := order.OpenUserService(nil, orderCode, o)
 									if err != nil {
 										log.Println("自动回款开通权益失败", id, orderCode)