diff --git a/admin-pc/.env b/admin-pc/.env
index 17c256e..ab697bd 100644
--- a/admin-pc/.env
+++ b/admin-pc/.env
@@ -1,5 +1,5 @@
NODE_ENV=production
-VUE_APP_PLATFORM_NAME=陌美人后台管理系统
+VUE_APP_PLATFORM_NAME=陌美人珠宝管理系统
# 开启单点登录
VUE_APP_SSO=false
# 开启微应用模式
diff --git a/admin-pc/public/index.html b/admin-pc/public/index.html
index ea92740..9d89f76 100644
--- a/admin-pc/public/index.html
+++ b/admin-pc/public/index.html
@@ -5,7 +5,7 @@
-
陌美人系统
+ 陌美人珠宝
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonFack/vue/modules/CommonFackForm.vue b/module-common/src/main/java/org/jeecg/modules/commonFack/vue/modules/CommonFackForm.vue
new file mode 100644
index 0000000..c6b8ee7
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonFack/vue/modules/CommonFackForm.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonFack/vue/modules/CommonFackModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonFack/vue/modules/CommonFackModal.Style#Drawer.vue
new file mode 100644
index 0000000..7938ad0
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonFack/vue/modules/CommonFackModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonFack/vue/modules/CommonFackModal.vue b/module-common/src/main/java/org/jeecg/modules/commonFack/vue/modules/CommonFackModal.vue
new file mode 100644
index 0000000..083f6af
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonFack/vue/modules/CommonFackModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/CommonFack.api.ts b/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/CommonFack.api.ts
new file mode 100644
index 0000000..059d2dd
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/CommonFack.api.ts
@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+ list = '/commonFack/commonFack/list',
+ save='/commonFack/commonFack/add',
+ edit='/commonFack/commonFack/edit',
+ deleteOne = '/commonFack/commonFack/delete',
+ deleteBatch = '/commonFack/commonFack/deleteBatch',
+ importExcel = '/commonFack/commonFack/importExcel',
+ exportXls = '/commonFack/commonFack/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+ defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+ Modal.confirm({
+ title: '确认删除',
+ content: '是否删除选中数据',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+ }
+ });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+ let url = isUpdate ? Api.edit : Api.save;
+ return defHttp.post({url: url, params});
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/CommonFack.data.ts b/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/CommonFack.data.ts
new file mode 100644
index 0000000..5842d14
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/CommonFack.data.ts
@@ -0,0 +1,66 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+ {
+ title: '内容',
+ align:"center",
+ dataIndex: 'remark'
+ },
+ {
+ title: '图片',
+ align:"center",
+ dataIndex: 'image',
+ customRender:render.renderAvatar,
+ },
+ {
+ title: '姓名',
+ align:"center",
+ dataIndex: 'name'
+ },
+ {
+ title: '电话',
+ align:"center",
+ dataIndex: 'phone'
+ },
+ {
+ title: '用户标识',
+ align:"center",
+ dataIndex: 'userId'
+ },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+ {
+ label: '内容',
+ field: 'remark',
+ component: 'InputTextArea',//TODO 注意string转换问题
+ },
+ {
+ label: '图片',
+ field: 'image',
+ component: 'JImageUpload',
+ componentProps:{
+ },
+ },
+ {
+ label: '姓名',
+ field: 'name',
+ component: 'Input',
+ },
+ {
+ label: '电话',
+ field: 'phone',
+ component: 'Input',
+ },
+ {
+ label: '用户标识',
+ field: 'userId',
+ component: 'Input',
+ },
+];
diff --git a/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/CommonFackList.vue b/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/CommonFackList.vue
new file mode 100644
index 0000000..34c8885
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/CommonFackList.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无文件
+ 下载
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/components/CommonFackModal.vue b/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/components/CommonFackModal.vue
new file mode 100644
index 0000000..8d6f246
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonFack/vue3/components/CommonFackModal.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java
index 4a6dae7..e127f61 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 订单信息表
* @Author: jeecg-boot
- * @Date: 2024-12-12
+ * @Date: 2025-01-02
* @Version: V1.0
*/
@Api(tags="订单信息表")
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java
index fd24a0f..9451a9d 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java
@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 订单信息表
* @Author: jeecg-boot
- * @Date: 2024-12-12
+ * @Date: 2025-01-02
* @Version: V1.0
*/
@Data
@@ -128,7 +128,27 @@ public class CommonOrder implements Serializable {
@Excel(name = "物流订单", width = 15)
@ApiModelProperty(value = "物流订单")
private java.lang.String wuliu;
+ /**订单材质*/
+ @Excel(name = "订单材质", width = 15)
+ @ApiModelProperty(value = "订单材质")
+ private java.lang.String subText;
+ /**下单须知*/
+ @Excel(name = "下单须知", width = 15)
+ @ApiModelProperty(value = "下单须知")
+ private java.lang.String orderDetails;
+ /**支付方式*/
+ @Excel(name = "支付方式", width = 15)
+ @ApiModelProperty(value = "支付方式")
+ private java.lang.Integer payType;
+ /**优惠券标识*/
+ @Excel(name = "优惠券标识", width = 15)
+ @ApiModelProperty(value = "优惠券标识")
+ private java.lang.String couponId;
+ /**优惠价格*/
+ @Excel(name = "优惠价格", width = 15)
+ @ApiModelProperty(value = "优惠价格")
+ private java.math.BigDecimal couponPrice;
- @TableField(exist = false)
+ @TableField(exist = false)
private List commonOrderSkuList;
}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java
index 3ba5eb5..3c7d40b 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 订单信息表
* @Author: jeecg-boot
- * @Date: 2024-12-12
+ * @Date: 2025-01-02
* @Version: V1.0
*/
public interface CommonOrderMapper extends BaseMapper {
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java
index c53439a..647f6fd 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 订单信息表
* @Author: jeecg-boot
- * @Date: 2024-12-12
+ * @Date: 2025-01-02
* @Version: V1.0
*/
public interface ICommonOrderService extends IService {
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java
index 6a41943..b185487 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 订单信息表
* @Author: jeecg-boot
- * @Date: 2024-12-12
+ * @Date: 2025-01-02
* @Version: V1.0
*/
@Service
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue
index e07e712..8d3a02b 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue
@@ -217,6 +217,31 @@
align:"center",
dataIndex: 'wuliu'
},
+ {
+ title:'订单材质',
+ align:"center",
+ dataIndex: 'subText'
+ },
+ {
+ title:'下单须知',
+ align:"center",
+ dataIndex: 'orderDetails'
+ },
+ {
+ title:'支付方式',
+ align:"center",
+ dataIndex: 'payType'
+ },
+ {
+ title:'优惠券标识',
+ align:"center",
+ dataIndex: 'couponId'
+ },
+ {
+ title:'优惠价格',
+ align:"center",
+ dataIndex: 'couponPrice'
+ },
{
title: '操作',
dataIndex: 'action',
@@ -267,6 +292,11 @@
fieldList.push({type:'int',value:'shareNum',text:'第几次推荐购买',dictCode:''})
fieldList.push({type:'string',value:'kuai',text:'快递公司',dictCode:''})
fieldList.push({type:'string',value:'wuliu',text:'物流订单',dictCode:''})
+ fieldList.push({type:'string',value:'subText',text:'订单材质',dictCode:''})
+ fieldList.push({type:'Text',value:'orderDetails',text:'下单须知',dictCode:''})
+ fieldList.push({type:'int',value:'payType',text:'支付方式',dictCode:''})
+ fieldList.push({type:'string',value:'couponId',text:'优惠券标识',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'couponPrice',text:'优惠价格',dictCode:''})
this.superFieldList = fieldList
}
}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue
index e506cb3..528c8e1 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue
@@ -83,6 +83,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts
index 17f276d..ef7e4d6 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts
@@ -84,6 +84,31 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'wuliu'
},
+ {
+ title: '订单材质',
+ align:"center",
+ dataIndex: 'subText'
+ },
+ {
+ title: '下单须知',
+ align:"center",
+ dataIndex: 'orderDetails'
+ },
+ {
+ title: '支付方式',
+ align:"center",
+ dataIndex: 'payType'
+ },
+ {
+ title: '优惠券标识',
+ align:"center",
+ dataIndex: 'couponId'
+ },
+ {
+ title: '优惠价格',
+ align:"center",
+ dataIndex: 'couponPrice'
+ },
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@@ -182,4 +207,29 @@ export const formSchema: FormSchema[] = [
field: 'wuliu',
component: 'Input',
},
+ {
+ label: '订单材质',
+ field: 'subText',
+ component: 'Input',
+ },
+ {
+ label: '下单须知',
+ field: 'orderDetails',
+ component: 'Input',
+ },
+ {
+ label: '支付方式',
+ field: 'payType',
+ component: 'InputNumber',
+ },
+ {
+ label: '优惠券标识',
+ field: 'couponId',
+ component: 'Input',
+ },
+ {
+ label: '优惠价格',
+ field: 'couponPrice',
+ component: 'InputNumber',
+ },
];
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/controller/CommonOrderSkuController.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/controller/CommonOrderSkuController.java
index 7ce5d5a..b972369 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/controller/CommonOrderSkuController.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/controller/CommonOrderSkuController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 订单详情表
* @Author: jeecg-boot
- * @Date: 2024-12-05
+ * @Date: 2025-01-02
* @Version: V1.0
*/
@Api(tags="订单详情表")
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java
index 78acd0d..ff4481b 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 订单详情表
* @Author: jeecg-boot
- * @Date: 2024-12-05
+ * @Date: 2025-01-02
* @Version: V1.0
*/
@Data
@@ -86,4 +86,12 @@ public class CommonOrderSku implements Serializable {
@Excel(name = "商品", width = 15)
@ApiModelProperty(value = "商品")
private java.lang.String shopId;
+ /**材质*/
+ @Excel(name = "材质", width = 15)
+ @ApiModelProperty(value = "材质")
+ private java.lang.String subText;
+ /**下单须知*/
+ @Excel(name = "下单须知", width = 15)
+ @ApiModelProperty(value = "下单须知")
+ private java.lang.String orderDetails;
}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/CommonOrderSkuMapper.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/CommonOrderSkuMapper.java
index 72b09fe..2a11735 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/CommonOrderSkuMapper.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/mapper/CommonOrderSkuMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 订单详情表
* @Author: jeecg-boot
- * @Date: 2024-12-05
+ * @Date: 2025-01-02
* @Version: V1.0
*/
public interface CommonOrderSkuMapper extends BaseMapper {
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/ICommonOrderSkuService.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/ICommonOrderSkuService.java
index a6a6069..3c33465 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/ICommonOrderSkuService.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/ICommonOrderSkuService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 订单详情表
* @Author: jeecg-boot
- * @Date: 2024-12-05
+ * @Date: 2025-01-02
* @Version: V1.0
*/
public interface ICommonOrderSkuService extends IService {
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/impl/CommonOrderSkuServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/impl/CommonOrderSkuServiceImpl.java
index 338f703..26da470 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/impl/CommonOrderSkuServiceImpl.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/service/impl/CommonOrderSkuServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 订单详情表
* @Author: jeecg-boot
- * @Date: 2024-12-05
+ * @Date: 2025-01-02
* @Version: V1.0
*/
@Service
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/CommonOrderSkuList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/CommonOrderSkuList.vue
index 2b0f35f..061eeb6 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/CommonOrderSkuList.vue
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/CommonOrderSkuList.vue
@@ -166,6 +166,16 @@
align:"center",
dataIndex: 'shopId'
},
+ {
+ title:'材质',
+ align:"center",
+ dataIndex: 'subText'
+ },
+ {
+ title:'下单须知',
+ align:"center",
+ dataIndex: 'orderDetails'
+ },
{
title: '操作',
dataIndex: 'action',
@@ -209,6 +219,8 @@
fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
fieldList.push({type:'string',value:'shopId',text:'商品',dictCode:''})
+ fieldList.push({type:'string',value:'subText',text:'材质',dictCode:''})
+ fieldList.push({type:'Text',value:'orderDetails',text:'下单须知',dictCode:''})
this.superFieldList = fieldList
}
}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuForm.vue b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuForm.vue
index c821cec..ea3a8e9 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuForm.vue
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue/modules/CommonOrderSkuForm.vue
@@ -48,6 +48,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.data.ts b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.data.ts
index e30b872..87a05dc 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.data.ts
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/vue3/CommonOrderSku.data.ts
@@ -49,6 +49,16 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'shopId'
},
+ {
+ title: '材质',
+ align:"center",
+ dataIndex: 'subText'
+ },
+ {
+ title: '下单须知',
+ align:"center",
+ dataIndex: 'orderDetails'
+ },
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@@ -100,4 +110,14 @@ export const formSchema: FormSchema[] = [
field: 'shopId',
component: 'Input',
},
+ {
+ label: '材质',
+ field: 'subText',
+ component: 'Input',
+ },
+ {
+ label: '下单须知',
+ field: 'orderDetails',
+ component: 'Input',
+ },
];
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/controller/CommonPidClassController.java b/module-common/src/main/java/org/jeecg/modules/commonPidClass/controller/CommonPidClassController.java
new file mode 100644
index 0000000..dfe819e
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/controller/CommonPidClassController.java
@@ -0,0 +1,229 @@
+package org.jeecg.modules.commonPidClass.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.commonPidClass.entity.CommonPidClass;
+import org.jeecg.modules.commonPidClass.service.ICommonPidClassService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 二级分类
+ * @Author: jeecg-boot
+ * @Date: 2025-01-16
+ * @Version: V1.0
+ */
+@Api(tags="二级分类")
+@RestController
+@RequestMapping("/commonPidClass/commonPidClass")
+@Slf4j
+public class CommonPidClassController extends JeecgController{
+ @Autowired
+ private ICommonPidClassService commonPidClassService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param commonPidClass
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "二级分类-分页列表查询")
+ @ApiOperation(value="二级分类-分页列表查询", notes="二级分类-分页列表查询")
+ @GetMapping(value = "/rootList")
+ public Result> queryPageList(CommonPidClass commonPidClass,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ String hasQuery = req.getParameter("hasQuery");
+ if(hasQuery != null && "true".equals(hasQuery)){
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonPidClass, req.getParameterMap());
+ List list = commonPidClassService.queryTreeListNoPage(queryWrapper);
+ IPage pageList = new Page<>(1, 10, list.size());
+ pageList.setRecords(list);
+ return Result.OK(pageList);
+ }else{
+ String parentId = commonPidClass.getPid();
+ if (oConvertUtils.isEmpty(parentId)) {
+ parentId = "0";
+ }
+ commonPidClass.setPid(null);
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonPidClass, req.getParameterMap());
+ // 使用 eq 防止模糊查询
+ queryWrapper.eq("pid", parentId);
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = commonPidClassService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+ }
+
+ /**
+ * 获取子数据
+ * @param commonPidClass
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "二级分类-获取子数据")
+ @ApiOperation(value="二级分类-获取子数据", notes="二级分类-获取子数据")
+ @GetMapping(value = "/childList")
+ public Result> queryPageList(CommonPidClass commonPidClass,HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonPidClass, req.getParameterMap());
+ List list = commonPidClassService.list(queryWrapper);
+ IPage pageList = new Page<>(1, 10, list.size());
+ pageList.setRecords(list);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 批量查询子节点
+ * @param parentIds 父ID(多个采用半角逗号分割)
+ * @return 返回 IPage
+ * @param parentIds
+ * @return
+ */
+ //@AutoLog(value = "二级分类-批量获取子数据")
+ @ApiOperation(value="二级分类-批量获取子数据", notes="二级分类-批量获取子数据")
+ @GetMapping("/getChildListBatch")
+ public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
+ try {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ List parentIdList = Arrays.asList(parentIds.split(","));
+ queryWrapper.in("pid", parentIdList);
+ List list = commonPidClassService.list(queryWrapper);
+ IPage pageList = new Page<>(1, 10, list.size());
+ pageList.setRecords(list);
+ return Result.OK(pageList);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return Result.error("批量查询子节点失败:" + e.getMessage());
+ }
+ }
+
+ /**
+ * 添加
+ *
+ * @param commonPidClass
+ * @return
+ */
+ @AutoLog(value = "二级分类-添加")
+ @ApiOperation(value="二级分类-添加", notes="二级分类-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody CommonPidClass commonPidClass) {
+ commonPidClassService.addCommonPidClass(commonPidClass);
+ return Result.OK("添加成功!");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param commonPidClass
+ * @return
+ */
+ @AutoLog(value = "二级分类-编辑")
+ @ApiOperation(value="二级分类-编辑", notes="二级分类-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result edit(@RequestBody CommonPidClass commonPidClass) {
+ commonPidClassService.updateCommonPidClass(commonPidClass);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "二级分类-通过id删除")
+ @ApiOperation(value="二级分类-通过id删除", notes="二级分类-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id",required=true) String id) {
+ commonPidClassService.deleteCommonPidClass(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "二级分类-批量删除")
+ @ApiOperation(value="二级分类-批量删除", notes="二级分类-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.commonPidClassService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "二级分类-通过id查询")
+ @ApiOperation(value="二级分类-通过id查询", notes="二级分类-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name="id",required=true) String id) {
+ CommonPidClass commonPidClass = commonPidClassService.getById(id);
+ if(commonPidClass==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(commonPidClass);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param commonPidClass
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, CommonPidClass commonPidClass) {
+ return super.exportXls(request, commonPidClass, CommonPidClass.class, "二级分类");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, CommonPidClass.class);
+ }
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/entity/CommonPidClass.java b/module-common/src/main/java/org/jeecg/modules/commonPidClass/entity/CommonPidClass.java
new file mode 100644
index 0000000..3a0bc9e
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/entity/CommonPidClass.java
@@ -0,0 +1,79 @@
+package org.jeecg.modules.commonPidClass.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+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 lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.commonShop.entity.CommonShop;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+/**
+ * @Description: 二级分类
+ * @Author: jeecg-boot
+ * @Date: 2025-01-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("common_pid_class")
+@ApiModel(value="common_pid_class对象", description="二级分类")
+public class CommonPidClass implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+ /**更新日期*/
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+ /**父级节点*/
+ @Excel(name = "父级节点", width = 15)
+ @ApiModelProperty(value = "父级节点")
+ private java.lang.String pid;
+ /**是否有子节点*/
+ @Excel(name = "是否有子节点", width = 15, dicCode = "yn")
+ @Dict(dicCode = "yn")
+ @ApiModelProperty(value = "是否有子节点")
+ private java.lang.String hasChild;
+ /**分类名称*/
+ @Excel(name = "分类名称", width = 15)
+ @ApiModelProperty(value = "分类名称")
+ private java.lang.String name;
+ /**排序*/
+ @Excel(name = "排序", width = 15)
+ @ApiModelProperty(value = "排序")
+ private java.lang.Integer sort;
+ /**图标*/
+ @Excel(name = "图标", width = 15)
+ @ApiModelProperty(value = "图标")
+ private java.lang.String image;
+
+
+
+
+ @TableField (exist = false)
+ private List children;
+
+ @TableField (exist = false)
+ private List shopList;
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/mapper/CommonPidClassMapper.java b/module-common/src/main/java/org/jeecg/modules/commonPidClass/mapper/CommonPidClassMapper.java
new file mode 100644
index 0000000..b11b6b8
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/mapper/CommonPidClassMapper.java
@@ -0,0 +1,22 @@
+package org.jeecg.modules.commonPidClass.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.commonPidClass.entity.CommonPidClass;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 二级分类
+ * @Author: jeecg-boot
+ * @Date: 2025-01-16
+ * @Version: V1.0
+ */
+public interface CommonPidClassMapper extends BaseMapper {
+
+ /**
+ * 编辑节点状态
+ * @param id
+ * @param status
+ */
+ void updateTreeNodeStatus(@Param("id") String id,@Param("status") String status);
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/mapper/xml/CommonPidClassMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonPidClass/mapper/xml/CommonPidClassMapper.xml
new file mode 100644
index 0000000..b6310be
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/mapper/xml/CommonPidClassMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+ update common_pid_class set has_child = #{status} where id = #{id}
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/service/ICommonPidClassService.java b/module-common/src/main/java/org/jeecg/modules/commonPidClass/service/ICommonPidClassService.java
new file mode 100644
index 0000000..25d612f
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/service/ICommonPidClassService.java
@@ -0,0 +1,38 @@
+package org.jeecg.modules.commonPidClass.service;
+
+import org.jeecg.modules.commonPidClass.entity.CommonPidClass;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.exception.JeecgBootException;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.List;
+
+/**
+ * @Description: 二级分类
+ * @Author: jeecg-boot
+ * @Date: 2025-01-16
+ * @Version: V1.0
+ */
+public interface ICommonPidClassService extends IService {
+
+ /**根节点父ID的值*/
+ public static final String ROOT_PID_VALUE = "0";
+
+ /**树节点有子节点状态值*/
+ public static final String HASCHILD = "1";
+
+ /**树节点无子节点状态值*/
+ public static final String NOCHILD = "0";
+
+ /**新增节点*/
+ void addCommonPidClass(CommonPidClass commonPidClass);
+
+ /**修改节点*/
+ void updateCommonPidClass(CommonPidClass commonPidClass) throws JeecgBootException;
+
+ /**删除节点*/
+ void deleteCommonPidClass(String id) throws JeecgBootException;
+
+ /**查询所有数据,无分页*/
+ List queryTreeListNoPage(QueryWrapper queryWrapper);
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/service/impl/CommonPidClassServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonPidClass/service/impl/CommonPidClassServiceImpl.java
new file mode 100644
index 0000000..3004dea
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/service/impl/CommonPidClassServiceImpl.java
@@ -0,0 +1,191 @@
+package org.jeecg.modules.commonPidClass.service.impl;
+
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.commonPidClass.entity.CommonPidClass;
+import org.jeecg.modules.commonPidClass.mapper.CommonPidClassMapper;
+import org.jeecg.modules.commonPidClass.service.ICommonPidClassService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 二级分类
+ * @Author: jeecg-boot
+ * @Date: 2025-01-16
+ * @Version: V1.0
+ */
+@Service
+public class CommonPidClassServiceImpl extends ServiceImpl implements ICommonPidClassService {
+
+ @Override
+ public void addCommonPidClass(CommonPidClass commonPidClass) {
+ //新增时设置hasChild为0
+ commonPidClass.setHasChild(ICommonPidClassService.NOCHILD);
+ if(oConvertUtils.isEmpty(commonPidClass.getPid())){
+ commonPidClass.setPid(ICommonPidClassService.ROOT_PID_VALUE);
+ }else{
+ //如果当前节点父ID不为空 则设置父节点的hasChildren 为1
+ CommonPidClass parent = baseMapper.selectById(commonPidClass.getPid());
+ if(parent!=null && !"1".equals(parent.getHasChild())){
+ parent.setHasChild("1");
+ baseMapper.updateById(parent);
+ }
+ }
+ baseMapper.insert(commonPidClass);
+ }
+
+ @Override
+ public void updateCommonPidClass(CommonPidClass commonPidClass) {
+ CommonPidClass entity = this.getById(commonPidClass.getId());
+ if(entity==null) {
+ throw new JeecgBootException("未找到对应实体");
+ }
+ String old_pid = entity.getPid();
+ String new_pid = commonPidClass.getPid();
+ if(!old_pid.equals(new_pid)) {
+ updateOldParentNode(old_pid);
+ if(oConvertUtils.isEmpty(new_pid)){
+ commonPidClass.setPid(ICommonPidClassService.ROOT_PID_VALUE);
+ }
+ if(!ICommonPidClassService.ROOT_PID_VALUE.equals(commonPidClass.getPid())) {
+ baseMapper.updateTreeNodeStatus(commonPidClass.getPid(), ICommonPidClassService.HASCHILD);
+ }
+ }
+ baseMapper.updateById(commonPidClass);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteCommonPidClass(String id) throws JeecgBootException {
+ //查询选中节点下所有子节点一并删除
+ id = this.queryTreeChildIds(id);
+ if(id.indexOf(",")>0) {
+ StringBuffer sb = new StringBuffer();
+ String[] idArr = id.split(",");
+ for (String idVal : idArr) {
+ if(idVal != null){
+ CommonPidClass commonPidClass = this.getById(idVal);
+ String pidVal = commonPidClass.getPid();
+ //查询此节点上一级是否还有其他子节点
+ List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal).notIn("id",Arrays.asList(idArr)));
+ if((dataList == null || dataList.size()==0) && !Arrays.asList(idArr).contains(pidVal)
+ && !sb.toString().contains(pidVal)){
+ //如果当前节点原本有子节点 现在木有了,更新状态
+ sb.append(pidVal).append(",");
+ }
+ }
+ }
+ //批量删除节点
+ baseMapper.deleteBatchIds(Arrays.asList(idArr));
+ //修改已无子节点的标识
+ String[] pidArr = sb.toString().split(",");
+ for(String pid : pidArr){
+ this.updateOldParentNode(pid);
+ }
+ }else{
+ CommonPidClass commonPidClass = this.getById(id);
+ if(commonPidClass==null) {
+ throw new JeecgBootException("未找到对应实体");
+ }
+ updateOldParentNode(commonPidClass.getPid());
+ baseMapper.deleteById(id);
+ }
+ }
+
+ @Override
+ public List queryTreeListNoPage(QueryWrapper queryWrapper) {
+ List dataList = baseMapper.selectList(queryWrapper);
+ List mapList = new ArrayList<>();
+ for(CommonPidClass data : dataList){
+ String pidVal = data.getPid();
+ //递归查询子节点的根节点
+ if(pidVal != null && !"0".equals(pidVal)){
+ CommonPidClass rootVal = this.getTreeRoot(pidVal);
+ if(rootVal != null && !mapList.contains(rootVal)){
+ mapList.add(rootVal);
+ }
+ }else{
+ if(!mapList.contains(data)){
+ mapList.add(data);
+ }
+ }
+ }
+ return mapList;
+ }
+
+ /**
+ * 根据所传pid查询旧的父级节点的子节点并修改相应状态值
+ * @param pid
+ */
+ private void updateOldParentNode(String pid) {
+// if(!ICommonPidClassService.ROOT_PID_VALUE.equals(pid)) {
+// Integer count = baseMapper.selectCount(new QueryWrapper().eq("pid", pid));
+// if(count==null || count<=1) {
+// baseMapper.updateTreeNodeStatus(pid, ICommonPidClassService.NOCHILD);
+// }
+// }
+ }
+
+ /**
+ * 递归查询节点的根节点
+ * @param pidVal
+ * @return
+ */
+ private CommonPidClass getTreeRoot(String pidVal){
+ CommonPidClass data = baseMapper.selectById(pidVal);
+ if(data != null && !"0".equals(data.getPid())){
+ return this.getTreeRoot(data.getPid());
+ }else{
+ return data;
+ }
+ }
+
+ /**
+ * 根据id查询所有子节点id
+ * @param ids
+ * @return
+ */
+ private String queryTreeChildIds(String ids) {
+ //获取id数组
+ String[] idArr = ids.split(",");
+ StringBuffer sb = new StringBuffer();
+ for (String pidVal : idArr) {
+ if(pidVal != null){
+ if(!sb.toString().contains(pidVal)){
+ if(sb.toString().length() > 0){
+ sb.append(",");
+ }
+ sb.append(pidVal);
+ this.getTreeChildIds(pidVal,sb);
+ }
+ }
+ }
+ return sb.toString();
+ }
+
+ /**
+ * 递归查询所有子节点
+ * @param pidVal
+ * @param sb
+ * @return
+ */
+ private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){
+ List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal));
+ if(dataList != null && dataList.size()>0){
+ for(CommonPidClass tree : dataList) {
+ if(!sb.toString().contains(tree.getId())){
+ sb.append(",").append(tree.getId());
+ }
+ this.getTreeChildIds(tree.getId(),sb);
+ }
+ }
+ return sb;
+ }
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue/CommonPidClassList.vue b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue/CommonPidClassList.vue
new file mode 100644
index 0000000..0b0ad4e
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue/CommonPidClassList.vue
@@ -0,0 +1,360 @@
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 添加下级
+
+
+ handleDeleteNode(record.id)" placement="topLeft">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue/modules/CommonPidClassModal.vue b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue/modules/CommonPidClassModal.vue
new file mode 100644
index 0000000..cf6c802
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue/modules/CommonPidClassModal.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/CommonPidClass.api.ts b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/CommonPidClass.api.ts
new file mode 100644
index 0000000..54642f0
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/CommonPidClass.api.ts
@@ -0,0 +1,82 @@
+import {defHttp} from "/@/utils/http/axios";
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+ list = '/commonPidClass/commonPidClass/rootList',
+ save='/commonPidClass/commonPidClass/add',
+ edit='/commonPidClass/commonPidClass/edit',
+ deleteCommonPidClass = '/sys/commonPidClass/delete',
+ deleteBatch = '/commonPidClass/commonPidClass/deleteBatch',
+ importExcel = '/commonPidClass/commonPidClass/importExcel',
+ exportXls = '/commonPidClass/commonPidClass/exportXls',
+ loadTreeData = '/commonPidClass/commonPidClass/loadTreeRoot',
+ getChildList = '/commonPidClass/commonPidClass/childList',
+ getChildListBatch = '/commonPidClass/commonPidClass/getChildListBatch',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ * @param params
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+ defHttp.get({url: Api.list, params});
+/**
+ * 删除
+ */
+export const deleteCommonPidClass = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteCommonPidClass, params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDeleteCommonPidClass = (params, handleSuccess) => {
+ Modal.confirm({
+ title: '确认删除',
+ content: '是否删除选中数据',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+ }
+ });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdateDict = (params, isUpdate) => {
+ let url = isUpdate ? Api.edit : Api.save;
+ return defHttp.post({url: url, params});
+}
+/**
+ * 查询全部树形节点数据
+ * @param params
+ */
+export const loadTreeData = (params) =>
+ defHttp.get({url: Api.loadTreeData,params});
+/**
+ * 查询子节点数据
+ * @param params
+ */
+export const getChildList = (params) =>
+ defHttp.get({url: Api.getChildList, params});
+/**
+ * 批量查询子节点数据
+ * @param params
+ */
+export const getChildListBatch = (params) =>
+ defHttp.get({url: Api.getChildListBatch, params},{isTransformResponse:false});
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/CommonPidClass.data.ts b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/CommonPidClass.data.ts
new file mode 100644
index 0000000..ac39297
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/CommonPidClass.data.ts
@@ -0,0 +1,51 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+ {
+ title: '分类名称',
+ align:"center",
+ dataIndex: 'name'
+ },
+ {
+ title: '排序',
+ align:"center",
+ dataIndex: 'sort'
+ },
+ {
+ title: '图标',
+ align:"center",
+ dataIndex: 'image',
+ customRender:render.renderAvatar,
+ },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+ {
+ label: '父级节点',
+ field: 'pid',
+ component: 'Input',
+ },
+ {
+ label: '分类名称',
+ field: 'name',
+ component: 'Input',
+ },
+ {
+ label: '排序',
+ field: 'sort',
+ component: 'InputNumber',
+ },
+ {
+ label: '图标',
+ field: 'image',
+ component: 'JImageUpload',
+ componentProps:{
+ },
+ },
+];
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/CommonPidClassList.vue b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/CommonPidClassList.vue
new file mode 100644
index 0000000..1da7a69
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/CommonPidClassList.vue
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/components/CommonPidClassModal.vue b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/components/CommonPidClassModal.vue
new file mode 100644
index 0000000..1160551
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonPidClass/vue3/components/CommonPidClassModal.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java b/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java
index d4ea20e..8f2d940 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 单商户商品信息表
* @Author: jeecg-boot
- * @Date: 2024-12-13
+ * @Date: 2025-01-16
* @Version: V1.0
*/
@Api(tags="单商户商品信息表")
diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java
index 29b755b..2c49590 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 单商户商品信息表
* @Author: jeecg-boot
- * @Date: 2024-12-13
+ * @Date: 2025-01-16
* @Version: V1.0
*/
@Data
@@ -47,6 +47,11 @@ public class CommonShop implements Serializable {
/**更新日期*/
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
+ /**分类*/
+ @Excel(name = "分类", width = 15, dictTable = "common_pid_class", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "common_pid_class", dicText = "name", dicCode = "id")
+ @ApiModelProperty(value = "分类")
+ private java.lang.String commonPidClassId;
/**标题*/
@Excel(name = "标题", width = 15)
@ApiModelProperty(value = "标题")
@@ -64,14 +69,26 @@ public class CommonShop implements Serializable {
@Dict(dicCode = "shop_type")
@ApiModelProperty(value = "类型")
private java.lang.Integer type;
- /**价格*/
- @Excel(name = "价格", width = 15)
- @ApiModelProperty(value = "价格")
- private java.math.BigDecimal price;
/**原价*/
@Excel(name = "原价", width = 15)
@ApiModelProperty(value = "原价")
private java.math.BigDecimal oldPrice;
+ /**价格*/
+ @Excel(name = "价格", width = 15)
+ @ApiModelProperty(value = "价格")
+ private java.math.BigDecimal price;
+ /**金卡价*/
+ @Excel(name = "金卡价", width = 15)
+ @ApiModelProperty(value = "金卡价")
+ private java.math.BigDecimal goldPrice;
+ /**银卡价*/
+ @Excel(name = "银卡价", width = 15)
+ @ApiModelProperty(value = "银卡价")
+ private java.math.BigDecimal silverPrice;
+ /**钻石价*/
+ @Excel(name = "钻石价", width = 15)
+ @ApiModelProperty(value = "钻石价")
+ private java.lang.String diamondPrice;
/**会员价格*/
@Excel(name = "会员价格", width = 15)
@ApiModelProperty(value = "会员价格")
@@ -109,16 +126,60 @@ public class CommonShop implements Serializable {
@Excel(name = "首页显示", width = 15)
@ApiModelProperty(value = "首页显示")
private java.lang.String indexNo;
- /**金卡价*/
- @Excel(name = "金卡价", width = 15)
- @ApiModelProperty(value = "金卡价")
- private java.math.BigDecimal goldPrice;
- /**银卡价*/
- @Excel(name = "银卡价", width = 15)
- @ApiModelProperty(value = "银卡价")
- private java.math.BigDecimal silverPrice;
- /**钻石价*/
- @Excel(name = "钻石价", width = 15)
- @ApiModelProperty(value = "钻石价")
- private java.lang.String diamondPrice;
+ /**产品材质*/
+ @Excel(name = "产品材质", width = 15)
+ @ApiModelProperty(value = "产品材质")
+ private java.lang.String subText;
+ /**X销量*/
+ @Excel(name = "X销量", width = 15)
+ @ApiModelProperty(value = "X销量")
+ private java.lang.Integer payNum;
+ /**说明*/
+ @Excel(name = "说明", width = 15)
+ @ApiModelProperty(value = "说明")
+ private java.lang.String subDetails;
+ /**下单须知*/
+ @Excel(name = "下单须知", width = 15)
+ @ApiModelProperty(value = "下单须知")
+ private java.lang.String orderDetails;
+ /**普通【直推】返佣*/
+ @Excel(name = "普通【直推】返佣", width = 15)
+ @ApiModelProperty(value = "普通【直推】返佣")
+ private java.math.BigDecimal givePrice;
+ /**金卡【直推】返佣*/
+ @Excel(name = "金卡【直推】返佣", width = 15)
+ @ApiModelProperty(value = "金卡【直推】返佣")
+ private java.math.BigDecimal goldGivePrice;
+ /**银卡【直推】返佣*/
+ @Excel(name = "银卡【直推】返佣", width = 15)
+ @ApiModelProperty(value = "银卡【直推】返佣")
+ private java.math.BigDecimal silverGivePrice;
+ /**钻石【直推】返佣*/
+ @Excel(name = "钻石【直推】返佣", width = 15)
+ @ApiModelProperty(value = "钻石【直推】返佣")
+ private java.math.BigDecimal diamondGivePrice;
+ /**合伙人【直推】返佣*/
+ @Excel(name = "合伙人【直推】返佣", width = 15)
+ @ApiModelProperty(value = "合伙人【直推】返佣")
+ private java.math.BigDecimal shopUseerMoney;
+ /**普通【间推】返佣*/
+ @Excel(name = "普通【间推】返佣", width = 15)
+ @ApiModelProperty(value = "普通【间推】返佣")
+ private java.math.BigDecimal givePriceTwo;
+ /**金卡【间推】返佣*/
+ @Excel(name = "金卡【间推】返佣", width = 15)
+ @ApiModelProperty(value = "金卡【间推】返佣")
+ private java.math.BigDecimal goldGivePriceTwo;
+ /**银卡【间推】返佣*/
+ @Excel(name = "银卡【间推】返佣", width = 15)
+ @ApiModelProperty(value = "银卡【间推】返佣")
+ private java.math.BigDecimal silverGivePriceTwo;
+ /**钻石【间推】返佣*/
+ @Excel(name = "钻石【间推】返佣", width = 15)
+ @ApiModelProperty(value = "钻石【间推】返佣")
+ private java.math.BigDecimal diamondGivePriceTwo;
+ /**合伙人【间推】返佣*/
+ @Excel(name = "合伙人【间推】返佣", width = 15)
+ @ApiModelProperty(value = "合伙人【间推】返佣")
+ private java.math.BigDecimal shopUseerMoneyTwo;
}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java b/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java
index fb15515..de33d50 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 单商户商品信息表
* @Author: jeecg-boot
- * @Date: 2024-12-13
+ * @Date: 2025-01-16
* @Version: V1.0
*/
public interface CommonShopMapper extends BaseMapper {
diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java b/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java
index 9cce8d9..90aa26f 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 单商户商品信息表
* @Author: jeecg-boot
- * @Date: 2024-12-13
+ * @Date: 2025-01-16
* @Version: V1.0
*/
public interface ICommonShopService extends IService {
diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java
index 5182d8d..6ec6f01 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 单商户商品信息表
* @Author: jeecg-boot
- * @Date: 2024-12-13
+ * @Date: 2025-01-16
* @Version: V1.0
*/
@Service
diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue
index 0ae7a50..7a717af 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue
+++ b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue
@@ -137,6 +137,17 @@
return parseInt(index)+1;
}
},
+ {
+ title:'创建日期',
+ align:"center",
+ sorter: true,
+ dataIndex: 'createTime'
+ },
+ {
+ title:'分类',
+ align:"center",
+ dataIndex: 'commonPidClassId_dictText'
+ },
{
title:'标题',
align:"center",
@@ -158,15 +169,30 @@
align:"center",
dataIndex: 'type_dictText'
},
+ {
+ title:'原价',
+ align:"center",
+ dataIndex: 'oldPrice'
+ },
{
title:'价格',
align:"center",
dataIndex: 'price'
},
{
- title:'原价',
+ title:'金卡价',
align:"center",
- dataIndex: 'oldPrice'
+ dataIndex: 'goldPrice'
+ },
+ {
+ title:'银卡价',
+ align:"center",
+ dataIndex: 'silverPrice'
+ },
+ {
+ title:'钻石价',
+ align:"center",
+ dataIndex: 'diamondPrice'
},
{
title:'会员价格',
@@ -174,14 +200,14 @@
dataIndex: 'vipPrice'
},
{
- title:'标签',
+ title:'限购数量',
align:"center",
- dataIndex: 'skuIcon'
+ dataIndex: 'num'
},
{
- title:'分类标识',
+ title:'标签',
align:"center",
- dataIndex: 'classId_dictText'
+ dataIndex: 'skuIcon'
},
{
title:'首页显示',
@@ -190,19 +216,74 @@
customRender: (text) => (text ? filterMultiDictText(this.dictOptions['indexNo'], text) : ''),
},
{
- title:'金卡价',
+ title:'产品材质',
align:"center",
- dataIndex: 'goldPrice'
+ dataIndex: 'subText'
},
{
- title:'银卡价',
+ title:'X销量',
align:"center",
- dataIndex: 'silverPrice'
+ dataIndex: 'payNum'
},
{
- title:'钻石价',
+ title:'说明',
align:"center",
- dataIndex: 'diamondPrice'
+ dataIndex: 'subDetails'
+ },
+ {
+ title:'下单须知',
+ align:"center",
+ dataIndex: 'orderDetails'
+ },
+ {
+ title:'普通【直推】返佣',
+ align:"center",
+ dataIndex: 'givePrice'
+ },
+ {
+ title:'金卡【直推】返佣',
+ align:"center",
+ dataIndex: 'goldGivePrice'
+ },
+ {
+ title:'银卡【直推】返佣',
+ align:"center",
+ dataIndex: 'silverGivePrice'
+ },
+ {
+ title:'钻石【直推】返佣',
+ align:"center",
+ dataIndex: 'diamondGivePrice'
+ },
+ {
+ title:'合伙人【直推】返佣',
+ align:"center",
+ dataIndex: 'shopUseerMoney'
+ },
+ {
+ title:'普通【间推】返佣',
+ align:"center",
+ dataIndex: 'givePriceTwo'
+ },
+ {
+ title:'金卡【间推】返佣',
+ align:"center",
+ dataIndex: 'goldGivePriceTwo'
+ },
+ {
+ title:'银卡【间推】返佣',
+ align:"center",
+ dataIndex: 'silverGivePriceTwo'
+ },
+ {
+ title:'钻石【间推】返佣',
+ align:"center",
+ dataIndex: 'diamondGivePriceTwo'
+ },
+ {
+ title:'合伙人【间推】返佣',
+ align:"center",
+ dataIndex: 'shopUseerMoneyTwo'
},
{
title: '操作',
@@ -239,20 +320,36 @@
},
getSuperFieldList(){
let fieldList=[];
+ fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+ fieldList.push({type:'string',value:'commonPidClassId',text:'分类'})
fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
fieldList.push({type:'Text',value:'image',text:'主图',dictCode:''})
fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
fieldList.push({type:'int',value:'type',text:'类型',dictCode:'shop_type'})
- fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
fieldList.push({type:'BigDecimal',value:'oldPrice',text:'原价',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'goldPrice',text:'金卡价',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'silverPrice',text:'银卡价',dictCode:''})
+ fieldList.push({type:'string',value:'diamondPrice',text:'钻石价',dictCode:''})
fieldList.push({type:'BigDecimal',value:'vipPrice',text:'会员价格',dictCode:''})
+ fieldList.push({type:'int',value:'num',text:'限购数量',dictCode:''})
fieldList.push({type:'string',value:'skuIcon',text:'标签',dictCode:''})
fieldList.push({type:'Text',value:'details',text:'详情',dictCode:''})
- fieldList.push({type:'sel_search',value:'classId',text:'分类标识',dictTable:"common_class", dictText:'title', dictCode:'id'})
fieldList.push({type:'switch',value:'indexNo',text:'首页显示'})
- fieldList.push({type:'BigDecimal',value:'goldPrice',text:'金卡价',dictCode:''})
- fieldList.push({type:'BigDecimal',value:'silverPrice',text:'银卡价',dictCode:''})
- fieldList.push({type:'string',value:'diamondPrice',text:'钻石价',dictCode:''})
+ fieldList.push({type:'string',value:'subText',text:'产品材质',dictCode:''})
+ fieldList.push({type:'int',value:'payNum',text:'X销量',dictCode:''})
+ fieldList.push({type:'string',value:'subDetails',text:'说明',dictCode:''})
+ fieldList.push({type:'Text',value:'orderDetails',text:'下单须知',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'givePrice',text:'普通【直推】返佣',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'goldGivePrice',text:'金卡【直推】返佣',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'silverGivePrice',text:'银卡【直推】返佣',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'diamondGivePrice',text:'钻石【直推】返佣',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'shopUseerMoney',text:'合伙人【直推】返佣',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'givePriceTwo',text:'普通【间推】返佣',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'goldGivePriceTwo',text:'金卡【间推】返佣',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'silverGivePriceTwo',text:'银卡【间推】返佣',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'diamondGivePriceTwo',text:'钻石【间推】返佣',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'shopUseerMoneyTwo',text:'合伙人【间推】返佣',dictCode:''})
this.superFieldList = fieldList
}
}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.vue b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.vue
index cd448a8..6bce2bd 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.vue
+++ b/module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.vue
@@ -3,6 +3,18 @@
+
+
+
+
+
+
@@ -23,14 +35,29 @@
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -38,6 +65,11 @@
+
+
+
+
+
@@ -49,28 +81,78 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/vue3/CommonShop.data.ts b/module-common/src/main/java/org/jeecg/modules/commonShop/vue3/CommonShop.data.ts
index 2406e3e..ff6110b 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonShop/vue3/CommonShop.data.ts
+++ b/module-common/src/main/java/org/jeecg/modules/commonShop/vue3/CommonShop.data.ts
@@ -5,6 +5,17 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
+ title: '创建日期',
+ align:"center",
+ sorter: true,
+ dataIndex: 'createTime'
+ },
+ {
+ title: '分类',
+ align:"center",
+ dataIndex: 'commonPidClassId_dictText'
+ },
+ {
title: '标题',
align:"center",
dataIndex: 'title'
@@ -25,15 +36,30 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'type_dictText'
},
+ {
+ title: '原价',
+ align:"center",
+ dataIndex: 'oldPrice'
+ },
{
title: '价格',
align:"center",
dataIndex: 'price'
},
{
- title: '原价',
+ title: '金卡价',
align:"center",
- dataIndex: 'oldPrice'
+ dataIndex: 'goldPrice'
+ },
+ {
+ title: '银卡价',
+ align:"center",
+ dataIndex: 'silverPrice'
+ },
+ {
+ title: '钻石价',
+ align:"center",
+ dataIndex: 'diamondPrice'
},
{
title: '会员价格',
@@ -41,14 +67,14 @@ export const columns: BasicColumn[] = [
dataIndex: 'vipPrice'
},
{
- title: '标签',
+ title: '限购数量',
align:"center",
- dataIndex: 'skuIcon'
+ dataIndex: 'num'
},
{
- title: '分类标识',
+ title: '标签',
align:"center",
- dataIndex: 'classId_dictText'
+ dataIndex: 'skuIcon'
},
{
title: '首页显示',
@@ -59,19 +85,74 @@ export const columns: BasicColumn[] = [
},
},
{
- title: '金卡价',
+ title: '产品材质',
align:"center",
- dataIndex: 'goldPrice'
+ dataIndex: 'subText'
},
{
- title: '银卡价',
+ title: 'X销量',
align:"center",
- dataIndex: 'silverPrice'
+ dataIndex: 'payNum'
},
{
- title: '钻石价',
+ title: '说明',
align:"center",
- dataIndex: 'diamondPrice'
+ dataIndex: 'subDetails'
+ },
+ {
+ title: '下单须知',
+ align:"center",
+ dataIndex: 'orderDetails'
+ },
+ {
+ title: '普通【直推】返佣',
+ align:"center",
+ dataIndex: 'givePrice'
+ },
+ {
+ title: '金卡【直推】返佣',
+ align:"center",
+ dataIndex: 'goldGivePrice'
+ },
+ {
+ title: '银卡【直推】返佣',
+ align:"center",
+ dataIndex: 'silverGivePrice'
+ },
+ {
+ title: '钻石【直推】返佣',
+ align:"center",
+ dataIndex: 'diamondGivePrice'
+ },
+ {
+ title: '合伙人【直推】返佣',
+ align:"center",
+ dataIndex: 'shopUseerMoney'
+ },
+ {
+ title: '普通【间推】返佣',
+ align:"center",
+ dataIndex: 'givePriceTwo'
+ },
+ {
+ title: '金卡【间推】返佣',
+ align:"center",
+ dataIndex: 'goldGivePriceTwo'
+ },
+ {
+ title: '银卡【间推】返佣',
+ align:"center",
+ dataIndex: 'silverGivePriceTwo'
+ },
+ {
+ title: '钻石【间推】返佣',
+ align:"center",
+ dataIndex: 'diamondGivePriceTwo'
+ },
+ {
+ title: '合伙人【间推】返佣',
+ align:"center",
+ dataIndex: 'shopUseerMoneyTwo'
},
];
//查询数据
@@ -88,6 +169,15 @@ export const searchFormSchema: FormSchema[] = [
];
//表单数据
export const formSchema: FormSchema[] = [
+ {
+ label: '分类',
+ field: 'commonPidClassId',
+ component: 'JTreeSelect',
+ componentProps:{
+ dict:"common_pid_class,name,id",
+ pidValue:"0",
+ },
+ },
{
label: '标题',
field: 'title',
@@ -113,21 +203,41 @@ export const formSchema: FormSchema[] = [
dictCode:"shop_type"
},
},
+ {
+ label: '原价',
+ field: 'oldPrice',
+ component: 'InputNumber',
+ },
{
label: '价格',
field: 'price',
component: 'InputNumber',
},
{
- label: '原价',
- field: 'oldPrice',
+ label: '金卡价',
+ field: 'goldPrice',
component: 'InputNumber',
},
+ {
+ label: '银卡价',
+ field: 'silverPrice',
+ component: 'InputNumber',
+ },
+ {
+ label: '钻石价',
+ field: 'diamondPrice',
+ component: 'Input',
+ },
{
label: '会员价格',
field: 'vipPrice',
component: 'InputNumber',
},
+ {
+ label: '限购数量',
+ field: 'num',
+ component: 'InputNumber',
+ },
{
label: '标签',
field: 'skuIcon',
@@ -138,14 +248,6 @@ export const formSchema: FormSchema[] = [
field: 'details',
component: 'JCodeEditor', //TODO String后缀暂未添加
},
- {
- label: '分类标识',
- field: 'classId',
- component: 'JSearchSelect',
- componentProps:{
- dict:"common_class,title,id"
- },
- },
{
label: '首页显示',
field: 'indexNo',
@@ -154,18 +256,73 @@ export const formSchema: FormSchema[] = [
},
},
{
- label: '金卡价',
- field: 'goldPrice',
- component: 'InputNumber',
+ label: '产品材质',
+ field: 'subText',
+ component: 'Input',
},
{
- label: '银卡价',
- field: 'silverPrice',
+ label: 'X销量',
+ field: 'payNum',
component: 'InputNumber',
},
{
- label: '钻石价',
- field: 'diamondPrice',
+ label: '说明',
+ field: 'subDetails',
component: 'Input',
},
+ {
+ label: '下单须知',
+ field: 'orderDetails',
+ component: 'InputTextArea',//TODO 注意string转换问题
+ },
+ {
+ label: '普通【直推】返佣',
+ field: 'givePrice',
+ component: 'InputNumber',
+ },
+ {
+ label: '金卡【直推】返佣',
+ field: 'goldGivePrice',
+ component: 'InputNumber',
+ },
+ {
+ label: '银卡【直推】返佣',
+ field: 'silverGivePrice',
+ component: 'InputNumber',
+ },
+ {
+ label: '钻石【直推】返佣',
+ field: 'diamondGivePrice',
+ component: 'InputNumber',
+ },
+ {
+ label: '合伙人【直推】返佣',
+ field: 'shopUseerMoney',
+ component: 'InputNumber',
+ },
+ {
+ label: '普通【间推】返佣',
+ field: 'givePriceTwo',
+ component: 'InputNumber',
+ },
+ {
+ label: '金卡【间推】返佣',
+ field: 'goldGivePriceTwo',
+ component: 'InputNumber',
+ },
+ {
+ label: '银卡【间推】返佣',
+ field: 'silverGivePriceTwo',
+ component: 'InputNumber',
+ },
+ {
+ label: '钻石【间推】返佣',
+ field: 'diamondGivePriceTwo',
+ component: 'InputNumber',
+ },
+ {
+ label: '合伙人【间推】返佣',
+ field: 'shopUseerMoneyTwo',
+ component: 'InputNumber',
+ },
];
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/controller/CommonUserController.java b/module-common/src/main/java/org/jeecg/modules/commonUser/controller/CommonUserController.java
new file mode 100644
index 0000000..d772e7f
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/controller/CommonUserController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.commonUser.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.commonUser.entity.CommonUser;
+import org.jeecg.modules.commonUser.service.ICommonUserService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 合伙人申请表
+ * @Author: jeecg-boot
+ * @Date: 2024-12-31
+ * @Version: V1.0
+ */
+@Api(tags="合伙人申请表")
+@RestController
+@RequestMapping("/commonUser/commonUser")
+@Slf4j
+public class CommonUserController extends JeecgController {
+ @Autowired
+ private ICommonUserService commonUserService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param commonUser
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "合伙人申请表-分页列表查询")
+ @ApiOperation(value="合伙人申请表-分页列表查询", notes="合伙人申请表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryPageList(CommonUser commonUser,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonUser, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = commonUserService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param commonUser
+ * @return
+ */
+ @AutoLog(value = "合伙人申请表-添加")
+ @ApiOperation(value="合伙人申请表-添加", notes="合伙人申请表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody CommonUser commonUser) {
+ commonUserService.save(commonUser);
+ return Result.OK("添加成功!");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param commonUser
+ * @return
+ */
+ @AutoLog(value = "合伙人申请表-编辑")
+ @ApiOperation(value="合伙人申请表-编辑", notes="合伙人申请表-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result edit(@RequestBody CommonUser commonUser) {
+ commonUserService.updateById(commonUser);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "合伙人申请表-通过id删除")
+ @ApiOperation(value="合伙人申请表-通过id删除", notes="合伙人申请表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id",required=true) String id) {
+ commonUserService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "合伙人申请表-批量删除")
+ @ApiOperation(value="合伙人申请表-批量删除", notes="合伙人申请表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.commonUserService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "合伙人申请表-通过id查询")
+ @ApiOperation(value="合伙人申请表-通过id查询", notes="合伙人申请表-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name="id",required=true) String id) {
+ CommonUser commonUser = commonUserService.getById(id);
+ if(commonUser==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(commonUser);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param commonUser
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, CommonUser commonUser) {
+ return super.exportXls(request, commonUser, CommonUser.class, "合伙人申请表");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, CommonUser.class);
+ }
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/entity/CommonUser.java b/module-common/src/main/java/org/jeecg/modules/commonUser/entity/CommonUser.java
new file mode 100644
index 0000000..9f053a6
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/entity/CommonUser.java
@@ -0,0 +1,74 @@
+package org.jeecg.modules.commonUser.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 合伙人申请表
+ * @Author: jeecg-boot
+ * @Date: 2024-12-31
+ * @Version: V1.0
+ */
+@Data
+@TableName("common_user")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="common_user对象", description="合伙人申请表")
+public class CommonUser implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+ /**更新日期*/
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+ /**用户标识*/
+ @Excel(name = "用户标识", width = 15)
+ @ApiModelProperty(value = "用户标识")
+ private java.lang.String userId;
+ /**姓名*/
+ @Excel(name = "姓名", width = 15)
+ @ApiModelProperty(value = "姓名")
+ private java.lang.String name;
+ /**电话*/
+ @Excel(name = "电话", width = 15)
+ @ApiModelProperty(value = "电话")
+ private java.lang.String phone;
+ /**地区*/
+ @Excel(name = "地区", width = 15)
+ @ApiModelProperty(value = "地区")
+ private java.lang.String address;
+ /**地址详情*/
+ @Excel(name = "地址详情", width = 15)
+ @ApiModelProperty(value = "地址详情")
+ private java.lang.String addressdetail;
+ /**审核状态*/
+ @Excel(name = "审核状态", width = 15)
+ @ApiModelProperty(value = "审核状态")
+ private java.lang.Integer state;
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/CommonUserMapper.java b/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/CommonUserMapper.java
new file mode 100644
index 0000000..ea370d1
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/CommonUserMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.commonUser.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.commonUser.entity.CommonUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 合伙人申请表
+ * @Author: jeecg-boot
+ * @Date: 2024-12-31
+ * @Version: V1.0
+ */
+public interface CommonUserMapper extends BaseMapper {
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/xml/CommonUserMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/xml/CommonUserMapper.xml
new file mode 100644
index 0000000..e906f37
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/mapper/xml/CommonUserMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/service/ICommonUserService.java b/module-common/src/main/java/org/jeecg/modules/commonUser/service/ICommonUserService.java
new file mode 100644
index 0000000..b50ca61
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/service/ICommonUserService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.commonUser.service;
+
+import org.jeecg.modules.commonUser.entity.CommonUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 合伙人申请表
+ * @Author: jeecg-boot
+ * @Date: 2024-12-31
+ * @Version: V1.0
+ */
+public interface ICommonUserService extends IService {
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/service/impl/CommonUserServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonUser/service/impl/CommonUserServiceImpl.java
new file mode 100644
index 0000000..0d5c2b7
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/service/impl/CommonUserServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.commonUser.service.impl;
+
+import org.jeecg.modules.commonUser.entity.CommonUser;
+import org.jeecg.modules.commonUser.mapper.CommonUserMapper;
+import org.jeecg.modules.commonUser.service.ICommonUserService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 合伙人申请表
+ * @Author: jeecg-boot
+ * @Date: 2024-12-31
+ * @Version: V1.0
+ */
+@Service
+public class CommonUserServiceImpl extends ServiceImpl implements ICommonUserService {
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue/CommonUserList.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/CommonUserList.vue
new file mode 100644
index 0000000..108deb1
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/CommonUserList.vue
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserForm.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserForm.vue
new file mode 100644
index 0000000..5706aa6
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserForm.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.Style#Drawer.vue
new file mode 100644
index 0000000..cee5347
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.vue
new file mode 100644
index 0000000..acfd257
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue/modules/CommonUserModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.api.ts b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.api.ts
new file mode 100644
index 0000000..899e5a6
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.api.ts
@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+ list = '/commonUser/commonUser/list',
+ save='/commonUser/commonUser/add',
+ edit='/commonUser/commonUser/edit',
+ deleteOne = '/commonUser/commonUser/delete',
+ deleteBatch = '/commonUser/commonUser/deleteBatch',
+ importExcel = '/commonUser/commonUser/importExcel',
+ exportXls = '/commonUser/commonUser/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+ defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+ Modal.confirm({
+ title: '确认删除',
+ content: '是否删除选中数据',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+ }
+ });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+ let url = isUpdate ? Api.edit : Api.save;
+ return defHttp.post({url: url, params});
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.data.ts b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.data.ts
new file mode 100644
index 0000000..e09733d
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUser.data.ts
@@ -0,0 +1,73 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+ {
+ title: '用户标识',
+ align:"center",
+ dataIndex: 'userId'
+ },
+ {
+ title: '姓名',
+ align:"center",
+ dataIndex: 'name'
+ },
+ {
+ title: '电话',
+ align:"center",
+ dataIndex: 'phone'
+ },
+ {
+ title: '地区',
+ align:"center",
+ dataIndex: 'address'
+ },
+ {
+ title: '地址详情',
+ align:"center",
+ dataIndex: 'addressdetail'
+ },
+ {
+ title: '审核状态',
+ align:"center",
+ dataIndex: 'state'
+ },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+ {
+ label: '用户标识',
+ field: 'userId',
+ component: 'Input',
+ },
+ {
+ label: '姓名',
+ field: 'name',
+ component: 'Input',
+ },
+ {
+ label: '电话',
+ field: 'phone',
+ component: 'Input',
+ },
+ {
+ label: '地区',
+ field: 'address',
+ component: 'Input',
+ },
+ {
+ label: '地址详情',
+ field: 'addressdetail',
+ component: 'Input',
+ },
+ {
+ label: '审核状态',
+ field: 'state',
+ component: 'InputNumber',
+ },
+];
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUserList.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUserList.vue
new file mode 100644
index 0000000..40b8356
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/CommonUserList.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无文件
+ 下载
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/components/CommonUserModal.vue b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/components/CommonUserModal.vue
new file mode 100644
index 0000000..7dd5ed1
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/commonUser/vue3/components/CommonUserModal.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java
new file mode 100644
index 0000000..307dcf6
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.popularizeRecruitLog.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
+import org.jeecg.modules.popularizeRecruitLog.service.IPopularizeRecruitLogService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 招募报名日志
+ * @Author: jeecg-boot
+ * @Date: 2025-01-06
+ * @Version: V1.0
+ */
+@Api(tags="招募报名日志")
+@RestController
+@RequestMapping("/popularizeRecruitLog/popularizeRecruitLog")
+@Slf4j
+public class PopularizeRecruitLogController extends JeecgController {
+ @Autowired
+ private IPopularizeRecruitLogService popularizeRecruitLogService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param popularizeRecruitLog
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "招募报名日志-分页列表查询")
+ @ApiOperation(value="招募报名日志-分页列表查询", notes="招募报名日志-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryPageList(PopularizeRecruitLog popularizeRecruitLog,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeRecruitLog, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = popularizeRecruitLogService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param popularizeRecruitLog
+ * @return
+ */
+ @AutoLog(value = "招募报名日志-添加")
+ @ApiOperation(value="招募报名日志-添加", notes="招募报名日志-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody PopularizeRecruitLog popularizeRecruitLog) {
+ popularizeRecruitLogService.save(popularizeRecruitLog);
+ return Result.OK("添加成功!");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param popularizeRecruitLog
+ * @return
+ */
+ @AutoLog(value = "招募报名日志-编辑")
+ @ApiOperation(value="招募报名日志-编辑", notes="招募报名日志-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result edit(@RequestBody PopularizeRecruitLog popularizeRecruitLog) {
+ popularizeRecruitLogService.updateById(popularizeRecruitLog);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "招募报名日志-通过id删除")
+ @ApiOperation(value="招募报名日志-通过id删除", notes="招募报名日志-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id",required=true) String id) {
+ popularizeRecruitLogService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "招募报名日志-批量删除")
+ @ApiOperation(value="招募报名日志-批量删除", notes="招募报名日志-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.popularizeRecruitLogService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "招募报名日志-通过id查询")
+ @ApiOperation(value="招募报名日志-通过id查询", notes="招募报名日志-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name="id",required=true) String id) {
+ PopularizeRecruitLog popularizeRecruitLog = popularizeRecruitLogService.getById(id);
+ if(popularizeRecruitLog==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(popularizeRecruitLog);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param popularizeRecruitLog
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, PopularizeRecruitLog popularizeRecruitLog) {
+ return super.exportXls(request, popularizeRecruitLog, PopularizeRecruitLog.class, "招募报名日志");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, PopularizeRecruitLog.class);
+ }
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/entity/PopularizeRecruitLog.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/entity/PopularizeRecruitLog.java
new file mode 100644
index 0000000..9b3a851
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/entity/PopularizeRecruitLog.java
@@ -0,0 +1,66 @@
+package org.jeecg.modules.popularizeRecruitLog.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 招募报名日志
+ * @Author: jeecg-boot
+ * @Date: 2025-01-06
+ * @Version: V1.0
+ */
+@Data
+@TableName("popularize_recruit_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="popularize_recruit_log对象", description="招募报名日志")
+public class PopularizeRecruitLog implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+ /**更新日期*/
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+ /**用户信息*/
+ @Excel(name = "用户信息", width = 15)
+ @ApiModelProperty(value = "用户信息")
+ private java.lang.String userId;
+ /**姓名*/
+ @Excel(name = "姓名", width = 15)
+ @ApiModelProperty(value = "姓名")
+ private java.lang.String name;
+ /**电话*/
+ @Excel(name = "电话", width = 15)
+ @ApiModelProperty(value = "电话")
+ private java.lang.String phone;
+ /**头像*/
+ @Excel(name = "头像", width = 15)
+ @ApiModelProperty(value = "头像")
+ private java.lang.String headImage;
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/PopularizeRecruitLogMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/PopularizeRecruitLogMapper.java
new file mode 100644
index 0000000..b7e7644
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/PopularizeRecruitLogMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.popularizeRecruitLog.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 招募报名日志
+ * @Author: jeecg-boot
+ * @Date: 2025-01-06
+ * @Version: V1.0
+ */
+public interface PopularizeRecruitLogMapper extends BaseMapper {
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/xml/PopularizeRecruitLogMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/xml/PopularizeRecruitLogMapper.xml
new file mode 100644
index 0000000..6157b58
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/xml/PopularizeRecruitLogMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/IPopularizeRecruitLogService.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/IPopularizeRecruitLogService.java
new file mode 100644
index 0000000..d1c16bb
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/IPopularizeRecruitLogService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.popularizeRecruitLog.service;
+
+import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 招募报名日志
+ * @Author: jeecg-boot
+ * @Date: 2025-01-06
+ * @Version: V1.0
+ */
+public interface IPopularizeRecruitLogService extends IService {
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/impl/PopularizeRecruitLogServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/impl/PopularizeRecruitLogServiceImpl.java
new file mode 100644
index 0000000..9b53f4a
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/impl/PopularizeRecruitLogServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.popularizeRecruitLog.service.impl;
+
+import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
+import org.jeecg.modules.popularizeRecruitLog.mapper.PopularizeRecruitLogMapper;
+import org.jeecg.modules.popularizeRecruitLog.service.IPopularizeRecruitLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 招募报名日志
+ * @Author: jeecg-boot
+ * @Date: 2025-01-06
+ * @Version: V1.0
+ */
+@Service
+public class PopularizeRecruitLogServiceImpl extends ServiceImpl implements IPopularizeRecruitLogService {
+
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/PopularizeRecruitLogList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/PopularizeRecruitLogList.vue
new file mode 100644
index 0000000..c321b40
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/PopularizeRecruitLogList.vue
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogForm.vue
new file mode 100644
index 0000000..27366ec
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogForm.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.Style#Drawer.vue
new file mode 100644
index 0000000..f30bf45
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.vue
new file mode 100644
index 0000000..c5ab107
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.api.ts
new file mode 100644
index 0000000..fef9bec
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.api.ts
@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+ list = '/popularizeRecruitLog/popularizeRecruitLog/list',
+ save='/popularizeRecruitLog/popularizeRecruitLog/add',
+ edit='/popularizeRecruitLog/popularizeRecruitLog/edit',
+ deleteOne = '/popularizeRecruitLog/popularizeRecruitLog/delete',
+ deleteBatch = '/popularizeRecruitLog/popularizeRecruitLog/deleteBatch',
+ importExcel = '/popularizeRecruitLog/popularizeRecruitLog/importExcel',
+ exportXls = '/popularizeRecruitLog/popularizeRecruitLog/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+ defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+ Modal.confirm({
+ title: '确认删除',
+ content: '是否删除选中数据',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+ }
+ });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+ let url = isUpdate ? Api.edit : Api.save;
+ return defHttp.post({url: url, params});
+}
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.data.ts
new file mode 100644
index 0000000..836a840
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.data.ts
@@ -0,0 +1,53 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+ {
+ title: '用户信息',
+ align:"center",
+ dataIndex: 'userId'
+ },
+ {
+ title: '姓名',
+ align:"center",
+ dataIndex: 'name'
+ },
+ {
+ title: '电话',
+ align:"center",
+ dataIndex: 'phone'
+ },
+ {
+ title: '头像',
+ align:"center",
+ dataIndex: 'headImage'
+ },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+ {
+ label: '用户信息',
+ field: 'userId',
+ component: 'Input',
+ },
+ {
+ label: '姓名',
+ field: 'name',
+ component: 'Input',
+ },
+ {
+ label: '电话',
+ field: 'phone',
+ component: 'Input',
+ },
+ {
+ label: '头像',
+ field: 'headImage',
+ component: 'Input',
+ },
+];
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLogList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLogList.vue
new file mode 100644
index 0000000..feb64a6
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLogList.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无文件
+ 下载
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/components/PopularizeRecruitLogModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/components/PopularizeRecruitLogModal.vue
new file mode 100644
index 0000000..e3c1dd9
--- /dev/null
+++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/components/PopularizeRecruitLogModal.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/module-system/src/main/resources/pay_weixin.properties b/module-system/src/main/resources/pay_weixin.properties
index 014a765..d932533 100644
--- a/module-system/src/main/resources/pay_weixin.properties
+++ b/module-system/src/main/resources/pay_weixin.properties
@@ -1,10 +1,10 @@
-pay.mchId=1700534180
-pay.appId=wx0839bc52e7849c13
-pay.mchKey=9bde2770a74c2a460592de2d451ce05f
+pay.mchId=1702891319
+pay.appId=wx28679cb649907e7e
+pay.mchKey=6b5fbf1439176f7b78209bd237dfdf7e
pay.keyPath=classpath:apiclient_cert.pem
-pay.notifyUrl=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
-pay.notifyUrlDev=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
-pay.notifyOneUrl=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
-pay.notifyUrlOneDev=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
+pay.notifyUrl=https://jewelry-admin.hhlm1688.com/jewelry-admin/index_common/payNotify
+pay.notifyUrlDev=https://jewelry-admin.hhlm1688.com/jewelry-admin/index_common/payNotify
+pay.notifyOneUrl=https://jewelry-admin.hhlm1688.com/jewelry-admin/index_common/payNotify
+pay.notifyUrlOneDev=https://jewelry-admin.hhlm1688.com/jewelry-admin/index_common/payNotify