From 1725e64e39e120a94c694b7c18ed313c98a411ba Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 07 九月 2024 09:26:32 +0800 Subject: [PATCH] 代码提交 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 271 ++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 213 insertions(+), 58 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java index d41c20d..ceaf65f 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java @@ -1,10 +1,11 @@ package com.ruoyi.order.service.impl; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.account.api.feignClient.*; import com.ruoyi.account.api.model.*; @@ -16,11 +17,9 @@ import com.ruoyi.common.core.dto.ChargingOrderGroup; import com.ruoyi.common.core.dto.ChargingPercentProvinceDto; import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.BasePage; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.service.TokenService; -import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.integration.api.feignClient.ChargingHandshakeClient; import com.ruoyi.integration.api.feignClient.PlatformStartChargingReplyClient; import com.ruoyi.integration.api.feignClient.SendMessageClient; @@ -32,10 +31,12 @@ import com.ruoyi.integration.api.feignClient.*; import com.ruoyi.integration.api.model.*; import com.ruoyi.integration.api.vo.GetPlatformStopChargingReply; +import com.ruoyi.order.api.dto.SettlementConfirmAdd; import com.ruoyi.order.api.feignClient.AccountingStrategyDetailOrderClient; import com.ruoyi.order.api.feignClient.ChargingOrderAccountingStrategyClient; import com.ruoyi.order.api.model.*; import com.ruoyi.order.api.query.ChargingOrderQuery; +import com.ruoyi.order.api.query.SettlementListQuery; import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery; import com.ruoyi.order.api.vo.ChargingOrderListVO; import com.ruoyi.order.api.vo.ChargingOrderTimeVO; @@ -43,12 +44,18 @@ import com.ruoyi.order.api.vo.TCharingOrderVO; import com.ruoyi.order.dto.*; import com.ruoyi.order.mapper.TChargingOrderMapper; +import com.ruoyi.order.mapper.TSettlementConfirmMapper; +import com.ruoyi.order.service.TChargingOrderAccountingStrategyService; +import com.ruoyi.order.service.TChargingOrderRefundService; +import com.ruoyi.order.service.TChargingOrderService; +import com.ruoyi.order.service.TOrderEvaluateService; import com.ruoyi.order.service.*; import com.ruoyi.other.api.domain.TCoupon; import com.ruoyi.other.api.domain.TGoods; import com.ruoyi.order.vo.ChargingOrderListInfoVO; import com.ruoyi.other.api.domain.TIntegralRule; import com.ruoyi.other.api.feignClient.IntegralRuleClient; +import com.ruoyi.other.api.feignClient.OtherClient; import com.ruoyi.other.api.feignClient.RoleSiteClient; import com.ruoyi.other.api.feignClient.UserSiteClient; import com.ruoyi.payment.api.feignClient.AliPaymentClient; @@ -57,7 +64,6 @@ import com.ruoyi.payment.api.model.RefundResp; import com.ruoyi.payment.api.model.WxPaymentRefundModel; import com.ruoyi.payment.api.vo.*; -import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.SysUserClient; import io.seata.spring.annotation.GlobalTransactional; import io.swagger.annotations.ApiModelProperty; @@ -77,7 +83,6 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; @@ -94,13 +99,16 @@ public class TChargingOrderServiceImpl extends ServiceImpl<TChargingOrderMapper, TChargingOrder> implements TChargingOrderService { private Logger log = LoggerFactory.getLogger(TChargingOrderServiceImpl.class); - + @Resource private ChargingGunClient chargingGunClient; + @Resource + private TSettlementConfirmMapper tSettlementConfirmMapper; @Resource private SiteClient siteClient; - + + @Resource private AppUserCarClient appUserCarClient; @Resource @@ -108,7 +116,6 @@ @Resource private ChargingPileClient chargingPileClient; - @Resource private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService; @@ -122,7 +129,6 @@ @Resource private AliPaymentClient aliPaymentClient; - @Resource private AppCouponClient appCouponClient; @@ -144,45 +150,45 @@ @Resource private TOrderEvaluateService orderEvaluateService; - + @Resource private AccountingStrategyDetailClient accountingStrategyDetailClient; - + @Resource private AccountingStrategyDetailOrderClient accountingStrategyDetailOrderClient; - + @Resource private AccountingStrategyClient accountingStrategyClient; - + @Resource private PlatformStartChargingReplyClient platformStartChargingReplyClient; - + @Resource private TChargingOrderRefundService chargingOrderRefundService; - + @Resource private PlatformStopChargingReplyClient platformStopChargingReplyClient; - + @Resource private AccountingStrategyOrderService accountingStrategyOrderService; - + @Resource private AccountingStrategyDetailOrderService accountingStrategyDetailOrderService; - + @Resource private InviteUserClient inviteUserClient; - + @Resource private AppUserIntegralChangeClient appUserIntegralChangeClient; - + @Resource private IntegralRuleClient integralRuleClient; - + //计数器 private Map<String, Integer> counter_map = new HashMap<>(); - - - + + + /** * 获取小程序充电记录列表数据 @@ -443,7 +449,7 @@ } } this.save(chargingOrder); - + //添加订单的计费策略 TAccountingStrategy accountingStrategy = accountingStrategyClient.getAccountingStrategyById(tChargingGun.getAccountingStrategyId()).getData(); List<TAccountingStrategyDetail> strategyDetailList = accountingStrategyDetailClient.getListByAccountingStrategyId(tChargingGun.getAccountingStrategyId()).getData(); @@ -459,7 +465,7 @@ list1.add(accountingStrategyDetailOrder); } accountingStrategyDetailOrderService.saveBatch(list1); - + //会员优惠折扣将其计入增加充电时长(增加总充电金额) //如果充电总金额未使用完,则需要退回费用=(原金额/总金额)*(总金额-实际充电金额) if(1 == addChargingOrder.getPaymentType()){ @@ -507,7 +513,7 @@ chargingOrder.setRechargePaymentStatus(2); chargingOrder.setRechargeSerialNumber(transaction_id); chargingOrder.setStatus(2); - + //添加安全检测数据到缓存中,每步安全检测完成后需要更新缓存数据 PreChargeCheck preChargeCheck = new PreChargeCheck(); preChargeCheck.setElectronicLockLock(false); @@ -529,7 +535,7 @@ //计算电费金额和服务费 BigDecimal serviceCharge = strategyDetail.getServiceCharge().multiply(degrees); BigDecimal electrovalence = strategyDetail.getElectrovalence().multiply(degrees); - + //再处理会员折扣 BigDecimal discount = BigDecimal.ZERO; TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData(); @@ -547,8 +553,8 @@ electrovalence = electrovalence.add(discount); chargingOrder.setChargeAmount(electrovalence); this.updateById(chargingOrder); - - + + TChargingPile chargingPile = chargingPileClient.getChargingPileById(chargingGun.getChargingPileId()).getData(); //调用远程启动充电消息 PlatformStartCharging platformStartCharging = new PlatformStartCharging(); @@ -665,11 +671,11 @@ } } } - + } } - - + + /** * 启动失败后微信退款的回调处理 * @param out_refund_no @@ -688,10 +694,10 @@ } return AjaxResult.success(); } - - - - + + + + /** * 获取充电中的详情 * @param id @@ -754,7 +760,7 @@ chargingOrder.setStatus(4); chargingOrder.setEndMode(1); this.updateById(chargingOrder); - + //异步线程处理停机 ExecutorService cachedThreadPool = Executors.newFixedThreadPool(1); cachedThreadPool.execute(()->{ @@ -779,7 +785,7 @@ } continue; } - + if(0 == reply.getStop_result()){ String failure_cause = ""; switch (reply.getFailure_cause()){ @@ -799,14 +805,14 @@ log.error("停机失败:订单号:{},失败原因:{}", chargingOrder.getCode(), failure_cause); throw new RuntimeException(failure_cause); } - + //计算费用,处理退款 endCharge(chargingOrder); break; } }); - - + + //处理推荐奖励(被推荐首单奖励) TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData(); long count = this.count(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserId, chargingOrder.getAppUserId()) @@ -841,15 +847,15 @@ appUserIntegralChange.setCurrentIntegral(appUser1.getPoints() + num1); appUserIntegralChange.setCreateTime(LocalDateTime.now()); appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange); - + appUser1.setPoints(appUser1.getPoints() + num1); appUserClient.updateAppUser(appUser1); } - + return AjaxResult.success(); } - - + + /** * 手动结束后的费用计算和退款逻辑 */ @@ -876,14 +882,14 @@ orderAmount = orderAmount.divide(chargingOrder.getVipDiscount().divide(new BigDecimal(10))); chargingOrder.setOrderAmount(total); } - + if(chargingOrder.getEndMode() == 2){ chargingOrder.setEndMode(refundAmount.compareTo(BigDecimal.ZERO) > 0 ? 2 : 3); } chargingOrder.setStatus(5); chargingOrder.setPaymentAmount(payAmount); this.updateById(chargingOrder); - + //计算优惠券 if(null != chargingOrder.getAppCouponId()){ //判断实际充电金额是否满足优惠券使用条件,如果不满足则不适用优惠券。 @@ -919,7 +925,7 @@ } } } - + if(null != chargingOrder.getVipDiscount()){ BigDecimal subtract = orderAmount.subtract(total); chargingOrder.setVipDiscountAmount(subtract); @@ -975,9 +981,9 @@ } } } - + } - + } @@ -1466,7 +1472,7 @@ chargingOrderAccountingStrategyService.save(chargingOrderAccountingStrategy1); } } - + List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>() .eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId())); BigDecimal t = BigDecimal.ZERO; @@ -1480,8 +1486,8 @@ this.updateById(chargingOrder); } } - - + + /** * 自动结束充电后的处理逻辑 * @param orderCode @@ -1497,10 +1503,10 @@ chargingOrder.setStatus(5); chargingOrder.setEndMode(endMode); this.updateById(chargingOrder); - + //计算费用,处理退款 endCharge(chargingOrder); - + //处理推荐奖励(被推荐首单奖励) TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData(); long count = this.count(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserId, chargingOrder.getAppUserId()) @@ -1535,12 +1541,12 @@ appUserIntegralChange.setCurrentIntegral(appUser1.getPoints() + num1); appUserIntegralChange.setCreateTime(LocalDateTime.now()); appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange); - + appUser1.setPoints(appUser1.getPoints() + num1); appUserClient.updateAppUser(appUser1); } } - + /** * 异常结束充电处理逻辑 * @param orderCode @@ -1549,4 +1555,153 @@ public void excelEndCharge(String orderCode) { endCharge(orderCode, 0); } + + @Override + public TSettlementConfirm settlementAdd(SettlementConfirmAdd dto) { + List<Site> data = siteClient.getSiteByIds(Arrays.asList(dto.getSiteId())).getData(); + TSettlementConfirm tSettlementConfirm = new TSettlementConfirm(); + if (!data.isEmpty()){ + tSettlementConfirm.setSiteName(data.get(0).getName()); + tSettlementConfirm.setPartnerId(data.get(0).getPartnerId()); + if (data.get(0).getPartnerId()!=null){ + Partner data1 = siteClient.getPartnerR(data.get(0).getPartnerId()).getData(); + if (data1!=null){ + tSettlementConfirm.setPartnerName(data1.getName()); + tSettlementConfirm.setPartnerId(data1.getId()); + } + } + } + String startTime = dto.getStartTime(); + String endTime = dto.getEndTime(); + // 将这两个时间转化为localDateTime + tSettlementConfirm.setStartTime(LocalDateTime.parse(startTime)); + tSettlementConfirm.setEndTime(LocalDateTime.parse(endTime)); + // 根据站点id和开始时间和结束时间和归属日期 查询充电订单列表 + QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>() + .eq("site_id", dto.getSiteId()) + .eq("recharge_payment_status",2); + switch (dto.getType()){ + case 1: + eq.between("start_time", startTime, endTime); + break; + case 2: + eq.between("end_time", startTime, endTime); + break; + } + List<TChargingOrder> tChargingOrders = this.baseMapper.selectList(eq); + // 充电电量 度 + BigDecimal chargingElectronic = new BigDecimal("0"); + // 三方收费 分佣 + BigDecimal sharingAmount = new BigDecimal("0"); + // 三方交易手续费 三方收费*0.6% + BigDecimal commissionAmount = new BigDecimal("0"); + // 累计电费 + BigDecimal electrovalence = new BigDecimal("0"); + // 累计服务费 + BigDecimal serviceCharge = new BigDecimal("0"); + // 订单手续费 订单支付金额*0.6% + BigDecimal orderCommission = new BigDecimal("0"); + // 会员抵扣 + BigDecimal vipDiscount = new BigDecimal("0"); + // 优惠券抵扣 + BigDecimal couponDiscount = new BigDecimal("0"); + // 支付订单金额 需要减去退款金额 + BigDecimal paymentAmount = new BigDecimal("0"); + for (TChargingOrder tChargingOrder : tChargingOrders) { + // 累加充电总度数 + chargingElectronic = chargingElectronic.add(tChargingOrder.getChargingCapacity()); + // 累加分佣 + sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount()); + // 累加电费 + electrovalence = electrovalence.add(tChargingOrder.getElectrovalence()); + // 累加服务费 + serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge()); + // 累加会员折扣 + if (tChargingOrder.getVipDiscountAmount()!=null){ + vipDiscount = vipDiscount.add(tChargingOrder.getVipDiscountAmount()); + } + // 累加优惠券折扣 + if (tChargingOrder.getCouponDiscountAmount()!=null){ + couponDiscount = couponDiscount.add(tChargingOrder.getCouponDiscountAmount()); + } + if (tChargingOrder.getRefundStatus() == 2){ + // 如果成功退款 那么减去退款金额 + paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount().subtract(tChargingOrder.getRefundAmount())); + }else{ + paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()); + } + } + // 三方交易手续费 三方收费*0.6% + commissionAmount = sharingAmount.multiply(new BigDecimal("0.006")); + // 订单手续费 订单支付金额 - 退款金额*0.6% + orderCommission = paymentAmount.multiply(new BigDecimal("0.006")); + tSettlementConfirm.setSharingAmount(sharingAmount); + tSettlementConfirm.setCommissionAmount(commissionAmount); + tSettlementConfirm.setElectrovalence(electrovalence); + // 服务费=总服务费-三费收费-交易手续费-交易手续费-服务费会员抵扣-服务费优惠券抵扣 + tSettlementConfirm.setServiceCharge(serviceCharge.subtract(commissionAmount).subtract(sharingAmount).subtract(orderCommission).subtract(vipDiscount).subtract(couponDiscount)); + tSettlementConfirm.setOrderCommission(orderCommission); + tSettlementConfirm.setVipDiscount(vipDiscount); + tSettlementConfirm.setCouponDiscount(couponDiscount); + tSettlementConfirm.setSiteId(dto.getSiteId()); + tSettlementConfirm.setMeteringElectronic(dto.getData().getMeteringElectronic()); + tSettlementConfirm.setChargingElectronic(chargingElectronic); + tSettlementConfirm.setLossElectronic(dto.getData().getLossElectronic()); + tSettlementConfirm.setIncome(chargingElectronic.add(serviceCharge)); + tSettlementConfirm.setVenue(dto.getData().getVenue()); + tSettlementConfirm.setMetering(dto.getData().getMetering()); + tSettlementConfirm.setClean(dto.getData().getClean()); + tSettlementConfirm.setMaintain(dto.getData().getMaintain()); + tSettlementConfirm.setCost(dto.getData().getCost()); + tSettlementConfirm.setProfitMoney(new BigDecimal("0")); + tSettlementConfirm.setNewMoney(new BigDecimal("0")); + tSettlementConfirm.setNewSettlement(new BigDecimal("0")); + tSettlementConfirm.setVipDiscount(vipDiscount); + tSettlementConfirm.setCouponDiscount(couponDiscount); + tSettlementConfirm.setSupplyElectronic(dto.getData().getSupplyElectronic()); + tSettlementConfirm.setType(dto.getType()); + tSettlementConfirm.setProportionPartner(dto.getData().getProportionPartner()); + tSettlementConfirm.setProportionMoney(dto.getData().getProportionMoney()); + tSettlementConfirm.setTotalElectronic(dto.getData().getTotalElectronic()); + tSettlementConfirm.setTotalService(dto.getData().getTotalService()); + tSettlementConfirm.setRemark(dto.getData().getRemark()); + tSettlementConfirm.setServicePartner(dto.getData().getServicePartner()); + tSettlementConfirm.setServiceMoney(dto.getData().getServiceMoney()); + tSettlementConfirm.setTotalService(dto.getData().getTotalService()); + tSettlementConfirm.setServiceRemark(dto.getData().getServiceRemark()); + if (dto.getState() == 2){ + tSettlementConfirmMapper.insert(tSettlementConfirm); + } + return tSettlementConfirm; + } + + @Override + public PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto) { + PageInfo<TSettlementConfirm> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize()); + List<TSettlementConfirm> list = tSettlementConfirmMapper.settlementList(pageInfo,dto); + for (TSettlementConfirm tSettlementConfirm : list) { + tSettlementConfirm.setUid(tSettlementConfirm.getId().toString()); + Partner data = siteClient.getPartnerR(tSettlementConfirm.getPartnerId()).getData(); + List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(tSettlementConfirm.getSiteId())).getData(); + if (!data1.isEmpty()){ + tSettlementConfirm.setSiteName(data1.get(0).getName()); + } + if (data!=null){ + tSettlementConfirm.setPartnerName(data.getName()); + } + String format = tSettlementConfirm.getStartTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss")); + String format1 = tSettlementConfirm.getEndTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss")); + tSettlementConfirm.setTime(format+"至"+format1); + + + } + pageInfo.setRecords(list); + return null; + } + + public static void main(String[] args) { + String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss")); + String format1 = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss")); + System.err.println(format+"至"+format1); + } } -- Gitblit v1.7.1