From f9aa237f98a3ed04e7ef68902a78e27bdca3ba46 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 12 Sep 2025 10:56:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=20=E6=9A=82=E6=97=B6=20?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ACouponController.java | 24 +++++++++++-------- .../com/czg/market/dto/ShopCouponDTO.java | 2 +- .../com/czg/market/entity/ShopCoupon.java | 2 +- .../service/impl/ShopCouponServiceImpl.java | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java index 430f2466..c855a344 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java @@ -14,6 +14,7 @@ import com.czg.validator.group.InsertGroup; import com.czg.validator.group.UpdateGroup; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*; * * @author ww */ +@Slf4j @RestController @RequestMapping("/admin/coupon") public class ACouponController { @@ -36,7 +38,7 @@ public class ACouponController { */ @GetMapping("page") @OperationLog("优惠券列表-分页") - @SaAdminCheckPermission("coupon:page") +// @SaAdminCheckPermission("coupon:page") public CzgResult> getCouponPage(ShopCouponDTO param) { Page data = shopCouponService.getCouponPage(param); return CzgResult.success(data); @@ -49,7 +51,7 @@ public class ACouponController { */ @GetMapping("{id}") @OperationLog("优惠券-详情") - @SaAdminCheckPermission("coupon:info") +// @SaAdminCheckPermission("coupon:info") public CzgResult getCouponById(@PathVariable("id") Long id) { AssertUtil.isNull(id, "{}不能为空", "id"); ShopCouponDTO data = shopCouponService.getCouponById(id); @@ -61,12 +63,13 @@ public class ACouponController { */ @PostMapping @OperationLog("优惠券-新增") - @SaAdminCheckPermission("coupon:add") +// @SaAdminCheckPermission("coupon:add") public CzgResult addCoupon(@RequestBody @Validated({InsertGroup.class, DefaultGroup.class}) ShopCouponDTO dto) { Long shopId = StpKit.USER.getShopId(0L); dto.setShopId(shopId); + dto.setLeftNum(dto.getGiveNum()); shopCouponService.addCoupon(dto); - asyncToBranchShop(dto.getId(),1); + asyncToBranchShop(dto.getId(), 1); return CzgResult.success(); } @@ -75,12 +78,12 @@ public class ACouponController { */ @PutMapping @OperationLog("优惠券-修改") - @SaAdminCheckPermission("coupon:update") +// @SaAdminCheckPermission("coupon:update") public CzgResult updateCoupon(@RequestBody @Validated({UpdateGroup.class, DefaultGroup.class}) ShopCouponDTO dto) { Long shopId = StpKit.USER.getShopId(0L); dto.setShopId(shopId); shopCouponService.updateCouponById(dto); - asyncToBranchShop(dto.getId(),2); + asyncToBranchShop(dto.getId(), 2); return CzgResult.success(); } @@ -89,18 +92,19 @@ public class ACouponController { */ @DeleteMapping("{id}") @OperationLog("优惠券-删除") - @SaAdminCheckPermission("prodGroup:delete") +// @SaAdminCheckPermission("prodGroup:delete") public CzgResult deleteCoupon(@PathVariable("id") Long id) { AssertUtil.isNull(id, "{}不能为空", "id"); shopCouponService.deleteCoupon(id); - asyncToBranchShop(id,3); + asyncToBranchShop(id, 3); return CzgResult.success(); } - private void asyncToBranchShop(Long id,Integer type) { + private void asyncToBranchShop(Long id, Integer type) { long shopId = StpKit.USER.getShopId(0L); + log.info("优惠券同步,优惠券id:{},类型:{}", id, type); ThreadUtil.execAsync(() -> { - shopSyncService.syncCouponBySourceShop(shopId, id,type); + shopSyncService.syncCouponBySourceShop(shopId, id, type); }); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java index bb3a19e9..e27712bc 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java @@ -72,7 +72,7 @@ public class ShopCouponDTO implements Serializable { private String useShops; /** - * 可使用类型：堂食/自取/配送/快递 + * 可使用类型：dine堂食/pickup自取/deliv配送/express快递 */ private String useType; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java index 9e04ea07..ea4e0460 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java @@ -69,7 +69,7 @@ public class ShopCoupon implements Serializable { private String useShops; /** - * 可使用类型：堂食/自取/配送/快递 + * 可使用类型：dine堂食/pickup自取/deliv配送/express快递 */ private String useType; diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java index eb986033..d220805c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java @@ -25,7 +25,7 @@ public class ShopCouponServiceImpl extends ServiceImpl getCouponPage(ShopCouponDTO param) { - QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq(ShopCoupon::getShopId, param.getShopId()) .eq(ShopCoupon::getCouponType, param.getCouponType()) .orderBy(ShopCoupon::getCreateTime).desc();