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

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
lifenlong 2021-05-21 16:43:53 +08:00
commit 2728cb1843
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java
View File

@ -11,6 +11,7 @@ import cn.lili.modules.store.entity.dto.FreightTemplateChildDTO;
import cn.lili.modules.store.entity.enums.FreightTemplateEnum; import cn.lili.modules.store.entity.enums.FreightTemplateEnum;
import cn.lili.modules.store.entity.vos.FreightTemplateVO; import cn.lili.modules.store.entity.vos.FreightTemplateVO;
import cn.lili.modules.store.service.FreightTemplateService; import cn.lili.modules.store.service.FreightTemplateService;
import com.xkcoding.http.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -43,8 +44,8 @@ public class SkuFreightRender implements CartRenderStep {
forSku: forSku:
for (CartSkuVO cartSkuVO : cartSkuVOS) { for (CartSkuVO cartSkuVO : cartSkuVOS) {
String freightTemplateId = cartSkuVO.getGoodsSku().getFreightTemplateId(); String freightTemplateId = cartSkuVO.getGoodsSku().getFreightTemplateId();
//如果商品设置卖家承担运费，则跳出计算 //如果商品设置卖家承担运费,或者没设置运费，则跳出此商品运费计算
if (cartSkuVO.getFreightPayer().equals("STORE")) { if (StringUtil.isEmpty(cartSkuVO.getFreightPayer())||cartSkuVO.getFreightPayer().equals("STORE")) {
continue; continue;
} }