提交 db8a132e authored 作者: Whispa's avatar Whispa

improvements

上级 4122a092
...@@ -75,6 +75,7 @@ public class OrderController extends Controller { ...@@ -75,6 +75,7 @@ public class OrderController extends Controller {
record.setCartRecordId(IdUtil.createIdbyUUID()); record.setCartRecordId(IdUtil.createIdbyUUID());
record.setItemSku(itemSku); record.setItemSku(itemSku);
record.setItemSkuId(itemSkuId); record.setItemSkuId(itemSkuId);
record.setItemCount( item.getItemCount() == null ? 0 : item.getItemCount().intValue());
record.setTemplate(item.getExpress()); record.setTemplate(item.getExpress());
record.setItemTitle(item.getItemName()); record.setItemTitle(item.getItemName());
record.setItemPrice(price); record.setItemPrice(price);
...@@ -109,8 +110,9 @@ public class OrderController extends Controller { ...@@ -109,8 +110,9 @@ public class OrderController extends Controller {
Optional<TbCfExpressTemplate> templateOptional = templateRepository.findFirstByIsDefault(1); Optional<TbCfExpressTemplate> templateOptional = templateRepository.findFirstByIsDefault(1);
templateOptional.ifPresent(order::setDefaultTemplate); templateOptional.ifPresent(order::setDefaultTemplate);
int code = ResultCodeEnum.SERVICE_ERROR.getCode();
if (StringUtils.isBlank(itemId) || itemNum == null || itemNum <= 0 || itemSkuId == null || itemSkuId.trim().isEmpty()) if (StringUtils.isBlank(itemId) || itemNum == null || itemNum <= 0 || itemSkuId == null || itemSkuId.trim().isEmpty())
return new Result<>(ResultCodeEnum.SERVICE_ERROR.getCode(), "Missing information !"); return new Result<>(code, "Missing information !");
Optional<TbCfStationItem> byId = itemRepository.findById(itemId); Optional<TbCfStationItem> byId = itemRepository.findById(itemId);
...@@ -118,11 +120,11 @@ public class OrderController extends Controller { ...@@ -118,11 +120,11 @@ public class OrderController extends Controller {
if (!byId.isPresent()) if (!byId.isPresent())
return new Result<>(ResultCodeEnum.SERVICE_ERROR.getCode(), "Item not found !"); return new Result<>(code, "Item not found !");
if (!skuOptional.isPresent()) if (!skuOptional.isPresent())
return new Result<>(ResultCodeEnum.SERVICE_ERROR.getCode(), "Sku not found !"); return new Result<>(code, "Sku not found !");
TbCfStationItem item = byId.get(); TbCfStationItem item = byId.get();
...@@ -131,6 +133,13 @@ public class OrderController extends Controller { ...@@ -131,6 +133,13 @@ public class OrderController extends Controller {
BigDecimal orderPrice = itemSkus.getSkuPrice().multiply(new BigDecimal(itemNum)); BigDecimal orderPrice = itemSkus.getSkuPrice().multiply(new BigDecimal(itemNum));
Map<String, Object> map = queryUserAvailableCoupons(orderPrice); Map<String, Object> map = queryUserAvailableCoupons(orderPrice);
list.add(getCart(item, itemSku, itemNum, itemSkus.getSkuPrice(), itemSkuId, itemSkus.getSkuImg())); list.add(getCart(item, itemSku, itemNum, itemSkus.getSkuPrice(), itemSkuId, itemSkus.getSkuImg()));
//Check that one of items in the cart run out of stock
//Check whether the inventory is greater than the purchased quantity before placing an order
boolean anyMatch = list.stream().anyMatch(TbCfCartRecordR::isOutOfStock);
if( anyMatch ) return new Result<>(code, "Items run out of stock");
order.setCouponId(toitableId); order.setCouponId(toitableId);
if (toitableId != null && !toitableId.isEmpty()) { if (toitableId != null && !toitableId.isEmpty()) {
......
...@@ -115,6 +115,10 @@ public class TbCfCartRecordR { ...@@ -115,6 +115,10 @@ public class TbCfCartRecordR {
this.itemSkuId = itemSkuId; this.itemSkuId = itemSkuId;
} }
public void setItemCount(Integer itemCount) {
this.itemCount = itemCount;
}
public void setItemImg(String itemImg) { public void setItemImg(String itemImg) {
this.itemImg = itemImg; this.itemImg = itemImg;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论