ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -3,3 +3,4 @@ com.ruoyi.account.api.factory.AppUserCarFallbackFactory com.ruoyi.account.api.factory.AppUserIntegralChangeFallbackFactory com.ruoyi.account.api.factory.AppUserAddressFallbackFactory com.ruoyi.account.api.factory.AppUserVipDetailFallbackFactory ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java
@@ -46,6 +46,11 @@ public void ack() { } @Override public void close(String outTradeNo) { } }; } } ruoyi-api/ruoyi-api-payment/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@ com.ruoyi.payment.api.factory.ChargingOrderFallbackFactory com.ruoyi.payment.api.factory.WxPaymentFallbackFactory ruoyi-service/ruoyi-chargingPile/pom.xml
@@ -16,6 +16,7 @@ <dependencies> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-api-account</artifactId> @@ -125,6 +126,13 @@ <artifactId>ruoyi-api-order</artifactId> </dependency> <dependency> <groupId>com.alibaba</groupId> <artifactId>easyexcel</artifactId> <version>3.3.0</version> <type>pom</type> </dependency> </dependencies> <build> ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -104,7 +104,15 @@ for (TApplyChargingPile tApplyChargingPile : list) { TApplyChargingPileExportDto applyChargingPileExportDto = new TApplyChargingPileExportDto(); BeanUtils.copyProperties(tApplyChargingPile,applyChargingPileExportDto); applyChargingPileExportDto.setImage(new URL("https://img-blog.csdnimg.cn/direct/c11088e1790049a5b84a0fda21a271b1.png")); applyChargingPileExportDto.setLandlordFrontIdCard(new URL(tApplyChargingPile.getLandlordFrontIdCard())); applyChargingPileExportDto.setLandlordBackIdCard(new URL(tApplyChargingPile.getLandlordBackIdCard())); applyChargingPileExportDto.setAgentBackIdCard(new URL(tApplyChargingPile.getAgentBackIdCard())); applyChargingPileExportDto.setAgentFrontIdCard(new URL(tApplyChargingPile.getAgentFrontIdCard())); List<URL> urls = new ArrayList<>(); urls.add(new URL("https://img-blog.csdnimg.cn/direct/c11088e1790049a5b84a0fda21a271b1.png")); urls.add(new URL("https://img-blog.csdnimg.cn/direct/c11088e1790049a5b84a0fda21a271b1.png")); urls.add(new URL("https://img-blog.csdnimg.cn/direct/c11088e1790049a5b84a0fda21a271b1.png")); applyChargingPileExportDto.setUrls(urls); exportDtos.add(applyChargingPileExportDto); } @@ -115,7 +123,7 @@ // 自动释放资源 try (ExcelWriter excelWriter = excelWriterBuilder.withTemplate(stream).build()) { WriteSheet writeSheet = EasyExcelFactory.writerSheet().build(); excelWriter.fill(list, writeSheet); excelWriter.fill(exportDtos, writeSheet); excelWriter.finish(); } catch (Exception e) { return R.fail("excel导出失败！"); ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/dto/TApplyChargingPileExportDto.java
@@ -1,12 +1,113 @@ package com.ruoyi.chargingPile.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import java.math.BigDecimal; import java.net.URL; import java.time.LocalDate; import java.util.List; @Data public class TApplyChargingPileExportDto { public class TApplyChargingPileExportDto extends BasePojo { @ApiModelProperty(value = "用户id") @TableField("app_user_id") private Long appUserId; @ApiModelProperty(value = "用电地址") @NotBlank(message = "用电地址不能为空") @TableField("address") private String address; private URL image; @ApiModelProperty(value = "申请容量") @TableField("capacity") private BigDecimal capacity; @ApiModelProperty(value = "用电时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @TableField("consumption_time") private LocalDate consumptionTime; @ApiModelProperty(value = "户主经办（0=关，1=开）") @TableField("landlord_handling") private Integer landlordHandling; @ApiModelProperty(value = "户名") @TableField("landlord_name") private String landlordName; @ApiModelProperty(value = "户主身份证号码") @TableField("landlord_id_card") private String landlordIdCard; @ApiModelProperty(value = "户主手机号") @TableField("landlord_phone") private String landlordPhone; @ApiModelProperty(value = "户主身份证正面") @TableField("landlord_front_id_card") private URL landlordFrontIdCard; @ApiModelProperty(value = "户主身份证反面") @TableField("landlord_back_id_card") private URL landlordBackIdCard; @ApiModelProperty(value = "产权证明") @TableField("title_certificate") private String titleCertificate; @ApiModelProperty(value = "营业执照") @TableField("business_license") private String businessLicense; @ApiModelProperty(value = "充电桩用户（0=关，1=开）") @TableField("charging_pile_user") private Integer chargingPileUser; @ApiModelProperty(value = "固定车位产权") @TableField("fixed_parking_property_rights") private String fixedParkingPropertyRights; @ApiModelProperty(value = "施工证明") @TableField("construction_certificate") private String constructionCertificate; @ApiModelProperty(value = "经办人姓名") @TableField("agent_name") private String agentName; @ApiModelProperty(value = "经办人身份证号") @TableField("agent_id_card") private String agentIdCard; @ApiModelProperty(value = "经办人手机号") @TableField("agent_phone") private String agentPhone; @ApiModelProperty(value = "经办人身份证正面") @TableField("agent_front_id_card") private URL agentFrontIdCard; @ApiModelProperty(value = "经办人身份证背面") @TableField("agent_back_id_card") private URL agentBackIdCard; @ApiModelProperty(value = "是否有充电桩（0=否，1=是）") @TableField("charging_pile") private Integer chargingPile; @ApiModelProperty(value = "补充资料") @TableField("further_information") private String furtherInformation; @ApiModelProperty(value = "备注") @TableField("remark") private String remark; private List<URL> urls; } ruoyi-service/ruoyi-chargingPile/src/main/resources/template/充电桩申请记录.xlsxBinary files differ
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -16,7 +16,6 @@ import com.ruoyi.other.api.domain.TGoods; import com.ruoyi.common.core.dto.ExchangeDto; import com.ruoyi.other.api.dto.AdvertisingDTO; import com.ruoyi.order.api.vo.ExchangeDto; import com.ruoyi.other.api.dto.GoodsDTO; import com.ruoyi.other.service.TActivityService; import com.ruoyi.other.service.TCouponService;
