Merge branch 'feature/2020-1104-混合支付' into qa

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -144,7 +144,7 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
     /**
      * svc卡支付金额
      */
-    private Integer svcPayAmount;
+    private String svcPayAmount;
 
     /**
      * 各类券信息

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

@@ -1664,8 +1664,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             deliveryAmount = shoppingCartGoodsResponseVo.getDiscountDeliveryAmount().intValue();
             orderAmount += deliveryAmount;
         }
-        log.info("svcPrice:totalAmount:{},orderAmount:{},deliveryAmount:{}",shoppingCartGoodsResponseVo.getTotalAmount().intValue(),orderAmount,deliveryAmount);
-
         if (svcTotalAmount>0 && svcTotalAmount>orderAmount) {
             svcPayAmount = orderAmount;
             shoppingCartGoodsResponseVo.setTotalAmount(0L);
@@ -1686,8 +1684,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsResponseVo.setTotalAmount(deliveryAmount.longValue());
         }
          */
-        shoppingCartGoodsResponseVo.setSvcPayAmount(svcPayAmount/100);
-        shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + svcPayAmount/100);
+        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);