From df12c83b8e588d11f6a9433e6cd1bc98d60aaf50 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 10 Dec 2025 17:06:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/controller/admin/PointsGoodsController.java | 7 ++++++- .../czg/service/market/mapper/MkPointsGoodsMapper.java | 2 +- .../market/service/impl/MkPointsGoodsServiceImpl.java | 10 +++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/PointsGoodsController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/PointsGoodsController.java index 35469c658..744d7ac4f 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/PointsGoodsController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/PointsGoodsController.java @@ -54,7 +54,12 @@ public class PointsGoodsController { public CzgResult addPointsGoodsSetting(@RequestBody @Validated MkPointsGoodsDTO dto) { dto.setShopId(StpKit.USER.getShopId()); MkPointsGoods entity = BeanUtil.copyProperties(dto, MkPointsGoods.class); - boolean ret = pointsGoodsSettingService.saveOrUpdate(entity); + boolean ret; + if (entity.getId() != null) { + ret = pointsGoodsSettingService.saveOrUpdate(entity); + } else { + ret = pointsGoodsSettingService.updateById(entity, false); + } return CzgResult.success(ret); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java index df4d314d6..abf2bd4d7 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java @@ -13,5 +13,5 @@ import java.util.List; */ public interface MkPointsGoodsMapper extends BaseMapper { - List getPointsGoodsPageByUser(Long shopId, Long userId,String goodsCategory); + List getPointsGoodsPageByUser(Long shopId, Long userId, String goodsCategory); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java index d4aa519ab..0d77d0b60 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java @@ -1,5 +1,6 @@ package com.czg.service.market.service.impl; +import cn.hutool.core.util.StrUtil; import com.czg.BaseQueryParam; import com.czg.exception.CzgException; import com.czg.market.entity.*; @@ -64,7 +65,14 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl result = new HashMap<>(2); MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId); PageHelper.startPage(page, size); - List list = mapper.getPointsGoodsPageByUser(shopId, userId, goodsCategory.trim()); + if (StrUtil.isNotBlank(goodsCategory)) { + if (goodsCategory.contains("优惠劵")) { + goodsCategory = "优惠劵"; + } else if (goodsCategory.contains("其他商品")) { + goodsCategory = "其他商品"; + } + } + List list = mapper.getPointsGoodsPageByUser(shopId, userId, StrUtil.trim(goodsCategory)); list.forEach(goods -> { if (goods.getGoodsCategory().equals("优惠劵")) { ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId())