From 1db4ff902a7330a8c356a33fdf83afbb1a3fc597 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Wed, 19 Mar 2025 14:59:59 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8E=A8=E5=B9=BF=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 121 +++++++++------------ .../controller/HanHaiMemberController.java | 2 +- .../modules/hanHaiMember/entity/HanHaiMember.java | 13 ++- .../hanHaiMember/mapper/HanHaiMemberMapper.java | 2 +- .../hanHaiMember/service/IHanHaiMemberService.java | 2 +- .../service/impl/HanHaiMemberServiceImpl.java | 2 +- .../modules/hanHaiMember/vue/HanHaiMemberList.vue | 16 ++- .../hanHaiMember/vue/modules/HanHaiMemberForm.vue | 12 +- .../modules/hanHaiMember/vue3/HanHaiMember.data.ts | 27 ++++- ...areController.java => RecommendController.java} | 25 +++-- .../jeecg/modules/apiService/RecommendService.java | 16 +++ .../org/jeecg/modules/apiService/ShareService.java | 8 -- ...eServiceImpl.java => RecommendServiceImpl.java} | 45 +++++++- 13 files changed, 196 insertions(+), 95 deletions(-) rename jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/{ShareController.java => RecommendController.java} (51%) create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShareService.java rename jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/{ShareServiceImpl.java => RecommendServiceImpl.java} (83%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d61532c..2ef475b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,39 +2,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -255,89 +241,90 @@ - - + - - + + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 700d194..e25ed18 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-03-18 + * @Date: 2025-03-19 * @Version: V1.0 */ @Api(tags="han_hai_member") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java index ca7db01..8ef6335 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-03-18 + * @Date: 2025-03-19 * @Version: V1.0 */ @Data @@ -160,7 +160,8 @@ public class HanHaiMember implements Serializable { @ApiModelProperty(value = "shareId") private java.lang.String shareId; /**邀请人*/ - @Excel(name = "邀请人", width = 15) + @Excel(name = "邀请人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "邀请人") private java.lang.String vid; /**邀请时间*/ @@ -201,4 +202,12 @@ public class HanHaiMember implements Serializable { @Excel(name = "是否分销商", width = 15) @ApiModelProperty(value = "是否分销商") private java.lang.String isDai; + /**推广佣金*/ + @Excel(name = "推广佣金", width = 15) + @ApiModelProperty(value = "推广佣金") + private java.math.BigDecimal recommendAmount; + /**被推广佣金*/ + @Excel(name = "被推广佣金", width = 15) + @ApiModelProperty(value = "被推广佣金") + private java.math.BigDecimal recommendedAmount; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java index 4c936e5..14ffc80 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-03-18 + * @Date: 2025-03-19 * @Version: V1.0 */ public interface HanHaiMemberMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java index 20e122c..108e16b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-03-18 + * @Date: 2025-03-19 * @Version: V1.0 */ public interface IHanHaiMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java index c23aff5..7969015 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-03-18 + * @Date: 2025-03-19 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue index 6de2d4f..c0005c0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -256,7 +256,7 @@ { title:'邀请人', align:"center", - dataIndex: 'vid' + dataIndex: 'vid_dictText' }, { title:'邀请时间', @@ -306,6 +306,16 @@ align:"center", dataIndex: 'isDai' }, + { + title:'推广佣金', + align:"center", + dataIndex: 'recommendAmount' + }, + { + title:'被推广佣金', + align:"center", + dataIndex: 'recommendedAmount' + }, { title: '操作', dataIndex: 'action', @@ -366,7 +376,7 @@ fieldList.push({type:'int',value:'successNum',text:'successNum',dictCode:''}) fieldList.push({type:'int',value:'addNum',text:'addNum',dictCode:''}) fieldList.push({type:'string',value:'shareId',text:'shareId',dictCode:''}) - fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:''}) + fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:"han_hai_member,nick_name,id"}) fieldList.push({type:'date',value:'vtime',text:'邀请时间'}) fieldList.push({type:'int',value:'isPay',text:'兼兼街会员',dictCode:''}) fieldList.push({type:'int',value:'follow',text:'是否关注公众号',dictCode:''}) @@ -376,6 +386,8 @@ fieldList.push({type:'string',value:'appletAppid',text:'小程序appid',dictCode:''}) fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''}) fieldList.push({type:'string',value:'isDai',text:'是否分销商',dictCode:''}) + fieldList.push({type:'BigDecimal',value:'recommendAmount',text:'推广佣金',dictCode:''}) + fieldList.push({type:'BigDecimal',value:'recommendedAmount',text:'被推广佣金',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue index b5f1565..1b3edac 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -135,7 +135,7 @@ - + @@ -183,6 +183,16 @@ + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts index 44fbba7..596c5ae 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts @@ -138,7 +138,7 @@ export const columns: BasicColumn[] = [ { title: '邀请人', align:"center", - dataIndex: 'vid' + dataIndex: 'vid_dictText' }, { title: '邀请时间', @@ -188,6 +188,16 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'isDai' }, + { + title: '推广佣金', + align:"center", + dataIndex: 'recommendAmount' + }, + { + title: '被推广佣金', + align:"center", + dataIndex: 'recommendedAmount' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -332,7 +342,10 @@ export const formSchema: FormSchema[] = [ { label: '邀请人', field: 'vid', - component: 'Input', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, }, { label: '邀请时间', @@ -379,4 +392,14 @@ export const formSchema: FormSchema[] = [ field: 'isDai', component: 'Input', }, + { + label: '推广佣金', + field: 'recommendAmount', + component: 'InputNumber', + }, + { + label: '被推广佣金', + field: 'recommendedAmount', + component: 'InputNumber', + }, ]; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/RecommendController.java similarity index 51% rename from jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java rename to jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/RecommendController.java index aaeada1..57b9663 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/RecommendController.java @@ -4,7 +4,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.apiService.ShareService; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.RecommendService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -12,23 +14,32 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -@Api(tags="我的-邀请好友相关接口") +@Api(tags="我的-邀请好友&我的团队相关接口") @RestController @RequestMapping("/massage/share") @Slf4j -public class ShareController { +public class RecommendController { /******************************************************************************************************************/ //邀请好友 @Resource - private ShareService shareService; + private RecommendService recommendService; /******************************************************************************************************************/ - //我的-邀请好友 - @ApiOperation(value="我的-邀请好友", notes="我的-邀请好友") + //邀请好友-获取推荐二维码 + @ApiOperation(value="邀请好友-获取推荐二维码", notes="邀请好友-获取推荐二维码") @RequestMapping(value = "/getInviteCode", method = {RequestMethod.POST}) public Result getInviteCode(@RequestHeader("X-Access-Token") String token){ - return shareService.getInviteCode(token); + return recommendService.getInviteCode(token); } + //我的团队-查询直推用户列表 + @ApiOperation(value="我的团队-查询直推用户列表", notes="我的-获取直推用户列表") + @RequestMapping(value = "/queryRecommendUserList", method = {RequestMethod.POST}) + public Result queryRecommendUserList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ + return recommendService.queryRecommendUserList(token, pageBean); + } + + + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java new file mode 100644 index 0000000..2ae501f --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/RecommendService.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.apiService; + +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +public interface RecommendService { + //邀请好友-获取推荐二维码 + public Result getInviteCode(String token); + + //我的团队-查询直推用户列表 + public Result queryRecommendUserList(String token, PageBean pageBean); +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShareService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShareService.java deleted file mode 100644 index 18e3889..0000000 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShareService.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jeecg.modules.apiService; - -import org.jeecg.common.api.vo.Result; - -public interface ShareService { - //我的-邀请好友 - public Result getInviteCode(String token); -} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java similarity index 83% rename from jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java rename to jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java index 6ec567a..0d11d39 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java @@ -4,15 +4,20 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.HttpClientUtil; +import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiBean.WxQrCodeVo; -import org.jeecg.modules.apiService.ShareService; +import org.jeecg.modules.apiService.RecommendService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.massageBanner.entity.MassageBanner; import org.jeecg.modules.massageConfig.entity.MassageConfig; import org.jeecg.modules.massageConfig.service.IMassageConfigService; import org.springframework.beans.factory.annotation.Value; @@ -31,7 +36,7 @@ import java.util.HashMap; import java.util.Map; @Service -public class ShareServiceImpl implements ShareService { +public class RecommendServiceImpl implements RecommendService { /*************************************************************************************/ //权限验证 @Resource @@ -183,6 +188,42 @@ public class ShareServiceImpl implements ShareService { return null; } + //我的团队-查询直推用户列表 + @Override + public Result queryRecommendUserList(String token, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = hanHaiMemberService + .lambdaQuery(); + + //组装查询条件 + query.eq(HanHaiMember::getVid, hanHaiMember.getId()); + + //按照创建时间降序排列 + query.orderByAsc(HanHaiMember::getCreateTime); + + //获取直推用户信息 + pageList = query.page(page); + + return Result.OK("直推用户列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("直推用户列表查询失败"); + } + } + /** * 获取令牌 *