提交修复

han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java

@@ -142,13 +142,11 @@ public class MpWxPayService {
         request.setTotalFee(price);           //总金额|分计
         request.setSpbillCreateIp(clientIp);  //终端IP
         request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径
-//        request.setNotifyUrl("http://h5.xzaiyp.top/a-notice-api/pay-api/info/notify");//设置回调路径
         request.setProductId(productId);      //商品id
         request.setOpenid(openId);            //JSAPI OPENID
         if (dev){
             request.setTotalFee(price);
             request.setNotifyUrl(wxPay.notifyUrlDev);
-//            request.setNotifyUrl("http://h5.xzaiyp.top/a-notice-api/pay-api/info/notify");//设置回调路径
         }
         try {
             Object order = wxPayService.createOrder(request);

han-hai-module-pay/src/main/resources/pay_weixin.properties

@@ -5,10 +5,10 @@
 #pay.notifyUrl=https://jobadmin.java996.icu/job-dev/job/pay/notify
 #pay.notifyUrlDev=https://jobadmin.java996.icu/job-dev/job/pay/notify
 
-pay.mchId=1669760259
-pay.appId=wxe934cebcbc89d869
-pay.mchKey=78e4e80a2096b362114a7afeefd2ef24
+pay.mchId=1673516176
+pay.appId=wxa4d29e67e8a58d38
+pay.mchKey=GVIP1008611ABCDEFGGGGJKHLOSJFLGK
 pay.keyPath=classpath:apiclient_cert.pem
-pay.notifyUrl=http://h5.xzaiyp.top/massage-api/post/create
-pay.notifyUrlDev=http://h5.xzaiyp.top/massage-api/post/notify
+pay.notifyUrl=https://admin.hhlm1688.com/api/order/payNotify
+pay.notifyUrlDev=http://h5.xzaiyp.top/api/order/payNotify
 

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -72,9 +72,10 @@ public class ShiroConfig {
             }
         }
         filterChainDefinitionMap.put("/web/**", "anon"); //官网接口开放验证
-        filterChainDefinitionMap.put("/city/**", "anon");
+        filterChainDefinitionMap.put("/order/**", "anon");
         filterChainDefinitionMap.put("/login/**", "anon");
         filterChainDefinitionMap.put("/token/**", "anon");
+        filterChainDefinitionMap.put("/city/**", "anon");
 
 
 

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/controller/CityAddressController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cityAddress.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.cityAddress.entity.CityAddress;
+import org.jeecg.modules.cityAddress.service.ICityAddressService;
+
+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-11-08
+ * @Version: V1.0
+ */
+@Api(tags="地址信息表")
+@RestController
+@RequestMapping("/cityAddress/cityAddress")
+@Slf4j
+public class CityAddressController extends JeecgController<CityAddress, ICityAddressService> {
+	@Autowired
+	private ICityAddressService cityAddressService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cityAddress
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "地址信息表-分页列表查询")
+	@ApiOperation(value="地址信息表-分页列表查询", notes="地址信息表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CityAddress>> queryPageList(CityAddress cityAddress,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CityAddress> queryWrapper = QueryGenerator.initQueryWrapper(cityAddress, req.getParameterMap());
+		Page<CityAddress> page = new Page<CityAddress>(pageNo, pageSize);
+		IPage<CityAddress> pageList = cityAddressService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cityAddress
+	 * @return
+	 */
+	@AutoLog(value = "地址信息表-添加")
+	@ApiOperation(value="地址信息表-添加", notes="地址信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CityAddress cityAddress) {
+		cityAddressService.save(cityAddress);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cityAddress
+	 * @return
+	 */
+	@AutoLog(value = "地址信息表-编辑")
+	@ApiOperation(value="地址信息表-编辑", notes="地址信息表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CityAddress cityAddress) {
+		cityAddressService.updateById(cityAddress);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "地址信息表-通过id删除")
+	@ApiOperation(value="地址信息表-通过id删除", notes="地址信息表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cityAddressService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "地址信息表-批量删除")
+	@ApiOperation(value="地址信息表-批量删除", notes="地址信息表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cityAddressService.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<CityAddress> queryById(@RequestParam(name="id",required=true) String id) {
+		CityAddress cityAddress = cityAddressService.getById(id);
+		if(cityAddress==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cityAddress);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cityAddress
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CityAddress cityAddress) {
+        return super.exportXls(request, cityAddress, CityAddress.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, CityAddress.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/entity/CityAddress.java

@@ -0,0 +1,82 @@
+package org.jeecg.modules.cityAddress.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-11-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("city_address")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="city_address对象", description="地址信息表")
+public class CityAddress 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 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.String defaultFlag;
+	/**经度*/
+	@Excel(name = "经度", width = 15)
+    @ApiModelProperty(value = "经度")
+    private java.lang.String latitude;
+	/**纬度*/
+	@Excel(name = "纬度", width = 15)
+    @ApiModelProperty(value = "纬度")
+    private java.lang.String longitude;
+	/**用户*/
+	@Excel(name = "用户", width = 15)
+    @ApiModelProperty(value = "用户")
+    private java.lang.String userId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/mapper/CityAddressMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cityAddress.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cityAddress.entity.CityAddress;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 地址信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-08
+ * @Version: V1.0
+ */
+public interface CityAddressMapper extends BaseMapper<CityAddress> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/mapper/xml/CityAddressMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.cityAddress.mapper.CityAddressMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/service/ICityAddressService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cityAddress.service;
+
+import org.jeecg.modules.cityAddress.entity.CityAddress;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 地址信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-08
+ * @Version: V1.0
+ */
+public interface ICityAddressService extends IService<CityAddress> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/service/impl/CityAddressServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cityAddress.service.impl;
+
+import org.jeecg.modules.cityAddress.entity.CityAddress;
+import org.jeecg.modules.cityAddress.mapper.CityAddressMapper;
+import org.jeecg.modules.cityAddress.service.ICityAddressService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 地址信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-08
+ * @Version: V1.0
+ */
+@Service
+public class CityAddressServiceImpl extends ServiceImpl<CityAddressMapper, CityAddress> implements ICityAddressService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/CityAddressList.vue

@@ -0,0 +1,213 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('地址信息表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <city-address-modal ref="modalForm" @ok="modalFormOk"></city-address-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CityAddressModal from './modules/CityAddressModal'
+
+  export default {
+    name: 'CityAddressList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CityAddressModal
+    },
+    data () {
+      return {
+        description: '地址信息表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'地址详情',
+            align:"center",
+            dataIndex: 'addressDetail'
+          },
+          {
+            title:'默认',
+            align:"center",
+            dataIndex: 'defaultFlag'
+          },
+          {
+            title:'经度',
+            align:"center",
+            dataIndex: 'latitude'
+          },
+          {
+            title:'纬度',
+            align:"center",
+            dataIndex: 'longitude'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cityAddress/cityAddress/list",
+          delete: "/cityAddress/cityAddress/delete",
+          deleteBatch: "/cityAddress/cityAddress/deleteBatch",
+          exportXlsUrl: "/cityAddress/cityAddress/exportXls",
+          importExcelUrl: "cityAddress/cityAddress/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'addressDetail',text:'地址详情',dictCode:''})
+        fieldList.push({type:'string',value:'defaultFlag',text:'默认',dictCode:''})
+        fieldList.push({type:'string',value:'latitude',text:'经度',dictCode:''})
+        fieldList.push({type:'string',value:'longitude',text:'纬度',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressForm.vue

@@ -0,0 +1,139 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressDetail">
+              <a-input v-model="model.addressDetail" placeholder="请输入地址详情"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="默认" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="defaultFlag">
+              <a-input v-model="model.defaultFlag" placeholder="请输入默认"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latitude">
+              <a-input v-model="model.latitude" placeholder="请输入经度"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="longitude">
+              <a-input v-model="model.longitude" placeholder="请输入纬度"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CityAddressForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/cityAddress/cityAddress/add",
+          edit: "/cityAddress/cityAddress/edit",
+          queryById: "/cityAddress/cityAddress/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <city-address-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-address-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CityAddressForm from './CityAddressForm'
+
+  export default {
+    name: 'CityAddressModal',
+    components: {
+      CityAddressForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <city-address-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-address-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CityAddressForm from './CityAddressForm'
+  export default {
+    name: 'CityAddressModal',
+    components: {
+      CityAddressForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddress.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cityAddress/cityAddress/list',
+  save='/cityAddress/cityAddress/add',
+  edit='/cityAddress/cityAddress/edit',
+  deleteOne = '/cityAddress/cityAddress/delete',
+  deleteBatch = '/cityAddress/cityAddress/deleteBatch',
+  importExcel = '/cityAddress/cityAddress/importExcel',
+  exportXls = '/cityAddress/cityAddress/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});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddress.data.ts

@@ -0,0 +1,93 @@
+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: 'phone'
+   },
+   {
+    title: '地址',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '地址详情',
+    align:"center",
+    dataIndex: 'addressDetail'
+   },
+   {
+    title: '默认',
+    align:"center",
+    dataIndex: 'defaultFlag'
+   },
+   {
+    title: '经度',
+    align:"center",
+    dataIndex: 'latitude'
+   },
+   {
+    title: '纬度',
+    align:"center",
+    dataIndex: 'longitude'
+   },
+   {
+    title: '用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '姓名',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '地址',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '地址详情',
+    field: 'addressDetail',
+    component: 'Input',
+  },
+  {
+    label: '默认',
+    field: 'defaultFlag',
+    component: 'Input',
+  },
+  {
+    label: '经度',
+    field: 'latitude',
+    component: 'Input',
+  },
+  {
+    label: '纬度',
+    field: 'longitude',
+    component: 'Input',
+  },
+  {
+    label: '用户',
+    field: 'userId',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddressList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CityAddressModal @register="registerModal" @success="handleSuccess"></CityAddressModal>
+  </div>
+</template>
+
+<script lang="ts" name="cityAddress-cityAddress" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CityAddressModal from './components/CityAddressModal.vue'
+  import {columns, searchFormSchema} from './cityAddress.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cityAddress.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '地址信息表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"地址信息表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/components/CityAddressModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../cityAddress.data';
+    import {saveOrUpdate} from '../cityAddress.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/controller/CityHomeController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 租房信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-26
+ * @Date:   2024-11-07
  * @Version: V1.0
  */
 @Api(tags="租房信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 租房信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-26
+ * @Date:   2024-11-07
  * @Version: V1.0
  */
 @Data
@@ -72,7 +72,7 @@ public class CityHome implements Serializable {
 	/**租金*/
 	@Excel(name = "租金", width = 15)
     @ApiModelProperty(value = "租金")
-    private java.math.BigDecimal money;
+    private java.lang.String money;
 	/**面积*/
 	@Excel(name = "面积", width = 15)
     @ApiModelProperty(value = "面积")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/mapper/CityHomeMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 租房信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-26
+ * @Date:   2024-11-07
  * @Version: V1.0
  */
 public interface CityHomeMapper extends BaseMapper<CityHome> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/ICityHomeService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 租房信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-26
+ * @Date:   2024-11-07
  * @Version: V1.0
  */
 public interface ICityHomeService extends IService<CityHome> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/impl/CityHomeServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 租房信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-26
+ * @Date:   2024-11-07
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue

@@ -305,7 +305,7 @@
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
         fieldList.push({type:'string',value:'titleSub',text:'备注',dictCode:''})
         fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'money',text:'租金',dictCode:''})
+        fieldList.push({type:'string',value:'money',text:'租金',dictCode:''})
         fieldList.push({type:'string',value:'crm',text:'面积',dictCode:''})
         fieldList.push({type:'string',value:'floor',text:'楼层',dictCode:''})
         fieldList.push({type:'string',value:'face',text:'朝向',dictCode:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue

@@ -30,7 +30,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="租金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
-              <a-input-number v-model="model.money" placeholder="请输入租金" style="width: 100%" />
+              <a-input v-model="model.money" placeholder="请输入租金"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts

@@ -187,7 +187,7 @@ export const formSchema: FormSchema[] = [
   {
     label: '租金',
     field: 'money',
-    component: 'InputNumber',
+    component: 'Input',
   },
   {
     label: '面积',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 工作信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-26
+ * @Date:   2024-11-08
  * @Version: V1.0
  */
 @Api(tags="工作信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 工作信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-26
+ * @Date:   2024-11-08
  * @Version: V1.0
  */
 @Data
@@ -68,9 +68,9 @@ public class CityJob implements Serializable {
 	@Excel(name = "地址", width = 15)
     @ApiModelProperty(value = "地址")
     private java.lang.String address;
-	/**学历要求*/
-	@Excel(name = "学历要求", width = 15)
-    @ApiModelProperty(value = "学历要求")
+	/**招聘要求*/
+	@Excel(name = "招聘要求", width = 15)
+    @ApiModelProperty(value = "招聘要求")
     private java.lang.String school;
 	/**岗位详情*/
 	@Excel(name = "岗位详情", width = 15)
@@ -92,4 +92,36 @@ public class CityJob implements Serializable {
 	@Excel(name = "标签列表", width = 15)
     @ApiModelProperty(value = "标签列表")
     private java.lang.String iconText;
+	/**联系人*/
+	@Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
+    private java.lang.String userName;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String userPhone;
+	/**职位描述*/
+	@Excel(name = "职位描述", width = 15)
+    @ApiModelProperty(value = "职位描述")
+    private java.lang.String jobContext;
+	/**公司介绍*/
+	@Excel(name = "公司介绍", width = 15)
+    @ApiModelProperty(value = "公司介绍")
+    private java.lang.String gsContext;
+	/**招聘公司*/
+	@Excel(name = "招聘公司", width = 15)
+    @ApiModelProperty(value = "招聘公司")
+    private java.lang.String company;
+	/**认证情况*/
+	@Excel(name = "认证情况", width = 15)
+    @ApiModelProperty(value = "认证情况")
+    private java.lang.String isCardOpen;
+	/**假日福利*/
+	@Excel(name = "假日福利", width = 15)
+    @ApiModelProperty(value = "假日福利")
+    private java.lang.String iconTitle;
+	/**所属乡镇*/
+	@Excel(name = "所属乡镇", width = 15)
+    @ApiModelProperty(value = "所属乡镇")
+    private java.lang.String city;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 工作信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-26
+ * @Date:   2024-11-08
  * @Version: V1.0
  */
 public interface CityJobMapper extends BaseMapper<CityJob> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 工作信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-26
+ * @Date:   2024-11-08
  * @Version: V1.0
  */
 public interface ICityJobService extends IService<CityJob> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 工作信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-26
+ * @Date:   2024-11-08
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue

@@ -148,7 +148,7 @@
             dataIndex: 'address'
           },
           {
-            title:'学历要求',
+            title:'招聘要求',
             align:"center",
             dataIndex: 'school'
           },
@@ -177,6 +177,46 @@
             align:"center",
             dataIndex: 'iconText'
           },
+          {
+            title:'联系人',
+            align:"center",
+            dataIndex: 'userName'
+          },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'userPhone'
+          },
+          {
+            title:'职位描述',
+            align:"center",
+            dataIndex: 'jobContext'
+          },
+          {
+            title:'公司介绍',
+            align:"center",
+            dataIndex: 'gsContext'
+          },
+          {
+            title:'招聘公司',
+            align:"center",
+            dataIndex: 'company'
+          },
+          {
+            title:'认证情况',
+            align:"center",
+            dataIndex: 'isCardOpen'
+          },
+          {
+            title:'假日福利',
+            align:"center",
+            dataIndex: 'iconTitle'
+          },
+          {
+            title:'所属乡镇',
+            align:"center",
+            dataIndex: 'city'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -216,12 +256,20 @@
         fieldList.push({type:'BigDecimal',value:'minPrice',text:'最低价格',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'maxPrice',text:'最高价格',dictCode:''})
         fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
-        fieldList.push({type:'string',value:'school',text:'学历要求',dictCode:''})
-        fieldList.push({type:'string',value:'jobDetails',text:'岗位详情',dictCode:''})
+        fieldList.push({type:'Text',value:'school',text:'招聘要求',dictCode:''})
+        fieldList.push({type:'Text',value:'jobDetails',text:'岗位详情',dictCode:''})
         fieldList.push({type:'string',value:'latitude',text:'经度',dictCode:''})
         fieldList.push({type:'string',value:'longitude',text:'纬度',dictCode:''})
         fieldList.push({type:'string',value:'workYear',text:'工作年限',dictCode:''})
         fieldList.push({type:'string',value:'iconText',text:'标签列表',dictCode:''})
+        fieldList.push({type:'string',value:'userName',text:'联系人',dictCode:''})
+        fieldList.push({type:'string',value:'userPhone',text:'联系电话',dictCode:''})
+        fieldList.push({type:'Text',value:'jobContext',text:'职位描述',dictCode:''})
+        fieldList.push({type:'Text',value:'gsContext',text:'公司介绍',dictCode:''})
+        fieldList.push({type:'string',value:'company',text:'招聘公司',dictCode:''})
+        fieldList.push({type:'string',value:'isCardOpen',text:'认证情况',dictCode:''})
+        fieldList.push({type:'string',value:'iconTitle',text:'假日福利',dictCode:''})
+        fieldList.push({type:'string',value:'city',text:'所属乡镇',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue

@@ -29,8 +29,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="学历要求" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="school">
-              <a-input v-model="model.school" placeholder="请输入学历要求"  ></a-input>
+            <a-form-model-item label="招聘要求" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="school">
+              <a-textarea v-model="model.school" rows="4" placeholder="请输入招聘要求" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -58,6 +58,46 @@
               <a-input v-model="model.iconText" placeholder="请输入标签列表"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
+              <a-input v-model="model.userName" placeholder="请输入联系人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userPhone">
+              <a-input v-model="model.userPhone" placeholder="请输入联系电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="职位描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jobContext">
+              <a-textarea v-model="model.jobContext" rows="4" placeholder="请输入职位描述" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="公司介绍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gsContext">
+              <a-textarea v-model="model.gsContext" rows="4" placeholder="请输入公司介绍" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="招聘公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
+              <a-input v-model="model.company" placeholder="请输入招聘公司"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="认证情况" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isCardOpen">
+              <a-input v-model="model.isCardOpen" placeholder="请输入认证情况"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="假日福利" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="iconTitle">
+              <a-input v-model="model.iconTitle" placeholder="请输入假日福利"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所属乡镇" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="city">
+              <a-input v-model="model.city" placeholder="请输入所属乡镇"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts

@@ -30,7 +30,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'address'
    },
    {
-    title: '学历要求',
+    title: '招聘要求',
     align:"center",
     dataIndex: 'school'
    },
@@ -59,6 +59,46 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'iconText'
    },
+   {
+    title: '联系人',
+    align:"center",
+    dataIndex: 'userName'
+   },
+   {
+    title: '联系电话',
+    align:"center",
+    dataIndex: 'userPhone'
+   },
+   {
+    title: '职位描述',
+    align:"center",
+    dataIndex: 'jobContext'
+   },
+   {
+    title: '公司介绍',
+    align:"center",
+    dataIndex: 'gsContext'
+   },
+   {
+    title: '招聘公司',
+    align:"center",
+    dataIndex: 'company'
+   },
+   {
+    title: '认证情况',
+    align:"center",
+    dataIndex: 'isCardOpen'
+   },
+   {
+    title: '假日福利',
+    align:"center",
+    dataIndex: 'iconTitle'
+   },
+   {
+    title: '所属乡镇',
+    align:"center",
+    dataIndex: 'city'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -94,9 +134,9 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '学历要求',
+    label: '招聘要求',
     field: 'school',
-    component: 'Input',
+    component: 'InputTextArea',//TODO 注意string转换问题
   },
   {
     label: '岗位详情',
@@ -123,4 +163,44 @@ export const formSchema: FormSchema[] = [
     field: 'iconText',
     component: 'Input',
   },
+  {
+    label: '联系人',
+    field: 'userName',
+    component: 'Input',
+  },
+  {
+    label: '联系电话',
+    field: 'userPhone',
+    component: 'Input',
+  },
+  {
+    label: '职位描述',
+    field: 'jobContext',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
+  {
+    label: '公司介绍',
+    field: 'gsContext',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
+  {
+    label: '招聘公司',
+    field: 'company',
+    component: 'Input',
+  },
+  {
+    label: '认证情况',
+    field: 'isCardOpen',
+    component: 'Input',
+  },
+  {
+    label: '假日福利',
+    field: 'iconTitle',
+    component: 'Input',
+  },
+  {
+    label: '所属乡镇',
+    field: 'city',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/controller/CityOrderController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cityOrder.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.cityOrder.entity.CityOrder;
+import org.jeecg.modules.cityOrder.service.ICityOrderService;
+
+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-11-09
+ * @Version: V1.0
+ */
+@Api(tags="订单管理")
+@RestController
+@RequestMapping("/cityOrder/cityOrder")
+@Slf4j
+public class CityOrderController extends JeecgController<CityOrder, ICityOrderService> {
+	@Autowired
+	private ICityOrderService cityOrderService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cityOrder
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "订单管理-分页列表查询")
+	@ApiOperation(value="订单管理-分页列表查询", notes="订单管理-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CityOrder>> queryPageList(CityOrder cityOrder,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CityOrder> queryWrapper = QueryGenerator.initQueryWrapper(cityOrder, req.getParameterMap());
+		Page<CityOrder> page = new Page<CityOrder>(pageNo, pageSize);
+		IPage<CityOrder> pageList = cityOrderService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cityOrder
+	 * @return
+	 */
+	@AutoLog(value = "订单管理-添加")
+	@ApiOperation(value="订单管理-添加", notes="订单管理-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CityOrder cityOrder) {
+		cityOrderService.save(cityOrder);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cityOrder
+	 * @return
+	 */
+	@AutoLog(value = "订单管理-编辑")
+	@ApiOperation(value="订单管理-编辑", notes="订单管理-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CityOrder cityOrder) {
+		cityOrderService.updateById(cityOrder);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "订单管理-通过id删除")
+	@ApiOperation(value="订单管理-通过id删除", notes="订单管理-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cityOrderService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "订单管理-批量删除")
+	@ApiOperation(value="订单管理-批量删除", notes="订单管理-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cityOrderService.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<CityOrder> queryById(@RequestParam(name="id",required=true) String id) {
+		CityOrder cityOrder = cityOrderService.getById(id);
+		if(cityOrder==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cityOrder);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cityOrder
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CityOrder cityOrder) {
+        return super.exportXls(request, cityOrder, CityOrder.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, CityOrder.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/entity/CityOrder.java

@@ -0,0 +1,106 @@
+package org.jeecg.modules.cityOrder.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-11-09
+ * @Version: V1.0
+ */
+@Data
+@TableName("city_order")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="city_order对象", description="订单管理")
+public class CityOrder 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 name;
+	/**商品图片*/
+	@Excel(name = "商品图片", width = 15)
+    @ApiModelProperty(value = "商品图片")
+    private java.lang.String image;
+	/**购买数量*/
+	@Excel(name = "购买数量", width = 15)
+    @ApiModelProperty(value = "购买数量")
+    private java.lang.Integer num;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.math.BigDecimal price;
+	/**积分*/
+	@Excel(name = "积分", width = 15)
+    @ApiModelProperty(value = "积分")
+    private java.math.BigDecimal points;
+	/**类型0积分支付1微信支付*/
+	@Excel(name = "类型0积分支付1微信支付", width = 15)
+    @ApiModelProperty(value = "类型0积分支付1微信支付")
+    private java.lang.Integer type;
+	/**状态0待支付1等待发货2待收货3已完成*/
+	@Excel(name = "状态0待支付1等待发货2待收货3已完成", width = 15)
+    @ApiModelProperty(value = "状态0待支付1等待发货2待收货3已完成")
+    private java.lang.Integer state;
+	/**关联用户*/
+	@Excel(name = "关联用户", width = 15)
+    @ApiModelProperty(value = "关联用户")
+    private java.lang.String userId;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private java.lang.String addressName;
+	/**电话*/
+	@Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private java.lang.String addressPhone;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private java.lang.String addressCity;
+	/**地址详情*/
+	@Excel(name = "地址详情", width = 15)
+    @ApiModelProperty(value = "地址详情")
+    private java.lang.String addressDetails;
+	/**所属商品*/
+	@Excel(name = "所属商品", width = 15)
+    @ApiModelProperty(value = "所属商品")
+    private java.lang.String shopId;
+	/**佣金*/
+	@Excel(name = "佣金", width = 15)
+    @ApiModelProperty(value = "佣金")
+    private java.math.BigDecimal giveMoney;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/mapper/CityOrderMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cityOrder.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cityOrder.entity.CityOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 订单管理
+ * @Author: jeecg-boot
+ * @Date:   2024-11-09
+ * @Version: V1.0
+ */
+public interface CityOrderMapper extends BaseMapper<CityOrder> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/mapper/xml/CityOrderMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.cityOrder.mapper.CityOrderMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/service/ICityOrderService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cityOrder.service;
+
+import org.jeecg.modules.cityOrder.entity.CityOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 订单管理
+ * @Author: jeecg-boot
+ * @Date:   2024-11-09
+ * @Version: V1.0
+ */
+public interface ICityOrderService extends IService<CityOrder> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/service/impl/CityOrderServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cityOrder.service.impl;
+
+import org.jeecg.modules.cityOrder.entity.CityOrder;
+import org.jeecg.modules.cityOrder.mapper.CityOrderMapper;
+import org.jeecg.modules.cityOrder.service.ICityOrderService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 订单管理
+ * @Author: jeecg-boot
+ * @Date:   2024-11-09
+ * @Version: V1.0
+ */
+@Service
+public class CityOrderServiceImpl extends ServiceImpl<CityOrderMapper, CityOrder> implements ICityOrderService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/CityOrderList.vue

@@ -0,0 +1,249 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('订单管理')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <city-order-modal ref="modalForm" @ok="modalFormOk"></city-order-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CityOrderModal from './modules/CityOrderModal'
+
+  export default {
+    name: 'CityOrderList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CityOrderModal
+    },
+    data () {
+      return {
+        description: '订单管理管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'商品名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'商品图片',
+            align:"center",
+            dataIndex: 'image'
+          },
+          {
+            title:'购买数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'积分',
+            align:"center",
+            dataIndex: 'points'
+          },
+          {
+            title:'类型0积分支付1微信支付',
+            align:"center",
+            dataIndex: 'type'
+          },
+          {
+            title:'状态0待支付1等待发货2待收货3已完成',
+            align:"center",
+            dataIndex: 'state'
+          },
+          {
+            title:'关联用户',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'addressName'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'addressPhone'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'addressCity'
+          },
+          {
+            title:'地址详情',
+            align:"center",
+            dataIndex: 'addressDetails'
+          },
+          {
+            title:'所属商品',
+            align:"center",
+            dataIndex: 'shopId'
+          },
+          {
+            title:'佣金',
+            align:"center",
+            dataIndex: 'giveMoney'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cityOrder/cityOrder/list",
+          delete: "/cityOrder/cityOrder/delete",
+          deleteBatch: "/cityOrder/cityOrder/deleteBatch",
+          exportXlsUrl: "/cityOrder/cityOrder/exportXls",
+          importExcelUrl: "cityOrder/cityOrder/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'name',text:'商品名称',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'商品图片',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'购买数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'points',text:'积分',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'类型0积分支付1微信支付',dictCode:''})
+        fieldList.push({type:'int',value:'state',text:'状态0待支付1等待发货2待收货3已完成',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:''})
+        fieldList.push({type:'string',value:'addressName',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'addressPhone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'addressCity',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'addressDetails',text:'地址详情',dictCode:''})
+        fieldList.push({type:'string',value:'shopId',text:'所属商品',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'giveMoney',text:'佣金',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderForm.vue

@@ -0,0 +1,169 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入商品名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <a-input v-model="model.image" placeholder="请输入商品图片"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="购买数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input-number v-model="model.num" placeholder="请输入购买数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="积分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="points">
+              <a-input-number v-model="model.points" placeholder="请输入积分" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型0积分支付1微信支付" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <a-input-number v-model="model.type" placeholder="请输入类型0积分支付1微信支付" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态0待支付1等待发货2待收货3已完成" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <a-input-number v-model="model.state" placeholder="请输入状态0待支付1等待发货2待收货3已完成" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入关联用户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressName">
+              <a-input v-model="model.addressName" placeholder="请输入姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressPhone">
+              <a-input v-model="model.addressPhone" placeholder="请输入电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressCity">
+              <a-input v-model="model.addressCity" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressDetails">
+              <a-input v-model="model.addressDetails" placeholder="请输入地址详情"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所属商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <a-input v-model="model.shopId" placeholder="请输入所属商品"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="佣金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="giveMoney">
+              <a-input-number v-model="model.giveMoney" placeholder="请输入佣金" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CityOrderForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/cityOrder/cityOrder/add",
+          edit: "/cityOrder/cityOrder/edit",
+          queryById: "/cityOrder/cityOrder/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <city-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-order-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CityOrderForm from './CityOrderForm'
+
+  export default {
+    name: 'CityOrderModal',
+    components: {
+      CityOrderForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <city-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-order-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CityOrderForm from './CityOrderForm'
+  export default {
+    name: 'CityOrderModal',
+    components: {
+      CityOrderForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrder.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cityOrder/cityOrder/list',
+  save='/cityOrder/cityOrder/add',
+  edit='/cityOrder/cityOrder/edit',
+  deleteOne = '/cityOrder/cityOrder/delete',
+  deleteBatch = '/cityOrder/cityOrder/deleteBatch',
+  importExcel = '/cityOrder/cityOrder/importExcel',
+  exportXls = '/cityOrder/cityOrder/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});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrder.data.ts

@@ -0,0 +1,153 @@
+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: 'image'
+   },
+   {
+    title: '购买数量',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '积分',
+    align:"center",
+    dataIndex: 'points'
+   },
+   {
+    title: '类型0积分支付1微信支付',
+    align:"center",
+    dataIndex: 'type'
+   },
+   {
+    title: '状态0待支付1等待发货2待收货3已完成',
+    align:"center",
+    dataIndex: 'state'
+   },
+   {
+    title: '关联用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
+   {
+    title: '姓名',
+    align:"center",
+    dataIndex: 'addressName'
+   },
+   {
+    title: '电话',
+    align:"center",
+    dataIndex: 'addressPhone'
+   },
+   {
+    title: '地址',
+    align:"center",
+    dataIndex: 'addressCity'
+   },
+   {
+    title: '地址详情',
+    align:"center",
+    dataIndex: 'addressDetails'
+   },
+   {
+    title: '所属商品',
+    align:"center",
+    dataIndex: 'shopId'
+   },
+   {
+    title: '佣金',
+    align:"center",
+    dataIndex: 'giveMoney'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '商品名称',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '商品图片',
+    field: 'image',
+    component: 'Input',
+  },
+  {
+    label: '购买数量',
+    field: 'num',
+    component: 'InputNumber',
+  },
+  {
+    label: '价格',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '积分',
+    field: 'points',
+    component: 'InputNumber',
+  },
+  {
+    label: '类型0积分支付1微信支付',
+    field: 'type',
+    component: 'InputNumber',
+  },
+  {
+    label: '状态0待支付1等待发货2待收货3已完成',
+    field: 'state',
+    component: 'InputNumber',
+  },
+  {
+    label: '关联用户',
+    field: 'userId',
+    component: 'Input',
+  },
+  {
+    label: '姓名',
+    field: 'addressName',
+    component: 'Input',
+  },
+  {
+    label: '电话',
+    field: 'addressPhone',
+    component: 'Input',
+  },
+  {
+    label: '地址',
+    field: 'addressCity',
+    component: 'Input',
+  },
+  {
+    label: '地址详情',
+    field: 'addressDetails',
+    component: 'Input',
+  },
+  {
+    label: '所属商品',
+    field: 'shopId',
+    component: 'Input',
+  },
+  {
+    label: '佣金',
+    field: 'giveMoney',
+    component: 'InputNumber',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrderList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CityOrderModal @register="registerModal" @success="handleSuccess"></CityOrderModal>
+  </div>
+</template>
+
+<script lang="ts" name="cityOrder-cityOrder" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CityOrderModal from './components/CityOrderModal.vue'
+  import {columns, searchFormSchema} from './cityOrder.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cityOrder.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '订单管理',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"订单管理",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/components/CityOrderModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../cityOrder.data';
+    import {saveOrUpdate} from '../cityOrder.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/controller/CityShoppingController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cityShopping.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.cityShopping.entity.CityShopping;
+import org.jeecg.modules.cityShopping.service.ICityShoppingService;
+
+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-11-08
+ * @Version: V1.0
+ */
+@Api(tags="商城表")
+@RestController
+@RequestMapping("/cityShopping/cityShopping")
+@Slf4j
+public class CityShoppingController extends JeecgController<CityShopping, ICityShoppingService> {
+	@Autowired
+	private ICityShoppingService cityShoppingService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cityShopping
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "商城表-分页列表查询")
+	@ApiOperation(value="商城表-分页列表查询", notes="商城表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CityShopping>> queryPageList(CityShopping cityShopping,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CityShopping> queryWrapper = QueryGenerator.initQueryWrapper(cityShopping, req.getParameterMap());
+		Page<CityShopping> page = new Page<CityShopping>(pageNo, pageSize);
+		IPage<CityShopping> pageList = cityShoppingService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cityShopping
+	 * @return
+	 */
+	@AutoLog(value = "商城表-添加")
+	@ApiOperation(value="商城表-添加", notes="商城表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CityShopping cityShopping) {
+		cityShoppingService.save(cityShopping);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cityShopping
+	 * @return
+	 */
+	@AutoLog(value = "商城表-编辑")
+	@ApiOperation(value="商城表-编辑", notes="商城表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CityShopping cityShopping) {
+		cityShoppingService.updateById(cityShopping);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "商城表-通过id删除")
+	@ApiOperation(value="商城表-通过id删除", notes="商城表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cityShoppingService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "商城表-批量删除")
+	@ApiOperation(value="商城表-批量删除", notes="商城表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cityShoppingService.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<CityShopping> queryById(@RequestParam(name="id",required=true) String id) {
+		CityShopping cityShopping = cityShoppingService.getById(id);
+		if(cityShopping==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cityShopping);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cityShopping
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CityShopping cityShopping) {
+        return super.exportXls(request, cityShopping, CityShopping.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, CityShopping.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/entity/CityShopping.java

@@ -0,0 +1,102 @@
+package org.jeecg.modules.cityShopping.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-11-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("city_shopping")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="city_shopping对象", description="商城表")
+public class CityShopping 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;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**商品名称*/
+	@Excel(name = "商品名称", width = 15)
+    @ApiModelProperty(value = "商品名称")
+    private java.lang.String name;
+	/**商品介绍*/
+	@Excel(name = "商品介绍", width = 15)
+    @ApiModelProperty(value = "商品介绍")
+    private java.lang.String nameSub;
+	/**主图*/
+	@Excel(name = "主图", width = 15)
+    @ApiModelProperty(value = "主图")
+    private java.lang.String image;
+	/**详情图*/
+	@Excel(name = "详情图", width = 15)
+    @ApiModelProperty(value = "详情图")
+    private java.lang.String imageDetails;
+	/**原价*/
+	@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 points;
+	/**详情*/
+	@Excel(name = "详情", width = 15)
+    @ApiModelProperty(value = "详情")
+    private java.lang.String details;
+	/**购买数量*/
+	@Excel(name = "购买数量", width = 15)
+    @ApiModelProperty(value = "购买数量")
+    private java.lang.Integer payNum;
+	/**库存*/
+	@Excel(name = "库存", width = 15)
+    @ApiModelProperty(value = "库存")
+    private java.lang.Integer num;
+	/**是否上架*/
+	@Excel(name = "是否上架", width = 15)
+    @ApiModelProperty(value = "是否上架")
+    private java.lang.String isOpen;
+	/**关联店铺*/
+	@Excel(name = "关联店铺", width = 15, dictTable = "city_shop", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "city_shop", dicText = "title", dicCode = "id")
+    @ApiModelProperty(value = "关联店铺")
+    private java.lang.String shopId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/CityShoppingMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cityShopping.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cityShopping.entity.CityShopping;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 商城表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-08
+ * @Version: V1.0
+ */
+public interface CityShoppingMapper extends BaseMapper<CityShopping> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/xml/CityShoppingMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.cityShopping.mapper.CityShoppingMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/ICityShoppingService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cityShopping.service;
+
+import org.jeecg.modules.cityShopping.entity.CityShopping;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 商城表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-08
+ * @Version: V1.0
+ */
+public interface ICityShoppingService extends IService<CityShopping> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/impl/CityShoppingServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cityShopping.service.impl;
+
+import org.jeecg.modules.cityShopping.entity.CityShopping;
+import org.jeecg.modules.cityShopping.mapper.CityShoppingMapper;
+import org.jeecg.modules.cityShopping.service.ICityShoppingService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 商城表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-08
+ * @Version: V1.0
+ */
+@Service
+public class CityShoppingServiceImpl extends ServiceImpl<CityShoppingMapper, CityShopping> implements ICityShoppingService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/CityShoppingList.vue

@@ -0,0 +1,256 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('商城表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <city-shopping-modal ref="modalForm" @ok="modalFormOk"></city-shopping-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CityShoppingModal from './modules/CityShoppingModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CityShoppingList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CityShoppingModal
+    },
+    data () {
+      return {
+        description: '商城表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'创建人',
+            align:"center",
+            dataIndex: 'createBy'
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
+          {
+            title:'商品名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'商品介绍',
+            align:"center",
+            dataIndex: 'nameSub'
+          },
+          {
+            title:'主图',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'详情图',
+            align:"center",
+            dataIndex: 'imageDetails',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'原价',
+            align:"center",
+            dataIndex: 'oldPrice'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'积分',
+            align:"center",
+            dataIndex: 'points'
+          },
+          {
+            title:'详情',
+            align:"center",
+            dataIndex: 'details',
+            scopedSlots: {customRender: 'htmlSlot'}
+          },
+          {
+            title:'购买数量',
+            align:"center",
+            dataIndex: 'payNum'
+          },
+          {
+            title:'库存',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'是否上架',
+            align:"center",
+            dataIndex: 'isOpen',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''),
+          },
+          {
+            title:'关联店铺',
+            align:"center",
+            dataIndex: 'shopId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cityShopping/cityShopping/list",
+          delete: "/cityShopping/cityShopping/delete",
+          deleteBatch: "/cityShopping/cityShopping/deleteBatch",
+          exportXlsUrl: "/cityShopping/cityShopping/exportXls",
+          importExcelUrl: "cityShopping/cityShopping/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.$set(this.dictOptions, 'isOpen', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'Text',value:'name',text:'商品名称',dictCode:''})
+        fieldList.push({type:'Text',value:'nameSub',text:'商品介绍',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'主图',dictCode:''})
+        fieldList.push({type:'Text',value:'imageDetails',text:'详情图',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'oldPrice',text:'原价',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'points',text:'积分',dictCode:''})
+        fieldList.push({type:'Text',value:'details',text:'详情',dictCode:''})
+        fieldList.push({type:'int',value:'payNum',text:'购买数量',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'库存',dictCode:''})
+        fieldList.push({type:'switch',value:'isOpen',text:'是否上架'})
+        fieldList.push({type:'sel_search',value:'shopId',text:'关联店铺',dictTable:"city_shop", dictText:'title', dictCode:'id'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingForm.vue

@@ -0,0 +1,159 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入商品名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品介绍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nameSub">
+              <a-input v-model="model.nameSub" placeholder="请输入商品介绍"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="主图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详情图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageDetails">
+              <j-image-upload isMultiple  v-model="model.imageDetails" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="原价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldPrice">
+              <a-input-number v-model="model.oldPrice" placeholder="请输入原价" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="积分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="points">
+              <a-input-number v-model="model.points" placeholder="请输入积分" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="details">
+              <j-editor v-model="model.details" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="购买数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payNum">
+              <a-input-number v-model="model.payNum" placeholder="请输入购买数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="库存" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input-number v-model="model.num" placeholder="请输入库存" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否上架" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isOpen">
+              <j-switch v-model="model.isOpen"  ></j-switch>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联店铺" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <j-search-select-tag v-model="model.shopId" dict="city_shop,title,id"  />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CityShoppingForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/cityShopping/cityShopping/add",
+          edit: "/cityShopping/cityShopping/edit",
+          queryById: "/cityShopping/cityShopping/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <city-shopping-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-shopping-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CityShoppingForm from './CityShoppingForm'
+
+  export default {
+    name: 'CityShoppingModal',
+    components: {
+      CityShoppingForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <city-shopping-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-shopping-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CityShoppingForm from './CityShoppingForm'
+  export default {
+    name: 'CityShoppingModal',
+    components: {
+      CityShoppingForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cityShopping/cityShopping/list',
+  save='/cityShopping/cityShopping/add',
+  edit='/cityShopping/cityShopping/edit',
+  deleteOne = '/cityShopping/cityShopping/delete',
+  deleteBatch = '/cityShopping/cityShopping/deleteBatch',
+  importExcel = '/cityShopping/cityShopping/importExcel',
+  exportXls = '/cityShopping/cityShopping/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});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.data.ts

@@ -0,0 +1,159 @@
+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: 'createBy'
+   },
+   {
+    title: '创建日期',
+    align:"center",
+    sorter: true,
+    dataIndex: 'createTime'
+   },
+   {
+    title: '商品名称',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '商品介绍',
+    align:"center",
+    dataIndex: 'nameSub'
+   },
+   {
+    title: '主图',
+    align:"center",
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '详情图',
+    align:"center",
+    dataIndex: 'imageDetails',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '原价',
+    align:"center",
+    dataIndex: 'oldPrice'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '积分',
+    align:"center",
+    dataIndex: 'points'
+   },
+   {
+    title: '详情',
+    align:"center",
+    dataIndex: 'details',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '购买数量',
+    align:"center",
+    dataIndex: 'payNum'
+   },
+   {
+    title: '库存',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '是否上架',
+    align:"center",
+    dataIndex: 'isOpen',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+   {
+    title: '关联店铺',
+    align:"center",
+    dataIndex: 'shopId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '商品名称',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '商品介绍',
+    field: 'nameSub',
+    component: 'Input',
+  },
+  {
+    label: '主图',
+    field: 'image',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '详情图',
+    field: 'imageDetails',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '原价',
+    field: 'oldPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '价格',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '积分',
+    field: 'points',
+    component: 'InputNumber',
+  },
+  {
+    label: '详情',
+    field: 'details',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '购买数量',
+    field: 'payNum',
+    component: 'InputNumber',
+  },
+  {
+    label: '库存',
+    field: 'num',
+    component: 'InputNumber',
+  },
+  {
+    label: '是否上架',
+    field: 'isOpen',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
+  {
+    label: '关联店铺',
+    field: 'shopId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"city_shop,title,id"
+    },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShoppingList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CityShoppingModal @register="registerModal" @success="handleSuccess"></CityShoppingModal>
+  </div>
+</template>
+
+<script lang="ts" name="cityShopping-cityShopping" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CityShoppingModal from './components/CityShoppingModal.vue'
+  import {columns, searchFormSchema} from './cityShopping.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cityShopping.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '商城表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"商城表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/components/CityShoppingModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../cityShopping.data';
+    import {saveOrUpdate} from '../cityShopping.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -53,6 +54,13 @@ public class AppletLoginServiceImpl implements AppletLoginService {
      */
     @Transactional(rollbackFor = {Exception.class})
     public Result<Object> appletLogin( LoginReq loginReq) {
+        //传入数据：
+        log.info("小程序登录参数：{}", loginReq);
+        //传入邀请者标识
+        log.info("小程序邀请者标识：" + loginReq.getShareId());
+
+
+
         Result<Object> result = new Result<>();
         Map<String, Object> map = new HashMap<>();
         if (StringUtils.isBlank(loginReq.getCode())) {
@@ -77,6 +85,9 @@ public class AppletLoginServiceImpl implements AppletLoginService {
             member.setAppletOpenid(wxOpenid);
             member.setNickName("瑶都墙友"+System.currentTimeMillis());
             member.setHeadImage(loginReq.getHeadimgurl());
+            member.setShareId(loginReq.getShareId());
+            member.setVtime(new Date());
+            member.setVid(loginReq.getVid());
             // 生成token返回给小程序端
             String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
             memberService.save(member);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/YaoDuOrderBean.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.api.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class YaoDuOrderBean {
+
+    /**显示条数*/
+    @ApiModelProperty(value = "显示条数" )
+    private Integer pageSize;
+    /**当前页*/
+    @ApiModelProperty(value = "当前页" )
+    private Integer pageNo;
+
+    public YaoDuOrderBean() {
+        this.pageNo = 1;
+        this.pageSize = 1000;
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java

@@ -5,6 +5,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.citiyShopAuthentication.entity.CitiyShopAuthentication;
 import org.jeecg.modules.citiyUserAuthentication.entity.CitiyUserAuthentication;
+import org.jeecg.modules.cityAddress.entity.CityAddress;
 import org.jeecg.modules.cityCat.entity.CityCat;
 import org.jeecg.modules.cityComment.entity.CityComment;
 import org.jeecg.modules.cityHome.entity.CityHome;
@@ -174,5 +175,23 @@ public interface YaoDuApiService {
     //获取活动类型
     Result<?> getActivityType();
 
+    //查询商城信息列表带分页
+    Result<?> getShopPingPage(PageBean pageBean);
+
+    //根据商品标识查询商品信息详情
+    Result<?> getShoppingDetail(String id);
+
+    //获取用户地址信息列表
+    Result<?> getAddressList(String token,PageBean pageBean);
+
+    //获取用户地址信息详情
+    Result<?> getAddressDetail(String token,String id);
+
+    //添加用户地址信息
+    Result<?> addOrEditAddress(String token, CityAddress address);
+
+    //删除地址信息
+    Result<?> deleteAddress(String token,String addressId);
+
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.api.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.YaoDuOrderBean;
+
+public interface YaoDuOrderService {
+
+
+    //商城-立即兑换商品
+    Result<?> createPointsOrder(String token,String shopId,Integer num,String addressId);
+
+    //商城-立即购买商品
+    Result<?> createOrder(String token,String shopId,Integer num,String addressId);
+
+    //商城-订单列表
+    Result<?> getOrderList(String token,YaoDuOrderBean bean);
+
+    //商城-订单详情
+    Result<?> getOrderDetail(String token,String orderId);
+
+    //商城-支付回调
+    Result<?> payNotify(String requestBody);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java

@@ -39,6 +39,8 @@ import org.jeecg.modules.cityAdd.entity.CityAdd;
 import org.jeecg.modules.cityAdd.service.ICityAddService;
 import org.jeecg.modules.cityAddr.entity.CityAddr;
 import org.jeecg.modules.cityAddr.service.ICityAddrService;
+import org.jeecg.modules.cityAddress.entity.CityAddress;
+import org.jeecg.modules.cityAddress.service.ICityAddressService;
 import org.jeecg.modules.cityAddressLog.service.ICityAddressLogService;
 import org.jeecg.modules.cityBanner.entity.CityBanner;
 import org.jeecg.modules.cityBanner.service.ICityBannerService;
@@ -62,6 +64,8 @@ import org.jeecg.modules.cityMember.service.ICityMemberService;
 import org.jeecg.modules.cityPhoneLog.service.ICityPhoneLogService;
 import org.jeecg.modules.cityShop.entity.CityShop;
 import org.jeecg.modules.cityShop.service.ICityShopService;
+import org.jeecg.modules.cityShopping.entity.CityShopping;
+import org.jeecg.modules.cityShopping.service.ICityShoppingService;
 import org.jeecg.modules.cityTrends.entity.CityTrends;
 import org.jeecg.modules.cityTrends.service.ICityTrendsService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -143,6 +147,12 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     //获取配置信息
     @Resource
     private ICityConfService cityConfService;
+    //获取商城列表
+    @Resource
+    private ICityShoppingService cityShoppingService;
+    //获取地址信息列表
+    @Resource
+    private ICityAddressService cityAddressService;
     //获取景点信息
     @Resource
     private ICityJdService cityJdService;
@@ -1215,4 +1225,69 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
         List<CityActivityType> list = cityActivityTypeService.list();
         return Result.OK(list);
     }
+
+
+
+    //查询商城信息列表带分页
+    @Override
+    public Result<?> getShopPingPage(PageBean pageBean){
+        Page<CityShopping> page = new Page<CityShopping>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<CityShopping> page1 = cityShoppingService.lambdaQuery()
+                .page(page);
+        //获取列表数据循环替换数据
+        List<CityShopping> records = page1.getRecords();
+        //创建一个新的集合
+        List<CityShopping> newRecords = new ArrayList<>();
+        for (CityShopping record : records) {
+           record.setShopId(cityShopService.getById(record.getShopId()).getTitle());
+           newRecords.add(record);
+        }
+        page1.setRecords(newRecords);
+        return Result.OK(page1);
+    }
+
+
+    //根据商品标识查询商品信息详情
+    @Override
+    public Result<?> getShoppingDetail(String id){
+        CityShopping cityShopping = cityShoppingService.getById(id);
+        return Result.OK(cityShopping);
+    }
+
+
+
+    //获取用户地址信息列表
+    @Override
+    public Result<?> getAddressList(String token,PageBean pageBean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Page<CityAddress> page = new Page<CityAddress>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<CityAddress> page1 = cityAddressService.lambdaQuery()
+                .page(page);
+
+        return Result.OK(page1);
+    }
+
+    //获取用户地址信息详情
+    @Override
+    public Result<?> getAddressDetail(String token,String id){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        CityAddress address1 = cityAddressService.getById(id);
+        return Result.OK(address1);
+    }
+
+    //添加用户地址信息
+    @Override
+    public Result<?> addOrEditAddress(String token, CityAddress address){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        cityAddressService.saveOrUpdate(address);
+        return Result.OK();
+    }
+
+    //删除地址信息
+    @Override
+    public Result<?> deleteAddress(String token,String id){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        cityAddressService.removeById(id);
+        return Result.OK();
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java

@@ -0,0 +1,200 @@
+package org.jeecg.modules.api.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import lombok.extern.log4j.Log4j;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.api.bean.YaoDuOrderBean;
+import org.jeecg.modules.api.service.YaoDuOrderService;
+import org.jeecg.modules.cityAddress.entity.CityAddress;
+import org.jeecg.modules.cityAddress.service.ICityAddressService;
+import org.jeecg.modules.cityOrder.entity.CityOrder;
+import org.jeecg.modules.cityOrder.service.ICityOrderService;
+import org.jeecg.modules.cityShopping.entity.CityShopping;
+import org.jeecg.modules.cityShopping.service.ICityShoppingService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.pay.MpWxPayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Log4j2
+@Service
+public class YaoDuOrderServiceImpl implements YaoDuOrderService {
+
+    //获取商城信息
+    @Resource
+    private ICityShoppingService cityShoppingService;
+    //权限配置
+    @Resource
+    private ShiroRealm shiroRealm;
+    //支付接口
+    @Autowired
+    private MpWxPayService mpWxPayService;
+    //订单
+    @Resource
+    private ICityOrderService cityOrderService;
+    //地址
+    @Resource
+    private ICityAddressService cityAddressService;
+
+
+
+
+    //商城-立即兑换商品
+    @Override
+    public Result<?> createPointsOrder(String token,String shopId,Integer num,String addressId){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //商品标识不能为空
+        if(StringUtils.isNotBlank(shopId)){
+            return Result.error("商品标识不能为空");
+        }
+        //商品数量不能为空，并且不能小于零
+        if(num!=null && num<0){
+            return Result.error("商品数量不能小于零");
+        }
+        //用户地址不能为空
+        if(StringUtils.isNotBlank(addressId)){
+            return Result.error("请选择收货地址");
+        }
+        //根据商品标识查询商品是否存在
+        CityShopping cityShopping = cityShoppingService.getById(shopId);
+        if(null==cityShopping){
+            return Result.error("商品不存在");
+        }
+        //根据商品标识查询地址是否存在
+        CityAddress cityAddress = cityAddressService.getById(addressId);
+        if(null==cityAddress){
+            return Result.error("地址不存在");
+        }
+        //创建订单
+        BigDecimal price = cityShopping.getPrice().multiply(new BigDecimal(num));
+        //积分
+        BigDecimal points = cityShopping.getPoints().multiply(new BigDecimal(num));
+
+        CityOrder cityOrder = new CityOrder();
+        cityOrder.setUserId(hanHaiMember.getId());
+        cityOrder.setShopId(shopId);
+        cityOrder.setNum(num);
+        cityOrder.setAddressCity(cityAddress.getAddress());
+        cityOrder.setAddressName(cityAddress.getName());
+        cityOrder.setAddressPhone(cityAddress.getPhone());
+        cityOrder.setAddressDetails(cityAddress.getAddressDetail());
+        cityOrder.setName(cityShopping.getName());
+        cityOrder.setPrice(price);
+        cityOrder.setPoints(points);
+        cityOrder.setImage(cityShopping.getImage());
+        cityOrder.setState(0);
+        cityOrder.setType(0); //积分兑换
+        cityOrder.setCreateTime(new Date());
+        cityOrderService.save(cityOrder);
+
+        //判断积分是否大于所需积分
+        if(hanHaiMember.getIntegerPrice().compareTo(points)<=0){
+            return Result.error("积分不足");
+        }
+
+        //积分不足
+        return Result.error("积分不足");
+    }
+
+    //商城-立即购买商品
+    @Override
+    public Result<?> createOrder(String token,String shopId,Integer num,String addressId){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //商品标识不能为空
+        if(StringUtils.isNotBlank(shopId)){
+            return Result.error("商品标识不能为空");
+        }
+        //商品数量不能为空，并且不能小于零
+        if(num!=null && num<0){
+            return Result.error("商品数量不能小于零");
+        }
+        //用户地址不能为空
+        if(StringUtils.isNotBlank(addressId)){
+            return Result.error("请选择收货地址");
+        }
+        //根据商品标识查询商品是否存在
+        CityShopping cityShopping = cityShoppingService.getById(shopId);
+        if(null==cityShopping){
+            return Result.error("商品不存在");
+        }
+        //根据商品标识查询地址是否存在
+        CityAddress cityAddress = cityAddressService.getById(addressId);
+        if(null==cityAddress){
+            return Result.error("地址不存在");
+        }
+        //创建订单
+        BigDecimal price = cityShopping.getPrice().multiply(new BigDecimal(num));
+        //积分
+        BigDecimal points = cityShopping.getPoints().multiply(new BigDecimal(num));
+
+        CityOrder cityOrder = new CityOrder();
+        cityOrder.setUserId(hanHaiMember.getId());
+        cityOrder.setShopId(shopId);
+        cityOrder.setNum(num);
+        cityOrder.setAddressCity(cityAddress.getAddress());
+        cityOrder.setAddressName(cityAddress.getName());
+        cityOrder.setAddressPhone(cityAddress.getPhone());
+        cityOrder.setAddressDetails(cityAddress.getAddressDetail());
+        cityOrder.setName(cityShopping.getName());
+        cityOrder.setPrice(price);
+        cityOrder.setPoints(points);
+        cityOrder.setImage(cityShopping.getImage());
+        cityOrder.setState(0);
+        cityOrder.setType(1); //微信支付
+        cityOrder.setCreateTime(new Date());
+        cityOrderService.save(cityOrder);
+
+        //吊起微信支付
+        String s = price.multiply(new BigDecimal(100)).toString();
+        int i1 = Double.valueOf(s).intValue();
+        Object appOrder = mpWxPayService.createOrderGo(
+                "购买"+ cityShopping.getName() ,
+                "127.0.0.1",
+                cityOrder.getId(),
+                i1,
+                cityOrder.getId(),
+                hanHaiMember.getAppletOpenid(),
+                cityOrder.toString());
+
+        return Result.OK("支付成功",appOrder);
+    }
+
+    //商城-订单列表
+    @Override
+    public Result<?> getOrderList(String token, YaoDuOrderBean bean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Page<CityOrder> page = new Page<CityOrder>(bean.getPageNo(), bean.getPageSize());
+        Page<CityOrder> page1 = cityOrderService.lambdaQuery()
+                .page(page);
+        return Result.OK(page1);
+    }
+
+    //商城-订单详情
+    @Override
+    public Result<?> getOrderDetail(String token,String orderId){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        CityOrder cityOrder = cityOrderService.getById(orderId);
+        return Result.OK(cityOrder);
+    }
+
+
+    //商城-支付回调
+    @Override
+    public Result<?> payNotify(String requestBody){
+        WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
+        String outTradeNo = notify.getOutTradeNo();
+        log.info("支付回调订单号码："+outTradeNo);
+
+        return null;
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiController.java

@@ -242,4 +242,19 @@ public class YaoDuApiController {
     public Result<?> getActivityType() {
         return yaoDuApiService.getActivityType();
     }
+
+
+    //查询商城信息列表带分页
+    @ApiOperation(value="查询商城信息列表带分页")
+    @GetMapping(value = "/getShopPingPage")
+    public Result<?> getShopPingPage(PageBean pageBean) {
+        return yaoDuApiService.getShopPingPage(pageBean);
+    }
+
+    //根据商品标识查询商品信息详情
+    @ApiOperation(value="根据商品标识查询商品信息详情")
+    @GetMapping(value = "/getShopPingDetail")
+    public Result<?> getShopPingDetail(String id) {
+        return yaoDuApiService.getShoppingDetail(id);
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java

@@ -8,6 +8,7 @@ import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.api.service.YaoDuApiService;
 import org.jeecg.modules.citiyShopAuthentication.entity.CitiyShopAuthentication;
 import org.jeecg.modules.citiyUserAuthentication.entity.CitiyUserAuthentication;
+import org.jeecg.modules.cityAddress.entity.CityAddress;
 import org.jeecg.modules.cityCat.entity.CityCat;
 import org.jeecg.modules.cityComment.entity.CityComment;
 import org.jeecg.modules.cityHome.entity.CityHome;
@@ -173,4 +174,42 @@ public class YaoDuApiTokenController {
     }
 
 
+    //获取用户地址信息列表
+    @ApiOperation(value="获取用户地址信息列表")
+    @GetMapping("/getAddressList")
+    public Result<?> getAddressList(@RequestHeader("X-Access-Token") String token,PageBean pageBean)
+    {
+        return yaoDuApiService.getAddressList(token,pageBean);
+    }
+
+    //获取地址信息列表详情
+    @ApiOperation(value="获取地址信息列表详情")
+    @GetMapping("/getAddressDetail")
+    public Result<?> getAddressDetail(@RequestHeader("X-Access-Token") String token,String addressId)
+    {
+        return yaoDuApiService.getAddressDetail(token,addressId);
+    }
+
+    //增加或者编辑地址信息
+    @ApiOperation(value="增加或者编辑地址信息")
+    @PostMapping("/addOrEditAddress")
+    public Result<?> addOrEditAddress(@RequestHeader("X-Access-Token") String token, CityAddress address)
+    {
+        return yaoDuApiService.addOrEditAddress(token,address);
+    }
+
+
+    //删除地址信息
+    @ApiOperation(value="删除地址信息")
+    @PostMapping("/deleteAddress")
+    public Result<?> deleteAddress(@RequestHeader("X-Access-Token") String token,String addressId)
+    {
+        return yaoDuApiService.deleteAddress(token,addressId);
+    }
+
+
+
+
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java

@@ -0,0 +1,65 @@
+package org.jeecg.modules.api.yaoduapi;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.YaoDuOrderBean;
+import org.jeecg.modules.api.service.YaoDuOrderService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Api(tags="商城模块相关接口")
+@RestController
+@RequestMapping("/order")
+@Slf4j
+public class YaoDuOrderController {
+
+
+    @Resource
+    private YaoDuOrderService yaoDuOrderService;
+
+
+
+    //商城-立即兑换商品
+    @ApiOperation(value="商城-立即兑换商品", notes="商城-立即兑换商品")
+    @PostMapping("/createPointsOrder")
+    public Result<?> createPointsOrder(@RequestHeader("X-Access-Token") String token,String shopId,Integer num,String addressId)
+    {
+        return yaoDuOrderService.createPointsOrder(token,shopId,num,addressId);
+    }
+
+
+    //商城-立即购买商品
+    @ApiOperation(value="商城-立即兑换商品", notes="商城-立即兑换商品")
+    @PostMapping("/createOrder")
+    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token,String shopId,Integer num,String addressId){
+        return yaoDuOrderService.createOrder(token,shopId,num,addressId);
+    }
+
+    //商城-订单列表
+    @ApiOperation(value="商城-订单列表", notes="商城-订单列表")
+    @PostMapping("/getOrderList")
+    public Result<?> getOrderList(@RequestHeader("X-Access-Token") String token, YaoDuOrderBean bean){
+        return yaoDuOrderService.getOrderList(token,bean);
+    }
+
+    //商城-订单详情
+    @ApiOperation(value="商城-订单详情", notes="商城-订单详情")
+    @GetMapping("/getOrderDetail")
+    public Result<?> getOrderDetail(@RequestHeader("X-Access-Token") String token,String orderId){
+        return yaoDuOrderService.getOrderDetail(token,orderId);
+    }
+
+    //商城-支付回调
+    @ApiOperation(value="商城-支付回调", notes="商城-支付回调")
+    @PostMapping("/payNotify")
+    public Result<?> payNotify(@RequestBody String requestBody){
+        return yaoDuOrderService.payNotify(requestBody);
+    }
+
+
+
+}