| @@ -166,6 +166,7 @@ public class MallUserInfoController extends BaseController { | |||||
| // 超管 | // 超管 | ||||
| boolean bModify = false; | boolean bModify = false; | ||||
| MallUserInfo adminUser = new MallUserInfo(); | MallUserInfo adminUser = new MallUserInfo(); | ||||
| adminUser.setFlowPermission(userInfo.getFlowPermission()); | |||||
| adminUser.setId(userInfo.getId()); | adminUser.setId(userInfo.getId()); | ||||
| if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { | if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { | ||||
| adminUser.setPassword(userInfo.getPassword()); | adminUser.setPassword(userInfo.getPassword()); | ||||
| @@ -119,10 +119,14 @@ public class WxCarCallBackController extends BaseController { | |||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar); | wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.CAR_STOP, userCar); | ||||
| WxCUser cUser = wxCUserService.getById(userCar.getCUserId()); | WxCUser cUser = wxCUserService.getById(userCar.getCUserId()); | ||||
| if(cUser != null){ | if(cUser != null){ | ||||
| phoneStrs += cUser.getPhone() + " "; | |||||
| phoneStrs += cUser.getPhone() + ","; | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| // 替换最后一个逗号 | |||||
| if(StringUtils.isNotBlank(phoneStrs)){ | |||||
| phoneStrs = phoneStrs.substring(0,phoneStrs.length() - 1); | |||||
| } | |||||
| try { | try { | ||||
| WxCarPayRecord record = new WxCarPayRecord(); | WxCarPayRecord record = new WxCarPayRecord(); | ||||
| @@ -21,7 +21,7 @@ public class WxCarPayRecord implements Serializable { | |||||
| private Date entranceTime; | private Date entranceTime; | ||||
| private Date exitTime; | private Date exitTime; | ||||
| private String fee; | private String fee; | ||||
| // private Date feeTime; | |||||
| private Date feeTime; | |||||
| private String coupon; | private String coupon; | ||||
| private String couponCode; | private String couponCode; | ||||
| private String fixParkingId; | private String fixParkingId; | ||||
| @@ -43,6 +43,14 @@ public class WxCarPayRecord implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否缴费",name="isPay") | @io.swagger.annotations.ApiModelProperty(value="是否缴费",name="isPay") | ||||
| private Integer isPay; | private Integer isPay; | ||||
| public Date getFeeTime() { | |||||
| return feeTime; | |||||
| } | |||||
| public void setFeeTime(Date feeTime) { | |||||
| this.feeTime = feeTime; | |||||
| } | |||||
| public Long getStayedTime() { | public Long getStayedTime() { | ||||
| return stayedTime; | return stayedTime; | ||||
| } | } | ||||
| @@ -680,8 +680,12 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); | SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); | ||||
| cell1.setCellValue(entity.getPlateNumber()); | cell1.setCellValue(entity.getPlateNumber()); | ||||
| cell2.setCellValue(entity.getPhone()); | 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()); | cell5.setCellValue(entity.getStayedTime()); | ||||
| cell6.setCellValue(entity.getFee()); | cell6.setCellValue(entity.getFee()); | ||||
| } | } | ||||
| @@ -13,6 +13,7 @@ | |||||
| <result column="entrance_time" property="entranceTime"/> | <result column="entrance_time" property="entranceTime"/> | ||||
| <result column="exit_time" property="exitTime"/> | <result column="exit_time" property="exitTime"/> | ||||
| <result column="fee" property="fee"/> | <result column="fee" property="fee"/> | ||||
| <result column="fee_time" property="feeTime"/> | |||||
| <result column="coupon" property="coupon"/> | <result column="coupon" property="coupon"/> | ||||
| <result column="coupon_code" property="couponCode"/> | <result column="coupon_code" property="couponCode"/> | ||||
| <result column="fix_parking_id" property="fixParkingId"/> | <result column="fix_parking_id" property="fixParkingId"/> | ||||
| @@ -24,31 +25,31 @@ | |||||
| <result column="update_date" property="updateDate"/> | <result column="update_date" property="updateDate"/> | ||||
| <result column="stayed_time" property="stayedTime"/> | <result column="stayed_time" property="stayedTime"/> | ||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`vendor_type`,`create_date`,`update_date`,syn_id,park_id,park_name,user_type, | `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 | ,paid_service_fee,create_date,update_date,floor(stayed_time/60) stayed_time | ||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| where 1 = 1 | where 1 = 1 | ||||
| <if test=" null != id "> | <if test=" null != id "> | ||||
| and `id` = #{id} | and `id` = #{id} | ||||
| </if> | </if> | ||||
| <if test=" null != tenantId "> | <if test=" null != tenantId "> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != vendorType "> | <if test=" null != vendorType "> | ||||
| and `vendor_type` = #{vendorType} | and `vendor_type` = #{vendorType} | ||||
| </if> | </if> | ||||
| <if test=" null != startDate"> | <if test=" null != startDate"> | ||||
| and create_date >= #{startDate} | and create_date >= #{startDate} | ||||
| @@ -63,7 +64,7 @@ | |||||
| order by create_date desc | order by create_date desc | ||||
| </sql> | </sql> | ||||
| <select id="findCarPayListByPage" parameterType="com.iformall.domain.po.WxCarPayRecord" resultMap="BaseResultMap"> | <select id="findCarPayListByPage" parameterType="com.iformall.domain.po.WxCarPayRecord" resultMap="BaseResultMap"> | ||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||