Merge branch 'dev/2024/0719/update-business-Y' of feifan/mall-backend-business into master

店铺新增银行信息

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/vo/ShopPageReqVO.java

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.sale.controller.admin.shop.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -40,4 +39,13 @@ public class ShopPageReqVO extends PageParam {
     @Schema(description = "是否开启自提")
     private Boolean deliveryPickUpEnabled;
 
+
+    @Schema(description = "账户名称", example = "非繁人")
+    private String accountName;
+
+    @Schema(description = "账户号码")
+    private String accountNumber;
+
+    @Schema(description = "开户银行", example = "李四")
+    private String bankName;
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/vo/ShopRespVO.java

@@ -2,9 +2,6 @@ package cn.newfeifan.mall.sale.controller.admin.shop.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
@@ -57,4 +54,16 @@ public class ShopRespVO {
     @ExcelProperty("是否开启自提")
     private Boolean deliveryPickUpEnabled;
 
+    @Schema(description = "账户名称", example = "非繁人")
+    @ExcelProperty("账户名称")
+    private String accountName;
+
+    @Schema(description = "账户号码")
+    @ExcelProperty("账户号码")
+    private String accountNumber;
+
+    @Schema(description = "开户银行", example = "李四")
+    @ExcelProperty("开户银行")
+    private String bankName;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/vo/ShopSaveReqVO.java

@@ -3,7 +3,6 @@ package cn.newfeifan.mall.sale.controller.admin.shop.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import java.util.*;
 import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 店铺新增/修改 Request VO")
@@ -42,4 +41,16 @@ public class ShopSaveReqVO {
 
     @Schema(description = "是否开启自提", example = "1")
     private Boolean deliveryPickUpEnabled;
+
+    @Schema(description = "账户名称", example = "非繁人")
+    @NotNull(message = "账户名称不能为空")
+    private String accountName;
+
+    @Schema(description = "账户号码")
+    @NotNull(message = "账户号码不能为空")
+    private String accountNumber;
+
+    @Schema(description = "开户银行", example = "李四")
+    @NotNull(message = "开户银行不能为空")
+    private String bankName;
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/dataobject/shop/ShopDO.java

@@ -2,9 +2,6 @@ package cn.newfeifan.mall.sale.dal.dataobject.shop;
 
 import lombok.*;
 
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.*;
 import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
@@ -62,4 +59,16 @@ public class ShopDO extends BaseDO {
      */
     private Boolean deliveryPickUpEnabled;
 
+    /**
+     * 账户名称
+     */
+    private String accountName;
+    /**
+     * 账户号码
+     */
+    private String accountNumber;
+    /**
+     * 开户银行
+     */
+    private String bankName;
 }