Przeglądaj źródła

[车流][修改][修改入库错误]

release_toaliyun_real
luozukai 6 lat temu
committed by Stormeye Wu
rodzic
commit
eae0b38df5
3 zmienionych plików z 90 dodań i 31 usunięć
  1. +80
    -2
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java
  3. +9
    -28
      mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml

+ 80
- 2
mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java Wyświetl plik

@@ -1,6 +1,7 @@
package com.iformall.controller.callback; package com.iformall.controller.callback;


import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.controller.base.BaseController; import com.iformall.controller.base.BaseController;
@@ -11,6 +12,7 @@ import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumETCPCode; import com.iformall.enums.EnumETCPCode;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.ETCPUtil; import com.iformall.utils.ETCPUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -171,6 +173,16 @@ public class WxCarCallBackController extends BaseController {
record.setPhone(phoneStrs); record.setPhone(phoneStrs);
record.setTenantId(tenantId); record.setTenantId(tenantId);
wxCarPayRecordService.updateBySynId(record); wxCarPayRecordService.updateBySynId(record);
record.setTenantId(park.getTenantId());

WxCarPayRecord query = new WxCarPayRecord();
query.setSynId(synId);
PageInfo<WxCarPayRecord> page = wxCarPayRecordService.findCarPayListByPage(query,1,1);
if(page != null && CollectionUtils.isNotEmpty(page.getList())){
wxCarPayRecordService.updateBySynId(record);
}else{
wxCarPayRecordService.saveOrUpdate(record);
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("WxCarPayRecord: 入库错误 ",e); logger.error("WxCarPayRecord: 入库错误 ",e);
@@ -241,6 +253,13 @@ public class WxCarCallBackController extends BaseController {
String synId = paramMap.get(ETCPUtil.ETCP_SYN_ID); String synId = paramMap.get(ETCPUtil.ETCP_SYN_ID);
String exitTime = paramMap.get(ETCPUtil.ETCP_EXIT_TIME); String exitTime = paramMap.get(ETCPUtil.ETCP_EXIT_TIME);
String stayedTime = paramMap.get(ETCPUtil.ETCP_STAYED_TIME); String stayedTime = paramMap.get(ETCPUtil.ETCP_STAYED_TIME);
String carNumber = paramMap.get(ETCPUtil.ETCP_CAR_NUMBER);
String parkId = paramMap.get(ETCPUtil.ETCP_PARK_ID);
String parkName = paramMap.get(ETCPUtil.ETCP_PARK_NAME);
String userType = paramMap.get(ETCPUtil.ETCP_USER_TYPE);
String entranceTime = paramMap.get(ETCPUtil.ETCP_ENTRANCE_TIME);
String fixParkingId = paramMap.get(ETCPUtil.ETCP_FIX_PARKING_ID);
String remainingDays = paramMap.get(ETCPUtil.ETCP_REMAINING_DAYS);


try { try {
// 保存WxCarPayRecord // 保存WxCarPayRecord
@@ -252,7 +271,28 @@ public class WxCarCallBackController extends BaseController {
if(StringUtils.isNotBlank(stayedTime)) { if(StringUtils.isNotBlank(stayedTime)) {
record.setStayedTime(Long.parseLong(stayedTime)); record.setStayedTime(Long.parseLong(stayedTime));
} }
wxCarPayRecordService.updateBySynId(record);
record.setVendorType(wxCarCmdLog.getVendorType());
record.setSynId(synId);
record.setParkId(parkId);
record.setParkName(parkName);
record.setUserType(userType);
record.setPlateNumber(carNumber);
if(StringUtils.isNotBlank(entranceTime)) {
record.setEntranceTime(dateFormat.parse(entranceTime));
}
record.setFixParkingId(fixParkingId);
record.setRemainingDays(remainingDays);
//record.setPhone(phoneStrs);
record.setTenantId(park.getTenantId());

WxCarPayRecord query = new WxCarPayRecord();
query.setSynId(synId);
PageInfo<WxCarPayRecord> page = wxCarPayRecordService.findCarPayListByPage(query,1,1);
if(page != null && CollectionUtils.isNotEmpty(page.getList())){
wxCarPayRecordService.updateBySynId(record);
}else{
wxCarPayRecordService.saveOrUpdate(record);
}
} catch (Exception e) { } catch (Exception e) {
logger.error("WxCarPayRecord: 出场更新错误 " +e.getMessage()+", " +paramMap.toString()); logger.error("WxCarPayRecord: 出场更新错误 " +e.getMessage()+", " +paramMap.toString());
return true; return true;
@@ -352,6 +392,16 @@ public class WxCarCallBackController extends BaseController {
} }


String paidServiceFee = paramMap.get(ETCPUtil.ETCP_PAID_SERVICE_FEE); String paidServiceFee = paramMap.get(ETCPUtil.ETCP_PAID_SERVICE_FEE);
String feetime = paramMap.get("time");
String synId = paramMap.get(ETCPUtil.ETCP_SYN_ID);
String exitTime = paramMap.get(ETCPUtil.ETCP_EXIT_TIME);
String stayedTime = paramMap.get(ETCPUtil.ETCP_STAYED_TIME);
String parkId = paramMap.get(ETCPUtil.ETCP_PARK_ID);
String parkName = paramMap.get(ETCPUtil.ETCP_PARK_NAME);
String userType = paramMap.get(ETCPUtil.ETCP_USER_TYPE);
String entranceTime = paramMap.get(ETCPUtil.ETCP_ENTRANCE_TIME);
String fixParkingId = paramMap.get(ETCPUtil.ETCP_FIX_PARKING_ID);
String remainingDays = paramMap.get(ETCPUtil.ETCP_REMAINING_DAYS);
String fee = paramMap.get(ETCPUtil.ETCP_FEE); String fee = paramMap.get(ETCPUtil.ETCP_FEE);


try { try {
@@ -363,7 +413,35 @@ public class WxCarCallBackController extends BaseController {
record.setFeeTime(dateFormat.parse(etcpTime)); record.setFeeTime(dateFormat.parse(etcpTime));
} }
record.setFee(fee); record.setFee(fee);
wxCarPayRecordService.updateBySynId(record);
if(StringUtils.isNotBlank(exitTime)) {
record.setExitTime(dateFormat.parse(exitTime));
}
if(StringUtils.isNotBlank(stayedTime)) {
record.setStayedTime(Long.parseLong(stayedTime));
}
record.setVendorType(wxCarCmdLog.getVendorType());
record.setSynId(synId);
record.setParkId(parkId);
record.setParkName(parkName);
record.setUserType(userType);
record.setPlateNumber(carNumber);
if(StringUtils.isNotBlank(entranceTime)) {
record.setEntranceTime(dateFormat.parse(entranceTime));
}
record.setFixParkingId(fixParkingId);
record.setRemainingDays(remainingDays);
//record.setPhone(phoneStrs);
//record.setTenantId(park.getTenantId());

WxCarPayRecord query = new WxCarPayRecord();
query.setSynId(orderId);
query.setFeeTimeStr(feetime);
PageInfo<WxCarPayRecord> page = wxCarPayRecordService.findCarPayListByPage(query,1,1);
if(page != null && CollectionUtils.isNotEmpty(page.getList())){
wxCarPayRecordService.updateBySynId(record);
}else{
wxCarPayRecordService.saveOrUpdate(record);
}
} catch (Exception e) { } catch (Exception e) {
logger.error("WxCarPayRecord: 缴费更新错误 " +e.getMessage()+", "+ paramMap.toString()); logger.error("WxCarPayRecord: 缴费更新错误 " +e.getMessage()+", "+ paramMap.toString());
//return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); //return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString());


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java Wyświetl plik

@@ -39,7 +39,7 @@ public class WxCarPayRecord extends BaseEntity {
private String parkName; private String parkName;
private String userType; private String userType;


private String feeTimeStr;
private Date feeTime; private Date feeTime;
private String coupon; private String coupon;
private String couponCode; private String couponCode;


+ 9
- 28
mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml Wyświetl plik

@@ -38,7 +38,12 @@
<if test=" null != id "> <if test=" null != id ">
and `id` = #{id} and `id` = #{id}
</if> </if>

<if test=" null != synId ">
and `syn_id` = #{synId}
</if>
<if test=" null != feeTimeStr ">
and `fee_time` = #{feeTimeStr}
</if>
<if test=" null != tenantId "> <if test=" null != tenantId ">
and `tenant_id` = #{tenantId} and `tenant_id` = #{tenantId}
</if> </if>
@@ -76,34 +81,8 @@
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
</select> </select>



<update id="updateBySynId" parameterType="com.iformall.domain.po.WxCarPayRecord"> <update id="updateBySynId" parameterType="com.iformall.domain.po.WxCarPayRecord">
insert into wx_car_pay_record values(
(select unix_timestamp(now()) + CEILING(RAND()*9000000+10000000)),
#{tenantId},
#{vendorType},
#{synId},
#{parkId},
#{parkName},
#{userType},
#{plateNumber},
#{entranceTime},
#{exitTime},
#{stayedTime},
#{fee},
#{feeTime},
#{phone},
#{coupon},
#{couponCode},
#{fixParkingId},
#{remainingDays},
#{discountAmount},
#{paidServiceFee},
now(),
now()
)
ON DUPLICATE KEY UPDATE
update_date = now()
update wx_car_pay_record set update_date = now()
<if test="null != exitTime"> <if test="null != exitTime">
,exit_time = #{exitTime} ,exit_time = #{exitTime}
</if> </if>
@@ -119,6 +98,8 @@
<if test="null != paidServiceFee"> <if test="null != paidServiceFee">
,paid_service_fee = #{paidServiceFee} ,paid_service_fee = #{paidServiceFee}
</if> </if>

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


</mapper> </mapper>

Ładowanie…
Anuluj
Zapisz