From 1346614a30d673edbfcefb28fec4c32b0ed2bf39 Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Thu, 22 Dec 2022 15:17:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=B8=8Elogo=E5=88=86=E5=BC=80=E6=B7=BB=E5=8A=A0=E4=B8=8E?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/system/entity/dto/BaseSetting.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java index 98b8cacc..3c257e24 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java @@ -25,12 +25,21 @@ public class BaseSetting implements Serializable { @ApiModelProperty(value = "后端logo") private String domainLogo; + @ApiModelProperty(value = "后端icon") + private String domainIcon; + @ApiModelProperty(value = "买家端logo") private String buyerSideLogo; + @ApiModelProperty(value = "买家端icon") + private String buyerSideIcon; + @ApiModelProperty(value = "商家端logo") private String storeSideLogo; + @ApiModelProperty(value = "商家端icon") + private String storeSideIcon; + @ApiModelProperty(value = "站点地址") private String staticPageAddress; From b97c8e7fda61923a02997645bbb8e12d816a6adf Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Thu, 22 Dec 2022 18:19:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=90=8C=E6=AD=A5=E5=88=B0=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cart/render/impl/CheckDataRender.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) 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 c85cfbbd..d00b1bec 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 @@ -95,8 +95,10 @@ public class CheckDataRender implements CartRenderStep { * @param tradeDTO 购物车视图 */ private void checkData(TradeDTO tradeDTO) { + List cartSkuVOS = tradeDTO.getSkuList(); + //循环购物车中的商品 - for (CartSkuVO cartSkuVO : tradeDTO.getSkuList()) { + for (CartSkuVO cartSkuVO : cartSkuVOS) { //如果失效，确认sku为未选中状态 if (Boolean.TRUE.equals(cartSkuVO.getInvalid())) { @@ -106,14 +108,17 @@ public class CheckDataRender implements CartRenderStep { //缓存中的商品信息 GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId()); + Map promotionMap = promotionGoodsService.getCurrentGoodsPromotion(dataSku, tradeDTO.getCartTypeEnum().name()); //商品有效性判定 - if (dataSku == null || dataSku.getCreateTime().after(cartSkuVO.getGoodsSku().getCreateTime())) { - //设置购物车未选中 - cartSkuVO.setChecked(false); - //设置购物车此sku商品已失效 - cartSkuVO.setInvalid(true); - //设置失效消息 - cartSkuVO.setErrorMessage("商品信息发生变化,已失效"); + if (dataSku == null || dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime())) { + //商品失效,将商品移除并重新填充商品 + cartSkuVOS.remove(cartSkuVO); + //设置新商品 + CartSkuVO newCartSkuVO = new CartSkuVO(dataSku,promotionMap); + newCartSkuVO.setCartType(tradeDTO.getCartTypeEnum()); + newCartSkuVO.setNum(cartSkuVO.getNum()); + newCartSkuVO.setSubTotal(CurrencyUtil.mul(newCartSkuVO.getPurchasePrice(), cartSkuVO.getNum())); + cartSkuVOS.add(newCartSkuVO); continue; } //商品上架状态判定