ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit 2d5872d0bf3eb36bfc24c10190a89eb10e8eb216 2 parents 56003b5a 15109d03

Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8

Inline Side-by-side
Showing 4 changed files with 14 additions and 1 deletions
... ... @@ -207,7 +207,7 @@ public class BuyerOrderChangeBusinessPostProcessor {
logger.info("[{}] notify resource to clear user cache", uid);
try {
String url = baseServiceCaller.getYohoGatewayUrl() + "?method=app.resources.clearUserCache&&client_type=h5&uid=" + uid;
String url = baseServiceCaller.getYohoGatewayUrl() + "?method=app.resources.clearUserCache&client_type=h5&uid=" + uid;
baseServiceCaller.proxyPost("app.resources.clearUserCache", url, null);
} catch (Exception ex) {
logger.error("clear user cache for resource,uid:{}", uid, ex);
... ...
... ... @@ -225,6 +225,12 @@ public class ProductServiceImpl implements ProductService {
BigDecimal hkLeastPrice = hkLeastPriceList.stream().min((p1, p2) -> (p1.compareTo(p2))).get();
productInfo.setHkLeastPrice(hkLeastPrice);
}
List<BigDecimal> flashLeastPriceList = goodsSizes.stream().map(GoodsSize::getFlashLeastPrice).filter(Objects::nonNull).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(flashLeastPriceList)) {
BigDecimal flashLeastPrice = flashLeastPriceList.stream().min((p1, p2) -> (p1.compareTo(p2))).get();
productInfo.setFlashLeastPrice(flashLeastPrice);
}
goodsSizes.sort(Comparator.comparing(GoodsSize::getOrderBy));
List<JSONObject> otherAddSizeList = getOtherSizeList(product.getMaxSortId(), product.getMidSortId(), goodsSizes);
... ... @@ -978,6 +984,8 @@ public class ProductServiceImpl implements ProductService {
storagePriceSecond = storagePriceSecondOld;
}
StoragePrice storagePriceFlash = storagePriceMap.get(storage.getId() + "_3_0");//大陆闪购
GoodsSize goodsSize = new GoodsSize();
goodsSize.setId(storage.getId());
goodsSize.setSizeId(storage.getSizeId());
... ... @@ -1017,6 +1025,11 @@ public class ProductServiceImpl implements ProductService {
goodsSize.setHkStatus(storagePriceHk == null ? null : storagePriceHk.getStatus());
goodsSize.setHkSkup(storagePriceHk == null ? null : storagePriceHk.getSkup());
goodsSize.setHkStorageNum(goodsSize.getHkSkup() == null || goodsSize.getHkSkup() == 0 ? 0: 1);
goodsSize.setFlashLeastPrice(storagePriceFlash == null ? null : storagePriceFlash.getPrice());
goodsSize.setFlashStatus(storagePriceFlash == null ? null : storagePriceFlash.getStatus());
goodsSize.setFlashSkup(storagePriceFlash == null ? null : storagePriceFlash.getSkup());
goodsSize.setFlashStorageNum(goodsSize.getFlashSkup() == null || goodsSize.getFlashSkup() == 0 ? 0: 1);
}
}
}
... ...