|
|
@@ -3193,7 +3193,7 @@ public class KwtLogisticsConsignmentService {
|
|
|
logisticsOrderResp.setGoodsId(String.valueOf(goods.getGoodsId()));
|
|
|
Map<String, String> goodsTypeMap = dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), new HashMap<>());
|
|
|
Map<String, String> goodsSpecMap = dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.GOODS_SPEC.getType(), new HashMap<>());
|
|
|
- logisticsOrderResp.setGoodsName(kwpGoods.getName() + "/" + goodsTypeMap.getOrDefault(kwpGoods.getGoodsType(), "") + "/" + goodsSpecMap.getOrDefault(kwpGoods.getSpec(), ""));
|
|
|
+ logisticsOrderResp.setGoodsName(goodsSpecMap.getOrDefault(kwpGoods.getSpec(), ""));
|
|
|
}
|
|
|
logisticsOrderResp.setTransportPrice((Objects.nonNull(kwtLogisticsOrder.getPrice()) ? kwtLogisticsOrder.getPrice().setScale(2,
|
|
|
RoundingMode.HALF_UP).toPlainString() : "0.00") + priceUnit);
|
|
|
@@ -3732,7 +3732,7 @@ public class KwtLogisticsConsignmentService {
|
|
|
if (Objects.nonNull(kwpGoods)) {
|
|
|
Map<String, String> goodsTypeMap = dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), new HashMap<>());
|
|
|
Map<String, String> goodsSpecMap = dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.GOODS_SPEC.getType(), new HashMap<>());
|
|
|
- goodsInfoVO.setGoodsName(kwpGoods.getName() + "/" + goodsTypeMap.getOrDefault(kwpGoods.getGoodsType(), "") + "/" + goodsSpecMap.getOrDefault(kwpGoods.getSpec(), ""));
|
|
|
+ goodsInfoVO.setGoodsName(goodsSpecMap.getOrDefault(kwpGoods.getSpec(), ""));
|
|
|
priceUnit = kwpGoods.getPriceUnit();
|
|
|
}
|
|
|
goodsInfoVO.setUnitPrice((Objects.nonNull(logisticsOrder.getPrice()) ? logisticsOrder.getPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + "元");
|