浏览代码

合并问题

xuzhiheng 2 年之前
父节点
当前提交
959c37d524
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      src/order/otherOrderService.go

+ 3 - 2
src/order/otherOrderService.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"encoding/json"
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
 	"log"
 	"log"
 	"math"
 	"math"
 	"mongodb"
 	"mongodb"
@@ -19,6 +18,8 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 	"util"
 	"util"
+
+	"go.mongodb.org/mongo-driver/bson"
 )
 )
 
 
 const (
 const (
@@ -1091,7 +1092,7 @@ func updateVipOrder(param *CreateOtherOrderParams, code string, returnStatus int
 	if param.Badge != "" {
 	if param.Badge != "" {
 		vms.Badge = param.Badge
 		vms.Badge = param.Badge
 	}
 	}
-	var vst, vet string
+	var vet string
 	userId := ""
 	userId := ""
 	userData := &map[string]interface{}{}
 	userData := &map[string]interface{}{}
 	ok := false
 	ok := false