订单库存bug

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityProductBiz.java

@@ -63,9 +63,14 @@ public class ActivityProductBiz extends BaseBiz<ActivityProductMapper, ActivityP
 		ActivityProduct oldValue = selectById(activityProduct.getId());
 		if (oldValue != null) { //增加销量，减少库存
 			oldValue.setSales(oldValue.getSales() + activityProduct.getSales());
+			if (oldValue.getStock() > 0) {
 				oldValue.setStock(oldValue.getStock() - activityProduct.getSales());
 				updateSelectiveByIdRe(oldValue);
 				return ObjectRestResponse.succ(oldValue);
+			} else {
+				return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "库存不足");
+			}
+
 		} else {
 			return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "商品不存在！");
 		}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityProductSpecsBiz.java

@@ -57,10 +57,15 @@ public class ActivityProductSpecsBiz extends BaseBiz<ActivityProductSpecsMapper,
 		}
 		ActivityProductSpecs oldValue = selectById(activityProductSpecs.getId());
 		if (oldValue != null) { //增加销量，减少库存
+			if (oldValue.getStock() > 0) {
 				oldValue.setSales(oldValue.getSales() + activityProductSpecs.getSales());
 				oldValue.setStock(oldValue.getStock() - activityProductSpecs.getSales());
 				updateSelectiveByIdRe(oldValue);
 				return ObjectRestResponse.succ(oldValue);
+			} else {
+				return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "库存不足");
+			}
+
 		} else {
 			return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "商品不存在！");
 		}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderActivityService.java

@@ -68,6 +68,7 @@ public class OrderActivityService extends AbstractOrderHandle<OrderActivityDetai
 		if (activityProductSpecs != null) {
 			bo.getOrder().setGoodsAmount(activityProductSpecs.getGoodsPrice());
 			//修改规格库存
+			if (activityProductSpecs.getStock() > 0) {
 				activityProductSpecs.setSales(bo.getNumber());
 				activityFeign.update(activityProductSpecs);
 
@@ -78,6 +79,8 @@ public class OrderActivityService extends AbstractOrderHandle<OrderActivityDetai
 				activityFeign.updateProduct(activityProduct);
 			}
 
+		}
+
 		//发送定时取消订单(30分钟)
 		rabbitProduct.sendDelayMessage(bo.getOrder(), autoCancelTime);
 	}