Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging...

Pu Zhibing

2 天以前 8b0cf2731d2b61999fdd1aeee91567dc47d67e14

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -451,7 +451,7 @@
      
      //检查当前枪是否是正在使用中
      TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, addChargingOrder.getId())
            .in(TChargingOrder::getStatus, Arrays.asList(1, 2, 3)).eq(TChargingOrder::getDelFlag, 0));
            .in(TChargingOrder::getStatus, Arrays.asList(3)).eq(TChargingOrder::getDelFlag, 0));
      if(null != one){
         return AjaxResult.error("充电枪正在充电中，启动失败");
      }
@@ -1035,12 +1035,12 @@
         }
         if(3 == rechargePaymentType){
            RefundReq dto = new RefundReq();
            dto.setOutTradeNo(chargingOrder.getCode());
            dto.setOutTradeNo(chargingOrder.getRechargeSerialNumber());
            dto.setOutRequestNo(chargingOrderRefund.getCode());
            dto.setRefundAmount(rechargeAmount.toString());
            dto.setRefundReason("充电失败，取消充电订单");
            RefundResp resp = h5AliPaymentClient.refund(dto).getData();
            if(null != resp){
            if(null != resp && "10000".equals(resp.getCode())){
               chargingOrderRefundService.save(chargingOrderRefund);
               //回退会员折扣次数
               if(chargingOrder.getVipDiscountAmount().compareTo(BigDecimal.ZERO) > 0){
@@ -1132,12 +1132,12 @@
         }
         if(3 == rechargePaymentType){
            RefundReq dto = new RefundReq();
            dto.setOutTradeNo(chargingOrder.getCode());
            dto.setOutTradeNo(chargingOrder.getRechargeSerialNumber());
            dto.setOutRequestNo(chargingOrderRefund.getCode());
            dto.setRefundAmount(money.toString());
            dto.setRefundReason("充电完成退款");
            RefundResp resp = h5AliPaymentClient.refund(dto).getData();
            if(null != resp){
            if(null != resp && "10000".equals(resp.getCode())){
               chargingOrderRefundService.save(chargingOrderRefund);
               try {
                  Thread.sleep(1000);
@@ -2732,12 +2732,12 @@
               }
               if(3 == rechargePaymentType){
                  RefundReq dto = new RefundReq();
                  dto.setOutTradeNo(chargingOrder.getCode());
                  dto.setOutTradeNo(chargingOrder.getRechargeSerialNumber());
                  dto.setOutRequestNo(chargingOrderRefund.getRefundCode());
                  dto.setRefundAmount(refundAmount.toString());
                  dto.setRefundReason("充电完成退款");
                  RefundResp resp = h5AliPaymentClient.refund(dto).getData();
                  if(null != resp){
                  if(null != resp && "10000".equals(resp.getCode())){
                     chargingOrderRefundService.save(chargingOrderRefund);
                     this.chargingOrderStartupFailureWxRefund(chargingOrderRefund.getRefundCode(), resp.getTradeNo(), "SUCCESS", null);
                  }
@@ -2949,12 +2949,12 @@
            }
            if(3 == tChargingOrder.getRechargePaymentType()){
               RefundReq dto = new RefundReq();
               dto.setOutTradeNo(tChargingOrder.getCode());
               dto.setOutTradeNo(tChargingOrder.getRechargeSerialNumber());
               dto.setOutRequestNo(tChargingOrder.getCode());
               dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
               dto.setRefundReason("取消订单");
               RefundResp resp = h5AliPaymentClient.refund(dto).getData();
               if(null != resp){
               if(null != resp && "10000".equals(resp.getCode())){
                  chargingOrderRefund.setRefundStatus(2);
                  chargingOrderRefund.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
                  this.baseMapper.updateById(tChargingOrder);
@@ -3029,20 +3029,20 @@
                  shoppingOrderRefundService.save(chargingOrderRefund);
               }
            }
            if(3 == tChargingOrder.getPaymentType()){
               RefundReq dto = new RefundReq();
               dto.setOutTradeNo(tChargingOrder.getCode());
               dto.setOutRequestNo(tChargingOrder.getCode());
               dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
               dto.setRefundReason("取消订单");
               RefundResp resp = h5AliPaymentClient.refund(dto).getData();
               if(null != resp){
                  tChargingOrder.setRefundStatus(2);
                  tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
                  shoppingOrderService.updateById(tChargingOrder);
                  shoppingOrderRefundService.save(chargingOrderRefund);
               }
            }
//            if(3 == tChargingOrder.getPaymentType()){
//               RefundReq dto = new RefundReq();
//               dto.setOutTradeNo(tChargingOrder.getCode());
//               dto.setOutRequestNo(tChargingOrder.getCode());
//               dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
//               dto.setRefundReason("取消订单");
//               RefundResp resp = h5AliPaymentClient.refund(dto).getData();
//               if(null != resp){
//                  tChargingOrder.setRefundStatus(2);
//                  tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
//                  shoppingOrderService.updateById(tChargingOrder);
//                  shoppingOrderRefundService.save(chargingOrderRefund);
//               }
//            }

         }

@@ -3108,20 +3108,20 @@
               vipOrderRefundService.save(chargingOrderRefund);
            }
         }
         if(3 == tChargingOrder.getPaymentType()){
            RefundReq dto = new RefundReq();
            dto.setOutTradeNo(tChargingOrder.getCode());
            dto.setOutRequestNo(tChargingOrder.getCode());
            dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
            dto.setRefundReason("取消订单");
            RefundResp resp = h5AliPaymentClient.refund(dto).getData();
            if(null != resp){
               tChargingOrder.setRefundStatus(2);
               tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
               vipOrderService.updateById(tChargingOrder);
               vipOrderRefundService.save(chargingOrderRefund);
            }
         }
//         if(3 == tChargingOrder.getPaymentType()){
//            RefundReq dto = new RefundReq();
//            dto.setOutTradeNo(tChargingOrder.getCode());
//            dto.setOutRequestNo(tChargingOrder.getCode());
//            dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
//            dto.setRefundReason("取消订单");
//            RefundResp resp = h5AliPaymentClient.refund(dto).getData();
//            if(null != resp){
//               tChargingOrder.setRefundStatus(2);
//               tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
//               vipOrderService.updateById(tChargingOrder);
//               vipOrderRefundService.save(chargingOrderRefund);
//            }
//         }
      }
      return R.ok();
   }