回款

src/order/optimizeOrder.go

@@ -122,8 +122,7 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 				paybackOpenServer = v
 			}
 			//修改成功，判断是否全额回款并且创建订单勾选回款开通权益 paybackOpenServer
-			t, _ := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*orderData)["vip_starttime"]), time.Local)
-			if (qutil.ObjToString((*orderData)["vip_starttime"]) == "" || (qutil.ObjToString((*orderData)["vip_starttime"]) != "" && t.Unix() > time.Now().Unix())) && paybackOpenServer {
+			if qutil.IntAll((*orderData)["return_status"]) != 1 && paybackOpenServer {
 				err := OpenUserService(nil, qutil.ObjToString((*orderData)["order_code"]), *orderData)
 				if err != nil {
 					return nil, err

src/order/otherOrderService.go

@@ -1706,15 +1706,13 @@ func UpdateBatchReturnInfo(transactionData *map[string]interface{}, orderArr map
 					paybackOpenServer = v
 				}
 				//修改成功，判断是否全额回款并且创建订单勾选回款开通权益 paybackOpenServer
-				t, _ := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString(value["vip_starttime"]), time.Local)
-				if qutil.ObjToString(value["vip_starttime"]) == "" || (qutil.ObjToString(value["vip_starttime"]) != "" && t.Unix() > time.Now().Unix()) {
-					if qutil.IntAll(updateData["return_status"]) == 1 && paybackOpenServer {
-						err := OpenUserService(tx, key, value)
-						if err != nil {
-							return false
-						}
+				if qutil.IntAll(value["return_status"]) != 1 && qutil.IntAll(updateData["return_status"]) == 1 && paybackOpenServer {
+					err := OpenUserService(tx, key, value)
+					if err != nil {
+						return false
 					}
 				}
+
 				return_id = return_id + fmt.Sprint(ok_2) + ","
 			} else {
 				return false
@@ -1792,13 +1790,10 @@ func ManualUpdateBatchReturnInfo(orderArr map[string]map[string]interface{}, ope
 					paybackOpenServer = v
 				}
 				//修改成功，判断是否全额回款并且创建订单勾选回款开通权益 paybackOpenServer
-				t, _ := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString(value["vip_starttime"]), time.Local)
-				if qutil.ObjToString(value["vip_starttime"]) == "" || (qutil.ObjToString(value["vip_starttime"]) != "" && t.Unix() > time.Now().Unix()) {
-					if qutil.IntAll(updateData["return_status"]) == 1 && paybackOpenServer {
-						err := OpenUserService(tx, key, value)
-						if err != nil {
-							return false
-						}
+				if qutil.IntAll(updateData["return_status"]) == 1 && qutil.IntAll(value["return_status"]) != 1 && paybackOpenServer {
+					err := OpenUserService(tx, key, value)
+					if err != nil {
+						return false
 					}
 				}
 				return_id = return_id + fmt.Sprint(ok2) + ","

src/task/returnMoneyTask.go

@@ -87,15 +87,13 @@ func StartTask1() {
 								if v, ok := ((*filterMap)["paybackOpenServer"]).(bool); ok {
 									paybackOpenServer = v
 								}
-								t, _ := time.ParseInLocation(qu.Date_Full_Layout, qu.ObjToString(o["vip_starttime"]), time.Local)
-								if qu.ObjToString(o["vip_starttime"]) == "" || (qu.ObjToString(o["vip_starttime"]) != "" && t.Unix() > time.Now().Unix()) {
-									if qu.IntAll(o["return_status"]) == 1 && paybackOpenServer {
-										err := order.OpenUserService(nil, orderCode, o)
-										if err != nil {
-											log.Println("自动回款开通权益失败", id, orderCode)
-										}
+								if qu.IntAll(o["return_status"]) == 1 && paybackOpenServer {
+									err := order.OpenUserService(nil, orderCode, o)
+									if err != nil {
+										log.Println("自动回款开通权益失败", id, orderCode)
 									}
 								}
+
 							} else {
 								log.Println("自动回款创建回款记录失败", id, orderCode)
 							}