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

修改停车列表

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
c6a7353fe4
5 измененных файлов: 65 добавлений и 4 удалений
  1. +37
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxCarPayRecordService.java
  4. +5
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java
  5. +20
    -0
      mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml

+ 37
- 1
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<String,String> 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());
}


+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java Просмотреть файл

@@ -12,4 +12,5 @@ public interface WxCarPayRecordMapper extends CommonMapper<WxCarPayRecord, Long>

List<WxCarPayRecord> findCarPayList(WxCarPayRecord record);

void updateBySynId(WxCarPayRecord record);
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxCarPayRecordService.java Просмотреть файл

@@ -15,4 +15,6 @@ public interface WxCarPayRecordService {
PageInfo<WxCarPayRecord> findCarPayListByPage(WxCarPayRecord record,Integer pageIndex, Integer pageSize);

void saveOrUpdate(WxCarPayRecord record);

void updateBySynId(WxCarPayRecord record);
}

+ 5
- 3
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);
}
}

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

@@ -80,4 +80,24 @@
</select>


<update id="updateBySynId" parameterType="com.iformall.domain.po.WxCarPayRecord">
update wx_car_pay_record set update_date = now()
<if test="null != exitTime">
,exit_time = #{exitTime}
</if>
<if test="null != stayedTime">
,stayed_time = #{stayedTime}
</if>
<if test="null != fee">
,fee = #{fee}
</if>
<if test="null != feeTime">
,fee_time = #{feeTime}
</if>
<if test="null != paidServiceFee">
,paid_service_fee = #{paidServiceFee}
</if>

where syn_id = #{synId}
</update>
</mapper>

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