From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 insertions(+), 6 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java b/server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java
index deb42ac..4147f2a 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java
@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
@@ -9,7 +10,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 闂ㄥ簵淇℃伅
@@ -95,21 +98,25 @@
@ApiModelProperty(value = "娉曚汉韬唤璇佸彿鐮侊紙浼佷笟绫诲瀷浣跨敤锛�")
private String legalPersonCard;
- @ApiModelProperty(value = "韬唤璇佹闈㈢収")
+ @ApiModelProperty(value = "韬唤璇佹闈㈢収锛堜紒涓氱被 涓烘硶浜鸿韩浠借瘉淇℃伅锛�")
private String idcardImg;
- @ApiModelProperty(value = "韬唤璇佸弽闈㈢収")
+ @ApiModelProperty(value = "韬唤璇佸弽闈㈢収锛堜紒涓氱被 涓烘硶浜鸿韩浠借瘉淇℃伅")
private String idcardImgBack;
@ApiModelProperty(value = "钀ヤ笟鎵х収")
private String businessImg;
- @ApiModelProperty(value = "鐘舵�侊細0=寰呭鎵癸紱1=瀹℃壒閫氳繃锛�2=瀹℃壒鏈�氳繃", example = "0")
- @ExcelColumn(name = "鐘舵��", index = 7, width = 10, valueMapping = "0=寰呭鎵�;1=瀹℃壒閫氳繃;2=瀹℃壒鏈�氳繃;")
+ @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0=寰呭鎵癸紱1=瀹℃壒閫氳繃锛�2=瀹℃壒鏈�氳繃锛�3=宸叉敮浠樻娂閲�", example = "0")
+ @ExcelColumn(name = "瀹℃壒鐘舵��", index = 7, width = 10, valueMapping = "0=寰呭鎵�;1=瀹℃壒閫氳繃;2=瀹℃壒鏈�氳繃;3=宸叉敮浠樻娂閲�;")
+ private Integer auditStatus;
+
+ @ApiModelProperty(value = "鐘舵�侊細0=鍚敤锛�1=绂佺敤", example = "0")
+ @ExcelColumn(name = "鐘舵��", index = 8, width = 10, valueMapping = "0=鍚敤;1=绂佺敤;")
private Integer status;
@ApiModelProperty(value = "瀹℃壒鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
@ApiModelProperty(value = "瀹℃壒浜�", example = "1")
@@ -118,7 +125,92 @@
@ApiModelProperty(value = "瀹℃壒澶囨敞")
private String auditRemark;
- @ApiModelProperty(value = "OPENID")
+ @ApiModelProperty(value = "褰撳墠鐧诲綍鐢ㄦ埛openid")
private String openid;
+ @ApiModelProperty(value = "鏀粯鐘舵�侊細0=寰呮敮浠橈紱1=宸叉敮浠�", example = "0")
+ private Integer payStatus;
+
+ @ApiModelProperty(value = "寰俊骞冲彴浜ゆ槗璁㈠崟鍙�")
+ private String wxExternalNo;
+
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
+ private String code;
+
+ @ApiModelProperty(value = "鏀粯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ @ApiModelProperty(value = "鎶奸噾閲戦")
+ private Long depositAmount;
+
+ @ApiModelProperty(value = "闂ㄥ簵璇勫垎")
+ private BigDecimal score;
+
+ @ApiModelProperty(value = "娉ㄥ唽浼氬憳涓婚敭")
+ private Integer regionMemberId;
+
+ @ApiModelProperty(value = "鎶奸噾鏀粯浼氬憳openid")
+ private String payMemberOpenId;
+
+ @ApiModelProperty(value = "閰嶉�佽寖鍥�(km)")
+ private BigDecimal deliveryArea;
+
+ @ApiModelProperty(value = "鏀粯瀹濇彁鐜拌处鎴�")
+ private String aliAccount;
+
+ @ApiModelProperty(value = "钀ヤ笟鏃堕棿")
+ private String shopHours;
+
+ @ApiModelProperty(value = "闂ㄥ簵浠嬬粛")
+ private String content;
+
+ @ApiModelProperty(value = "闂ㄥ簵澶村儚")
+ private String coverImg;
+
+ @ApiModelProperty(value = "瀵勫瓨绫诲瀷锛堥�楀彿鍒嗛殧鐨刢ategory涓婚敭锛�")
+ private String depositTypes;
+
+ @ApiModelProperty(value = "鏀惰垂鏍囧噯")
+ private String feeStandard;
+
+ @ApiModelProperty(value = "闂ㄥ簵钀ヤ笟绫诲瀷锛�0=闈炲叏澶╋紱1=鍏ㄥぉ", example = "0")
+ private Integer businessType;
+
+
+ // 闈炴寔涔呭寲锛氶檮浠跺垪琛�
+ @TableField(exist = false)
+ @ApiModelProperty(value = "闂ㄥ簵闂ㄥご鐓�", hidden = true)
+ private List<String> storeFrontImgs;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "闂ㄥ簵鍐呴儴鐓�", hidden = true)
+ private List<String> storeInteriorImgs;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍏朵粬鏉愭枡", hidden = true)
+ private List<String> otherMaterialImgs;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏈夋晥鍔冲姩鍚堝悓", hidden = true)
+ private List<String> laborContractImgs;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "绀句繚缂寸撼璇佹槑", hidden = true)
+ private List<String> socialSecurityImgs;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娉ㄥ唽寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createStartTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娉ㄥ唽缁撴潫鏃堕棿(鏌ヨ鐢�)", example = "2026-12-31")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createEndTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀹℃壒鐘舵�佸垪琛�(鏌ヨ鐢紝閫楀彿鍒嗛殧)", example = "0,1,2")
+ private List<Integer> auditStatusList;
+
}
--
Gitblit v1.9.3