xucaiqin 3 tygodni temu
rodzic
commit
f2bac5c0b9

+ 4 - 2
sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -1944,7 +1944,7 @@ public class KwoTradeOrderService {
         kwoTradeOrderGoods.setGoodsId(tradeOrderParam.getGoodsId());
         kwoTradeOrderGoods.setGoodsType(goodsById.getGoodsType());
         kwoTradeOrderGoods.setSkuId(goodsInfoDto.getSkuId());
-        kwoTradeOrderGoods.setUnit(goodsInfoDto.getUnit());
+        kwoTradeOrderGoods.setUnit(goodsById.getUnit());
         kwoTradeOrderGoods.setUnitPrice(goodsInfoDto.getPrice());
         kwoTradeOrderGoods.setPriceRangeId(0L);//
         kwoTradeOrderGoods.setGoodsName(goodsById.getName());
@@ -2081,7 +2081,7 @@ public class KwoTradeOrderService {
         if (Objects.isNull(goodsInfoDto)) {
             throw new BusinessException("当前贸易订单不存在交易商品");
         }
-        order.setUnit(goodsInfoDto.getUnit());
+        order.setUnit(goodsById.getUnit());
         order.setPickupType(String.valueOf(tradeContractResDto.getConsignment()));//来源于合同约束的托运方式
         order.setDeliveryType("");
         order.setTrading(String.valueOf(tradeContractResDto.getSigningWay()));//签约方式
@@ -2359,6 +2359,8 @@ public class KwoTradeOrderService {
         addLogisticOrderParam.setGoodsType(byOrderId.getGoodsType());
         addLogisticOrderParam.setGoodsPrice(byOrderId.getUnitPrice());
         Map<String, String> map = dict.get(DictTypeEnum.UNIT_TYPE.getType());
+        log.info("map {}", map);
+        log.info("byOrderId {}", JSONObject.toJSONString(byOrderId));
         if (CollUtil.isNotEmpty(map)) {
             addLogisticOrderParam.setGoodsUnit(map.get(byOrderId.getUnit()));
         }