From e9fec0f78cc44690ad069e1449ade3edb8ed8b67 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 23 Jan 2019 13:37:28 +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 --- .../com/iformall/controller/WxFlowAbleController.java | 2 +- .../java/com/iformall/domain/po/WxCarPayRecord.java | 10 +--------- .../src/main/resources/mapper/WxCarPayRecordMapper.xml | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java index 84ae25d88..3f5e1e473 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java @@ -22,7 +22,7 @@ public class WxFlowAbleController extends BaseController { @Autowired private WxFlowService wxFlowService; - @ApiOperation(value = "启动流程",notes = "{\"businessId\":\"215315084967149568\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"204398756307664896\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"204398756307664896\"}]}") + @ApiOperation(value = "启动流程",notes = "{\"businessId\":\"221178539888607232\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"243650055783841792\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"\"}],\"variables\":[{\"key\":\"contractType\",\"value\":\"1\"},{\"key\":\"contractNumber\",\"value\":\"1111\"}]}") @PostMapping("/start") public ResultData start(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] FlowAbleController::start"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java index 9e74b2004..38c843307 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java @@ -21,7 +21,7 @@ public class WxCarPayRecord implements Serializable { private Date entranceTime; private Date exitTime; private String fee; - private Date feeTime; +// private Date feeTime; private String coupon; private String couponCode; private String fixParkingId; @@ -171,14 +171,6 @@ public class WxCarPayRecord implements Serializable { this.fee = fee; } - public Date getFeeTime() { - return feeTime; - } - - public void setFeeTime(Date feeTime) { - this.feeTime = feeTime; - } - public String getCoupon() { return coupon; } diff --git a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml index 1deda5359..5fd2e7b4f 100644 --- a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml @@ -13,7 +13,6 @@ - @@ -28,7 +27,7 @@ `id`,`tenant_id`,`vendor_type`,`create_date`,`update_date`,syn_id,park_id,park_name,user_type, - plate_number,entrance_time,exit_time,fee,fee_time,coupon,coupon_code,fix_parking_id,remaining_days,discount_amount,phone + plate_number,entrance_time,exit_time,fee,coupon,coupon_code,fix_parking_id,remaining_days,discount_amount,phone ,paid_service_fee,create_date,update_date,floor(stayed_time/60) stayed_time