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


@@ -708,6 +708,9 @@


         preChargeCheck1.setStartupSuccess(2);


         order.setStatus(3);


         order.setStartTime(LocalDateTime.now());


         TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();


         chargingGun.setStatus(4);


         chargingGunClient.updateChargingGunById(chargingGun);


      }


      redisService.setCacheObject("AQJC_" + order.getChargingGunId(), preChargeCheck1, 24L, TimeUnit.HOURS);


      this.updateById(order);


@@ -1275,12 +1278,12 @@


      List<ChargingOrderListVO> list = this.baseMapper.chargingList(pageInfo,dto,startTime1,startTime2,endTime1,endTime2);


      for (ChargingOrderListVO chargingOrderListVO : list) {


         chargingOrderListVO.setChargingCapacity(chargingOrderListVO.getElectricity());


         chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getOrderAmount());


         chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getPaymentAmount());


         BigDecimal bigDecimal = new BigDecimal("0.006");


         if (chargingOrderListVO.getServiceCharge()!=null){


            chargingOrderListVO.setCommissionAmount(chargingOrderListVO.getServiceCharge().multiply(bigDecimal));


         }


         chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getResidualAmount()==null?chargingOrderListVO.getPaymentAmount():chargingOrderListVO.getPaymentAmount().subtract(chargingOrderListVO.getResidualAmount()));


         chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getResidualAmount()==null?chargingOrderListVO.getPaymentAmount():chargingOrderListVO.getPaymentAmount());


         chargingOrderListVO.setUid(chargingOrderListVO.getId()+"");


         List<Integer> integers = new ArrayList<>();


         integers.add(chargingOrderListVO.getSiteId());


@@ -1404,7 +1407,7 @@


      for (ChargingOrderListVO chargingOrderListVO : list1) {


         if (chargingOrderListVO.getChargingCapacity()!=null)electronic = electronic.add(chargingOrderListVO.getElectricity());




         if (chargingOrderListVO.getPaymentAmount()!=null)paymentAmount = paymentAmount.add(chargingOrderListVO.getOrderAmount());


         if (chargingOrderListVO.getPaymentAmount()!=null)paymentAmount = paymentAmount.add(chargingOrderListVO.getPaymentAmount());


         if (chargingOrderListVO.getElectrovalence()!=null)electrovalence = electrovalence.add(chargingOrderListVO.getElectrovalence());


         if (chargingOrderListVO.getServiceCharge()!=null)serviceCharge = serviceCharge.add(chargingOrderListVO.getServiceCharge());


         List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategyService.lambdaQuery()


@@ -2078,7 +2081,7 @@


               model.setNotify_url("/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());


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


               amount.setCurrency("CNY");


               model.setAmount(amount);


               R<String> orderR = wxPaymentClient.refundOrderR(model);