删掉注释

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -1656,26 +1656,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             svcPayAmount = svcTotalAmount;
             shoppingCartGoodsResponseVo.setTotalAmount((orderAmount.longValue()-svcPayAmount.longValue()));
         }
-        /**
-        BigDecimal svcPayAmount = BigDecimal.ZERO;
-        if (orderAmount >= amount1 + vamount) {
-            //throw new ServiceException(ResponseResult.USER_SVC_CARD_AMOUNT_DEFICIENCY);
-            svcPayAmount = new BigDecimal(amount1 + vamount).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
-            shoppingCartGoodsResponseVo.setTotalAmount(orderAmount - svcPayAmount.multiply(new BigDecimal(100)).longValue());
-        }
-        else {
-            svcPayAmount = new BigDecimal(orderAmount - deliveryAmount).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
-            shoppingCartGoodsResponseVo.setTotalAmount(deliveryAmount.longValue());
-        }
-         */
         BigDecimal bigDecimal = new BigDecimal(svcPayAmount);
         String amountStr = bigDecimal.divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
         shoppingCartGoodsResponseVo.setSvcPayAmount(amountStr);
         shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + amountStr);
-        //BigDecimal bigDecimal = new BigDecimal(orderAmount);
-        //String amountStr = bigDecimal.divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
-        //shoppingCartGoodsResponseVo.setTotalAmount(0L);
-        //shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + amountStr);
     }
 
     /**