fix:bug

controllers/client/order_entry.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"hudongzhuanjia/controllers"
 	"hudongzhuanjia/models"
-	invitation_service "hudongzhuanjia/services/invitation"
 	"hudongzhuanjia/utils"
 	"hudongzhuanjia/utils/code"
 	"hudongzhuanjia/utils/define"
+	"strings"
 
 	"github.com/ouxuanserver/osmanthuswine/src/core"
 )
@@ -78,19 +78,17 @@ func (t *OrderEntryCtl) Order() {
 	t.CheckErr(err)
 	t.Assert(exist, code.MSG_INVITE_LETTER_NOT_EXIST, "邀请函不存在")
 
-	items, err := invitation_service.GetOptionItem(activity.Id)
-	t.CheckErr(err)
-
-	values, err := invitation_service.GetOptionValue(items, letter.ExtraData)
+	values := make([]map[string]interface{}, 0)
+	err = json.Unmarshal([]byte(strings.Trim(letter.ExtraData, `"`)), &values)
 	t.CheckErr(err)
 	var name, phone, address = "", "", ""
 	for _, value := range values {
-		if v, ok := value["姓名"]; ok {
-			name = fmt.Sprint(v)
-		} else if v, ok := value["手机"]; ok {
-			phone = fmt.Sprint(v)
-		} else if v, ok := value["地址"]; ok {
-			address = fmt.Sprint(v)
+		if value["name"] == "姓名" {
+			name = fmt.Sprint(value["val"])
+		} else if value["name"] == "手机" {
+			phone = fmt.Sprint(value["val"])
+		} else if value["name"] == "地址" {
+			address = fmt.Sprint(value["val"])
 		}
 	}
 

controllers/pc/order_draw.go

@@ -549,7 +549,7 @@ func (t *OrderDrawCtl) Orders() {
 		count, err := (&models.CustomerOrder{}).CountCustomerOrder(activity.Id, activity.RehearsalId, activity.ArchId, 1)
 		orders := make([]*OrdersResult, 0)
 		err = core.GetXormAuto().Table(&models.CustomerOrder{}).Alias("o").Select("o.id as id, "+
-			" o.area_name, o.order_entry_person_name as entry_person_name, o.buyer_id as user_id, o.goods_name "+
+			" o.area_name, o.order_entry_person_name as entry_person_name, o.buyer_id as user_id, o.goods_name, "+
 			" o.receiver as nickname, o.phone as phone, o.address as address, o.created_at, l.extra_data").
 			Distinct("o.id").Join("LEFT", (&models.InvitationLetter{}).Alias("l"),
 			"o.buyer_id=l.user_id and l.rehearsal_id=? and l.arch_id=?", activity.RehearsalId, activity.ArchId).