From 7c5e40cd38dc8a64bd5c056d421c23545d461dce Mon Sep 17 00:00:00 2001 From: wangguocheng Date: Thu, 23 May 2024 09:27:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AF=E7=94=A8=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=88=B8=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/controller/UserContoller.java | 7 +++++++ .../cashierservice/dao/TbSystemCouponsMapper.java | 3 +++ .../system/cashierservice/dao/TbUserCouponsMapper.java | 3 +++ .../system/cashierservice/service/UserService.java | 10 ++++++++++ src/main/resources/mapper/TbSystemCouponsMapper.xml | 3 +++ src/main/resources/mapper/TbUserCouponsMapper.xml | 5 ++++- 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java index 43a9a24..24af319 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java @@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -79,6 +80,12 @@ public class UserContoller { TbShopUser shopUser = shopUserMapper.selectByUserIdAndShopId(userId,shopId); return Result.success(CodeEnum.SUCCESS,shopUser); } + + @GetMapping("/userCoupon") + public Result userCoupon(@RequestParam("userId") String userId ,@RequestParam("shopId") BigDecimal orderNum ) throws Exception { + int num = userService.userCoupon(userId,orderNum); + return Result.success(CodeEnum.SUCCESS,num); + } @PostMapping("/modityIntegral") public JSONObject modityIntegral(@RequestHeader String token,@RequestBody IntegralVo integralVo ) throws Exception { JSONObject jsonObject = TokenUtil.parseParamFromToken(token); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbSystemCouponsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbSystemCouponsMapper.java index f4bfecf..c66ed50 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbSystemCouponsMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbSystemCouponsMapper.java @@ -3,6 +3,7 @@ package com.chaozhanggui.system.cashierservice.dao; import com.chaozhanggui.system.cashierservice.entity.TbSystemCoupons; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; public interface TbSystemCouponsMapper { @@ -19,4 +20,6 @@ public interface TbSystemCouponsMapper { int updateByPrimaryKey(TbSystemCoupons record); List selectAll(@Param("type") String type); + + int selectByAmount(@Param("orderNum") BigDecimal orderNum); } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java index 6ea8997..9f5c926 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java @@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; +import java.math.BigDecimal; import java.util.List; @Component @@ -25,4 +26,6 @@ public interface TbUserCouponsMapper { List selectByUserId(@Param("userId") String userId,@Param("status") String status); TbUserCoupons selectByOrderId(@Param("orderId") Integer orderId); + + int selectByUserIdAndAmount(@Param("userId") String userId, @Param("orderNum") BigDecimal orderNum); } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java index acc7811..c39c22d 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java @@ -36,6 +36,10 @@ public class UserService { @Autowired private TbUserInfoMapper userInfoMapper; @Autowired + private TbUserCouponsMapper userCouponsMapper; + @Autowired + private TbSystemCouponsMapper systemCouponsMapper; + @Autowired RedisUtils redisUtils; public JSONObject modityIntegral(IntegralVo integralVo, String userSign) { @@ -218,4 +222,10 @@ public class UserService { result.put("data", pageInfo); return result; } + + public int userCoupon(String userId, BigDecimal orderNum) { + int userNum = userCouponsMapper.selectByUserIdAndAmount(userId,orderNum); + int sysNum = systemCouponsMapper.selectByAmount(orderNum); + return userNum+sysNum; + } } diff --git a/src/main/resources/mapper/TbSystemCouponsMapper.xml b/src/main/resources/mapper/TbSystemCouponsMapper.xml index 2185fbf..115e91f 100644 --- a/src/main/resources/mapper/TbSystemCouponsMapper.xml +++ b/src/main/resources/mapper/TbSystemCouponsMapper.xml @@ -24,6 +24,9 @@ + delete from tb_system_coupons where id = #{id,jdbcType=INTEGER} diff --git a/src/main/resources/mapper/TbUserCouponsMapper.xml b/src/main/resources/mapper/TbUserCouponsMapper.xml index 3c5c1c0..02c9600 100644 --- a/src/main/resources/mapper/TbUserCouponsMapper.xml +++ b/src/main/resources/mapper/TbUserCouponsMapper.xml @@ -30,7 +30,10 @@ - + + delete from tb_user_coupons where id = #{id,jdbcType=INTEGER}