czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

不可使用愿意 优惠券 列表

This commit is contained in:
wangw 2025-09-27 09:57:09 +08:00
parent a069d14657
commit 9dbd002211
9 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java
View File

@ -186,7 +186,7 @@ public class ACouponController {
* @param shopUserId 店铺用户Id
*/
@GetMapping("/findCoupon")
public CzgResult<List<UserCouponVo>> findCoupon(@RequestParam Long shopUserId, @RequestParam(required = false) Integer type) {
return CzgResult.success(shopCouponService.findCoupon(StpKit.USER.getShopId(), shopUserId, type));
public CzgResult<List<UserCouponVo>> findCoupon(@RequestParam Long shopUserId, @RequestParam(required = false) Integer type, @RequestParam(required = false) Integer isFood) {
return CzgResult.success(shopCouponService.findCoupon(StpKit.USER.getShopId(), shopUserId, type, isFood));
}
}

5
cash-api/market-server/src/main/java/com/czg/controller/user/UShopCouponController.java
View File

@ -83,8 +83,9 @@ public class UShopCouponController {
* @param shopUserId 店铺用户Id
*/
@GetMapping("/findCoupon")
public CzgResult<List<UserCouponVo>> findCoupon(@RequestHeader String shopId, @RequestParam Long shopUserId, @RequestParam(required = false) Integer type) {
public CzgResult<List<UserCouponVo>> findCoupon(@RequestHeader String shopId, @RequestParam Long shopUserId,
@RequestParam(required = false) Integer type, @RequestParam(required = false) Integer isFood) {
AssertUtil.isBlank(shopId, "店铺Id不能为空");
return CzgResult.success(couponService.findCoupon(Long.parseLong(shopId), shopUserId, type));
return CzgResult.success(couponService.findCoupon(Long.parseLong(shopId), shopUserId, type, isFood));
}
}

1
cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java
View File

@ -33,6 +33,7 @@ public class UserCouponVo {
private String useRule;
private String ruleDetails;
private String useRestrictions;
private String noUseRestrictions;
private boolean isUse = false;
/**
* 优惠券门槛商品列表

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java
View File

@ -26,7 +26,7 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
List<UserCouponVO> findByUser(String name, List<Long> shopUserIds, Integer status);
List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type);
List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type, Integer isFood);
/**
* 优惠券列表/已领取详情

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/ShopCouponService.java
View File

@ -35,7 +35,7 @@ public interface ShopCouponService extends IService<ShopCoupon> {
Page<UserCouponVO> find(Long userId, String name, Long shopId, Integer status);
List<UserCouponVo> findCoupon(Long shopId, Long shopUserId, Integer type);
List<UserCouponVo> findCoupon(Long shopId, Long shopUserId, Integer type, Integer isFood);
Boolean use(List<Long> ids, Long shopUserId, Long orderId);

2
cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkShopCouponRecordMapper.java
View File

@ -23,7 +23,7 @@ public interface MkShopCouponRecordMapper extends BaseMapper<MkShopCouponRecord>
List<UserCouponVO> findCouponVOByUser(String name, List<Long> shopUserIds, Integer status);
List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type);
List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type, Integer isFood);
List<ShopInfoCouponVO> getShopByCouponRecord(Long userId);
}

4
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
View File

@ -72,8 +72,8 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
}
@Override
public List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type) {
return getMapper().queryByVipIdAndShopId(shopId, shopUserId, type);
public List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type, Integer isFood) {
return getMapper().queryByVipIdAndShopId(shopId, shopUserId, type, isFood);
}

8
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java
View File

@ -284,8 +284,8 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
}
@Override
public List<UserCouponVo> findCoupon(Long shopId, Long shopUserId, Integer type) {
List<UserCouponVo> tbUserCouponVos = recordService.queryByVipIdAndShopId(shopId, shopUserId, type);
public List<UserCouponVo> findCoupon(Long shopId, Long shopUserId, Integer type, Integer isFood) {
List<UserCouponVo> tbUserCouponVos = recordService.queryByVipIdAndShopId(shopId, shopUserId, type, isFood);
if (CollectionUtil.isNotEmpty(tbUserCouponVos)) {
String week = DateUtil.dayOfWeekEnum(new Date()).toChinese("周");
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
@ -418,6 +418,7 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
useRestrictions = new StringBuilder(tbShopCoupon.getUseDays() + " ");
}
if (!tbShopCoupon.getUseDays().contains(week)) {
tbUserCouponVo.setNoUseRestrictions("不在可用时间范围内");
isUse = false;
}
}
@ -427,12 +428,15 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
LocalTime endTime = tbShopCoupon.getUseEndTime().toLocalTime();
if (currentTime.isBefore(startTime)) {
if (startTime.isBefore(endTime)) {
tbUserCouponVo.setNoUseRestrictions("不在可用时间范围内");
isUse = false;
} else if (currentTime.isAfter(endTime)) {
tbUserCouponVo.setNoUseRestrictions("不在可用时间范围内");
isUse = false;
}
} else if (startTime.isBefore(endTime)) {
if (currentTime.isAfter(endTime)) {
tbUserCouponVo.setNoUseRestrictions("不在可用时间范围内");
isUse = false;
}
}

13
cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml
View File

@ -108,9 +108,16 @@
<if test="shopId != null and shopId != ''">
and inRecord.shop_id = #{shopId}
</if>
<if test="type != null ">
and inRecord.type = #{type}
</if>
<choose>
<when test="type != null ">
and inRecord.type = #{type}
</when>
<otherwise>
<if test="isFood != null">
and inRecord.type != 2
</if>
</otherwise>
</choose>
and inRecord.status = 0
and inRecord.use_start_time &lt; now()
and inRecord.use_end_time &gt; now()