Commit 868dbcd31c10dbbf957fb5ccad2fa58f7ef0f325
1 parent
1b8be02a
提交金额修改
Showing
2 changed files
with
4 additions
and
5 deletions
src/main/java/com/rnt/controller/ParkLotController.java
@@ -26,7 +26,6 @@ import com.rnt.vo.ParkLotCardVO; | @@ -26,7 +26,6 @@ import com.rnt.vo.ParkLotCardVO; | ||
26 | import com.rnt.vo.ParkLotListVO; | 26 | import com.rnt.vo.ParkLotListVO; |
27 | import com.rnt.vo.PsersonCustCardVO; | 27 | import com.rnt.vo.PsersonCustCardVO; |
28 | import com.xiaoleilu.hutool.date.DateUtil; | 28 | import com.xiaoleilu.hutool.date.DateUtil; |
29 | -import org.beetl.sql.core.kit.StringKit; | ||
30 | 29 | ||
31 | /** | 30 | /** |
32 | * Copyright: Copyright (c) 2017 zteits | 31 | * Copyright: Copyright (c) 2017 zteits |
@@ -92,7 +91,7 @@ public class ParkLotController extends Controller { | @@ -92,7 +91,7 @@ public class ParkLotController extends Controller { | ||
92 | 91 | ||
93 | public void parkListView() { | 92 | public void parkListView() { |
94 | this.getResponse().setHeader("Access-Control-Allow-Origin", "*"); | 93 | this.getResponse().setHeader("Access-Control-Allow-Origin", "*"); |
95 | - logger.info("获取到的微信用户为:wxuser="+ JSONObject.toJSONString(TLWXUser.getWXUser())); | 94 | + logger.info("获取到的微信用户为:wxuser=" + JSONObject.toJSONString(TLWXUser.getWXUser())); |
96 | setAttr("openId", TLWXUser.getOpenId()); | 95 | setAttr("openId", TLWXUser.getOpenId()); |
97 | render("mylist.html"); | 96 | render("mylist.html"); |
98 | } | 97 | } |
@@ -182,13 +181,11 @@ public class ParkLotController extends Controller { | @@ -182,13 +181,11 @@ public class ParkLotController extends Controller { | ||
182 | String carNum = this.getPara("carNum"); | 181 | String carNum = this.getPara("carNum"); |
183 | String parkCardId = this.getPara("parkCardId"); //停车场卡券id | 182 | String parkCardId = this.getPara("parkCardId"); //停车场卡券id |
184 | PersonCardCouponsService personCardCouponsService = Duang.duang(PersonCardCouponsService.class); | 183 | PersonCardCouponsService personCardCouponsService = Duang.duang(PersonCardCouponsService.class); |
185 | - | ||
186 | PsersonCustCardVO psersonCustCardVO = new PsersonCustCardVO(); | 184 | PsersonCustCardVO psersonCustCardVO = new PsersonCustCardVO(); |
187 | psersonCustCardVO.setCarNumber(carNum); | 185 | psersonCustCardVO.setCarNumber(carNum); |
188 | psersonCustCardVO.setParkCardId(parkCardId); | 186 | psersonCustCardVO.setParkCardId(parkCardId); |
189 | String perSonCardId = personCardCouponsService.queryPsersonCard(psersonCustCardVO); | 187 | String perSonCardId = personCardCouponsService.queryPsersonCard(psersonCustCardVO); |
190 | - | ||
191 | - result.setData(perSonCardId); | 188 | + result.setData(perSonCardId); |
192 | 189 | ||
193 | this.renderJson(result); | 190 | this.renderJson(result); |
194 | } | 191 | } |
src/main/java/com/rnt/controller/WeixinPayController.java
@@ -376,6 +376,7 @@ public class WeixinPayController extends Controller { | @@ -376,6 +376,7 @@ public class WeixinPayController extends Controller { | ||
376 | Calendar calendar = Calendar.getInstance(); | 376 | Calendar calendar = Calendar.getInstance(); |
377 | calendar.setTime(date); | 377 | calendar.setTime(date); |
378 | calendar.add(Calendar.MONTH, Integer.parseInt(cardBuyVO.getBuyNum())); | 378 | calendar.add(Calendar.MONTH, Integer.parseInt(cardBuyVO.getBuyNum())); |
379 | + calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 1); | ||
379 | Date resultDate = calendar.getTime(); | 380 | Date resultDate = calendar.getTime(); |
380 | logger.info("前端结束时间=" + cardBuyVO.getEndDate()); | 381 | logger.info("前端结束时间=" + cardBuyVO.getEndDate()); |
381 | cardBuyVO.setEndDate(format.format(resultDate)); | 382 | cardBuyVO.setEndDate(format.format(resultDate)); |
@@ -386,6 +387,7 @@ public class WeixinPayController extends Controller { | @@ -386,6 +387,7 @@ public class WeixinPayController extends Controller { | ||
386 | Calendar calendar = Calendar.getInstance(); | 387 | Calendar calendar = Calendar.getInstance(); |
387 | calendar.setTime(date); | 388 | calendar.setTime(date); |
388 | calendar.add(Calendar.YEAR, Integer.parseInt(cardBuyVO.getBuyNum())); | 389 | calendar.add(Calendar.YEAR, Integer.parseInt(cardBuyVO.getBuyNum())); |
390 | + calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 1); | ||
389 | Date resultDate = calendar.getTime(); | 391 | Date resultDate = calendar.getTime(); |
390 | logger.info("前端结束时间=" + cardBuyVO.getEndDate()); | 392 | logger.info("前端结束时间=" + cardBuyVO.getEndDate()); |
391 | cardBuyVO.setEndDate(format.format(resultDate)); | 393 | cardBuyVO.setEndDate(format.format(resultDate)); |