|
@@ -190,11 +190,11 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public Boolean placeRefundSmallOrder(OrderGoodsRefundAddBo bo) {
|
|
public Boolean placeRefundSmallOrder(OrderGoodsRefundAddBo bo) {
|
|
- if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getOrderSn())){
|
|
|
|
|
|
+ if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getOrderSn())||Validator.isEmpty(bo.getOrderGoodsId())){
|
|
throw new CustomException("参数缺失");
|
|
throw new CustomException("参数缺失");
|
|
}
|
|
}
|
|
OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn,bo.getOrderSn())
|
|
OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn,bo.getOrderSn())
|
|
- .eq(OrderGoods::getGoodsId, bo.getGoodsId()));
|
|
|
|
|
|
+ .eq(OrderGoods::getGoodsId, bo.getGoodsId()).eq(OrderGoods::getOrderGoodsId, bo.getOrderGoodsId()));
|
|
if(Validator.isEmpty(orderGoods)){
|
|
if(Validator.isEmpty(orderGoods)){
|
|
throw new CustomException("订单商品数据错误");
|
|
throw new CustomException("订单商品数据错误");
|
|
}
|
|
}
|
|
@@ -352,11 +352,11 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public Boolean placeRefundInputOrder(List<OrderGoodsRefundAddBo> bos) {
|
|
public Boolean placeRefundInputOrder(List<OrderGoodsRefundAddBo> bos) {
|
|
for(OrderGoodsRefundAddBo bo : bos){
|
|
for(OrderGoodsRefundAddBo bo : bos){
|
|
- if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getOrderSn())){
|
|
|
|
|
|
+ if(Validator.isEmpty(bo.getGoodsId())||Validator.isEmpty(bo.getOrderSn())||Validator.isEmpty(bo.getOrderGoodsId())){
|
|
throw new CustomException("参数缺失");
|
|
throw new CustomException("参数缺失");
|
|
}
|
|
}
|
|
OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn,bo.getOrderSn())
|
|
OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn,bo.getOrderSn())
|
|
- .eq(OrderGoods::getGoodsId, bo.getGoodsId()));
|
|
|
|
|
|
+ .eq(OrderGoods::getGoodsId, bo.getGoodsId()).eq(OrderGoods::getOrderGoodsId, bo.getOrderGoodsId()));
|
|
if(Validator.isEmpty(orderGoods)){
|
|
if(Validator.isEmpty(orderGoods)){
|
|
throw new CustomException("订单商品数据错误");
|
|
throw new CustomException("订单商品数据错误");
|
|
}
|
|
}
|