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

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

@@ -1639,7 +1639,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (StringUtils.isBlank(cardCode)) {
             return;
         }
-        Integer orderAmount = shoppingCartGoodsResponseVo.getTotalAmount().intValue();
+        Integer orderAmount = shoppingCartGoodsResponseVo.getTotalAmount().intValue()*100;
         String trackingNo = LogThreadLocal.getTrackingNo();
         SVCCardAmountRequest request = new SVCCardAmountRequest();
         request.setPartnerId(partnerId);
@@ -1672,7 +1672,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         else if (svcTotalAmount>0 && svcTotalAmount<=orderAmount) {
             svcPayAmount = svcTotalAmount;
-            shoppingCartGoodsResponseVo.setTotalAmount(orderAmount.longValue()-svcPayAmount.longValue());
+            shoppingCartGoodsResponseVo.setTotalAmount((orderAmount.longValue()-svcPayAmount.longValue())/100);
         }
         /**
         BigDecimal svcPayAmount = BigDecimal.ZERO;
@@ -1686,8 +1686,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsResponseVo.setTotalAmount(deliveryAmount.longValue());
         }
          */
-        shoppingCartGoodsResponseVo.setSvcPayAmount(svcPayAmount);
-        shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + svcPayAmount);
+        shoppingCartGoodsResponseVo.setSvcPayAmount(svcPayAmount/100);
+        shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + svcPayAmount/100);
         //BigDecimal bigDecimal = new BigDecimal(orderAmount);
         //String amountStr = bigDecimal.divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
         //shoppingCartGoodsResponseVo.setTotalAmount(0L);