dao/src/main/java/com/sandu/ximon/dao/bo/C3mOrderBo.java
@@ -1,6 +1,5 @@ package com.sandu.ximon.dao.bo; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; /** @@ -63,6 +62,11 @@ */ private Long payTimestamp; private Long createTimestamp; private String alreadyChargingTime; /** * 订单退款时间戳 */ @@ -96,7 +100,7 @@ /** * 0 充电中 1充电结束 */ private Integer changingStates; private Integer chargingStates;
@@ -133,6 +133,9 @@ */ private Integer orderStatus; private String alreadyChargingTime; /** * 0 充电中 1充电结束 */ dao/src/main/resources/mapper/C3mOrderMapper.xml
@@ -25,6 +25,7 @@ <result property="payTimestamp" column="pay_timestamp" jdbcType="BIGINT"/> <result property="refundTimestamp" column="refund_timestamp" jdbcType="BIGINT"/> <result property="refundMsg" column="refund_msg" jdbcType="VARCHAR"/> <result property="alreadyChargingTime" column="already_charging_time" jdbcType="VARCHAR"/> <result property="startChargingTimestamp" column="start_charging_timestamp" jdbcType="BIGINT"/> <result property="stopChargingTimestamp" column="stop_charging_timestamp" jdbcType="BIGINT"/> <result property="orderStatus" column="order_status" jdbcType="INTEGER"/> ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
@@ -12,7 +12,6 @@ import com.sandu.ximon.admin.service.*; import com.sandu.ximon.admin.utils.LogUtils; import com.sandu.ximon.admin.utils.RedisUtils; import com.sandu.ximon.dao.domain.C3mCharging; import com.sandu.ximon.dao.domain.C3mOrder; import com.sandu.ximon.dao.domain.Pole; import com.sandu.ximon.dao.enums.OrderStatus; @@ -174,7 +173,10 @@ lastOrderByC3Mac.setChargingStates(1); //设置剩余金额 lastOrderByC3Mac.setSurplusAmount(Double.parseDouble(aPackage.getRemainingAmount())); //设置退款金额 lastOrderByC3Mac.setRefundAmount(Double.parseDouble(aPackage.getRemainingAmount())); //充电时长 lastOrderByC3Mac.setAlreadyChargingTime(aPackage.getAlreadyChargingTime()); SpringContextHolder.getBean(C3mOrderService.class).updateById(lastOrderByC3Mac); } } ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
@@ -142,35 +142,6 @@ } } /** * 订单退款 只能退款一次 * * @param orderId * @param refundFee * @param callbackUrl * @return */ public boolean refundOrder(String orderId, String refundSn, Integer refundFee, String callbackUrl) { WxPayRefundRequest refundRequest = new WxPayRefundRequest(); refundRequest.setOutTradeNo(orderId); refundRequest.setOutRefundNo(refundSn); refundRequest.setRefundFee(refundFee); refundRequest.setTotalFee(refundFee); refundRequest.setNotifyUrl(callbackUrl); try { WxPayRefundResult wxPayRefundResult = wxPayService.refund(refundRequest); if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayRefundResult.getResultCode())) { return true; } else { log.error("微信退款失败，{}", wxPayRefundResult.getErrCodeDes()); throw new BusinessException("微信退款失败，" + wxPayRefundResult.getErrCodeDes()); } } catch (WxPayException e) { log.error("微信退款失败，{}", e.getErrCodeDes()); throw new BusinessException("微信退款失败，" + e.getErrCodeDes()); } } /** * 退款 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -256,6 +256,7 @@ } //开启充电成功后，更新订单状态为充电中 userOrder.setChargingStates(0); userOrder.setStartChargingTimestamp(System.currentTimeMillis()); log.error("[-----------------微信支付回调结束-----------------]"); if (!updateById(userOrder)) { return WxPayNotifyResponse.fail("更新数据已失效");
