Merge branch 'master-order' into dev

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

@@ -63,7 +63,7 @@ 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) {
+			if (oldValue.getStock() > 0 || activityProduct.getSales() < 0) {
 				oldValue.setStock(oldValue.getStock() - activityProduct.getSales());
 				updateSelectiveByIdRe(oldValue);
 				return ObjectRestResponse.succ(oldValue);

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

@@ -57,7 +57,7 @@ public class ActivityProductSpecsBiz extends BaseBiz<ActivityProductSpecsMapper,
 		}
 		ActivityProductSpecs oldValue = selectById(activityProductSpecs.getId());
 		if (oldValue != null) { //增加销量，减少库存
-			if (oldValue.getStock() > 0) {
+			if (oldValue.getStock() > 0 || activityProductSpecs.getSales() < 0) {
 				oldValue.setSales(oldValue.getSales() + activityProductSpecs.getSales());
 				oldValue.setStock(oldValue.getStock() - activityProductSpecs.getSales());
 				updateSelectiveByIdRe(oldValue);