明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhibing.pu
2024-09-10 eb5aadd8ea2ce7151459a708d49eb0aedd3c8316 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java


@@ -644,7 +644,7 @@


            model.setOut_trade_no(chargingOrder.getCode());


            model.setOut_refund_no(chargingOrderRefund.getRefundCode());


            model.setReason("充电失败，取消充电订单");


            model.setNotify_url("http://127.0.0.1:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");


            model.setNotify_url("http://221.182.45.100:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");


            WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();


            amount.setRefund(rechargeAmount.multiply(new BigDecimal(100)).intValue());


            amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());


@@ -954,7 +954,7 @@


            model.setOut_trade_no(chargingOrder.getCode());


            model.setOut_refund_no(chargingOrderRefund.getRefundCode());


            model.setReason("充电完成退款");


            model.setNotify_url("http://127.0.0.1:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");


            model.setNotify_url("http://221.182.45.100:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");


            WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();


            amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());


            amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());


@@ -1245,6 +1245,7 @@


      }


      // 不分页


      List<ChargingOrderListVO> list1 = this.baseMapper.chargingList1(dto,startTime1,startTime2,endTime1,endTime2);


      chargingOrderTimeVO.setExportList(list1);


      chargingOrderTimeVO.setOrderCount(list1.size());


      // 计算充电总度数


      BigDecimal electronic = new BigDecimal("0");


@@ -1583,7 +1584,7 @@


               model.setOut_refund_no(chargingOrderRefund.getRefundCode());


               model.setTransaction_id(tChargingOrder.getRechargeSerialNumber());


               model.setReason("取消订单");


               model.setNotify_url("http://127.0.0.1:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");


               model.setNotify_url("http://221.182.45.100:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");


               WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();


               amount.setRefund(payOrderQueryDto.getRefundAmount().multiply(new BigDecimal(100)).intValue());


               amount.setTotal(tChargingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());