From c6a7353fe41632c707323909f0b712df0ec70f6e Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 23 Jan 2019 19:59:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=81=9C=E8=BD=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCarCallBackController.java | 38 ++++++++++++++++++- .../iformall/mapper/WxCarPayRecordMapper.java | 1 + .../service/WxCarPayRecordService.java | 2 + .../impl/WxCarPayRecordServiceImpl.java | 8 ++-- .../resources/mapper/WxCarPayRecordMapper.xml | 20 ++++++++++ 5 files changed, 65 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java index f36e91881..dd5fb51c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java @@ -50,7 +50,7 @@ public class WxCarCallBackController extends BaseController { @Autowired WxCouponSendService wxCouponSendService; - + @Autowired WxCarPayRecordService wxCarPayRecordService; @Autowired @@ -129,6 +129,7 @@ public class WxCarCallBackController extends BaseController { } try { + // 保存WxCarPayRecord WxCarPayRecord record = new WxCarPayRecord(); record.setVendorType(wxCarCmdLog.getVendorType()); Map jsonMap = (Map)JSON.parseObject(wxCarCmdLog.getCmdJson()); @@ -143,8 +144,10 @@ public class WxCarCallBackController extends BaseController { record.setFixParkingId(jsonMap.get("fixParkingId")); record.setRemainingDays(jsonMap.get("remainingDays")); record.setPhone(phoneStrs); + record.setTenantId(park.getTenantId()); wxCarPayRecordService.saveOrUpdate(record); } catch (Exception e) { + e.printStackTrace(); logger.error("WxCarPayRecord: 入库错误 " + paramMap.toString()); return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); } @@ -201,6 +204,23 @@ public class WxCarCallBackController extends BaseController { return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); } + try { + // 保存WxCarPayRecord + WxCarPayRecord record = new WxCarPayRecord(); + record.setSynId(paramMap.get("synId")); + if(StringUtils.isNotBlank(paramMap.get("exitTime"))) { + record.setExitTime(new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(paramMap.get("exitTime"))); + } + if(StringUtils.isNotBlank(paramMap.get("stayedTime"))) { + record.setStayedTime(Long.parseLong(paramMap.get("stayedTime"))); + } + wxCarPayRecordService.updateBySynId(record); + } catch (Exception e) { + e.printStackTrace(); + logger.error("WxCarPayRecord: 出场更新错误 " + paramMap.toString()); + return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); + } + // TODO 如果此车关联了停车优免券,自动把优免券设为已使用 return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage()); @@ -286,6 +306,22 @@ public class WxCarCallBackController extends BaseController { return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); } + try { + // 保存WxCarPayRecord + WxCarPayRecord record = new WxCarPayRecord(); + record.setSynId(paramMap.get("orderId")); + record.setPaidServiceFee(paramMap.get("paidServiceFee")); + if(StringUtils.isNotBlank(paramMap.get("time"))) { + record.setFeeTime(new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(paramMap.get("time"))); + } + record.setFee(paramMap.get("fee")); + wxCarPayRecordService.updateBySynId(record); + } catch (Exception e) { + e.printStackTrace(); + logger.error("WxCarPayRecord: 缴费更新错误 " + paramMap.toString()); + return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); + } + // 营销 - 短信 return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage()); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java index 134e159cf..5240934f3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java @@ -12,4 +12,5 @@ public interface WxCarPayRecordMapper extends CommonMapper List findCarPayList(WxCarPayRecord record); + void updateBySynId(WxCarPayRecord record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCarPayRecordService.java b/mallinkService/src/main/java/com/iformall/service/WxCarPayRecordService.java index 1bfcbd41c..66c14f8d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCarPayRecordService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCarPayRecordService.java @@ -15,4 +15,6 @@ public interface WxCarPayRecordService { PageInfo findCarPayListByPage(WxCarPayRecord record,Integer pageIndex, Integer pageSize); void saveOrUpdate(WxCarPayRecord record); + + void updateBySynId(WxCarPayRecord record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java index 535fd5ddf..046ce7538 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java @@ -2,7 +2,6 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.iformall.common.IdWorker; import com.iformall.domain.po.WxCarPayRecord; import com.iformall.mapper.WxCarPayRecordMapper; import com.iformall.service.WxCarPayRecordService; @@ -26,12 +25,15 @@ public class WxCarPayRecordServiceImpl implements WxCarPayRecordService{ @Override public void saveOrUpdate(WxCarPayRecord record) { if (record.getId() == null) { - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); wxCarPayRecordMapper.insertSelective(record); } else { wxCarPayRecordMapper.updateByPrimaryKeySelective(record); } } + + @Override + public void updateBySynId(WxCarPayRecord record) { + wxCarPayRecordMapper.updateBySynId(record); + } } diff --git a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml index cf4f98bb1..0385baf7b 100644 --- a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml @@ -80,4 +80,24 @@ + + update wx_car_pay_record set update_date = now() + + ,exit_time = #{exitTime} + + + ,stayed_time = #{stayedTime} + + + ,fee = #{fee} + + + ,fee_time = #{feeTime} + + + ,paid_service_fee = #{paidServiceFee} + + + where syn_id = #{synId} +