yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改异常订单失败的原因，历史订单的详情显示

Browse Source
This commit is contained in:
yuyang 2022-08-11 09:23:54 +08:00
parent 30cb54f290
commit b20e7ae470
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
View File

@ -156,6 +156,7 @@ public class XhpcPileOrderController extends BaseController {
}else if(status==3 || status==4){
//订单定位异常,修改充电订单状态
if(status==3) {
xhpcChargeOrder.setErroRemark(remark);
xhpcChargeOrder.setStatus(2);
xhpcChargeOrder.setUpdateTime(new Date());
//获取实时订单
@ -735,7 +736,7 @@ public class XhpcPileOrderController extends BaseController {
xhpcChargeOrder.setDelFlag(1);
xhpcChargeOrder.setEndTime(date);
}
xhpcChargeOrder.setErroRemark(remark);
//xhpcChargeOrder.setErroRemark(remark);
Long userId = xhpcChargeOrder.getUserId();
if (type == 1) {

2
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java
View File

@ -205,7 +205,7 @@ public interface XhpcChargeOrderMapper {
/**
* 标记异常大于创建4小时，标记为异常
*/
void updateStatus(@Param("status")Integer status,@Param("chargeOrderId")Long chargeOrderId);
void updateStatus(@Param("status")Integer status,@Param("chargeOrderId")Long chargeOrderId,@Param("erroRemark")String erroRemark);
/**
* 4小时订单未结算的订单

10
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
View File

@ -666,17 +666,17 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
Long chargeOrderId = xhpcChargeOrder.getChargeOrderId();
if(UserTypeUtil.INTERNET_TYPE.equals(xhpcChargeOrder.getSource())){
//标记异常
xhpcChargeOrderMapper.updateStatus(2,chargeOrderId);
xhpcChargeOrderMapper.updateStatus(2,chargeOrderId,"大于4小时没有结算的第三方订单，系统自动修改为异常订单");
}else{
CacheRealtimeData cacheRealtimeData = redisService.getCacheObject("order:" + xhpcChargeOrder.getSerialNumber() + ".lord");
if(cacheRealtimeData ==null){
int count = xhpcChargeOrderMapper.getSerialNumberLike(xhpcChargeOrder.getSerialNumber().substring(0, 16), chargeOrderId);
if(count>0){
//有充电改为 由充电中变为启动充电中
xhpcChargeOrderMapper.updateStatus(-1,chargeOrderId);
xhpcChargeOrderMapper.updateStatus(-1,chargeOrderId,null);
}else{
//标记异常
xhpcChargeOrderMapper.updateStatus(2,chargeOrderId);
xhpcChargeOrderMapper.updateStatus(2,chargeOrderId,"大于4小时没有结算的C端用户订单，系统自动修改为异常订单");
}
}else{
@ -684,10 +684,10 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
long l = System.currentTimeMillis();//秒
Date date = DateUtil.parse(cacheRealtimeData.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
if(l-date.getTime()>360000){
xhpcChargeOrderMapper.updateStatus(2,chargeOrderId);
xhpcChargeOrderMapper.updateStatus(2,chargeOrderId,"大于4小时没有结算的C端用户订单，系统自动修改为异常订单");
}
}else{
xhpcChargeOrderMapper.updateStatus(2,chargeOrderId);
xhpcChargeOrderMapper.updateStatus(2,chargeOrderId,"大于4小时没有结算的C端用户订单，系统自动修改为异常订单");
}
}
}

6
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
View File

@ -702,7 +702,11 @@
</select>
<update id="updateStatus">
update xhpc_charge_order set status=#{status} where status=0 and charge_order_id = #{chargeOrderId}
update xhpc_charge_order set status=#{status}
<if test="erroRemark !=null and erroRemark !=''">
and erro_remark=#{erroRemark}
</if>
where status=0 and charge_order_id = #{chargeOrderId}
</update>
<select id="getFourTimsStatus" resultMap="XhpcChargeOrderResult">

4
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -1202,8 +1202,8 @@
cp.type as type,
co.type as orderType,
co.create_time as createTime,
co.start_time as startTime,
co.end_time as endTime,
ho.start_time as startTime,
ho.end_time as endTime,
co.update_time as updateTime,
co.charging_time as chargingTimeTotal,
ho.total_price as totalPrice,