开通权益修改

src/order/orderManageController.go

@@ -2647,7 +2647,7 @@ func CreateSupplyOrder(context *admin.Context) (interface{}, error) {
 			if !param.Open {
 				return nil, nil
 			}
-			for _, v := range param.ServerArr {
+			/*for _, v := range param.ServerArr {
 				if qutil.IntAll(v["id"]) == 16 {
 					sqls := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ?"
 					serverData := util.JysqlDB.SelectBySql(sqls, 12, userId)
@@ -2738,9 +2738,9 @@ func CreateSupplyOrder(context *admin.Context) (interface{}, error) {
 					log.Println("更新补充包数量失败", v, userId)
 					return nil, errors.New("更新补充包数量失败")
 				}
-			}
+			}*/
 		}
-		ClearBigVipUserPower(userId)
+		//ClearBigVipUserPower(userId)
 	}
 	return nil, nil
 }

src/order/otherOrderService.go

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

src/task/returnMoneyTask.go

@@ -82,8 +82,8 @@ func StartTask1() {
 								log.Println("自动回款创建回款记录成功", id, orderCode)
 								util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": orderCode}, updateData)
 								util.CbsDB.Update("transaction", map[string]interface{}{"id": id}, map[string]interface{}{"ISRELATION": 1, "return_id": fmt.Sprint(returnId)})
-								//filterMap := qu.ObjToMap(o["filter"])
-								if qu.IntAll(o["return_status"]) == 1 {
+								filterMap := qu.ObjToMap(o["filter"])
+								if qu.IntAll(o["return_status"]) == 1 && qu.IntAll((*filterMap)["isServiceOpen"]) == 0 {
 									err := order.OpenUserService(orderCode, o)
 									if err != nil {
 										log.Println("自动回款开通权益失败", id, orderCode)