|
|
@@ -2190,7 +2190,7 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
}
|
|
|
goods.setB2cDeliveryDemMaxTime((short) (delayTime3.get(0).getMaxTime() + Short.valueOf(goods.getSelfDeliveryDemMaxTime() == null ? 0 : goods.getSelfDeliveryDemMaxTime())));
|
|
|
goods.setB2cDeliveryDemMinTime((short) (delayTime3.get(0).getMinTime() + Short.valueOf(goods.getSelfDeliveryDemMinTime() == null ? 0 : goods.getSelfDeliveryDemMinTime())));
|
|
|
- goods.setB2cMaxDelivery((short) (delayTime3.get(0).getMinTime() + Short.valueOf(goods.getMaxDelivery() == null ? 0 : goods.getMaxDelivery())));
|
|
|
+ goods.setB2cMaxDelivery((short) (delayTime3.get(0).getMaxTime() + Short.valueOf(goods.getMaxDelivery() == null ? 0 : goods.getMaxDelivery())));
|
|
|
goods.setB2cMinDelivery((short) (delayTime3.get(0).getMinTime() + Short.valueOf(goods.getMinDelivery() == null ? 0 : goods.getMinDelivery())));
|
|
|
}
|
|
|
if (goods.getCurrencyName().indexOf("USD") > -1) {
|
|
|
@@ -2200,7 +2200,7 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
}
|
|
|
goods.setB2cDeliveryHKMaxTime((short) (delayTime1.get(0).getMaxTime() + Short.valueOf(goods.getSelfDeliveryHKMaxTime() == null ? 0 : goods.getSelfDeliveryHKMaxTime())));
|
|
|
goods.setB2cDeliveryHKMinTime((short) (delayTime1.get(0).getMinTime() + Short.valueOf(goods.getSelfDeliveryHKMinTime() == null ? 0 : goods.getSelfDeliveryHKMinTime())));
|
|
|
- goods.setB2cMaxDelivery((short) (delayTime1.get(0).getMinTime() + Short.valueOf(goods.getMaxDelivery() == null ? 0 : goods.getMaxDelivery())));
|
|
|
+ goods.setB2cMaxDelivery((short) (delayTime1.get(0).getMaxTime() + Short.valueOf(goods.getMaxDelivery() == null ? 0 : goods.getMaxDelivery())));
|
|
|
goods.setB2cMinDelivery((short) (delayTime1.get(0).getMinTime() + Short.valueOf(goods.getMinDelivery() == null ? 0 : goods.getMinDelivery())));
|
|
|
}
|
|
|
} else { //如果是店铺自营
|