|
|
@@ -435,39 +435,7 @@ public class OrderCommonService {
|
|
|
} else {
|
|
|
arrList.add(3);
|
|
|
}
|
|
|
- // 冷链运输费 -- 联合丽格
|
|
|
- if (null != shopOrder.getIsColdChina() && 1 == shopOrder.getIsColdChina()) {
|
|
|
- shopOrder.setColdChina(baseMapper.getFreightAmount(7578));
|
|
|
- } else {
|
|
|
- shopOrder.setColdChina(0.00d);
|
|
|
- }
|
|
|
- // 拼接运费信息--联合丽格
|
|
|
- if (null != shopOrder.getColdChina() && null != shopOrder.getIsColdChina() && 1 == shopOrder.getIsColdChina()) {
|
|
|
- String open = "";
|
|
|
- String close = "";
|
|
|
- if (shopOrder.getIsColdChina()==1) {
|
|
|
- open = "(";
|
|
|
- close = ")";
|
|
|
- } else if (!arrList.stream().allMatch(c -> c == 1)) {
|
|
|
- open = "(";
|
|
|
- close = ")";
|
|
|
- } else {
|
|
|
- open = "";
|
|
|
- close = "";
|
|
|
- }
|
|
|
- if (2 == shopOrder.getShopPostFlag()) {
|
|
|
- // 到付
|
|
|
- shopOrder.setPostageInfo("￥" + shopOrder.getShopPostFee() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina():"") + (arrList.stream().allMatch(c -> c == 1)?"":" 其他: 到付")+close);
|
|
|
- } else if (0 == shopOrder.getShopPostFlag()) {
|
|
|
- // 包邮
|
|
|
- shopOrder.setPostageInfo("￥" + shopOrder.getShopPostFee() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina():"") + (arrList.stream().allMatch(c -> c == 1)?"":" 其他: 包邮")+close);
|
|
|
- } else {
|
|
|
- // 有运费
|
|
|
- shopOrder.setPostageInfo("￥" + shopOrder.getShopPostFee() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina():"") + ((shopOrder.getShopPostFee() != null && shopOrder.getShopPostFee() != 0d)?" 其他: ￥" + MathUtil.sub(shopOrder.getShopPostFee(), shopOrder.getColdChina()):"") + close);
|
|
|
- }
|
|
|
- } else {
|
|
|
- shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == 2?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee());
|
|
|
- }
|
|
|
+ shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == 2?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee());
|
|
|
}
|
|
|
|
|
|
/**
|
