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

Browse Source
This commit is contained in:
misworga831 2023-02-03 17:55:54 +08:00
commit 475f96d00a
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java
View File

@ -3,6 +3,7 @@ package cn.lili.modules.order.cart.entity.vo;
import cn.lili.modules.distribution.entity.dos.DistributionGoods; import cn.lili.modules.distribution.entity.dos.DistributionGoods;
import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
import cn.lili.modules.promotion.tools.PromotionTools; import cn.lili.modules.promotion.tools.PromotionTools;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -89,6 +90,12 @@ public class CartSkuVO extends CartBase implements Serializable {
@ApiModelProperty(value = "购物车类型") @ApiModelProperty(value = "购物车类型")
private CartTypeEnum cartType; private CartTypeEnum cartType;
/**
* @see DeliveryMethodEnum
*/
@ApiModelProperty(value = "配送方式")
private String deliveryMethod;
/** /**
* 在构造器里初始化促销列表，规格列表 * 在构造器里初始化促销列表，规格列表
*/ */

1
framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java
View File

@ -81,6 +81,7 @@ public class CartVO extends CartBase implements Serializable {
public CartVO(CartSkuVO cartSkuVO) { public CartVO(CartSkuVO cartSkuVO) {
this.setStoreId(cartSkuVO.getStoreId()); this.setStoreId(cartSkuVO.getStoreId());
this.setStoreName(cartSkuVO.getStoreName()); this.setStoreName(cartSkuVO.getStoreName());
this.setDeliveryMethod(cartSkuVO.getDeliveryMethod());
this.setSkuList(new ArrayList<>()); this.setSkuList(new ArrayList<>());
this.setCouponList(new ArrayList<>()); this.setCouponList(new ArrayList<>());
this.setGiftList(new ArrayList<>()); this.setGiftList(new ArrayList<>());

7
framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
View File

@ -492,12 +492,11 @@ public class CartServiceImpl implements CartService {
if (CharSequenceUtil.isNotEmpty(way)) { if (CharSequenceUtil.isNotEmpty(way)) {
cartTypeEnum = CartTypeEnum.valueOf(way); cartTypeEnum = CartTypeEnum.valueOf(way);
} }
TradeDTO tradeDTO = this.getCheckedTradeDTO(cartTypeEnum); TradeDTO tradeDTO = this.readDTO(cartTypeEnum);
for (CartVO cartVO : tradeDTO.getCartList()) { for (CartSkuVO cartSkuVO : tradeDTO.getSkuList()) {
cartVO.setDeliveryMethod(DeliveryMethodEnum.valueOf(deliveryMethod).name()); cartSkuVO.setDeliveryMethod(DeliveryMethodEnum.valueOf(deliveryMethod).name());
} }
this.resetTradeDTO(tradeDTO); this.resetTradeDTO(tradeDTO);
TradeDTO neTradeDTO = (TradeDTO) cache.get(this.getOriginKey(cartTypeEnum));
} }
/** /**