changes

liuhaonan

2022-09-06 b353cecfa4181d281243df5a70d1de5cc373e35d

changes

 ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java

@@ -18,7 +18,7 @@
    public static final Long SCREEN_SHOT_TIMEOUT = 30 * 60L;

    public static final String NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/progress";
    public static final String SCREEN_SHOT_NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/screenshot"; //要改
    public static final String SCREEN_SHOT_NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/screenshot"; // TODO   要改

    public static final String username = "zhxm";
    public static final String password = "xm2512209.";

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java

@@ -45,8 +45,8 @@
     *
     * @return
     */
    @PostMapping("/refond")
    public ResponseVO<Object> refond(@RequestBody PayParam params) {
    @PostMapping("/refund")
    public ResponseVO<Object> refund(@RequestBody PayParam params) {
        if (params.getOutTradeNo().isEmpty() || params.getOutTradeNo() == null) {
            throw new BusinessException("退款参数不能为空");
        }

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java

@@ -23,7 +23,7 @@
    @PostMapping("/screenshot")
    public ResponseVO<Object> screenshot(@RequestBody VnnoxScreenShotParam vnnoxScreenShot) {
        String url = vnnoxScreenShot.getScreenShotUrl().replace("&amp;", "&");
        redisUtils.set(VnnoxConstant.REDIS_SCREEN_SHOT + vnnoxScreenShot.getPlayerId(), url, VnnoxConstant.SCREEN_SHOT_TIMEOUT);
        redisUtils.set(VnnoxConstant.REDIS_SCREEN_SHOT + vnnoxScreenShot.getPlayerId(), url);
        return ResponseUtil.success("ok");
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java

@@ -14,8 +14,6 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.ChargingDto;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.pay.OrderStatusEnums;
import com.sandu.ximon.admin.pay.wx.WxFastPayService;
@@ -24,7 +22,10 @@
import com.sandu.ximon.admin.utils.AliPayUtils;
import com.sandu.ximon.admin.vo.C3mOrderVO;
import com.sandu.ximon.dao.bo.C3mOrderBo;
import com.sandu.ximon.dao.domain.*;
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.domain.WxConfigEntity;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.enums.OrderType;
import com.sandu.ximon.dao.mapper.C3mOrderMapper;
@@ -36,8 +37,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
@@ -72,6 +71,15 @@
        String username = SecurityUtils.getUsername();
        C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);

        if(orderByOutTradeNo==null){
            throw new BusinessException("未找到订单!");
        }
        //退款前进行状态判断
        if (orderByOutTradeNo.getOrderStatus().equals(OrderStatus.REFUND.getStatus())
                || orderByOutTradeNo.getOrderStatus().equals(OrderStatus.CANCEL.getStatus())
                || orderByOutTradeNo.getOrderStatus().equals(OrderStatus.NO_PAY.getStatus())) {
            throw new BusinessException("订单状态错误,无法退款 !");
        }
        if (orderByOutTradeNo == null) {
            throw new BusinessException("未找到订单");
        } else {
@@ -152,11 +160,11 @@
            throw new BusinessException("充电桩正在被占用!");
        }

        //存在订单,但是未支付,需要取消订单
        if (c3mOrder != null) {
            c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
            updateById(c3mOrder);
        }
//        //存在订单,但是未支付,需要取消订单
//        if (c3mOrder != null) {
//            c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
//            updateById(c3mOrder);
//        }

        Pole pole = poleService.getById(streetlightId);
        if (null == pole) {