sunyu::update::fix bug about copyOrder

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -407,9 +407,9 @@ public class CalculationServiceImpl {
         long totalPackgeAmount = 0L;
         for (CartGoods cartGoods : cartGoodsList) {
             // 设置商品原价与商品现价的初始值
-            long originalAmount = cartGoods.getOriginalPrice() * cartGoods.getQty();
-            long amount = cartGoods.getOriginalPrice() * cartGoods.getQty();
-            long packAmount = cartGoods.getPackPrice() * cartGoods.getQty();
+            long originalAmount = (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty();
+            long amount =  (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty();
+            long packAmount =  (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty();
             totalOriginalAmount += originalAmount;
             totalAmount += amount;
             totalPackgeAmount += packAmount;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java

@@ -58,6 +58,7 @@ public class TimeSaleCalculation {
         Map<String, Integer> numberMap = new HashMap<>();
         List<Integer> discounts = Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode(),ActivityTypeEnum.TYPE_23.getCode());
         for (CartGoods cartGoods : cartGoodsList) {
+            cartGoods.setOriginalPrice( null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0);
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods goods;
             if ((goods = goodsMap.get(cartGoods.getGoodsId())) == null) {
                 continue;