From 6a2efde318fa6b4a23bf5dad6ec99c8d1a66a21d Mon Sep 17 00:00:00 2001 From: wangguocheng Date: Fri, 17 May 2024 10:02:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=BE=97=E5=85=8D=E5=8D=95=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrderController.java | 6 ++++++ .../cashierservice/dao/TbOrderInfoMapper.java | 1 + .../system/cashierservice/entity/TbOrderInfo.java | 3 ++- .../cashierservice/service/OrderService.java | 15 +++++++++++++++ src/main/resources/mapper/TbOrderInfoMapper.xml | 5 +++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java index c47df9f..3025813 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java @@ -76,6 +76,12 @@ public class OrderController { private Result findWiningUser(){ return orderService.findWiningUser(); } + @GetMapping("/mineWinner") + private Result mineWinner(@RequestHeader String token,@RequestParam Integer userId, + @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, + @RequestParam(value = "size", required = false, defaultValue = "1") Integer size){ + return orderService.mineWinner(userId,page,size); + } @GetMapping("/getYhqPara") private Result getYhqPara(){ return orderService.getYhqPara(); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java index 3419c7c..20d3776 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java @@ -33,4 +33,5 @@ public interface TbOrderInfoMapper { List selectByTradeDay(@Param("day") String day,@Param("minPrice") BigDecimal minPrice,@Param("maxPrice") BigDecimal maxPrice); + List selectWinnerByUserId(@Param("userId")Integer userId); } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java index 4ca654d..f64eebd 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java @@ -99,7 +99,8 @@ public class TbOrderInfo implements Serializable { private String isUseCoupon; private Integer totalNumber; private List detailList; - + private String winnnerNo; + private String isWinner; private static final long serialVersionUID = 1L; public TbOrderInfo(){ super(); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index f4eeaa5..f0b89d0 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -16,6 +16,7 @@ import com.chaozhanggui.system.cashierservice.util.N; import com.chaozhanggui.system.cashierservice.util.RedisUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -383,4 +384,18 @@ public class OrderService { modityDouble(conponsId); } } + + public Result mineWinner(Integer userId, Integer page, Integer size) { + PageHelper.startPage(page, size); + List list = orderInfoMapper.selectWinnerByUserId(userId); + for (TbOrderInfo tbOrderInfo:list){ + if (StringUtils.isNotEmpty(tbOrderInfo.getWinnnerNo())){ + tbOrderInfo.setIsWinner("true"); + }else { + tbOrderInfo.setIsWinner("false"); + } + } + PageInfo pageInfo = new PageInfo(list); + return Result.success(CodeEnum.SUCCESS, pageInfo); + } } diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml index ea03dba..bbbbdbc 100644 --- a/src/main/resources/mapper/TbOrderInfoMapper.xml +++ b/src/main/resources/mapper/TbOrderInfoMapper.xml @@ -560,4 +560,9 @@ select tio1.* from tb_order_info tio1 where not EXISTS (SELECT 1 FROM `tb_order_info` toi2 where toi2.order_type = 'return' and toi2.source = tio1.id) and tio1.trade_day = #{day} and status = 'closed' and tio1.pay_amount >= #{minPrice} and tio1.pay_amount < #{maxPrice} and tio1.order_type = 'miniapp' + \ No newline at end of file