Browse Source

更新

master
huangjiajun 6 months ago
parent
commit
3611bc8142
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      app/admin/svc/order/svc_order_list.go

+ 6
- 2
app/admin/svc/order/svc_order_list.go View File

@@ -25,7 +25,7 @@ func OrderList(c *gin.Context) {
}
eg := db.Db
list, total := db.GetOrderList(eg, args)
data := make([]map[string]string, 0)
data := make([]map[string]interface{}, 0)
if list != nil {
stateArr := []string{"待制作", "制作中", "制作完成", "烘焙完成", "分拣完成", "已取消"}
enterpriseIds := make([]int, 0)
@@ -42,11 +42,13 @@ func OrderList(c *gin.Context) {
enterpriseName := ""
insideEnterpriseName := ""
_, ok := enterpriseMap[v.EnterpriseId]
companyId := 0
if ok {
enterpriseName = enterpriseMap[v.EnterpriseId].Name
insideEnterpriseName = enterpriseMap[v.EnterpriseId].InsideName
companyId = enterpriseMap[v.EnterpriseId].CompanyId
}
var tmp = map[string]string{
var tmp = map[string]interface{}{
"buy_phone": v1.BuyPhone,
"ord_no": v1.OrdNo,
"oid": utils.Int64ToStr(v1.Oid),
@@ -60,6 +62,8 @@ func OrderList(c *gin.Context) {
"is_can_cancel": isCanCancel,
"enterprise_name": enterpriseName,
"inside_name": insideEnterpriseName,
"enterprise_id": v.EnterpriseId,
"company_id": companyId,
}
data = append(data, tmp)
}


Loading…
Cancel
Save