diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java index 81663a270..b5ed99604 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java @@ -166,6 +166,7 @@ public class MallUserInfoController extends BaseController { // 超管 boolean bModify = false; MallUserInfo adminUser = new MallUserInfo(); + adminUser.setFlowPermission(userInfo.getFlowPermission()); adminUser.setId(userInfo.getId()); if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { adminUser.setPassword(userInfo.getPassword()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java index b0dee5abf..b83d9c807 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java @@ -119,10 +119,14 @@ public class WxCarCallBackController extends BaseController { wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar); WxCUser cUser = wxCUserService.getById(userCar.getCUserId()); if(cUser != null){ - phoneStrs += cUser.getPhone() + " "; + phoneStrs += cUser.getPhone() + ","; } } } + // 替换最后一个逗号 + if(StringUtils.isNotBlank(phoneStrs)){ + phoneStrs = phoneStrs.substring(0,phoneStrs.length() - 1); + } try { WxCarPayRecord record = new WxCarPayRecord(); 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 38c843307..cb0dda6bf 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; @@ -43,6 +43,14 @@ public class WxCarPayRecord implements Serializable { @io.swagger.annotations.ApiModelProperty(value="是否缴费",name="isPay") private Integer isPay; + public Date getFeeTime() { + return feeTime; + } + + public void setFeeTime(Date feeTime) { + this.feeTime = feeTime; + } + public Long getStayedTime() { return stayedTime; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 009cdbe5b..70c7c62be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -680,8 +680,12 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); cell1.setCellValue(entity.getPlateNumber()); cell2.setCellValue(entity.getPhone()); - cell3.setCellValue(sdf.format(entity.getEntranceTime())); - cell4.setCellValue(sdf.format(entity.getExitTime())); + if(entity.getEntranceTime() != null) { + cell3.setCellValue(sdf.format(entity.getEntranceTime())); + } + if(entity.getExitTime() != null) { + cell4.setCellValue(sdf.format(entity.getExitTime())); + } cell5.setCellValue(entity.getStayedTime()); cell6.setCellValue(entity.getFee()); } diff --git a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml index 5fd2e7b4f..cf4f98bb1 100644 --- a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml @@ -13,6 +13,7 @@ + @@ -24,31 +25,31 @@ - + `id`,`tenant_id`,`vendor_type`,`create_date`,`update_date`,syn_id,park_id,park_name,user_type, - plate_number,entrance_time,exit_time,fee,coupon,coupon_code,fix_parking_id,remaining_days,discount_amount,phone + plate_number,entrance_time,exit_time,fee,fee_time,coupon,coupon_code,fix_parking_id,remaining_days,discount_amount,phone ,paid_service_fee,create_date,update_date,floor(stayed_time/60) stayed_time - + where 1 = 1 - + and `id` = #{id} - + - + and `tenant_id` = #{tenantId} - + - + and `vendor_type` = #{vendorType} - + - + and create_date >= #{startDate} @@ -63,7 +64,7 @@ order by create_date desc - +