From 6465dc2b73116504ed30b10f87a1aa3c364cceba Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Thu, 30 Dec 2021 09:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BC=98=E5=8C=96=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=B4=A2=E5=BC=95=E4=BF=83=E9=94=80=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E7=BB=93=E7=AE=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promotion/KanjiaGoodsActivityBuyerController.java       | 4 ++--
 .../modules/order/cart/render/impl/CheckDataRender.java     | 6 ++++--
 .../promotion/serviceimpl/CouponActivityServiceImpl.java    | 2 +-
 .../promotion/serviceimpl/FullDiscountServiceImpl.java      | 2 +-
 .../modules/promotion/serviceimpl/PintuanServiceImpl.java   | 2 +-
 .../promotion/serviceimpl/PointsGoodsServiceImpl.java       | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/KanjiaGoodsActivityBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/KanjiaGoodsActivityBuyerController.java
index 6f6ab3ef..5fcf7832 100644
--- a/buyer-api/src/main/java/cn/lili/controller/promotion/KanjiaGoodsActivityBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/promotion/KanjiaGoodsActivityBuyerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.promotion;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
@@ -79,7 +79,7 @@ public class KanjiaGoodsActivityBuyerController {
     @ApiOperation(value = "获取砍价活动")
     public ResultMessage<KanjiaActivityVO> getKanJiaActivity(KanjiaActivitySearchParams kanjiaActivitySearchParams) {
         //如果是非被邀请关系则填写会员ID
-        if (StrUtil.isEmpty(kanjiaActivitySearchParams.getKanjiaActivityId())) {
+        if (CharSequenceUtil.isEmpty(kanjiaActivitySearchParams.getKanjiaActivityId())) {
             kanjiaActivitySearchParams.setMemberId(UserContext.getCurrentUser().getId());
         }
         return ResultUtil.data(kanJiaActivityService.getKanjiaActivityVO(kanjiaActivitySearchParams));
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
index 9e47a349..6ddd6b2c 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
@@ -154,8 +154,10 @@ public class CheckDataRender implements CartRenderStep {
                 try {
                     //筛选属于当前店铺的优惠券
                     storeCart.getValue().forEach(i -> i.getPromotionMap().forEach((key, value) -> {
-                        if (key.contains(PromotionTypeEnum.COUPON.name()) && ((Coupon) value).getStoreId().equals(storeCart.getKey())) {
-                            cartVO.getCanReceiveCoupon().add(new CouponVO((Coupon) value));
+                        JSONObject promotionsObj = JSONUtil.parseObj(value);
+                        Coupon coupon = JSONUtil.toBean(promotionsObj, Coupon.class);
+                        if (key.contains(PromotionTypeEnum.COUPON.name()) && coupon.getStoreId().equals(storeCart.getKey())) {
+                            cartVO.getCanReceiveCoupon().add(new CouponVO(coupon));
                         }
                     }));
                 } catch (Exception e) {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
index f7961151..c413e6a4 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
@@ -137,7 +137,7 @@ public class CouponActivityServiceImpl extends AbstractPromotionsServiceImpl<Cou
      * 更新优惠券活动商品信息
      *
      * @param couponActivity 优惠券活动实体
-     * @return
+     * @return 是否更新成功
      */
     @Override
     public boolean updatePromotionsGoods(CouponActivity couponActivity) {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
index 8c0e0fa8..dce86bca 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
@@ -107,7 +107,7 @@ public class FullDiscountServiceImpl extends AbstractPromotionsServiceImpl<FullD
      * 更新促销商品信息
      *
      * @param promotions 促销实体
-     * @return
+     * @return 是否更新成功
      */
     @Override
     public boolean updatePromotionsGoods(FullDiscount promotions) {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
index 4f06e820..dbec57fa 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
@@ -204,7 +204,7 @@ public class PintuanServiceImpl extends AbstractPromotionsServiceImpl<PintuanMap
      * 更新促销商品信息
      *
      * @param promotions 促销实体
-     * @return
+     * @return 是否更新成功
      */
     @Override
     public boolean updatePromotionsGoods(Pintuan promotions) {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
index b27761e9..de4af0d3 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
@@ -204,7 +204,7 @@ public class PointsGoodsServiceImpl extends AbstractPromotionsServiceImpl<Points
      * 更新促销商品信息
      *
      * @param promotions 促销实体
-     * @return
+     * @return 是否更新成功
      */
     @Override
     public boolean updatePromotionsGoods(PointsGoods promotions) {