ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java
@@ -31,6 +31,8 @@ private String endTime; @ApiModelProperty(value = "订单来源 1明星 2快电 3新电途") private Integer orderSource; @ApiModelProperty(value = "是否白名单用户：0=否，1=是") private Integer isWhitelist; @ApiModelProperty(value = "支付方式筛选 1微信支付 2支付宝支付 3余额支付") private Integer paymentType; @ApiModelProperty(value = "用户ids 前端忽略") ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -3,16 +3,13 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.account.api.feignClient.AppUserCarClient; import com.ruoyi.account.api.feignClient.AppUserClient; import com.ruoyi.account.api.model.TAppUser; import com.ruoyi.account.api.model.TAppUserCar; import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient; import com.ruoyi.chargingPile.api.feignClient.SiteClient; import com.ruoyi.chargingPile.api.model.Partner; import com.ruoyi.chargingPile.api.model.Site; import com.ruoyi.chargingPile.api.model.TChargingGun; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.WebUtils; @@ -50,7 +47,6 @@ import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; /** * <p> @@ -79,13 +75,7 @@ @Resource private AppUserClient appUserClient; @Resource private ChargingGunClient chargingGunClient; @Resource private AppUserCarClient appUserCarClient; @Resource private AccountingStrategyOrderService accountingStrategyOrderService; @Resource private TChargingOrderAccountingStrategyService tChargingOrderAccountingStrategyService; @@ -112,41 +102,24 @@ public void export(@RequestBody ChargingListQuery dto) { List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>(); List<ChargingOrderListVO> exportList = chargingOrderService.export(dto); int i = 1; List<TChargingGun> data = chargingGunClient.getAllGun().getData(); List<Site> data9 = siteClient.getSiteAll().getData(); List<TAppUser> data6 = appUserClient.getAllUser().getData(); List<Partner> data7 = siteClient.getAllPartner().getData(); // List<Long> collect = exportList.stream().map(ChargingOrderListVO::getId).collect(Collectors.toList()); // List<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>() // .in("charging_order_id", collect)); List<TVip> data5 = vipClient.getAllVip().getData(); List<TAppUserCar> data8 = appUserCarClient.getAllCar().getData(); for (ChargingOrderListVO chargingOrderListVO : exportList) { TChargingOrderExport tChargingOrderExport = new TChargingOrderExport(); Site site = data9.stream().filter(e -> e.getId().equals(chargingOrderListVO.getSiteId())).findFirst().orElse(null); TAppUser data3 = data6.stream().filter(e->e.getId().equals(chargingOrderListVO.getAppUserId())).findFirst().orElse(null); TChargingGun data4 = data.stream().filter(e->e.getId().equals(chargingOrderListVO.getChargingGunId())).findFirst().orElse(null); if (site!=null){ tChargingOrderExport.setSiteCode(site.getCode()); tChargingOrderExport.setSiteName(chargingOrderListVO.getSiteName()); tChargingOrderExport.setCity(site.getCity()); tChargingOrderExport.setCityName(site.getDistricts()); tChargingOrderExport.setSiteType(site.getSiteType()); tChargingOrderExport.setStatus(site.getStatus()+""); Partner data2 = data7.stream().filter(e->e.getId().equals(site.getPartnerId())).findFirst().orElse(null); if (data2!=null){ tChargingOrderExport.setPartner(data2.getName()); } } tChargingOrderExport.setSaleType("1"); tChargingOrderExport.setBusinessCategory("1"); tChargingOrderExport.setId(i); tChargingOrderExport.setCode(chargingOrderListVO.getCode()); tChargingOrderExport.setTerminalName(chargingOrderListVO.getTerminalName()); tChargingOrderExport.setName(chargingOrderListVO.getAccountingStrategyName()); tChargingOrderExport.setOrderClassification("1"); tChargingOrderExport.setStartType("扫码"); tChargingOrderExport.setOne("小程序"); if (chargingOrderListVO.getRechargePaymentType()!=null){ if (chargingOrderListVO.getOrderSource()!=null&&chargingOrderListVO.getOrderSource().equals(2)){ @@ -187,47 +160,15 @@ String s3 = DateUtils.localDateTimeToString(chargingOrderListVO.getEndTime()); tChargingOrderExport.setEndTime(s3); } tChargingOrderExport.setRechargePaymentStatus(chargingOrderListVO.getRechargePaymentStatus()+""); tChargingOrderExport.setType("充电订单"); tChargingOrderExport.setChargingType("单桩双充"); tChargingOrderExport.setEndmode(chargingOrderListVO.getEndMode()+""); tChargingOrderExport.setChargingEndAccount("平台"); tChargingOrderExport.setIsFree("否"); tChargingOrderExport.setElectrovalence(chargingOrderListVO.getElectrovalence()+""); tChargingOrderExport.setServiceCharge(chargingOrderListVO.getServiceCharge()+""); tChargingOrderExport.setTotal(chargingOrderListVO.getPaymentAmount()+""); tChargingOrderExport.setChargingCapacity(chargingOrderListVO.getElectricity()+""); // List<TChargingOrderAccountingStrategy> stageCost = stageCostAll.stream().filter(e -> e.getChargingOrderId().equals(chargingOrderListVO.getId())).collect(Collectors.toList()); // if (!stageCost.isEmpty()){ // // 累加时段电费单价 取平均值 // BigDecimal bigDecimal1 = new BigDecimal("0"); // BigDecimal bigDecimal2 = new BigDecimal("0"); // BigDecimal bigDecimal3 = new BigDecimal("0"); // BigDecimal size = new BigDecimal(stageCost.size()); // // for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : stageCost) { // bigDecimal1 = bigDecimal1.add(tChargingOrderAccountingStrategy.getPeriodElectricPrice()); // bigDecimal2 = bigDecimal2.add(tChargingOrderAccountingStrategy.getPeriodServicePrice()); // bigDecimal3 = bigDecimal3.add(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice()); // } // BigDecimal divide1 = bigDecimal1.divide(size, 2, RoundingMode.HALF_DOWN); // BigDecimal divide2 = bigDecimal2.divide(size, 2, RoundingMode.HALF_DOWN); // BigDecimal divide3 = bigDecimal3.divide(size, 2, RoundingMode.HALF_DOWN); // tChargingOrderExport.setElectrovalencePrice(divide1+""); // tChargingOrderExport.setServiceChargePrice(divide2+""); // tChargingOrderExport.setServiceChargePriceLook(divide3+""); // } tChargingOrderExport.setElectrovalencePrice(""); tChargingOrderExport.setServiceChargePrice(""); tChargingOrderExport.setServiceChargePriceLook(""); tChargingOrderExport.setCumulativeChargingTime(chargingOrderListVO.getChargingSecond() + ""); tChargingOrderExport.setRefundAmount(null != chargingOrderListVO.getRefundAmount() ? chargingOrderListVO.getRefundAmount().toString() : ""); tChargingOrderExport.setStartSoc(chargingOrderListVO.getStartSoc()); tChargingOrderExport.setEndtSoc(chargingOrderListVO.getEndSoc()); tChargingOrderExport.setIsSoc("否"); tChargingOrderExport.setIsSocType(""); tChargingOrderExport.setIsSocNum("0"); tChargingOrderExport.setUserType("普通个人用户"); if (data3!=null&&data3.getVipId()!=null){ TVip data1 = data5.stream().filter(e->e.getId().equals(data3.getVipId())).findFirst().orElse(null); if (data1!=null){ @@ -236,35 +177,18 @@ } tChargingOrderExport.setIsPlus(chargingOrderListVO.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0?"是":"否"); if (data3!=null){ tChargingOrderExport.setRealName(data3.getName()); tChargingOrderExport.setPhone(data3.getPhone()); tChargingOrderExport.setNickName(data3.getName()); } if (data4!=null){ tChargingOrderExport.setDeviceCode(data4.getCode()); } tChargingOrderExport.setAccountType("个人"); TAppUserCar tAppUserCar = data8.stream().filter(e -> e.getId().equals(chargingOrderListVO.getAppUserId())).findFirst().orElse(null); if (tAppUserCar!=null){ tChargingOrderExport.setCarNumber(tAppUserCar.getLicensePlate()); tChargingOrderExport.setCarType(tAppUserCar.getVehicleModel()); tChargingOrderExport.setCarBrand(tAppUserCar.getVehicleBrand()); } tChargingOrderExport.setOrderCode(chargingOrderListVO.getStartChargeSeq()); tChargingOrderExport.setIsSingle("是"); tChargingOrderExport.setPayTime(chargingOrderListVO.getPayTime()+""); tChargingOrderExport.setElectrovalenceSiteName("四川明星新能源科技有限公司"); tChargingOrderExport.setCompanyNameAdmin("四川明星新能源科技有限公司"); tChargingOrderExport.setMoneyType("线上计费"); tChargingOrderExport.setDeviceType("设备直连(自由集控)"); tChargingOrderExport.setSettlementCompanyName("四川明星新能源科技有限公司"); tChargingOrderExport.setPrePaymentType("先付后退"); tChargingOrderExport.setIsSecurity("是"); tChargingOrderExport.setSharingAmount(formatMoney(chargingOrderListVO.getSharingAmount())); tChargingOrderExport.setIsWhitelist(Integer.valueOf(1).equals(chargingOrderListVO.getIsWhitelist()) ? "是" : "否"); tChargingOrderExport.setWhitelistElectricRefundAmount(formatMoney(chargingOrderListVO.getWhitelistElectricRefundAmount())); tChargingOrderExport.setWhitelistServiceRefundAmount(formatMoney(chargingOrderListVO.getWhitelistServiceRefundAmount())); tChargingOrderExports.add(tChargingOrderExport); i++; } Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TChargingOrderExport.class, tChargingOrderExports); HttpServletResponse response = WebUtils.response(); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
@@ -8,36 +8,25 @@ @Data @ApiModel(value = "充电时段统计-导出") public class TChargingOrderExport implements Serializable { @Excel(name = "序号",width = 30) private Integer id; @Excel(name = "订单编号",width = 30) private String code; @Excel(name = "电站编号",width = 30) private String siteCode; @Excel(name = "电站名称",width = 30) private String siteName; @Excel(name = "终端名称",width = 30) private String terminalName; @Excel(name = "所属城市",width = 30) private String city; @Excel(name = "市区名称",width = 30) private String cityName; @Excel(name = "所属合作商",width = 30) private String partner; @Excel(name = "电站类型",width = 30,replace = {"其他_0","公共_1","个人_2","公交_3","环卫_4","物流_5","出租车_6"}) private Integer siteType; @Excel(name = "售电模式",width = 30,replace = {"正常使用_1","维修中_2","关闭下线_3"}) private String saleType; @Excel(name = "站点状态",width = 30,replace = {"正常使用_1","维修中_2","关闭下线_3"}) private String status; @Excel(name = "运营类型",width = 30,replace = {"直营_1","非直营_2"}) private String businessCategory; @Excel(name = "计费模板",width = 30) private String name; @Excel(name = "收款方式",width = 30,replace = {"线上_1","线下_2"}) private String orderClassification; @Excel(name = "充电启动方式",width = 30) private String startType; @Excel(name = "一级来源",width = 30) private String one; @@ -49,17 +38,12 @@ private String startTime; @Excel(name = "充电结束时间",width = 30) private String endTime; @Excel(name = "订单状态",width = 30,replace = {"待支付_1","已支付_2"}) private String rechargePaymentStatus; @Excel(name = "订单类型",width = 30) private String type; @Excel(name = "充电形式",width = 30) private String chargingType; @Excel(name = "判定结束原因",width = 30,replace = {"异常终止_0","主动终止_1","满电终止_2","费用不足终止_3"}) private String endmode; @Excel(name = "充电结束账号",width = 30) private String chargingEndAccount; @Excel(name = "是否是免费订单",width = 30) private String isFree; @Excel(name = "充电电费(元)",width = 30) private String electrovalence; @@ -69,11 +53,8 @@ private String total; @Excel(name = "充电电量(度)",width = 30) private String chargingCapacity; @Excel(name = "平均电费单价(元)",width = 30) private String electrovalencePrice; @Excel(name = "平均服务费实际单价(元)",width = 30) private String serviceChargePrice; @Excel(name = "平均服务费挂牌单价(元)",width = 30) private String serviceChargePriceLook; @Excel(name = "充电时长(分钟)",width = 30) private String cumulativeChargingTime; @@ -89,39 +70,25 @@ private String startSoc; @Excel(name = "充电后soc",width = 30) private String endtSoc; @Excel(name = "是否限制soc",width = 30) private String isSoc; @Excel(name = "限制soc方式",width = 30) private String isSocType; @Excel(name = "限制soc值",width = 30) private String isSocNum; @Excel(name = "客户类型",width = 30) private String userType; @Excel(name = "会员类型",width = 30) private String vipType; @Excel(name = "是否PLUS订单",width = 30) private String isPlus; @Excel(name = "客户编号",width = 30) private String userCode; @Excel(name = "真实姓名",width = 30) private String realName; @Excel(name = "设备号",width = 30) private String deviceCode; @Excel(name = "手机号",width = 30) private String phone; @Excel(name = "昵称",width = 30) private String nickName; @Excel(name = "企业编号",width = 30) private String companyCode; @Excel(name = "企业名称",width = 30) private String companyName; @Excel(name = "扣费账户类型",width = 30) private String accountType; @Excel(name = "使用人",width = 30) private String useUser; @Excel(name = "卡号",width = 30) private String bankCard; @Excel(name = "代充使用人",width = 30) private String replaceUser; @Excel(name = "车架号",width = 30) private String carSiteName; @@ -129,42 +96,27 @@ private String carSiteSource; @Excel(name = "车牌号",width = 30) private String carNumber; @Excel(name = "发动机号",width = 30) private String carEngineNumber; @Excel(name = "车辆自编号",width = 30) private String carNumberCode; @Excel(name = "第三方商户订单",width = 30) private String orderCode; @Excel(name = "判定车牌号",width = 30) private String carNumberSource; @Excel(name = "是否单枪",width = 30) private String isSingle; @Excel(name = "选择车型",width = 30) private String carType; @Excel(name = "车辆品牌",width = 30) private String carBrand; @Excel(name = "判定车系",width = 30) private String carSeries; @Excel(name = "判定车系来源",width = 30) private String carSeriesSource; @Excel(name = "收款时间",width = 30) private String payTime; @Excel(name = "电费结算方编码",width = 30) private String electrovalenceSiteCode; @Excel(name = "电费结算方名称",width = 30) private String electrovalenceSiteName; @Excel(name = "管理公司",width = 30) private String companyNameAdmin; @Excel(name = "计费方式",width = 30) private String moneyType; @Excel(name = "设备接入方式",width = 30) private String deviceType; @Excel(name = "核算公司",width = 30) private String settlementCompanyName; @Excel(name = "预支付类型",width = 30) private String prePaymentType; @Excel(name = "是否安全防护订单",width = 30) private String isSecurity; @Excel(name = "引流平台分佣",width = 30) private String sharingAmount; @Excel(name = "是否白名单",width = 30) private String isWhitelist; @Excel(name = "白名单电费退款金额",width = 30) ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -125,6 +125,9 @@ <if test="req.orderSource != null and req.orderSource == 3 "> and t1.tripartite_platform_name = 'XinDianTu' </if> <if test="req.isWhitelist != null"> and t1.is_whitelist = #{req.isWhitelist} </if> <if test="req.paymentType != null and req.paymentType == 1 "> and t1.recharge_payment_type = 1 </if> @@ -1050,6 +1053,8 @@ h.electrovalence as electrovalence, CASE WHEN a.order_source = 1 THEN h.serviceCharge ELSE h.serviceCharge * 0.8 END as serviceCharge, 0 as commissionAmount, <!-- 引流平台分佣按三方订单原始服务费的20%计算，导出需展示在白名单字段前。 --> CASE WHEN a.order_source = 2 THEN IFNULL(h.serviceCharge, 0) * 0.2 ELSE 0 END as sharingAmount, a.tripartite_platform_name as tripartitePlatformName, a.create_time as createTime, a.start_time as startTime, @@ -2151,6 +2156,9 @@ <if test="req.orderSource != null and req.orderSource == 3 "> and b.tripartite_platform_name = 'XinDianTu' </if> <if test="req.isWhitelist != null"> and b.is_whitelist = #{req.isWhitelist} </if> <if test="req.paymentType != null and req.paymentType == 1 "> and b.recharge_payment_type = 1 </if>
