donglang il y a 2 mois
Parent
commit
69346d661b

+ 1 - 1
sckw-common/sckw-common-remote/src/main/java/com/sckw/remote/annotation/SckwRemoteApplication.java

@@ -11,6 +11,6 @@ import java.lang.annotation.*;
 @Inherited
 @EnableDubbo
 @EnableFeignClients({"com.sckw.*.api.feign"})
-@ComponentScan(basePackages = {"com.sckw.payment.config","com.sckw.remote.filter","com.sckw.*.controller", "com.sckw.*.service","com.sckw.*.repository", "com.sckw.*.dubbo", "com.sckw.*.model"})
+@ComponentScan(basePackages = {"com.sckw.file.config","com.sckw.payment.config","com.sckw.remote.filter","com.sckw.*.controller", "com.sckw.*.service","com.sckw.*.repository", "com.sckw.*.dubbo", "com.sckw.*.model"})
 public @interface SckwRemoteApplication {
 }

+ 1 - 2
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpBizWalletController.java

@@ -115,12 +115,11 @@ public class KwpBizWalletController {
      */
     @Operation(summary = "导出钱包冻结明细", description = "导出钱包冻结明细为Excel文件")
     @PostMapping("/exportWalletPrepay")
-    public BaseResult exportWalletPrepay(@RequestBody @Validated KwpBizWalletPrepayQueryRequest request, HttpServletResponse response) {
+    public void exportWalletPrepay(@RequestBody @Validated KwpBizWalletPrepayQueryRequest request, HttpServletResponse response) {
         //查询导出数据
         List<KwpBizWalletPrepayExcelVO> excelVOList = kwpBizWalletService.queryExportWalletPrepay(request);
         //导出
         ExcelUtil.downData(response, KwpBizWalletPrepayExcelVO.class, excelVOList);
-        return BaseResult.success();
     }
 
 

+ 3 - 0
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/request/KwpBizWalletPrepayQueryRequest.java

@@ -1,6 +1,7 @@
 package com.sckw.payment.request;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.page.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
@@ -54,12 +55,14 @@ public class KwpBizWalletPrepayQueryRequest extends PageRequest {
      * 开始时间
      */
     @Schema(description = "开始时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @Schema(description = "结束时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
 }

+ 0 - 3
sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsParam.java

@@ -62,14 +62,11 @@ public class AddGoodsParam {
     /**
      * 发票税率
      */
-    @NotBlank(message = "发票税率不能为空")
     private String taxRate;
 
     /**
      * 是否设置预付限额0否1是
      */
-    @NotNull(message = "是否设置预付限额不能为空")
-    @Range(min = 0, max = 1, message = "非法设置预付限额参数")
     private Integer prepaidLimit;
 
     /**