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

消费赠券 跳转 id 选中

This commit is contained in:
wangw 2025-09-13 11:18:26 +08:00
parent 212f27daa6
commit db50c78049
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import com.czg.log.annotation.OperationLog;
import com.czg.market.dto.MkCouponGiftDTO; import com.czg.market.dto.MkCouponGiftDTO;
import com.czg.market.dto.ShopCouponDTO; import com.czg.market.dto.ShopCouponDTO;
import com.czg.market.service.MkCouponGiftService; import com.czg.market.service.MkCouponGiftService;
import com.czg.market.service.MkShopConsumerCouponService;
import com.czg.market.service.ShopCouponService; import com.czg.market.service.ShopCouponService;
import com.czg.product.service.ShopSyncService; import com.czg.product.service.ShopSyncService;
import com.czg.resp.CzgResult; import com.czg.resp.CzgResult;
@ -37,6 +38,8 @@ public class ACouponController {
private ShopCouponService shopCouponService; private ShopCouponService shopCouponService;
@Resource @Resource
private MkCouponGiftService couponGiftService; private MkCouponGiftService couponGiftService;
@Resource
private MkShopConsumerCouponService consumerCouponService;
@DubboReference @DubboReference
private ShopSyncService shopSyncService; private ShopSyncService shopSyncService;
@ -132,16 +135,16 @@ public class ACouponController {
return CzgResult.success(data); return CzgResult.success(data);
} }
/** // /**
* 通过关联Id取消该券的关联 // * 通过关联Id取消该券的关联
* // *
* @param id /admin/coupon/gifts的 主键Id // * @param id /admin/coupon/gifts的 主键Id
*/ // */
@DeleteMapping("/cancelGift") // @DeleteMapping("/cancelGift")
public CzgResult<Void> cancelGift(Long id) { // public CzgResult<Void> cancelGift(Long id) {
couponGiftService.cancelGift(id); // couponGiftService.cancelGift(id);
return CzgResult.success(); // return CzgResult.success();
} // }
private void asyncToBranchShop(Long id, Integer type) { private void asyncToBranchShop(Long id, Integer type) {
long shopId = StpKit.USER.getShopId(0L); long shopId = StpKit.USER.getShopId(0L);

1
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumerCouponServiceImpl.java
View File

@ -33,6 +33,7 @@ public class MkShopConsumerCouponServiceImpl extends ServiceImpl<MkShopConsumerC
public Page<MkShopConsumerCouponDTO> getConsumerCouponPage(MkShopConsumerCouponDTO param) { public Page<MkShopConsumerCouponDTO> getConsumerCouponPage(MkShopConsumerCouponDTO param) {
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq(MkShopConsumerCoupon::getShopId, param.getShopId()) queryWrapper.eq(MkShopConsumerCoupon::getShopId, param.getShopId())
.eq(MkShopConsumerCoupon::getId, param.getId())
.orderBy(MkShopConsumerCoupon::getCreateTime).desc(); .orderBy(MkShopConsumerCoupon::getCreateTime).desc();
Page<MkShopConsumerCouponDTO> pages = pageAs(PageUtil.buildPage(), queryWrapper, MkShopConsumerCouponDTO.class); Page<MkShopConsumerCouponDTO> pages = pageAs(PageUtil.buildPage(), queryWrapper, MkShopConsumerCouponDTO.class);
pages.getRecords().forEach(item -> { pages.getRecords().forEach(item -> {