diff --git a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java index ccd838c..14164f1 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java @@ -1,25 +1,15 @@ package com.example.demo.controller.bean; -import com.example.demo.Util.JWTUtil; -import com.example.demo.domain.entity.Admin; import com.example.demo.domain.vo.bean.BeanConsumeGold; -import com.example.demo.domain.vo.bean.BeanConsumeLive; -import com.example.demo.domain.vo.bean.BeanPage; -import com.example.demo.domain.vo.coin.Gold; import com.example.demo.domain.vo.coin.Page; -import com.example.demo.domain.vo.coin.RechargeAudit; import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.bean.BeanConsumeService; -import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import java.util.Arrays; import java.util.List; /** diff --git a/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java b/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java index f173799..3d921c4 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java @@ -1,25 +1,16 @@ package com.example.demo.controller.bean; -import com.example.demo.Util.JWTUtil; -import com.example.demo.domain.entity.Admin; import com.example.demo.domain.vo.bean.BeanRecharge; -import com.example.demo.domain.vo.bean.BeanPage; import com.example.demo.domain.vo.bean.BeanRechargeInfo; import com.example.demo.domain.vo.bean.GoldBean; import com.example.demo.domain.vo.coin.Page; import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.bean.BeanRechargeService; -import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import java.util.Arrays; -import java.util.List; /** * @program: gold-java diff --git a/src/main/java/com/example/demo/controller/bean/BeanUserController.java b/src/main/java/com/example/demo/controller/bean/BeanUserController.java index 4549988..097fb00 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanUserController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanUserController.java @@ -1,14 +1,19 @@ package com.example.demo.controller.bean; import com.example.demo.domain.entity.User; +import com.example.demo.domain.vo.bean.BeanUser; import com.example.demo.domain.vo.bean.BeanUserCard; +import com.example.demo.domain.vo.coin.Page; import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.bean.BeanUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @program: gold-java * @ClassName BeanUserController @@ -37,4 +42,38 @@ public class BeanUserController { return Result.error("请检查输入精网号格式"); } } + //客户金豆余额 + @PostMapping("/userBean") + public Result userBean(@RequestBody Page page) { + try { + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } else { + + return Result.success(beanUserService.selectUserBy(page.getPageNum(), page.getPageSize(), page.getBeanUser())); + } + } catch (Exception e) { + e.printStackTrace(); + return Result.error(e.toString()); + }} + //客户金币余额合计数 + @PostMapping("/userBeanSum") + public Result userBeanSum(@RequestBody Page page) { + + return Result.success(beanUserService.sumUserGold(page)); + } + //查询客户分部 + @PostMapping("/getDept") + public Result getDept() { + List deptList = beanUserService.getDept(); + return Result.success(deptList); + } } + + + + + diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanPage.java b/src/main/java/com/example/demo/domain/vo/bean/BeanPage.java deleted file mode 100644 index b747967..0000000 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanPage.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.demo.domain.vo.bean; - -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @program: gold-java - * @ClassName Page - * @description: - * @author: Ethan - * @create: 2025−07-30 11:44 - * @Version 1.0 - **/ -@Data -@NoArgsConstructor -public class BeanPage { - private static final long serialVersionUID = 1L; - - private String token; - private Integer pageNum; //页码 - private Integer pageSize; //每页大小 - -} diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java b/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java new file mode 100644 index 0000000..65fd39a --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java @@ -0,0 +1,28 @@ +package com.example.demo.domain.vo.bean; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @program: gold-java + * @ClassName BeanUser + * @description: + * @author: Ethan + * @create: 2025−08-01 10:40 + * @Version 1.0 + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class BeanUser { + private String name; //姓名 + private Integer jwcode; //精网号 + private String dept; //分部 + private Integer beanNum; //金豆数量 + private Integer buyBean; //付费金豆 + private Integer freeBean; //免费金豆 + private Integer totalCostBean; //历史消费 + private String sortField; //排序字段 + private String sortOrder; //排序顺序 +} diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanUserCard.java b/src/main/java/com/example/demo/domain/vo/bean/BeanUserCard.java index 2f62f15..7a5597f 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanUserCard.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanUserCard.java @@ -22,6 +22,7 @@ public class BeanUserCard { private String name; // 客户姓名 private Integer jwcode; // 精网号 private String market; // 所属地区 + private Integer sumBean; // 所有金豆 private Integer freeBean; // 免费豆 private Integer permanentBean; // 永久豆 private Integer consumeSum; // 消费金额 diff --git a/src/main/java/com/example/demo/domain/vo/coin/Page.java b/src/main/java/com/example/demo/domain/vo/coin/Page.java index dc476be..d763a14 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/Page.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Page.java @@ -36,4 +36,6 @@ public class Page { private BeanConsumeArticle beanConsumeArticle; //文章金豆消费 private BeanRechargeInfo beanRechargeInfo; //金豆充值信息 private BeanConsumeGold beanConsumeGold; //金豆消费合计数 + private BeanUser beanUser; //客户金豆余额明细 + private BeanUserCard beanUserCard; //客户金豆卡片 } diff --git a/src/main/java/com/example/demo/mapper/bean/BeanUserMapper.java b/src/main/java/com/example/demo/mapper/bean/BeanUserMapper.java index 3ff34ef..66694c2 100644 --- a/src/main/java/com/example/demo/mapper/bean/BeanUserMapper.java +++ b/src/main/java/com/example/demo/mapper/bean/BeanUserMapper.java @@ -1,6 +1,7 @@ package com.example.demo.mapper.bean; +import com.example.demo.domain.vo.bean.BeanUser; import com.example.demo.domain.vo.bean.BeanUserCard; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -18,6 +19,13 @@ import java.util.List; @Mapper public interface BeanUserMapper { + //查询客户金豆余额 + List selectUserBy(@Param("beanUser") BeanUser beanUser); + //查询用户卡片 BeanUserCard userCard(@Param("jwcode")String jwcode, @Param("markets")List markets); + //查询客户金豆余额合计 + BeanUserCard SumUserBy(@Param("beanUser")BeanUser beanUser); + //查询客户分部 + List getDept(); } diff --git a/src/main/java/com/example/demo/service/bean/BeanUserService.java b/src/main/java/com/example/demo/service/bean/BeanUserService.java index e50db56..5dcbc47 100644 --- a/src/main/java/com/example/demo/service/bean/BeanUserService.java +++ b/src/main/java/com/example/demo/service/bean/BeanUserService.java @@ -2,9 +2,13 @@ package com.example.demo.service.bean; +import com.example.demo.domain.vo.bean.BeanUser; import com.example.demo.domain.vo.bean.BeanUserCard; +import com.example.demo.domain.vo.coin.Page; import com.example.demo.domain.vo.coin.Result; +import java.util.List; + /** * @program: gold-java * @ClassName BeanUserService @@ -17,4 +21,11 @@ import com.example.demo.domain.vo.coin.Result; public interface BeanUserService { //查询用户卡片 Result userCard(String jwcode); + //查询客户金豆余额 + Object selectUserBy(Integer pageNum, Integer pageSize, BeanUser beanUser); + //客户金豆余额合计数 + BeanUserCard sumUserGold(Page page); + + //客户 部门 + List getDept(); } diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java index ca21b09..415963a 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java @@ -2,10 +2,15 @@ package com.example.demo.serviceImpl.bean; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; +import com.example.demo.domain.vo.bean.BeanConsumeArticle; +import com.example.demo.domain.vo.bean.BeanUser; import com.example.demo.domain.vo.bean.BeanUserCard; +import com.example.demo.domain.vo.coin.Page; import com.example.demo.domain.vo.coin.Result; import com.example.demo.mapper.bean.BeanUserMapper; import com.example.demo.service.bean.BeanUserService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -51,4 +56,21 @@ public class BeanUserServiceImpl implements BeanUserService { return Result.error("用户查找不到"); } } + //查询客户金豆余额 + @Override + public Object selectUserBy(Integer pageNum, Integer pageSize, BeanUser beanUser) { + PageHelper.startPage(pageNum, pageSize); + List beanUsers = beanUserMapper.selectUserBy(beanUser); + return new PageInfo<>(beanUsers); + } + //客户金豆余额合计数 + @Override + public BeanUserCard sumUserGold(Page page) { + return beanUserMapper.SumUserBy(page.getBeanUser()); + } + + @Override + public List getDept() { + return beanUserMapper.getDept(); + } } diff --git a/src/main/resources/jindouMapper/BeanUser.xml b/src/main/resources/jindouMapper/BeanUser.xml index c029b3e..1055283 100644 --- a/src/main/resources/jindouMapper/BeanUser.xml +++ b/src/main/resources/jindouMapper/BeanUser.xml @@ -20,5 +20,72 @@ m.jwcode = #{jwcode} + + + + + + \ No newline at end of file