|
@@ -428,10 +428,10 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
// orderInfoVo.setBargainId(detailRequest.getBargainId());
|
|
|
// orderInfoVo.setBargainUserId(detailRequest.getBargainUserId());
|
|
|
// } else
|
|
|
- if (detailRequest.getCombinationId() > 0) {
|
|
|
+ if (detailRequest.getCId() > 0) {
|
|
|
// 拼团
|
|
|
detailVoList.add(validatePreOrderCombination(detailRequest, userId));
|
|
|
- orderInfoVo.setCombinationId(detailRequest.getCombinationId());
|
|
|
+ orderInfoVo.setCombinationId(detailRequest.getCId());
|
|
|
orderInfoVo.setPinkId(detailRequest.getPinkId());
|
|
|
} else {
|
|
|
// 普通商品
|
|
@@ -507,7 +507,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
*/
|
|
|
private OrderInfoDetailVO validatePreOrderCombination(PreOrderDetailRequest detailRequest, Long userId) {
|
|
|
// 拼团部分判断
|
|
|
- Long combinationId = detailRequest.getCombinationId();
|
|
|
+ Long combinationId = detailRequest.getCId();
|
|
|
StoreCombination storeCombination = storeCombinationService.getByIdException(combinationId);
|
|
|
if (storeCombination.getStock().equals(0) || detailRequest.getProductNum() > storeCombination.getStock()) {
|
|
|
throw new ServiceException("拼团商品库存不足");
|