From 11e35e0257e48667292b4f563ddf6ce02a3a22bb Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 13:49:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java
index ff78a33..e8b89d8 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
@@ -233,13 +234,6 @@
.eq("MEMBER_ID",addCartGoodsRequest.getMemberId())
.eq("GOODS_SKU_ID",addCartGoodsRequest.getGoodsSkuId())
);
-// Goods goods = goodsMapper.selectById(addCartGoodsRequest.getGoodsId());
-// if(Objects.isNull(goods)){
-// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍟嗗搧淇℃伅");
-// }
-// if(!goods.getType().equals(Constants.ZERO)){
-// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"闈炲晢鍩庡晢鍝佹棤娉曞姞鍏ヨ喘鐗╄溅");
-// }
GoodsSku goodsSku = goodsSkuMapper.selectById(addCartGoodsRequest.getGoodsSkuId());
if(Objects.isNull(goodsSku)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍟嗗搧SKU淇℃伅");
@@ -271,6 +265,15 @@
userCenterVO.setServerPhone(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_PHONE).getCode()));
userCenterVO.setUserAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_AGREEMENT).getCode()));
userCenterVO.setPrivacyAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRIVACY_AGREEMENT).getCode()));
+
+ userCenterVO.setShopIntegralBg(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SHOP_INTEGRAL_BG).getCode()));
+
+ userCenterVO.setUserInviteBg(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_INVITE_BG).getCode()));
+
+ userCenterVO.setCenterInviteBg(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CENTER_INVITE_BG).getCode()));
+
+ userCenterVO.setUserShareBg(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_SHARE_BG).getCode()));
+
return userCenterVO;
}
--
Gitblit v1.9.3