| @@ -178,9 +178,14 @@ public class WxPayServiceImpl implements WxPayService { | |||||
| //用户当前是否已过期 | //用户当前是否已过期 | ||||
| boolean isExpired = false; | boolean isExpired = false; | ||||
| if (null != wxCUser.getValidEndTime() && wxCUser.getValidEndTime().before(curr)) { | |||||
| isExpired = true; | |||||
| boolean isNew = true; | |||||
| if (null != wxCUser.getValidEndTime()) { | |||||
| isNew = false; | |||||
| if (wxCUser.getValidEndTime().before(curr)) { | |||||
| isExpired = true; | |||||
| } | |||||
| } | } | ||||
| //创建停车支付订单记录 | //创建停车支付订单记录 | ||||
| final IdWorker idworker = IdWorker.get(); | final IdWorker idworker = IdWorker.get(); | ||||
| payOrder = new WxPayOrder(); | payOrder = new WxPayOrder(); | ||||
| @@ -197,12 +202,17 @@ public class WxPayServiceImpl implements WxPayService { | |||||
| payOrder.setUpdateTime(curr); | payOrder.setUpdateTime(curr); | ||||
| payOrder.setValidStartTime(curr); | payOrder.setValidStartTime(curr); | ||||
| Date endtime = null; | Date endtime = null; | ||||
| if (isExpired) { | |||||
| if (isNew) { | |||||
| endtime = DateUtils.getTimeAfterDays(Integer.parseInt(config.getConfigItemValue()), curr); | endtime = DateUtils.getTimeAfterDays(Integer.parseInt(config.getConfigItemValue()), curr); | ||||
| payOrder.setRemark("过期缴费"); | |||||
| payOrder.setRemark("首次缴费"); | |||||
| }else { | }else { | ||||
| endtime = DateUtils.getTimeAfterDays(Integer.parseInt(config.getConfigItemValue()), wxCUser.getValidEndTime()); | |||||
| payOrder.setRemark("未过期续费"); | |||||
| if (isExpired) { | |||||
| endtime = DateUtils.getTimeAfterDays(Integer.parseInt(config.getConfigItemValue()), curr); | |||||
| payOrder.setRemark("过期缴费"); | |||||
| }else { | |||||
| endtime = DateUtils.getTimeAfterDays(Integer.parseInt(config.getConfigItemValue()), wxCUser.getValidEndTime()); | |||||
| payOrder.setRemark("未过期续费"); | |||||
| } | |||||
| } | } | ||||
| payOrder.setValidEndTime(endtime); | payOrder.setValidEndTime(endtime); | ||||
| wxPayOrderMapper.insert(payOrder); | wxPayOrderMapper.insert(payOrder); | ||||