minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、优化零售明细接口，如果销售员对应的系统数据为空，则销售员姓名直接使用ErpOrderSales记录的name;

Browse Source 
2、会员邀请记录优化，邀请人昵称以sys_user表nick_name为准，如果为空则取user表的shop_assistant_name；
This commit is contained in:
chenlin 2025-02-05 16:08:22 +08:00
parent 1e7557bd79
commit eb9a6e3a7d
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/admin/models/erp_order.go
View File

@ -1977,7 +1977,10 @@ func (m *ErpOrder) SetOrderSalesman() error {
if err != nil {
logger.Error("GetSysUserInfoByUid err:", logger.Field("err", err))
}
item.Name = userInfo.NickName
if userInfo.UserId != 0 {
item.Name = userInfo.NickName
}
item.SalesmanPer = totalStaffProfit * userInfo.SalesCommRate * 0.01 / float64(len(salesmanInfo))
//if m.RetailType == RetailTypeRejected {

34
app/admin/models/user.go
View File

@ -1606,12 +1606,14 @@ func (m *NewUserInviteRecordReq) NewList(c *gin.Context) (*UserInviteRecordListR
qs := orm.Eloquent.Table("user_invite_record").Where("action=2")
countQuery := orm.Eloquent.Table("user_invite_record").Where("action=2").
Select("user_invite_record.*, B1.nick_name AS InviteUserName, " +
Select("user_invite_record.*, " +
"COALESCE(SU.nick_name, U.shop_assistant_name) AS InviteUserName, " +
"B2.tel AS UserTel, B2.created_at AS CreateTime, B2.member_expire AS MemberExpire, B2.member_level AS UserMemberLevel, " +
"B3.member_expire AS PrivilegeMemberExpire, B3.member_level AS PrivilegeMemberLevel").
Joins("Left JOIN sys_user B1 ON user_invite_record.from_uid = B1.uid and B1.uid != 0").
Joins("Left JOIN user B2 ON user_invite_record.to_uid = B2.uid").
Joins("Left JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
Joins("LEFT JOIN sys_user SU ON user_invite_record.from_uid = SU.uid AND SU.uid != 0").
Joins("LEFT JOIN user U ON user_invite_record.from_uid = U.uid AND SU.uid IS NULL"). // 仅在 sys_user 为空时使用 user
Joins("LEFT JOIN user B2 ON user_invite_record.to_uid = B2.uid").
Joins("LEFT JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
Group("user_invite_record.id").
Order("MAX(user_invite_record.action_time) DESC")
@ -1648,8 +1650,8 @@ func (m *NewUserInviteRecordReq) NewList(c *gin.Context) (*UserInviteRecordListR
countQuery = countQuery.Where("user_invite_record.store_id=?", m.StoreId)
}
if m.InviteUserName != "" {
qs = qs.Where("B1.nick_name=?", m.InviteUserName)
countQuery = countQuery.Where("B1.nick_name=?", m.InviteUserName)
qs = qs.Where("B1.shop_assistant_name=?", m.InviteUserName)
countQuery = countQuery.Where("B1.shop_assistant_name=?", m.InviteUserName)
}
if m.FromUid != 0 {
qs = qs.Where("user_invite_record.from_uid=?", m.FromUid)
@ -1757,12 +1759,14 @@ func (m *NewUserInviteRecordReq) NewList(c *gin.Context) (*UserInviteRecordListR
}
if m.IsExport == 1 { // 导出excel
err = qs.Select("user_invite_record.*, B1.nick_name AS InviteUserName, " +
err = qs.Select("user_invite_record.*, " +
"COALESCE(SU.nick_name, U.shop_assistant_name) AS InviteUserName, " +
"B2.tel AS UserTel, B2.created_at AS CreateTime, B2.member_expire AS MemberExpire, B2.member_level AS UserMemberLevel, " +
"B3.member_expire AS PrivilegeMemberExpire, B3.member_level AS PrivilegeMemberLevel").
Joins("Left JOIN sys_user B1 ON user_invite_record.from_uid = B1.uid and B1.uid != 0").
Joins("Left JOIN user B2 ON user_invite_record.to_uid = B2.uid").
Joins("Left JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
Joins("LEFT JOIN sys_user SU ON user_invite_record.from_uid = SU.uid AND SU.uid != 0").
Joins("LEFT JOIN user U ON user_invite_record.from_uid = U.uid AND SU.uid IS NULL"). // 仅在 sys_user 为空时使用 user
Joins("LEFT JOIN user B2 ON user_invite_record.to_uid = B2.uid").
Joins("LEFT JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
Group("user_invite_record.id").
Order("MAX(user_invite_record.action_time) DESC").
Find(&records).Error
@ -1771,12 +1775,14 @@ func (m *NewUserInviteRecordReq) NewList(c *gin.Context) (*UserInviteRecordListR
return nil, err
}
} else {
err = qs.Select("user_invite_record.*, B1.nick_name AS InviteUserName, " +
err = qs.Select("user_invite_record.*, " +
"COALESCE(SU.nick_name, U.shop_assistant_name) AS InviteUserName, " +
"B2.tel AS UserTel, B2.created_at AS CreateTime, B2.member_expire AS MemberExpire, B2.member_level AS UserMemberLevel, " +
"B3.member_expire AS PrivilegeMemberExpire, B3.member_level AS PrivilegeMemberLevel").
Joins("Left JOIN sys_user B1 ON user_invite_record.from_uid = B1.uid and B1.uid != 0").
Joins("Left JOIN user B2 ON user_invite_record.to_uid = B2.uid").
Joins("Left JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
Joins("LEFT JOIN sys_user SU ON user_invite_record.from_uid = SU.uid AND SU.uid != 0").
Joins("LEFT JOIN user U ON user_invite_record.from_uid = U.uid AND SU.uid IS NULL"). // 仅在 sys_user 为空时使用 user
Joins("LEFT JOIN user B2 ON user_invite_record.to_uid = B2.uid").
Joins("LEFT JOIN privilege_member B3 ON user_invite_record.to_uid = B3.uid").
Group("user_invite_record.id").
Order("MAX(user_invite_record.action_time) DESC").
Offset(page * pageSize).