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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
张松
2025-02-27 16:50:41 +08:00
parent b5e2f0c261 7dc3183289
commit 41c84fd199
14 changed files with 194 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,8 +66,8 @@ public class ShopCouponController {
* 权限标识: coupon:delete
*/
@SaAdminCheckPermission("coupon:queryReceive")
@PostMapping("/queryReceive")
public CzgResult<Page<CouponReceiveVo>> queryReceive(@Validated @RequestBody QueryReceiveDto param) {
@GetMapping("/queryReceive")
public CzgResult<Page<CouponReceiveVo>> queryReceive(@Validated QueryReceiveDto param) {
return CzgResult.success(couponService.queryReceive(param));
}

21
cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java
View File

@@ -2,7 +2,9 @@ package com.czg.controller.user;
import com.czg.account.entity.ShopActivateCouponRecord;
import com.czg.account.service.ShopCouponService;
import com.czg.account.vo.UserCouponVo;
import com.czg.resp.CzgResult;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*;
@@ -27,8 +29,21 @@ public class UserShopCouponController {
* @param status 0 未使用 1已使用 2已过期
*/
@GetMapping("/findByUserId")
public CzgResult<List<ShopActivateCouponRecord>> findByUserId(
@RequestParam Long shopUserId, @RequestParam(required = false) Integer status) {
return CzgResult.success(couponService.find(shopUserId, status));
public CzgResult<Page<ShopActivateCouponRecord>> findByUserId(
@RequestParam Long userId,
@RequestParam(required = false) Integer status,
@RequestParam(required = false) Long orderId) {
return CzgResult.success(couponService.find(userId, orderId, status));
}
/**
* 生成订单后使用
* 通过用户Id 查找优惠券
*
* @param shopUserId 店铺用户Id
*/
@GetMapping("/findCoupon")
public CzgResult<List<UserCouponVo>> findCoupon(@RequestHeader String shopId, @RequestParam Long shopUserId) {
return CzgResult.success(couponService.findCoupon(Long.parseLong(shopId), shopUserId));
}
}