Merge branch 'feature/20210625-第二件优惠优惠数量'

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -358,7 +358,7 @@ public class OrderAdapter {
                         goodsStockDTO.setBenefitSeq(goods.getBenefitSeq());
                         goodsStockDTO.setGoodsId(goods.getGoodsId());
                         int stock = goods.getStock() == null ? 1 : goods.getStock();
-                        goodsStockDTO.setStock(ActivityTypeEnum.TYPE_53.getCode().equals(stockVO.getActivityType()) ? 1 : stock);
+                        goodsStockDTO.setStock(stock);
                         goodsStockDTOS.add(goodsStockDTO);
                     });
                     stockBeanDto.setGoodsStock(goodsStockDTOS);
@@ -886,7 +886,7 @@ public class OrderAdapter {
                         goodsStockDTO.setBenefitSeq(goods.getBenefitSeq());
                         goodsStockDTO.setGoodsId(goods.getGoodsId());
                         int stock = goods.getStock() == null ? 1 : goods.getStock();
-                        goodsStockDTO.setStock(ActivityTypeEnum.TYPE_53.getCode().equals(stockVO.getActivityType()) ? 1 : stock);
+                        goodsStockDTO.setStock(stock);
                         goodsStockDTOS.add(goodsStockDTO);
                     });
                     stockBeanDto.setGoodsStock(goodsStockDTOS);
@@ -3602,7 +3602,7 @@ public class OrderAdapter {
                         goodsStockDTO.setBenefitSeq(goods.getBenefitSeq());
                         goodsStockDTO.setGoodsId(goods.getGoodsId());
                         int stock = goods.getStock() == null ? 1 : goods.getStock();
-                        goodsStockDTO.setStock(ActivityTypeEnum.TYPE_53.getCode().equals(stockVO.getActivityType()) ? 1 : stock);
+                        goodsStockDTO.setStock(stock);
                         goodsStockDTOS.add(goodsStockDTO);
                     });
                     stockBeanDto.setGoodsStock(goodsStockDTOS);

order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java

@@ -1320,7 +1320,7 @@ public abstract class UniversalOrderService {
                         goodsStockDTO.setBenefitSeq(goods.getBenefitSeq());
                         goodsStockDTO.setGoodsId(goods.getGoodsId());
                         int stock = goods.getStock() == null ? 1 : goods.getStock();
-                        goodsStockDTO.setStock(ActivityTypeEnum.TYPE_53.getCode().equals(stockVO.getActivityType()) ? 1 : stock);
+                        goodsStockDTO.setStock(stock);
                         goodsStockDTOS.add(goodsStockDTO);
                     });
                     stockBeanDto.setGoodsStock(goodsStockDTOS);

order-application-service/src/main/java/cn/freemud/service/universal/impl/SaasMallOrderService.java

@@ -702,7 +702,7 @@ public class SaasMallOrderService extends UniversalOrderService {
                         goodsStockDTO.setBenefitSeq(goods.getBenefitSeq());
                         goodsStockDTO.setGoodsId(goods.getGoodsId());
                         int stock = goods.getStock() == null ? 1 : goods.getStock();
-                        goodsStockDTO.setStock(ActivityTypeEnum.TYPE_53.getCode().equals(stockVO.getActivityType()) ? 1 : stock);
+                        goodsStockDTO.setStock(stock);
                         goodsStockDTOS.add(goodsStockDTO);
                     });
                     stockBeanDto.setGoodsStock(goodsStockDTOS);