diff --git a/src/main/java/com/rnt/controller/WeixinPayController.java b/src/main/java/com/rnt/controller/WeixinPayController.java index 4defa9c..22f7a05 100644 --- a/src/main/java/com/rnt/controller/WeixinPayController.java +++ b/src/main/java/com/rnt/controller/WeixinPayController.java @@ -225,7 +225,7 @@ public class WeixinPayController extends Controller { //到期时间字符串 setAttr("expDateStr", DateUtil.format(cardCoupons.getExpDate(), "yyyy-MM-dd")); //单价 - setAttr("cardPrice", cardCoupons.getCardPrice()); + setAttr("cardPrice", cardCoupons.getCardPrice()!=null?cardCoupons.getCardPrice().divide(new BigDecimal("100")).toString():null); //停车场名称 setAttr("parkName", parkName); diff --git a/src/main/webapp/WEB-INF/pages/card.html b/src/main/webapp/WEB-INF/pages/card.html index bb74a44..6bec866 100644 --- a/src/main/webapp/WEB-INF/pages/card.html +++ b/src/main/webapp/WEB-INF/pages/card.html @@ -3,11 +3,11 @@ 月卡年卡 - - - - - + + + + + @@ -19,172 +19,174 @@ - -
-
-

-

-
-
+ +
+
+

+

+
+
- + - -
+ + diff --git a/src/main/webapp/WEB-INF/pages/monthpay.html b/src/main/webapp/WEB-INF/pages/monthpay.html index c7b8966..563bd58 100644 --- a/src/main/webapp/WEB-INF/pages/monthpay.html +++ b/src/main/webapp/WEB-INF/pages/monthpay.html @@ -101,9 +101,10 @@ $('#parkLotName').text(parkLot.parkName); $('#parkLotCode').val(parkLot.parkNo); $('#cardTypeRemark').text(parkLot.parkCardCouponsList[0].goods_type_remark); - $('#totle_money').text(parkLot.parkCardCouponsList[0].goods_amount); + $('#totle_money').text(parkLot.parkCardCouponsList[0].goods_amount/100); $('#parkLotCardId').val(parkLot.parkCardCouponsList[0].id); - $('#cardAmount').val(parkLot.parkCardCouponsList[0].goods_amount); + //将分转为元 + $('#cardAmount').val(parkLot.parkCardCouponsList[0].goods_amount/100); } else { $.alert("系统繁忙,请重新操作!"); } diff --git a/src/main/webapp/WEB-INF/pages/pay.html b/src/main/webapp/WEB-INF/pages/pay.html index 7551a0f..fcb2202 100644 --- a/src/main/webapp/WEB-INF/pages/pay.html +++ b/src/main/webapp/WEB-INF/pages/pay.html @@ -159,8 +159,9 @@ $('#buyNum').text(order.buyNum); $('#startDate').text(order.startDate); $('#endDate').text(order.endDate); - $('#totalAmount').text(order.totleMoney); - totleMoney = order.totleMoney; + totleMoney = order.totleMoney/100; + $('#totalAmount').text('￥'+totleMoney); + $('#carTypeRemark').text(order.orderTypeRemark); } }); diff --git a/src/main/webapp/WEB-INF/pages/yearpay.html b/src/main/webapp/WEB-INF/pages/yearpay.html index 366ad87..bddd3ea 100644 --- a/src/main/webapp/WEB-INF/pages/yearpay.html +++ b/src/main/webapp/WEB-INF/pages/yearpay.html @@ -99,9 +99,10 @@ var func = { $('#totle_money').empty(); $('#parkLotName').text(parkLot.parkName); $('#cardTypeRemark').text(parkLot.parkCardCouponsList[0].goods_type_remark); - $('#totle_money').text(parkLot.parkCardCouponsList[0].goods_amount); + $('#totle_money').text(parkLot.parkCardCouponsList[0].goods_amount/100); $('#parkLotCardId').val(parkLot.parkCardCouponsList[0].id); - $('#cardAmount').val(parkLot.parkCardCouponsList[0].goods_amount); + //将分转为元 + $('#cardAmount').val(parkLot.parkCardCouponsList[0].goods_amount/100); }else{ $.alert("系统繁忙,请重新操作!"); } diff --git a/src/main/webapp/static/js/srcjs/mylist.js b/src/main/webapp/static/js/srcjs/mylist.js index 6a3c9e7..4ccf240 100644 --- a/src/main/webapp/static/js/srcjs/mylist.js +++ b/src/main/webapp/static/js/srcjs/mylist.js @@ -51,7 +51,8 @@ success: function(res){ if(res.code == '8888'){ var numStr = res.data.numStr; - $("#cardNum").html('共'+numStr+'张'); + var num = res.data.num; + $("#cardNum").html('共'+num+'张'); }else{ $.toptip('获取停车场卡卷数量失败，请重试!', 2000, 'error'); }