caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

Browse Source
This commit is contained in:
paulGao 2023-01-05 14:39:33 +08:00
commit bda297b90d
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
View File

@ -95,8 +95,10 @@ public class CheckDataRender implements CartRenderStep {
* @param tradeDTO 购物车视图 * @param tradeDTO 购物车视图
*/ */
private void checkData(TradeDTO tradeDTO) { private void checkData(TradeDTO tradeDTO) {
List<CartSkuVO> cartSkuVOS = tradeDTO.getSkuList();
//循环购物车中的商品 //循环购物车中的商品
for (CartSkuVO cartSkuVO : tradeDTO.getSkuList()) { for (CartSkuVO cartSkuVO : cartSkuVOS) {
//如果失效，确认sku为未选中状态 //如果失效，确认sku为未选中状态
if (Boolean.TRUE.equals(cartSkuVO.getInvalid())) { if (Boolean.TRUE.equals(cartSkuVO.getInvalid())) {
@ -106,14 +108,17 @@ public class CheckDataRender implements CartRenderStep {
//缓存中的商品信息 //缓存中的商品信息
GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId()); GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId());
Map<String, Object> promotionMap = promotionGoodsService.getCurrentGoodsPromotion(dataSku, tradeDTO.getCartTypeEnum().name());
//商品有效性判定 //商品有效性判定
if (dataSku == null || dataSku.getCreateTime().after(cartSkuVO.getGoodsSku().getCreateTime())) { if (dataSku == null || dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime())) {
//设置购物车未选中 //商品失效,将商品移除并重新填充商品
cartSkuVO.setChecked(false); cartSkuVOS.remove(cartSkuVO);
//设置购物车此sku商品已失效 //设置新商品
cartSkuVO.setInvalid(true); CartSkuVO newCartSkuVO = new CartSkuVO(dataSku,promotionMap);
//设置失效消息 newCartSkuVO.setCartType(tradeDTO.getCartTypeEnum());
cartSkuVO.setErrorMessage("商品信息发生变化,已失效"); newCartSkuVO.setNum(cartSkuVO.getNum());
newCartSkuVO.setSubTotal(CurrencyUtil.mul(newCartSkuVO.getPurchasePrice(), cartSkuVO.getNum()));
cartSkuVOS.add(newCartSkuVO);
continue; continue;
} }
//商品上架状态判定 //商品上架状态判定

9
framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java
View File

@ -25,12 +25,21 @@ public class BaseSetting implements Serializable {
@ApiModelProperty(value = "后端logo") @ApiModelProperty(value = "后端logo")
private String domainLogo; private String domainLogo;
@ApiModelProperty(value = "后端icon")
private String domainIcon;
@ApiModelProperty(value = "买家端logo") @ApiModelProperty(value = "买家端logo")
private String buyerSideLogo; private String buyerSideLogo;
@ApiModelProperty(value = "买家端icon")
private String buyerSideIcon;
@ApiModelProperty(value = "商家端logo") @ApiModelProperty(value = "商家端logo")
private String storeSideLogo; private String storeSideLogo;
@ApiModelProperty(value = "商家端icon")
private String storeSideIcon;
@ApiModelProperty(value = "站点地址") @ApiModelProperty(value = "站点地址")
private String staticPageAddress; private String staticPageAddress;