Просмотр исходного кода

修改停车列表

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
b69af8cda5
5 измененных файлов: 33 добавлений и 15 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java
  2. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java
  3. +9
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java
  4. +6
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  5. +12
    -11
      mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml

+ 1
- 0
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());


+ 5
- 1
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();


+ 9
- 1
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;
}


+ 6
- 2
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());
}


+ 12
- 11
mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml Просмотреть файл

@@ -13,6 +13,7 @@
<result column="entrance_time" property="entranceTime"/>
<result column="exit_time" property="exitTime"/>
<result column="fee" property="fee"/>
<result column="fee_time" property="feeTime"/>
<result column="coupon" property="coupon"/>
<result column="coupon_code" property="couponCode"/>
<result column="fix_parking_id" property="fixParkingId"/>
@@ -24,31 +25,31 @@
<result column="update_date" property="updateDate"/>
<result column="stayed_time" property="stayedTime"/>
</resultMap>
<sql id="allColumns">
`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
</sql>
<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != vendorType ">
and `vendor_type` = #{vendorType}
</if>

<if test=" null != startDate">
and create_date >= #{startDate}
@@ -63,7 +64,7 @@
order by create_date desc

</sql>
<select id="findCarPayListByPage" parameterType="com.iformall.domain.po.WxCarPayRecord" resultMap="BaseResultMap">
select
<include refid="allColumns"/>


Загрузка…
Отмена
Сохранить