From 47adb34c2c32f2859454cf2b95e3ee4305fa1305 Mon Sep 17 00:00:00 2001 From: chenlin Date: Thu, 10 Oct 2024 16:25:45 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=8E=B7=E5=8F=96=E9=9B=B6=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=B0=8F=E7=A5=A8=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5IsShowImei=E5=92=8CIMEI?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/erp_order.go | 23 ++++++++++++----------- docs/docs.go | 9 ++++++++- docs/swagger.json | 9 ++++++++- docs/swagger.yaml | 7 ++++++- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go index 9b503d9..845e1b2 100644 --- a/app/admin/models/erp_order.go +++ b/app/admin/models/erp_order.go @@ -426,13 +426,15 @@ type ErpOrderReceiptDataResp struct { StoreTel string `json:"storeTel"` // 卖家电话 StoreAddress string `json:"storeAddress"` // 店铺地址 Uid int `json:"uid"` // 用户id + IsShowImei int `json:"is_show_imei"` // 是否打印商品串码,1-打印串码，0-不打印 } type TableData struct { Name string `json:"name"` - SL uint32 `json:"SL"` // 销售数量 - DJ float64 `json:"DJ"` // 商品指导零售价 - JE float64 `json:"JE"` // 商品指导零售价乘以销售数量 + SL uint32 `json:"SL"` // 销售数量 + DJ float64 `json:"DJ"` // 商品指导零售价 + JE float64 `json:"JE"` // 商品指导零售价乘以销售数量 + IMEI string `json:"imei"` // 串码 } // Contains 判断id是否在list中 @@ -5169,16 +5171,10 @@ func QueryReceiptData(req *ErpOrderDeleteReq, c *gin.Context) (*ErpOrderReceiptD order := orders[0] var salesName string - if order.SalesmanList != "" { - var salesmanInfo []ErpOrderSales - err = json.Unmarshal([]byte(order.SalesmanList), &salesmanInfo) - if err != nil { - logger.Error("unmarshal err:", logger.Field("err", err)) - } - + if len(order.Salesman) != 0 { // 遍历销售员信息，拼接名称 var names []string - for _, item := range salesmanInfo { + for _, item := range order.Salesman { names = append(names, item.Name) } salesName = strings.Join(names, "，") // 使用中文逗号拼接 @@ -5191,6 +5187,10 @@ func QueryReceiptData(req *ErpOrderDeleteReq, c *gin.Context) (*ErpOrderReceiptD resp.Time = orders[0].UpdatedAt resp.CollectS = salesName + if order.StoreId == 29 { // 大运哈曼店才打印商品串码 + resp.IsShowImei = 1 + } + var totalCouponAmount float64 commodityMap := make(map[string]TableData, 0) for i, item := range order.Commodities { @@ -5199,6 +5199,7 @@ func QueryReceiptData(req *ErpOrderDeleteReq, c *gin.Context) (*ErpOrderReceiptD tableData.SL = uint32(item.Count) tableData.DJ = item.RetailPrice tableData.JE = float64(item.Count) * item.RetailPrice + tableData.IMEI = item.IMEI key := fmt.Sprintf("commodity_%d", i) commodityMap[key] = tableData diff --git a/docs/docs.go b/docs/docs.go index bad6d31..7c8feda 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -9383,7 +9383,6 @@ const docTemplate = `{ "required": [ "cashiers", "erp_order_commodities", - "member_type", "retail_type", "salesman", "store_id", @@ -9624,6 +9623,10 @@ const docTemplate = `{ "description": "积分抵扣总金额", "type": "number" }, + "is_show_imei": { + "description": "是否打印商品串码,1-打印串码，0-不打印", + "type": "integer" + }, "membersAmount": { "description": "会员优惠总金额", "type": "number" @@ -16896,6 +16899,10 @@ const docTemplate = `{ "description": "销售数量", "type": "integer" }, + "imei": { + "description": "串码", + "type": "string" + }, "name": { "type": "string" } diff --git a/docs/swagger.json b/docs/swagger.json index d87dd06..6285080 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -9372,7 +9372,6 @@ "required": [ "cashiers", "erp_order_commodities", - "member_type", "retail_type", "salesman", "store_id", @@ -9613,6 +9612,10 @@ "description": "积分抵扣总金额", "type": "number" }, + "is_show_imei": { + "description": "是否打印商品串码,1-打印串码，0-不打印", + "type": "integer" + }, "membersAmount": { "description": "会员优惠总金额", "type": "number" @@ -16885,6 +16888,10 @@ "description": "销售数量", "type": "integer" }, + "imei": { + "description": "串码", + "type": "string" + }, "name": { "type": "string" } diff --git a/docs/swagger.yaml b/docs/swagger.yaml index dd37889..a4d2929 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -2310,7 +2310,6 @@ definitions: required: - cashiers - erp_order_commodities - - member_type - retail_type - salesman - store_id @@ -2439,6 +2438,9 @@ definitions: integrationAmount: description: 积分抵扣总金额 type: number + is_show_imei: + description: 是否打印商品串码,1-打印串码，0-不打印 + type: integer membersAmount: description: 会员优惠总金额 type: number @@ -7691,6 +7693,9 @@ definitions: SL: description: 销售数量 type: integer + imei: + description: 串码 + type: string name: type: string type: object