合并

MrShi

7 小时以前 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c

 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信息");
@@ -265,12 +259,21 @@
    public UserCenterVO getPlatformAboutUs(){
        UserCenterVO userCenterVO = new UserCenterVO();
        userCenterVO.setAboutUs(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ABOUT_US).getCode()));
        userCenterVO.setIntegralRule(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INTERALSET_INTEGRALRULEINFO).getCode()));
        userCenterVO.setInvitelRule(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INVITE_RULE).getCode()));
        userCenterVO.setIntegralRule(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.INTEGRAL_SET,Constants.INTERALSET_INTEGRALRULEINFO).getCode()));
        userCenterVO.setInvitelRule(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.ORDER_SET,Constants.INVITE_RULE).getCode()));
        userCenterVO.setServerIntroduce(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_INTRODUCE).getCode()));
        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;
    }