diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ea9ac58..d4c31b4 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,9 +17,6 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/admin-pc/.env.development b/admin-pc/.env.development
index 3067050..b1751fa 100644
--- a/admin-pc/.env.development
+++ b/admin-pc/.env.development
@@ -1,5 +1,5 @@
NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8000/houserent-admin/
+VUE_APP_API_BASE_URL=https://houserent-admin.hhlm1688.com/houserent-admin/
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
diff --git a/admin-pc/.env.production b/admin-pc/.env.production
index 07b8555..1a73620 100644
--- a/admin-pc/.env.production
+++ b/admin-pc/.env.production
@@ -1,4 +1,4 @@
NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8001/houserent-admin/
+VUE_APP_API_BASE_URL=https://houserent-admin.hhlm1688.com/houserent-admin/
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/houserent-admin.iml b/houserent-admin.iml
deleted file mode 100644
index 9dbf17b..0000000
--- a/houserent-admin.iml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/houserent-applet-api/pom.xml b/houserent-applet-api/pom.xml
index 2a082ec..342d223 100644
--- a/houserent-applet-api/pom.xml
+++ b/houserent-applet-api/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- answer-api
+ houserent-admin
org.jeecgframework.boot
3.2.0
diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java
index 59146b9..310cd41 100644
--- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java
+++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 用户账户表
* @Author: jeecg-boot
- * @Date: 2024-12-07
+ * @Date: 2025-03-23
* @Version: V1.0
*/
@Api(tags="用户账户表")
diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java
index aeee391..a1cccc0 100644
--- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java
+++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 用户账户表
* @Author: jeecg-boot
- * @Date: 2024-12-07
+ * @Date: 2025-03-23
* @Version: V1.0
*/
@Data
@@ -56,6 +56,11 @@ public class HanHaiMember implements Serializable {
@Excel(name = "昵称", width = 15)
@ApiModelProperty(value = "昵称")
private java.lang.String nickName;
+ /**是否会员*/
+ @Excel(name = "是否会员", width = 15, dicCode = "pay_role")
+ @Dict(dicCode = "pay_role")
+ @ApiModelProperty(value = "是否会员")
+ private java.lang.Integer isPay;
/**用户头像*/
@Excel(name = "用户头像", width = 15)
@ApiModelProperty(value = "用户头像")
@@ -167,10 +172,6 @@ public class HanHaiMember implements Serializable {
@Excel(name = "addNum", width = 15)
@ApiModelProperty(value = "addNum")
private java.lang.Integer addNum;
- /**会员*/
- @Excel(name = "会员", width = 15)
- @ApiModelProperty(value = "会员")
- private java.lang.Integer isPay;
/**是否关注公众号*/
@Excel(name = "是否关注公众号", width = 15)
@ApiModelProperty(value = "是否关注公众号")
diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java
index 5cb9cb2..8f50732 100644
--- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java
+++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 用户账户表
* @Author: jeecg-boot
- * @Date: 2024-12-07
+ * @Date: 2025-03-23
* @Version: V1.0
*/
public interface HanHaiMemberMapper extends BaseMapper {
diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java
index dca0382..db19deb 100644
--- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java
+++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 用户账户表
* @Author: jeecg-boot
- * @Date: 2024-12-07
+ * @Date: 2025-03-23
* @Version: V1.0
*/
public interface IHanHaiMemberService extends IService {
diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java
index ec5ae05..e025013 100644
--- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java
+++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 用户账户表
* @Author: jeecg-boot
- * @Date: 2024-12-07
+ * @Date: 2025-03-23
* @Version: V1.0
*/
@Service
diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue
index 9a7a954..22c5b37 100644
--- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue
+++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue
@@ -10,11 +10,16 @@
-
-
+
+
+
+
+
+
+
@@ -169,6 +174,11 @@
align:"center",
dataIndex: 'nickName'
},
+ {
+ title:'是否会员',
+ align:"center",
+ dataIndex: 'isPay_dictText'
+ },
{
title:'用户头像',
align:"center",
@@ -236,6 +246,7 @@
let fieldList=[];
fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''})
+ fieldList.push({type:'int',value:'isPay',text:'是否会员',dictCode:'pay_role'})
fieldList.push({type:'Text',value:'headImage',text:'用户头像',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
fieldList.push({type:'int',value:'role',text:'角色',dictCode:'member_role'})
diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue
index 111cceb..4485e3e 100644
--- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue
+++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue
@@ -8,6 +8,11 @@
+
+
+
+
+
diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts
index fbb108c..f81dbcc 100644
--- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts
+++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts
@@ -14,6 +14,11 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'nickName'
},
+ {
+ title: '是否会员',
+ align:"center",
+ dataIndex: 'isPay_dictText'
+ },
{
title: '用户头像',
align:"center",
@@ -52,6 +57,15 @@ export const searchFormSchema: FormSchema[] = [
label: "昵称",
field: "nickName",
component: 'Input',
+ colProps: {span: 6},
+ },
+ {
+ label: "是否会员",
+ field: "isPay",
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"pay_role"
+ },
colProps: {span: 6},
},
{
@@ -95,6 +109,14 @@ export const formSchema: FormSchema[] = [
field: 'nickName',
component: 'Input',
},
+ {
+ label: '是否会员',
+ field: 'isPay',
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"pay_role"
+ },
+ },
{
label: '用户头像',
field: 'headImage',
diff --git a/module-base/pom.xml b/module-base/pom.xml
index 57e709d..403d0b5 100644
--- a/module-base/pom.xml
+++ b/module-base/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- answer-api
+ houserent-admin
org.jeecgframework.boot
3.2.0
diff --git a/module-common/pom.xml b/module-common/pom.xml
index 4d13500..ea26162 100644
--- a/module-common/pom.xml
+++ b/module-common/pom.xml
@@ -5,7 +5,7 @@
4.0.0
org.jeecgframework.boot
- answer-api
+ houserent-admin
3.2.0
diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java
index 6d91cdd..851b8d8 100644
--- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java
+++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java
@@ -98,7 +98,7 @@ public class AppletLoginServiceImpl implements AppletLoginService {
member = new HanHaiMember();
member.setSessionKey(sessionKey);
member.setAppletOpenid(wxOpenid);
- member.setNickName(null);
+ member.setNickName("农闲宝"+System.currentTimeMillis());
member.setHeadImage(null);
member.setShareId(loginReq.getShareId());
member.setVtime(new Date());
diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/controller/CommonHomeController.java b/module-common/src/main/java/org/jeecg/modules/commonHome/controller/CommonHomeController.java
index c625a65..272908e 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonHome/controller/CommonHomeController.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonHome/controller/CommonHomeController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 房源信息表
* @Author: jeecg-boot
- * @Date: 2024-12-07
+ * @Date: 2025-03-23
* @Version: V1.0
*/
@Api(tags="房源信息表")
diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/entity/CommonHome.java b/module-common/src/main/java/org/jeecg/modules/commonHome/entity/CommonHome.java
index 06fed6c..b005c29 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonHome/entity/CommonHome.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonHome/entity/CommonHome.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 房源信息表
* @Author: jeecg-boot
- * @Date: 2024-12-07
+ * @Date: 2025-03-23
* @Version: V1.0
*/
@Data
@@ -214,6 +214,11 @@ public class CommonHome implements Serializable {
@Excel(name = "府市民云房屋信息档案查询", width = 15)
@ApiModelProperty(value = "府市民云房屋信息档案查询")
private java.lang.String homeTf;
+ /**审核状态*/
+ @Excel(name = "审核状态", width = 15, dicCode = "home_status")
+ @Dict(dicCode = "home_status")
+ @ApiModelProperty(value = "审核状态")
+ private java.lang.Integer status;
/**户主年龄*/
@Excel(name = "户主年龄", width = 15)
@ApiModelProperty(value = "户主年龄")
@@ -248,8 +253,4 @@ public class CommonHome implements Serializable {
@Excel(name = "视频", width = 15)
@ApiModelProperty(value = "视频")
private java.lang.String mpVio;
- /**审核状态*/
- @Excel(name = "审核状态", width = 15)
- @ApiModelProperty(value = "审核状态")
- private Integer status;
}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/mapper/CommonHomeMapper.java b/module-common/src/main/java/org/jeecg/modules/commonHome/mapper/CommonHomeMapper.java
index c8e32e2..866b7da 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonHome/mapper/CommonHomeMapper.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonHome/mapper/CommonHomeMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 房源信息表
* @Author: jeecg-boot
- * @Date: 2024-12-07
+ * @Date: 2025-03-23
* @Version: V1.0
*/
public interface CommonHomeMapper extends BaseMapper {
diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/service/ICommonHomeService.java b/module-common/src/main/java/org/jeecg/modules/commonHome/service/ICommonHomeService.java
index c4f212e..942778f 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonHome/service/ICommonHomeService.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonHome/service/ICommonHomeService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 房源信息表
* @Author: jeecg-boot
- * @Date: 2024-12-07
+ * @Date: 2025-03-23
* @Version: V1.0
*/
public interface ICommonHomeService extends IService {
diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/service/impl/CommonHomeServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonHome/service/impl/CommonHomeServiceImpl.java
index 0830c32..54bd454 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonHome/service/impl/CommonHomeServiceImpl.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonHome/service/impl/CommonHomeServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 房源信息表
* @Author: jeecg-boot
- * @Date: 2024-12-07
+ * @Date: 2025-03-23
* @Version: V1.0
*/
@Service
diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/vue/CommonHomeList.vue b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/CommonHomeList.vue
index 1cf540a..02a8daf 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonHome/vue/CommonHomeList.vue
+++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/CommonHomeList.vue
@@ -15,6 +15,11 @@
+
+
+
+
+
@@ -358,6 +363,11 @@
dataIndex: 'homeTf',
scopedSlots: {customRender: 'imgSlot'}
},
+ {
+ title:'审核状态',
+ align:"center",
+ dataIndex: 'status_dictText'
+ },
{
title:'户主年龄',
align:"center",
@@ -474,6 +484,7 @@
fieldList.push({type:'string',value:'homeJtzy',text:'户主家庭职业',dictCode:''})
fieldList.push({type:'string',value:'homeBjsx',text:'报建手续',dictCode:''})
fieldList.push({type:'Text',value:'homeTf',text:'府市民云房屋信息档案查询',dictCode:''})
+ fieldList.push({type:'int',value:'status',text:'审核状态',dictCode:'home_status'})
fieldList.push({type:'string',value:'homeAge',text:'户主年龄',dictCode:''})
fieldList.push({type:'Text',value:'homeImage',text:'产权证照片',dictCode:''})
fieldList.push({type:'Text',value:'homeBz',text:'备注',dictCode:''})
diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeForm.vue b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeForm.vue
index 0578b54..58cf600 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeForm.vue
+++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeForm.vue
@@ -198,6 +198,11 @@
+
+
+
+
+
@@ -275,6 +280,9 @@
},
confirmLoading: false,
validatorRules: {
+ status: [
+ { required: true, message: '请输入审核状态!'},
+ ],
},
url: {
add: "/commonHome/commonHome/add",
diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.data.ts b/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.data.ts
index 42c7b00..06f6bf6 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.data.ts
+++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.data.ts
@@ -208,6 +208,11 @@ export const columns: BasicColumn[] = [
dataIndex: 'homeTf',
customRender:render.renderAvatar,
},
+ {
+ title: '审核状态',
+ align:"center",
+ dataIndex: 'status_dictText'
+ },
{
title: '户主年龄',
align:"center",
@@ -269,6 +274,15 @@ export const searchFormSchema: FormSchema[] = [
componentProps:{
dict:"common_class,title,id"
},
+ colProps: {span: 6},
+ },
+ {
+ label: "审核状态",
+ field: "status",
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"home_status"
+ },
colProps: {span: 6},
},
{
@@ -499,6 +513,19 @@ export const formSchema: FormSchema[] = [
componentProps:{
},
},
+ {
+ label: '审核状态',
+ field: 'status',
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"home_status"
+ },
+ dynamicRules: ({model,schema}) => {
+ return [
+ { required: true, message: '请输入审核状态!'},
+ ];
+ },
+ },
{
label: '户主年龄',
field: 'homeAge',
diff --git a/module-pay/pom.xml b/module-pay/pom.xml
index c2fd2b1..de2bd36 100644
--- a/module-pay/pom.xml
+++ b/module-pay/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- answer-api
+ houserent-admin
org.jeecgframework.boot
3.2.0
diff --git a/module-system/pom.xml b/module-system/pom.xml
index 67230c2..d4f10d9 100644
--- a/module-system/pom.xml
+++ b/module-system/pom.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
org.jeecgframework.boot
- answer-api
+ houserent-admin
3.2.0
4.0.0
diff --git a/pom.xml b/pom.xml
index 48a31ef..e238696 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
4.0.0
org.jeecgframework.boot
- answer-api
+ houserent-admin
3.2.0
pom
HAN HAI ${project.version}