1：处理取消订单报错的问题。

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -498,24 +498,24 @@ public class GoodsServiceImpl implements GoodsService {
 			if(resultMap.getCode() != CodeType.OK.code()) {
 				return resultMap;
 			}
-		}
-		Double reserve = goods.getReserve() + number;
-		goods.setReserve(reserve);
-		// 检查是否大于最小发货量
-		if (reserve.doubleValue() >= goods.getMinBuyQty().doubleValue()) {
-			goods.setStatus(Status.AVAILABLE.value());
-		}
+			Double reserve = goods.getReserve() + number;
+			goods.setReserve(reserve);
+			// 检查是否大于最小发货量
+			if (reserve.doubleValue() >= goods.getMinBuyQty().doubleValue()) {
+				goods.setStatus(Status.AVAILABLE.value());
+			}
 
-		goodsDao.modifyReserve(goods.getBatchCode(), goods.getUuid(), goods.getReserve(), goods.getStatus().intValue());
-		// 每次批次保存同时保存一遍历史信息
-		GoodsHistory goodsHistory = new GoodsHistory(goods);
-		goodsHistory.setOperateUU(SystemSession.getUser().getUserUU());
-		goodsHistory.setOperateDate(new Date());
-		goodsHistory.setOperateType(GoodsHistory.OperateType.ReleaseReserve.getPhrase());
-		goodsHistory.setMessage(compareGoodsHistory(goodsHistory));
-		goodsHistoryService.save(goodsHistory);
-		// 更新器件属性的库存
-		updateComponentTradeInfos(goods.getUuid());
+			goodsDao.modifyReserve(goods.getBatchCode(), goods.getUuid(), goods.getReserve(), goods.getStatus().intValue());
+			// 每次批次保存同时保存一遍历史信息
+			GoodsHistory goodsHistory = new GoodsHistory(goods);
+			goodsHistory.setOperateUU(SystemSession.getUser().getUserUU());
+			goodsHistory.setOperateDate(new Date());
+			goodsHistory.setOperateType(GoodsHistory.OperateType.ReleaseReserve.getPhrase());
+			goodsHistory.setMessage(compareGoodsHistory(goodsHistory));
+			goodsHistoryService.save(goodsHistory);
+			// 更新器件属性的库存
+			updateComponentTradeInfos(goods.getUuid());
+		}
 		return ResultMap.success(goods);
 	}