From 6d9004e27dce9e05919f6ab710e4c6bf8f6b833e Mon Sep 17 00:00:00 2001 From: chenlin Date: Thu, 6 Feb 2025 12:02:20 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=B3=BB=E7=BB=9F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=AF=BC=E5=87=BAexcel=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E7=A8=8B=E5=BA=8FID=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=9B=202=E3=80=81=E9=9B=B6=E5=94=AE=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8E=E5=AF=BC=E5=87=BAexcel=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=91=98=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= =?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 | 4 +++- app/admin/models/sysuser.go | 13 +++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go index 415f39b..c7d38c8 100644 --- a/app/admin/models/erp_order.go +++ b/app/admin/models/erp_order.go @@ -1920,7 +1920,9 @@ func (m *ErpOrder) SetOrderSalesmanAI(erpCommodityMap map[uint32]ErpCommodity, s // 获取员工毛利 userInfo := userMap[item.Uid] - item.Name = userInfo.NickName + if userInfo.UserId != 0 { + item.Name = userInfo.NickName + } item.SalesmanPer = totalStaffProfit * userInfo.SalesCommRate * 0.01 / float64(len(salesmanInfo)) salesmanList = append(salesmanList, item) diff --git a/app/admin/models/sysuser.go b/app/admin/models/sysuser.go index 311239a..aa771a5 100644 --- a/app/admin/models/sysuser.go +++ b/app/admin/models/sysuser.go @@ -440,7 +440,7 @@ func sysUserExport(req []SysUserPage) (string, error) { fmt.Println("url fileName:", url+fileName) // 组合标题栏数据 - title := []interface{}{"用户名称", "用户昵称", "角色", "合作商", "门店", "手机号", "店员识别码", "状态"} + title := []interface{}{"用户名称", "用户昵称", "角色", "合作商", "门店", "手机号", "店员识别码", "状态", "小程序账号ID"} for i, _ := range title { cell, _ := excelize.CoordinatesToCellName(1+i, 1) err := file.SetCellValue(fSheet, cell, title[i]) @@ -473,6 +473,13 @@ func sysUserExport(req []SysUserPage) (string, error) { status = "停用" } + var userUid string + if userData.UserId == 0 { + userUid = "" + } else { + userUid = tools.IntToString(int(userData.Uid)) + } + row = []interface{}{ userData.UserName.Username, // 用户名称 userData.NickName, // 用户昵称 @@ -482,6 +489,7 @@ func sysUserExport(req []SysUserPage) (string, error) { userData.Phone, // 手机号 userData.ShopperCode, // 店员识别码 status, // 状态 + userUid, // 用户UID } for j, _ := range row { @@ -518,8 +526,9 @@ func sysUserExport(req []SysUserPage) (string, error) { file.SetColWidth("Sheet1", "E", "E", 30) file.SetColWidth("Sheet1", "F", "F", 15) file.SetColWidth("Sheet1", "G", "G", 15) + file.SetColWidth("Sheet1", "I", "I", 15) - endRow := fmt.Sprintf("H"+"%d", nExcelStartRow+2) + endRow := fmt.Sprintf("I"+"%d", nExcelStartRow+2) // 应用样式到整个表格 _ = file.SetCellStyle("Sheet1", "A1", endRow, style)