Merge branch 'dev/2024/0717/update-app-Y' of Harper/feifan-backend-zx-app into master

用户的提现记录显示错误

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/applicationforwithdrawal/vo/AppApplicationForWithdrawalPageReqVO.java

@@ -26,8 +26,8 @@ public class AppApplicationForWithdrawalPageReqVO extends PageParam {
     @Schema(description = "支付宝账号", example = "30303")
     private String withdrawalAccount;
 
-    @Schema(description = "提现状态,已完成是1，未完成为0", example = "1")
-    private Boolean status;
+    @Schema(description = "提现状态,成功是1， 失败是2， 提现中为0", example = "1")
+    private Integer status;
 
     @Schema(description = "提现渠道记录id", example = "19322")
     private Long applicationForWithdrawalChannelId;

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/applicationforwithdrawal/vo/AppApplicationForWithdrawalRespVO.java

@@ -30,9 +30,9 @@ public class AppApplicationForWithdrawalRespVO {
     @ExcelProperty("支付宝账号")
     private String withdrawalAccount;
 
-    @Schema(description = "提现状态,已完成是1，未完成为0", example = "1")
-    @ExcelProperty("提现状态,已完成是1，未完成为0")
-    private Boolean status;
+    @Schema(description = "提现状态,成功是1， 失败是2， 提现中为0", example = "1")
+    @ExcelProperty("提现状态,成功是1， 失败是2， 提现中为0")
+    private Integer status;
 
     @Schema(description = "提现渠道记录id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19322")
     @ExcelProperty("提现渠道记录id")

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/applicationforwithdrawal/vo/AppApplicationForWithdrawalSaveReqVO.java

@@ -25,8 +25,8 @@ public class AppApplicationForWithdrawalSaveReqVO {
     @Schema(description = "支付宝账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "30303")
     private String withdrawalAccount;
 
-    @Schema(description = "提现状态,已完成是1，未完成为0", example = "1")
-    private Boolean status;
+    @Schema(description = "提现状态,成功是1， 失败是2， 提现中为0", example = "1")
+    private Integer status;
 
     @Schema(description = "提现渠道记录id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19322")
     private Long applicationForWithdrawalChannelId;

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/applicationforwithdrawal/ApplicationForWithdrawalDO.java

@@ -41,9 +41,9 @@ public class ApplicationForWithdrawalDO extends BaseDO {
      */
     private String withdrawalAccount;
     /**
-     * 提现状态,已完成是1，未完成为0
+     * 提现状态,成功是1， 失败是2， 提现中为0
      */
-    private Boolean status;
+    private Integer status;
     /**
      * 提现渠道记录id
      */

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/favorite/AppFavoriteController.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.newfeifan.mall.framework.common.pojo.CommonResult;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
-import cn.newfeifan.mall.module.product.controller.app.favorite.vo.AppFavoriteBatchReqVO;
 import cn.newfeifan.mall.module.product.controller.app.favorite.vo.AppFavoritePageReqVO;
 import cn.newfeifan.mall.module.product.controller.app.favorite.vo.AppFavoriteReqVO;
 import cn.newfeifan.mall.module.product.controller.app.favorite.vo.AppFavoriteRespVO;