From cbb1c95b0ef07d3d5f6c6cb622caf17549fee0c2 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 31 Aug 2023 22:17:46 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java | 3 +++
src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java | 2 ++
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 3 ++-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java | 1 +
src/main/resources/templates/febs/views/modules/order/orderList.html | 1 +
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 28 ++++++++++++++--------------
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 8 ++++----
7 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index 5f92116..d681674 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -75,20 +75,20 @@
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MallMember> mallMembers = this.baseMapper.selectMallMemberListInPage(page, mallMember);
- if(CollUtil.isNotEmpty(mallMembers.getRecords())){
- for(MallMember mallMemberTeam : mallMembers.getRecords()){
- Long salesmansId = mallMemberTeam.getSalesmansId();
- MallSalesman mallSalesman = mallSalesmanMapper.selectById(salesmansId);
- if(ObjectUtil.isNotEmpty(mallSalesman)){
- StringBuffer salesmanName = new StringBuffer();
- salesmanName.append(mallSalesman.getName());
- if(2 == mallSalesman.getState()){
- salesmanName.append("（禁用）");
- }
- mallMemberTeam.setSalesmansName(salesmanName.toString());
- }
- }
- }
+// if(CollUtil.isNotEmpty(mallMembers.getRecords())){
+// for(MallMember mallMemberTeam : mallMembers.getRecords()){
+// Long salesmansId = mallMemberTeam.getSalesmansId();
+// MallSalesman mallSalesman = mallSalesmanMapper.selectById(salesmansId);
+// if(ObjectUtil.isNotEmpty(mallSalesman)){
+// StringBuffer salesmanName = new StringBuffer();
+// salesmanName.append(mallSalesman.getName());
+// if(2 == mallSalesman.getState()){
+// salesmanName.append("（禁用）");
+// }
+// mallMemberTeam.setSalesmansName(salesmanName.toString());
+// }
+// }
+// }
return mallMembers;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
index 5780232..1e2d6e1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
@@ -120,6 +120,7 @@
}
List<String> images = goodsImagesMapper.selectGoodsImagesByGoodsId(mallGoods.getId());
MallGoodsDetailsVo mallGoodsDetailsVo = MallGoodsConversion.INSTANCE.entityToDetailsVo(mallGoods);
+ mallGoodsDetailsVo.setMainImage(mallGoods.getThumb());
List<GoodsDetailsStyleVo> styles = mallGoodsDetailsVo.getStyles();
if(ObjectUtil.isNotEmpty(styles)){
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
index 951dc9c..6c4c3ec 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
@@ -85,4 +85,6 @@
private String leaderName;
//商品名称
private String goodsName;
+
+ private String refererName;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
index dd49968..3566603 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
@@ -102,4 +102,7 @@
@ApiModelProperty(value = "是否收藏")
private Integer hasCollect;
+
+ @ApiModelProperty(value = "商品主图")
+ private String mainImage;
}
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index f9d27cb..7fb0231 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -56,7 +56,8 @@
select a.*,
b.name memberName,
b.bind_phone memberBindPhone,
- b.phone memberPhone
+ b.phone memberPhone,
+ (select member.name from mall_member member where member.invite_id = b.referrer_id) refererName
from mall_order_info a
left join mall_member b on a.member_id = b.id
<where>
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 668ab7c..b305536 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -265,9 +265,9 @@
// {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
// {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
// {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
- // {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
+ {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
- {field: 'salesmansName', title: '推销员', minWidth: 100,align:'left'},
+ // {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
// {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
// {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
// {field: 'accountType', title: '账号类型',
@@ -296,11 +296,11 @@
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
{title: '操作',
templet: function (d) {
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agentSelect" shiro:hasPermission="user:update">推销员设置</button>'
+ return ''
// '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
// + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'
- },minWidth: 200,align:'center', fixed:"right"}
+ },minWidth: 200,align:'center'}
]]
});
}
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index b19b257..c2dbb7e 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -411,6 +411,7 @@
{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left' ,totalRowText:"合计"},
{field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
+ {field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
{field: 'remark', title: '备注', minWidth: 160,align:'left'},
{field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
--
Gitblit v1.9.1