09063PM

log/common.log

@@ -268,3 +268,4 @@
 2018/09/06 19:58:18 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
 2018/09/06 19:59:58 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
 2018/09/06 20:00:48 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
+2018/09/06 20:03:48 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string

models/goods/orders.go

@@ -162,17 +162,26 @@ func (m *GoodsDAO) GetOrdersByCaseID(caseID, userType string, makeStatus []strin
 	}
 
 	for i, o := range orderList {
-		var details []model.TaGoodsOrdersDetail
-		if err := m.db.Where("orders_id=?", o.OrdersId).Find(&details); err != nil {
+		details, err := m.GetOrderDetailByOrder(o.OrdersId)
+		if err != nil {
 			return nil, 0, err
 		}
-
 		orderList[i].Goods = details
 	}
 
 	return orderList, cnt, nil
 }
 
+// GetOrderDetailByOrder 获取商品明细
+func (m *GoodsDAO) GetOrderDetailByOrder(orderid string) ([]DetailWithType, error) {
+	var details []DetailWithType
+	sql := `select a.*,b.type_id,c.type_name from ta_goods_orders_detail a inner join ta_goods b on a.goods_id=b.goods_id inner join td_goods_type c on b.type_id=c.type_id where a.orders_id=?`
+	if err := m.db.Sql(sql, orderid).Find(&details); err != nil {
+		return nil, err
+	}
+	return details, nil
+}
+
 // GetOrdersByRecord 根据
 func (m *GoodsDAO) GetOrdersByRecord(recordid string) ([]OrdersWithGoods, error) {
 	var orderList []OrdersWithGoods
@@ -183,8 +192,8 @@ func (m *GoodsDAO) GetOrdersByRecord(recordid string) ([]OrdersWithGoods, error)
 		return nil, err
 	}
 	for i, o := range orderList {
-		var details []model.TaGoodsOrdersDetail
-		if err := m.db.Where("orders_id=?", o.OrdersId).Find(&details); err != nil {
+		details, err := m.GetOrderDetailByOrder(o.OrdersId)
+		if err != nil {
 			return nil, err
 		}
 		orderList[i].Goods = details

models/goods/types.go

@@ -31,8 +31,15 @@ type GoodsWithPrice struct {
 	model.TaGoodsSpec `xorm:"extends"`
 }
 
+// DetailWithType 含类型的明细
+type DetailWithType struct {
+	model.TaGoodsOrdersDetail `xorm:"extends"`
+	TypeId                    string
+	TypeName                  string
+}
+
 // OrdersWithGoods 订单列表
 type OrdersWithGoods struct {
 	model.TaGoodsOrders `xorm:"extends"`
-	Goods               []model.TaGoodsOrdersDetail
+	Goods               []DetailWithType
 }

models/verify/verify.go

@@ -28,11 +28,7 @@ type MyCourse struct {
 	CourseName                   string
 	DetailName                   string
 	LocationName                 string
-<<<<<<< HEAD
-	CostomerId                   string
-=======
 	CustomerId                   string
->>>>>>> 802c15c146846cf0ddc7fc7e0273f2683cea90f4
 }
 
 func (m *VerifyDAO) GetCustomerCourseDetailById(id string) (*model.TaCustomerCourseDetail, error) {

service/verify/verify.go

@@ -80,7 +80,7 @@ func (s *VerifyServ) GetCustomerCourseDetailByTel(tel, caseid string, page, page
 		utils.LogError("获取列表失败: " + err.Error())
 		return nil, errors.New("获取列表失败")
 	}
-	customerId := customerDetail[0].
+	customerId := customerDetail[0].CustomerId
 	total, err := s.dao.GetCustomerCourseListByTelCount(tel, caseid)
 	if err != nil {
 		utils.LogError("获取列表失败: " + err.Error())