diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopCouponController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopCouponController.java index 0675e8c7b..c2033fac6 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopCouponController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopCouponController.java @@ -4,6 +4,7 @@ import com.czg.account.dto.QueryReceiveDto; import com.czg.account.dto.ShopCouponDTO; import com.czg.account.service.ShopCouponService; import com.czg.account.vo.CouponReceiveVo; +import com.czg.account.vo.UserCouponVo; import com.czg.annotation.SaAdminCheckPermission; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; @@ -71,5 +72,15 @@ public class ShopCouponController { return CzgResult.success(couponService.queryReceive(param)); } + /** + * 生成订单后使用 + * 通过用户Id 查找优惠券 + * + * @param shopUserId 店铺用户Id + */ + @GetMapping("/findCoupon") + public CzgResult> findCoupon(@RequestParam Long shopUserId, @RequestParam(required = false) Integer type) { + return CzgResult.success(couponService.findCoupon(StpKit.USER.getShopId(), shopUserId, type)); + } } diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java index 139db9816..3c7e65fd9 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java @@ -43,7 +43,7 @@ public class UserShopCouponController { * @param shopUserId 店铺用户Id */ @GetMapping("/findCoupon") - public CzgResult> findCoupon(@RequestHeader String shopId, @RequestParam Long shopUserId) { - return CzgResult.success(couponService.findCoupon(Long.parseLong(shopId), shopUserId)); + public CzgResult> findCoupon(@RequestHeader String shopId, @RequestParam Long shopUserId, @RequestParam(required = false) Integer type) { + return CzgResult.success(couponService.findCoupon(Long.parseLong(shopId), shopUserId, type)); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateCouponRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateCouponRecordService.java index cc4db3c7a..f525b84f8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateCouponRecordService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateCouponRecordService.java @@ -21,5 +21,5 @@ public interface ShopActivateCouponRecordService extends IService findByUser(List shopUserIds, Integer status); - List queryByVipIdAndShopId(Long shopId, Long shopUserId); + List queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java index 10c5d8ba1..88c4dc9de 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java @@ -37,7 +37,7 @@ public interface ShopCouponService extends IService { Page find(Long userId,Long shopId, Integer status); - List findCoupon(Long shopId, Long shopUserId); + List findCoupon(Long shopId, Long shopUserId, Integer type); Boolean use(List ids, Long shopUserId, Long orderId); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopActivateCouponRecordMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopActivateCouponRecordMapper.java index f3dd30553..c234dd1dc 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopActivateCouponRecordMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopActivateCouponRecordMapper.java @@ -19,5 +19,5 @@ public interface ShopActivateCouponRecordMapper extends BaseMapper queryReceive(QueryReceiveDto param); List findByUser(List shopUserIds, Integer status); - List queryByVipIdAndShopId(Long shopId, Long shopUserId); + List queryByVipIdAndShopId(Long shopId, Long shopUserId,Integer type); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateCouponRecordServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateCouponRecordServiceImpl.java index a2a92fe91..dff08425c 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateCouponRecordServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateCouponRecordServiceImpl.java @@ -31,7 +31,7 @@ public class ShopActivateCouponRecordServiceImpl extends ServiceImpl queryByVipIdAndShopId(Long shopId, Long shopUserId) { - return getMapper().queryByVipIdAndShopId(shopId, shopUserId); + public List queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type) { + return getMapper().queryByVipIdAndShopId(shopId, shopUserId, type); } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java index 85dc39e1c..8af6a7602 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java @@ -83,7 +83,7 @@ public class ShopCouponServiceImpl extends ServiceImpl queryReceive(QueryReceiveDto param) { Page page = PageUtil.buildPage(); - PageHelper.startPage(Math.toIntExact(page.getPageNumber()),Math.toIntExact(page.getPageSize())); + PageHelper.startPage(Math.toIntExact(page.getPageNumber()), Math.toIntExact(page.getPageSize())); return PageUtil.convert(new PageInfo<>(couponRecordService.queryReceive(param))); } @@ -96,15 +96,15 @@ public class ShopCouponServiceImpl extends ServiceImpl(couponRecordService.findByUser(shopUserIds, status))); } return new Page<>(); } @Override - public List findCoupon(Long shopId, Long shopUserId) { - List tbUserCouponVos = couponRecordService.queryByVipIdAndShopId(shopId, shopUserId); + public List findCoupon(Long shopId, Long shopUserId, Integer type) { + List tbUserCouponVos = couponRecordService.queryByVipIdAndShopId(shopId, shopUserId,type); if (CollectionUtil.isNotEmpty(tbUserCouponVos)) { String week = DateUtil.dayOfWeekEnum(new Date()).toChinese("周"); LocalTime now = LocalTime.now(); diff --git a/cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml index 145c4aaff..3c02fc902 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml @@ -63,7 +63,7 @@ inRecord.over_num as num, inRecord.use_end_time as endTime FROM - tb_activate_in_record inRecord + tb_shop_activate_coupon_record inRecord LEFT JOIN tb_shop_info shop ON inRecord.shop_id = shop.id LEFT JOIN tb_product pro ON inRecord.pro_id = pro.id and pro.shop_id = #{shopId} WHERE @@ -74,7 +74,10 @@ and inRecord.shop_id = #{shopId} - and inRecord.over_num != 0 + + and inRecord.type = #{type} + + and inRecord.status = 0 and inRecord.use_start_time < now() and inRecord.use_end_time > now() order by inRecord.use_end_time diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 633e5a120..5da3ef22d 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -317,10 +317,10 @@ public class PayServiceImpl implements PayService { if (isFree) { shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.FREE_IN); orderInfoService.updateChain().eq(OrderInfo::getId, payParam.getOrderId()) - .set(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()) - .set(OrderInfo::getIsFreeDine, 1) - .set(OrderInfo::getPayAmount, 0) - .update(); + .set(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()) + .set(OrderInfo::getIsFreeDine, 1) + .set(OrderInfo::getPayAmount, 0) + .update(); } //更新会员余额 并生成流水 Long flowId = shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO); @@ -635,7 +635,7 @@ public class PayServiceImpl implements PayService { orderInfo.setRefundRemark(orderInfo.getRefundRemark() + param.getRefundReason()); orderInfoService.updateById(orderInfo); //退款返还库存 - rabbitPublisher.sendOrderRefundMsg(JSONObject.toJSONString(returnProMap)); + rabbitPublisher.sendOrderRefundMsg(JSONObject.toJSONString(Map.of("orderId", orderInfo.getId(), "returnProMap", returnProMap))); return CzgResult.success(); }