BJ_ZTEITS-Developers / zteits-rnt-wx

Commit 868dbcd31c10dbbf957fb5ccad2fa58f7ef0f325

Authored by atao
1 parent 1b8be02a

提交金额修改

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