1、企业信息相关接口添加

2、个人信息相关接口添加
3、商品信息相关接口添加
4、新闻信息相关接口添加
5、预约信息相关接口添加

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/controller/CarrrentOrderController.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/controller/CarrentOrderController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.carrrentOrder.controller;
+package org.jeecg.modules.carrentOrder.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +12,8 @@ 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.carrrentOrder.entity.CarrrentOrder;
-import org.jeecg.modules.carrrentOrder.service.ICarrrentOrderService;
+import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
+import org.jeecg.modules.carrentOrder.service.ICarrentOrderService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -44,16 +44,16 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  */
 @Api(tags="预约信息表")
 @RestController
-@RequestMapping("/carrrentOrder/carrrentOrder")
+@RequestMapping("/carrentOrder/carrentOrder")
 @Slf4j
-public class CarrrentOrderController extends JeecgController<CarrrentOrder, ICarrrentOrderService> {
+public class CarrentOrderController extends JeecgController<CarrentOrder, ICarrentOrderService> {
 	@Autowired
-	private ICarrrentOrderService carrrentOrderService;
+	private ICarrentOrderService carrentOrderService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param carrrentOrder
+	 * @param carrentOrder
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
@@ -62,41 +62,41 @@ public class CarrrentOrderController extends JeecgController<CarrrentOrder, ICar
 	//@AutoLog(value = "预约信息表-分页列表查询")
 	@ApiOperation(value="预约信息表-分页列表查询", notes="预约信息表-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CarrrentOrder>> queryPageList(CarrrentOrder carrrentOrder,
+	public Result<IPage<CarrentOrder>> queryPageList(CarrentOrder carrentOrder,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<CarrrentOrder> queryWrapper = QueryGenerator.initQueryWrapper(carrrentOrder, req.getParameterMap());
-		Page<CarrrentOrder> page = new Page<CarrrentOrder>(pageNo, pageSize);
-		IPage<CarrrentOrder> pageList = carrrentOrderService.page(page, queryWrapper);
+		QueryWrapper<CarrentOrder> queryWrapper = QueryGenerator.initQueryWrapper(carrentOrder, req.getParameterMap());
+		Page<CarrentOrder> page = new Page<CarrentOrder>(pageNo, pageSize);
+		IPage<CarrentOrder> pageList = carrentOrderService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param carrrentOrder
+	 * @param carrentOrder
 	 * @return
 	 */
 	@AutoLog(value = "预约信息表-添加")
 	@ApiOperation(value="预约信息表-添加", notes="预约信息表-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CarrrentOrder carrrentOrder) {
-		carrrentOrderService.save(carrrentOrder);
+	public Result<String> add(@RequestBody CarrentOrder carrentOrder) {
+		carrentOrderService.save(carrentOrder);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param carrrentOrder
+	 * @param carrentOrder
 	 * @return
 	 */
 	@AutoLog(value = "预约信息表-编辑")
 	@ApiOperation(value="预约信息表-编辑", notes="预约信息表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CarrrentOrder carrrentOrder) {
-		carrrentOrderService.updateById(carrrentOrder);
+	public Result<String> edit(@RequestBody CarrentOrder carrentOrder) {
+		carrentOrderService.updateById(carrentOrder);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -110,7 +110,7 @@ public class CarrrentOrderController extends JeecgController<CarrrentOrder, ICar
 	@ApiOperation(value="预约信息表-通过id删除", notes="预约信息表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		carrrentOrderService.removeById(id);
+		carrentOrderService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -124,7 +124,7 @@ public class CarrrentOrderController extends JeecgController<CarrrentOrder, ICar
 	@ApiOperation(value="预约信息表-批量删除", notes="预约信息表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.carrrentOrderService.removeByIds(Arrays.asList(ids.split(",")));
+		this.carrentOrderService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -137,23 +137,23 @@ public class CarrrentOrderController extends JeecgController<CarrrentOrder, ICar
 	//@AutoLog(value = "预约信息表-通过id查询")
 	@ApiOperation(value="预约信息表-通过id查询", notes="预约信息表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CarrrentOrder> queryById(@RequestParam(name="id",required=true) String id) {
-		CarrrentOrder carrrentOrder = carrrentOrderService.getById(id);
-		if(carrrentOrder==null) {
+	public Result<CarrentOrder> queryById(@RequestParam(name="id",required=true) String id) {
+		CarrentOrder carrentOrder = carrentOrderService.getById(id);
+		if(carrentOrder==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(carrrentOrder);
+		return Result.OK(carrentOrder);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param carrrentOrder
+    * @param carrentOrder
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, CarrrentOrder carrrentOrder) {
-        return super.exportXls(request, carrrentOrder, CarrrentOrder.class, "预约信息表");
+    public ModelAndView exportXls(HttpServletRequest request, CarrentOrder carrentOrder) {
+        return super.exportXls(request, carrentOrder, CarrentOrder.class, "预约信息表");
     }
 
     /**
@@ -165,7 +165,7 @@ public class CarrrentOrderController extends JeecgController<CarrrentOrder, ICar
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CarrrentOrder.class);
+        return super.importExcel(request, response, CarrentOrder.class);
     }
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/entity/CarrrentOrder.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/entity/CarrentOrder.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.carrrentOrder.entity;
+package org.jeecg.modules.carrentOrder.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -24,11 +24,11 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("carrrent_order")
+@TableName("carrent_order")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="carrrent_order对象", description="预约信息表")
-public class CarrrentOrder implements Serializable {
+@ApiModel(value="carrent_order对象", description="预约信息表")
+public class CarrentOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
@@ -47,17 +47,17 @@ public class CarrrentOrder implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**姓名*/
-	@Excel(name = "姓名", width = 15)
-    @ApiModelProperty(value = "姓名")
+	/**联系人名称*/
+	@Excel(name = "联系人名称", width = 15)
+    @ApiModelProperty(value = "联系人名称")
     private java.lang.String name;
-	/**联系方式*/
-	@Excel(name = "联系方式", width = 15)
-    @ApiModelProperty(value = "联系方式")
+	/**联系人方式*/
+	@Excel(name = "联系人方式", width = 15)
+    @ApiModelProperty(value = "联系人方式")
     private java.lang.String phone;
-	/**所属区域*/
-	@Excel(name = "所属区域", width = 15)
-    @ApiModelProperty(value = "所属区域")
+	/**所在区域*/
+	@Excel(name = "所在区域", width = 15)
+    @ApiModelProperty(value = "所在区域")
     private java.lang.String area;
 	/**详细地址*/
 	@Excel(name = "详细地址", width = 15)
@@ -69,8 +69,8 @@ public class CarrrentOrder implements Serializable {
     @ApiModelProperty(value = "关联商品")
     private java.lang.String carId;
 	/**关联用户*/
-	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Excel(name = "关联用户", width = 15, dictTable = "hai_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "hai_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户")
     private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/CarrrentOrderMapper.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/CarrentOrderMapper.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.carrrentOrder.mapper;
+package org.jeecg.modules.carrentOrder.mapper;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.carrrentOrder.entity.CarrrentOrder;
+import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -12,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2024-11-12
  * @Version: V1.0
  */
-public interface CarrrentOrderMapper extends BaseMapper<CarrrentOrder> {
+public interface CarrentOrderMapper extends BaseMapper<CarrentOrder> {
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/xml/CarrrentOrderMapper.xml → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/xml/CarrentOrderMapper.xml

@@ -1,5 +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.carrrentOrder.mapper.CarrrentOrderMapper">
+<mapper namespace="org.jeecg.modules.carrentOrder.mapper.CarrentOrderMapper">
 
 </mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/ICarrentOrderService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.carrentOrder.service;
+
+import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 预约信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-12
+ * @Version: V1.0
+ */
+public interface ICarrentOrderService extends IService<CarrentOrder> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.carrentOrder.service.impl;
+
+import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
+import org.jeecg.modules.carrentOrder.mapper.CarrentOrderMapper;
+import org.jeecg.modules.carrentOrder.service.ICarrentOrderService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 预约信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-12
+ * @Version: V1.0
+ */
+@Service
+public class CarrentOrderServiceImpl extends ServiceImpl<CarrentOrderMapper, CarrentOrder> implements ICarrentOrderService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/CarrrentOrderList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/CarrentOrderList.vue

@@ -89,7 +89,7 @@
       </a-table>
     </div>
 
-    <carrrent-order-modal ref="modalForm" @ok="modalFormOk"></carrrent-order-modal>
+    <carrent-order-modal ref="modalForm" @ok="modalFormOk"></carrent-order-modal>
   </a-card>
 </template>
 
@@ -98,14 +98,14 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CarrrentOrderModal from './modules/CarrrentOrderModal'
+  import CarrentOrderModal from './modules/CarrentOrderModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
-    name: 'CarrrentOrderList',
+    name: 'CarrentOrderList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CarrrentOrderModal
+      CarrentOrderModal
     },
     data () {
       return {
@@ -123,17 +123,17 @@
             }
           },
           {
-            title:'姓名',
+            title:'联系人名称',
             align:"center",
             dataIndex: 'name'
           },
           {
-            title:'联系方式',
+            title:'联系人方式',
             align:"center",
             dataIndex: 'phone'
           },
           {
-            title:'所属区域',
+            title:'所在区域',
             align:"center",
             dataIndex: 'area'
           },
@@ -162,11 +162,11 @@
           }
         ],
         url: {
-          list: "/carrrentOrder/carrrentOrder/list",
-          delete: "/carrrentOrder/carrrentOrder/delete",
-          deleteBatch: "/carrrentOrder/carrrentOrder/deleteBatch",
-          exportXlsUrl: "/carrrentOrder/carrrentOrder/exportXls",
-          importExcelUrl: "carrrentOrder/carrrentOrder/importExcel",
+          list: "/carrentOrder/carrentOrder/list",
+          delete: "/carrentOrder/carrentOrder/delete",
+          deleteBatch: "/carrentOrder/carrentOrder/deleteBatch",
+          exportXlsUrl: "/carrentOrder/carrentOrder/exportXls",
+          importExcelUrl: "carrentOrder/carrentOrder/importExcel",
           
         },
         dictOptions:{},
@@ -186,12 +186,12 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''})
-        fieldList.push({type:'string',value:'area',text:'所属区域',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'联系人名称',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系人方式',dictCode:''})
+        fieldList.push({type:'string',value:'area',text:'所在区域',dictCode:''})
         fieldList.push({type:'string',value:'address',text:'详细地址',dictCode:''})
         fieldList.push({type:'string',value:'carId',text:'关联商品',dictCode:"carrent_car,name,id"})
-        fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"hai_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderForm.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderForm.vue

@@ -4,18 +4,18 @@
       <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 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 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="area">
-              <a-input v-model="model.area" placeholder="请输入所属区域"  ></a-input>
+            <a-form-model-item label="所在区域" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="area">
+              <a-input v-model="model.area" placeholder="请输入所在区域"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -30,7 +30,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户" />
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="hai_hai_member,nick_name,id" placeholder="请选择关联用户" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -45,7 +45,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CarrrentOrderForm',
+    name: 'CarrentOrderForm',
     components: {
     },
     props: {
@@ -72,9 +72,9 @@
         validatorRules: {
         },
         url: {
-          add: "/carrrentOrder/carrrentOrder/add",
-          edit: "/carrrentOrder/carrrentOrder/edit",
-          queryById: "/carrrentOrder/carrrentOrder/queryById"
+          add: "/carrentOrder/carrentOrder/add",
+          edit: "/carrentOrder/carrentOrder/edit",
+          queryById: "/carrentOrder/carrentOrder/queryById"
         }
       }
     },

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.Style#Drawer.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <carrrent-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrrent-order-form>
+    <carrent-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import CarrrentOrderForm from './CarrrentOrderForm'
+  import CarrentOrderForm from './CarrentOrderForm'
 
   export default {
-    name: 'CarrrentOrderModal',
+    name: 'CarrentOrderModal',
     components: {
-      CarrrentOrderForm
+      CarrentOrderForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <carrrent-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrrent-order-form>
+    <carrent-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-order-form>
   </j-modal>
 </template>
 
 <script>
 
-  import CarrrentOrderForm from './CarrrentOrderForm'
+  import CarrentOrderForm from './CarrentOrderForm'
   export default {
-    name: 'CarrrentOrderModal',
+    name: 'CarrentOrderModal',
     components: {
-      CarrrentOrderForm
+      CarrentOrderForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrder.api.ts → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue3/CarrentOrder.api.ts

@@ -2,13 +2,13 @@ import {defHttp} from '/@/utils/http/axios';
 import {Modal} from 'ant-design-vue';
 
 enum Api {
-  list = '/carrrentOrder/carrrentOrder/list',
-  save='/carrrentOrder/carrrentOrder/add',
-  edit='/carrrentOrder/carrrentOrder/edit',
-  deleteOne = '/carrrentOrder/carrrentOrder/delete',
-  deleteBatch = '/carrrentOrder/carrrentOrder/deleteBatch',
-  importExcel = '/carrrentOrder/carrrentOrder/importExcel',
-  exportXls = '/carrrentOrder/carrrentOrder/exportXls',
+  list = '/carrentOrder/carrentOrder/list',
+  save='/carrentOrder/carrentOrder/add',
+  edit='/carrentOrder/carrentOrder/edit',
+  deleteOne = '/carrentOrder/carrentOrder/delete',
+  deleteBatch = '/carrentOrder/carrentOrder/deleteBatch',
+  importExcel = '/carrentOrder/carrentOrder/importExcel',
+  exportXls = '/carrentOrder/carrentOrder/exportXls',
 }
 /**
  * 导出api

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrder.data.ts → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue3/CarrentOrder.data.ts

@@ -5,17 +5,17 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '姓名',
+    title: '联系人名称',
     align:"center",
     dataIndex: 'name'
    },
    {
-    title: '联系方式',
+    title: '联系人方式',
     align:"center",
     dataIndex: 'phone'
    },
    {
-    title: '所属区域',
+    title: '所在区域',
     align:"center",
     dataIndex: 'area'
    },
@@ -41,17 +41,17 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '姓名',
+    label: '联系人名称',
     field: 'name',
     component: 'Input',
   },
   {
-    label: '联系方式',
+    label: '联系人方式',
     field: 'phone',
     component: 'Input',
   },
   {
-    label: '所属区域',
+    label: '所在区域',
     field: 'area',
     component: 'Input',
   },
@@ -73,7 +73,7 @@ export const formSchema: FormSchema[] = [
     field: 'userId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"han_hai_member,nick_name,id"
+        dictCode:"hai_hai_member,nick_name,id"
      },
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/CarrrentOrderList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue3/CarrentOrderList.vue

@@ -35,18 +35,18 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <CarrrentOrderModal @register="registerModal" @success="handleSuccess"></CarrrentOrderModal>
+    <CarrentOrderModal @register="registerModal" @success="handleSuccess"></CarrentOrderModal>
   </div>
 </template>
 
-<script lang="ts" name="carrrentOrder-carrrentOrder" setup>
+<script lang="ts" name="carrentOrder-carrentOrder" 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 CarrrentOrderModal from './components/CarrrentOrderModal.vue'
-  import {columns, searchFormSchema} from './carrrentOrder.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrrentOrder.api';
+  import CarrentOrderModal from './components/CarrentOrderModal.vue'
+  import {columns, searchFormSchema} from './carrentOrder.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentOrder.api';
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue3/components/CarrrentOrderModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue3/components/CarrentOrderModal.vue

@@ -8,8 +8,8 @@
     import {ref, computed, unref} from 'vue';
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../carrrentOrder.data';
-    import {saveOrUpdate} from '../carrrentOrder.api';
+    import {formSchema} from '../carrentOrder.data';
+    import {saveOrUpdate} from '../carrentOrder.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/service/ICarrrentOrderService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.carrrentOrder.service;
-
-import org.jeecg.modules.carrrentOrder.entity.CarrrentOrder;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 预约信息表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-public interface ICarrrentOrderService extends IService<CarrrentOrder> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.carrrentOrder.service.impl;
-
-import org.jeecg.modules.carrrentOrder.entity.CarrrentOrder;
-import org.jeecg.modules.carrrentOrder.mapper.CarrrentOrderMapper;
-import org.jeecg.modules.carrrentOrder.service.ICarrrentOrderService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 预约信息表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-@Service
-public class CarrrentOrderServiceImpl extends ServiceImpl<CarrrentOrderMapper, CarrrentOrder> implements ICarrrentOrderService {
-
-}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CarController.java

@@ -0,0 +1,38 @@
+package org.jeecg.modules.api.carrentController;
+
+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.apiBean.CarBean;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.CarService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="商品信息相关接口")
+@RestController
+@RequestMapping("/api/car")
+@Slf4j
+public class CarController {
+
+    //车辆信息
+    @Resource
+    private CarService carService;
+    /****************************************************************************************************/
+
+    @ApiOperation(value="首页-获取商品列表", notes="首页-获取商品列表")
+    @RequestMapping(value = "/queryCarList", method = {RequestMethod.GET})
+    public Result<?> queryCarList(CarBean carBean, PageBean pageBean){
+        return carService.queryCarList(carBean, pageBean);
+    }
+
+    @ApiOperation(value="首页-根据id获取商品详情", notes="首页-根据id获取商品详情")
+    @RequestMapping(value = "/queryCarById", method = {RequestMethod.GET})
+    public Result<?> queryCarById(String carId){
+        return carService.queryCarById(carId);
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CompanyController.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.api.carrentController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.CompanyBean;
+import org.jeecg.modules.apiService.CompanyService;
+import org.jeecg.modules.carrentCompany.entity.CarrentCompany;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="企业信息相关接口")
+@RestController
+@RequestMapping("/api/company")
+@Slf4j
+public class CompanyController {
+
+    //企业信息
+    @Resource
+    private CompanyService companyService;
+    /****************************************************************************************************/
+
+    @ApiOperation(value="企业信息-企业注册", notes="企业信息-企业注册")
+    @RequestMapping(value = "/addCompany", method = {RequestMethod.POST})
+    public Result<?> addCompany(CompanyBean companyBean){
+
+        //将注册信息注入实体bean中
+        CarrentCompany carrentCompany = new CarrentCompany();
+        carrentCompany.setUserName(companyBean.getUserName());
+        carrentCompany.setCompanyName(companyBean.getCompanyName());
+        carrentCompany.setTaxCode(companyBean.getTaxCode());
+        carrentCompany.setAddress(companyBean.getAddress());
+        carrentCompany.setPhone(companyBean.getPhone());
+        carrentCompany.setBusinessLicense(companyBean.getBusinessLicense());
+
+        String message = "";
+        //注册信息验证
+        if(StringUtils.isEmpty(carrentCompany.getUserName())){
+            message = "用户名未填写，请填写用户名!";
+        }else if(StringUtils.isEmpty(carrentCompany.getCompanyName())){
+            message = "公司名称未填写，请填写公司名称!";
+        }else if(StringUtils.isEmpty(carrentCompany.getTaxCode())){
+            message = "税收编码未填写，请填写税收编码!";
+        }else if(StringUtils.isEmpty(carrentCompany.getAddress())){
+            message = "公司地址未填写，请填写公司地址!";
+        }else if(StringUtils.isEmpty(carrentCompany.getPhone())){
+            message = "联系电话未填写，请填写联系电话!";
+        }else if(StringUtils.isEmpty(carrentCompany.getBusinessLicense())){
+            message = "营业执照未填写，请上传营业执照!";
+        }else {
+            //注册信息无误，进入业务流程处理
+            return companyService.addCompany(carrentCompany);
+        }
+
+        //注册信息有误，返回错误信息
+        return Result.error(message);
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/NewsController.java

@@ -0,0 +1,39 @@
+package org.jeecg.modules.api.carrentController;
+
+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.apiBean.PageBean;
+import org.jeecg.modules.apiService.CompanyService;
+import org.jeecg.modules.apiService.NewsService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="新闻资讯相关接口")
+@RestController
+@RequestMapping("/api/news")
+@Slf4j
+public class NewsController {
+
+    //新闻信息
+    @Resource
+    private NewsService newsService;
+    /****************************************************************************************************/
+
+    @ApiOperation(value="新闻资讯-获取新闻列表", notes="新闻资讯-获取新闻列表")
+    @RequestMapping(value = "/queryNewsList", method = {RequestMethod.GET})
+    public Result<?> queryNewsList(PageBean pageBean){
+        return newsService.queryNewsList(pageBean);
+    }
+
+    @ApiOperation(value="新闻资讯-根据id获取新闻详情", notes="新闻资讯-根据id获取新闻详情")
+    @RequestMapping(value = "/queryNewsById", method = {RequestMethod.GET})
+    public Result<?> queryNewsById(String newsId){
+        return newsService.queryNewsById(newsId);
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java

@@ -0,0 +1,64 @@
+package org.jeecg.modules.api.carrentController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.OrderBean;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.NewsService;
+import org.jeecg.modules.apiService.OrderService;
+import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="预约信息相关接口")
+@RestController
+@RequestMapping("/api/order")
+@Slf4j
+public class OrderController {
+
+    //预约信息
+    @Resource
+    private OrderService orderService;
+    /****************************************************************************************************/
+
+    @ApiOperation(value="商品预约-提交预约信息", notes="商品预约-提交预约信息")
+    @RequestMapping(value = "/addOrder", method = {RequestMethod.POST})
+    public Result<?> addOrder(OrderBean orderBean){
+
+        //将预约信息注入到实体bean中
+        CarrentOrder carrentOrder = new CarrentOrder();
+        carrentOrder.setName(orderBean.getName());
+        carrentOrder.setPhone(orderBean.getPhone());
+        carrentOrder.setCarId(orderBean.getCarId());
+
+        String message = "";
+        //预约信息验证
+        if(StringUtils.isEmpty(carrentOrder.getName())){
+            message = "联系人姓名未填写，请填写联系人姓名";
+        }else if(StringUtils.isEmpty(carrentOrder.getPhone())){
+            message = "联系人手机号未填写，请填写联系人手机号";
+        }else if(StringUtils.isEmpty(carrentOrder.getCarId())){
+            message = "预约商品id未填写，请填写预约商品id";
+        }else {
+            //预约信息无误，进入业务流程处理
+            return orderService.addOrder(carrentOrder);
+        }
+
+        //预约信息有误，返回错误信息
+        return Result.error(message);
+    }
+
+    @ApiOperation(value="商品预约-联系电话", notes="商品预约-联系电话")
+    @RequestMapping(value = "/queryPhone", method = {RequestMethod.GET})
+    public Result<?> queryPhone(){
+        return orderService.queryPhone();
+    }
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java

@@ -0,0 +1,87 @@
+package org.jeecg.modules.api.carrentController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.UserBean;
+import org.jeecg.modules.apiService.UserService;
+import org.jeecg.modules.carrentUser.entity.CarrentUser;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="用户信息相关接口")
+@RestController
+@RequestMapping("/api/user")
+@Slf4j
+public class UserController {
+
+    //预约信息
+    @Resource
+    private UserService userService;
+    /****************************************************************************************************/
+
+    @ApiOperation(value="用户信息-个人注册", notes="用户信息-个人注册")
+    @RequestMapping(value = "/addUser", method = {RequestMethod.POST})
+    public Result<?> addUser(UserBean userBean){
+
+        //将注册信息注入到实体bean中
+        CarrentUser carrentUser = new CarrentUser();
+        carrentUser.setName(userBean.getName());
+        carrentUser.setCerNo(userBean.getCerNo());
+        carrentUser.setPhone(userBean.getPhone());
+        carrentUser.setCerImage(userBean.getCerImage());
+
+        String message = "";
+        //注册信息验证
+        if(StringUtils.isEmpty(carrentUser.getName())){
+            message = "用户姓名未填写，请填写用户姓名!";
+        }else if(StringUtils.isEmpty(carrentUser.getCerNo())){
+            message = "身份证号码未填写，请填写身份证号码!";
+        }else if(StringUtils.isEmpty(carrentUser.getPhone())){
+            message = "联系方式未填写，请填写联系方式!";
+        }else if(StringUtils.isEmpty(carrentUser.getCerImage())){
+            message = "身份证正面照片未填写，请上传身份证正面照片!";
+        }else {
+            //注册信息无误，进入业务流程处理
+            return userService.addUser(carrentUser);
+        }
+
+        //注册信息有误，返回错误信息
+        return Result.error(message);
+    }
+
+    @ApiOperation(value="用户信息-资料修改", notes="用户信息-资料修改")
+    @RequestMapping(value = "/updateUser", method = {RequestMethod.POST})
+    public Result<?> updateUser(UserBean userBean){
+        //将注册信息注入到实体bean中
+        CarrentUser carrentUser = new CarrentUser();
+        carrentUser.setName(userBean.getName());
+        carrentUser.setCerNo(userBean.getCerNo());
+        carrentUser.setPhone(userBean.getPhone());
+        carrentUser.setCerImage(userBean.getCerImage());
+
+        String message = "";
+        //注册信息验证
+        if(StringUtils.isEmpty(carrentUser.getName())){
+            message = "用户姓名未填写，请填写用户姓名!";
+        }else if(StringUtils.isEmpty(carrentUser.getCerNo())){
+            message = "身份证号码未填写，请填写身份证号码!";
+        }else if(StringUtils.isEmpty(carrentUser.getPhone())){
+            message = "联系方式未填写，请填写联系方式!";
+        }else if(StringUtils.isEmpty(carrentUser.getCerImage())){
+            message = "身份证正面照片未填写，请上传身份证正面照片!";
+        }else {
+            //注册信息无误，进入业务流程处理
+            return userService.updateUser(carrentUser);
+        }
+
+        //注册信息有误，返回错误信息
+        return Result.error(message);
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CarBean.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+@Data
+public class CarBean {
+
+    /**车辆公里数*/
+    @Excel(name = "车辆公里数", width = 15)
+    @ApiModelProperty(value = "车辆公里数")
+    private java.lang.Integer mileage;
+    /**车辆类型*/
+    @Excel(name = "车辆类型", width = 15)
+    @ApiModelProperty(value = "车辆类型")
+    private java.lang.String type;
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CompanyBean.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+@Data
+public class CompanyBean {
+    /**用户名*/
+    @Excel(name = "用户名", width = 15)
+    @ApiModelProperty(value = "用户名")
+    private java.lang.String userName;
+    /**公司名称*/
+    @Excel(name = "公司名称", width = 15)
+    @ApiModelProperty(value = "公司名称")
+    private java.lang.String companyName;
+    /**税收编码*/
+    @Excel(name = "税收编码", width = 15)
+    @ApiModelProperty(value = "税收编码")
+    private java.lang.String taxCode;
+    /**公司地址*/
+    @Excel(name = "公司地址", width = 15)
+    @ApiModelProperty(value = "公司地址")
+    private java.lang.String address;
+    /**联系电话*/
+    @Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String phone;
+    /**营业执照*/
+    @Excel(name = "营业执照", width = 15)
+    @ApiModelProperty(value = "营业执照")
+    private java.lang.String businessLicense;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderBean.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+@Data
+public class OrderBean {
+
+    /**姓名*/
+    @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 area;
+    /**详细地址*/
+    @Excel(name = "详细地址", width = 15)
+    @ApiModelProperty(value = "详细地址")
+    private java.lang.String address;
+    /**关联商品*/
+    @Excel(name = "关联商品", width = 15, dictTable = "carrent_car", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "carrent_car", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联商品")
+    private java.lang.String carId;
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PageBean.java

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

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/UserBean.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+@Data
+public class UserBean {
+    /**姓名*/
+    @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 cerNo;
+    /**身份证正面照*/
+    @Excel(name = "身份证正面照", width = 15)
+    @ApiModelProperty(value = "身份证正面照")
+    private java.lang.String cerImage;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CarService.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.apiService;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.CarBean;
+import org.jeecg.modules.apiBean.PageBean;
+
+public interface CarService {
+
+    /**
+     * 首页-获取商品列表
+     * @param carBean 车辆筛选信息
+     * @param pageBean 分页信息
+     * @return
+     */
+    public Result<?> queryCarList(CarBean carBean, PageBean pageBean);
+
+    /**
+     * 首页-根据id获取商品详情
+     * @param carId 车辆编号
+     * @return
+     */
+    public Result<?> queryCarById(String carId);
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CompanyService.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.apiService;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.CompanyBean;
+import org.jeecg.modules.apiBean.UserBean;
+import org.jeecg.modules.carrentCompany.entity.CarrentCompany;
+
+public interface CompanyService {
+
+    /**
+     * 企业信息-企业注册
+     * @param carrentCompany 企业信息
+     * @return
+     */
+    public Result<?> addCompany(CarrentCompany carrentCompany);
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NewsService.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.apiService;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+
+public interface NewsService {
+
+    /**
+     * 新闻资讯-获取新闻列表
+     * @param pageBean 分页信息
+     * @return
+     */
+    public Result<?> queryNewsList(PageBean pageBean);
+
+    /**
+     * 新闻资讯-根据id获取新闻详情
+     * @param newsId 新闻id
+     * @return
+     */
+    public Result<?> queryNewsById(String newsId);
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.apiService;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.OrderBean;
+import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
+
+public interface OrderService {
+
+    /**
+     * 商品预约-提交预约信息
+     * @param carrentOrder 预约信息
+     * @return
+     */
+    public Result<?> addOrder(CarrentOrder carrentOrder);
+
+    /**
+     * 商品预约-联系电话
+     * @return
+     */
+    public Result<?> queryPhone();
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.apiService;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.UserBean;
+import org.jeecg.modules.carrentUser.entity.CarrentUser;
+
+public interface UserService {
+
+    /**
+     * 用户信息-个人注册
+     * @param carrentUser 用户信息
+     * @return
+     */
+    public Result<?> addUser(CarrentUser carrentUser);
+
+
+    /**
+     * 用户信息-资料修改
+     * @param carrentUser 用户信息
+     * @return
+     */
+    public Result<?> updateUser(CarrentUser carrentUser);
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CarServiceImpl.java

@@ -0,0 +1,97 @@
+package org.jeecg.modules.apiService.impl;
+
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.CarBean;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.CarService;
+import org.jeecg.modules.carrentCar.entity.CarrentCar;
+import org.jeecg.modules.carrentCar.service.ICarrentCarService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class CarServiceImpl implements CarService {
+
+    /*************************************************************************************/
+    //车辆信息
+    @Resource
+    private ICarrentCarService carrentCarService;
+
+    /*************************************************************************************/
+    //首页-获取商品列表
+    @Override
+    public Result<?> queryCarList(CarBean carBean, PageBean pageBean) {
+
+        //返回信息
+        String message = "获取商品列表失败!";
+        //商品列表
+        Page<CarrentCar> pageList = null;
+        //分页信息
+        Page<CarrentCar> page = null;
+
+        try{
+            //分页
+            page = new Page<CarrentCar>(pageBean.getPageNo(), pageBean.getPageSize());
+            LambdaQueryChainWrapper<CarrentCar> query = carrentCarService.lambdaQuery();
+
+            //组装查询条件
+            if(null != carBean.getType()){
+                query.eq(CarrentCar::getType, carBean.getType());
+            }
+            if(null != carBean.getMileage()){
+                query.eq(CarrentCar::getMileage, carBean.getMileage());
+            }
+
+            //获取商品列表
+            pageList = query.page(page);
+
+            //判断执行结果
+            if(null != pageList){
+                message = "商品列表信息";
+            }else {
+                message = "商品列表信息为空";
+            }
+
+            //返回执行结果
+            return Result.OK(message, pageList);
+
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message, pageList);
+        }
+
+    }
+
+    //首页-根据id获取商品详情
+    @Override
+    public Result<?> queryCarById(String carId) {
+        //返回信息
+        String message = "获取商品详情失败！";
+        //商品详情
+        CarrentCar one = null;
+
+        try{
+            //获取商品信息详情
+            one = carrentCarService.getById(carId);
+
+            //判断执行结果
+            if(null != one){
+                message = "商品详情信息";
+            }else {
+                message = "商品详情信息为空";
+            }
+
+            //返回执行结果
+            return Result.OK(message, one);
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message, one);
+        }
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java

@@ -0,0 +1,49 @@
+package org.jeecg.modules.apiService.impl;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiService.CompanyService;
+import org.jeecg.modules.carrentCompany.entity.CarrentCompany;
+import org.jeecg.modules.carrentCompany.service.ICarrentCompanyService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class CompanyServiceImpl implements CompanyService {
+
+    /*************************************************************************************/
+    //企业信息
+    @Resource
+    private ICarrentCompanyService carrentCompanyService;
+    /*************************************************************************************/
+
+    //企业信息-企业注册
+    @Override
+    public Result<?> addCompany(CarrentCompany carrentCompany) {
+        //返回信息
+        String message = "企业注册失败";
+        //执行结果
+        boolean result = false;
+
+        try{
+            //执行企业注册
+            result = carrentCompanyService.save(carrentCompany);
+
+            //判断执行结果
+            if(result){
+                message = "企业注册成功！";
+            }else {
+                message = "企业注册失败！";
+            }
+
+            //返回执行结果
+            return Result.OK(message);
+
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message);
+        }
+
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NewsServiceImpl.java

@@ -0,0 +1,87 @@
+package org.jeecg.modules.apiService.impl;
+
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.NewsService;
+import org.jeecg.modules.carrentCar.entity.CarrentCar;
+import org.jeecg.modules.carrentCompany.service.ICarrentCompanyService;
+import org.jeecg.modules.carrentNews.entity.CarrentNews;
+import org.jeecg.modules.carrentNews.service.ICarrentNewsService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class NewsServiceImpl implements NewsService {
+
+    /*************************************************************************************/
+    //新闻信息
+    @Resource
+    private ICarrentNewsService carrentNewsService;
+    /*************************************************************************************/
+
+    //新闻资讯-获取新闻列表
+    @Override
+    public Result<?> queryNewsList(PageBean pageBean) {
+        //返回信息
+        String message = "新闻列表查询失败!";
+        //新闻列表
+        Page<CarrentNews> pageList = null;
+
+        try{
+            //分页
+            Page<CarrentNews> page = new Page<CarrentNews>(pageBean.getPageNo(), pageBean.getPageSize());
+            //获取新闻列表
+            pageList = carrentNewsService
+                    .lambdaQuery()
+                    .page(page);
+
+            //判断执行结果
+            if(null != pageList){
+                message = "新闻列表信息";
+            }else {
+                message = "新闻列表为空";
+            }
+
+            //返回执行结果
+            return Result.OK(message, pageList);
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message, pageList);
+        }
+
+    }
+
+    //新闻资讯-根据id获取新闻详情
+    @Override
+    public Result<?> queryNewsById(String newsId) {
+        //返回信息
+        String message = "新闻详情查询失败!";
+        //新闻详情
+        CarrentNews one = null;
+
+        try{
+            //获取新闻详情
+            one = carrentNewsService.getById(newsId);
+
+            //判断执行结果
+            if(null != one){
+                message = "新闻详情信息";
+            }else {
+                message = "新闻详情为空";
+            }
+
+            //返回执行结果
+            return Result.OK(message, one);
+
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message, one);
+        }
+
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java

@@ -0,0 +1,56 @@
+package org.jeecg.modules.apiService.impl;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.OrderBean;
+import org.jeecg.modules.apiService.OrderService;
+import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
+import org.jeecg.modules.carrentOrder.service.ICarrentOrderService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class OrderServiceImpl implements OrderService {
+
+    /*************************************************************************************/
+    //预约信息
+    @Resource
+    private ICarrentOrderService carrentOrderService;
+    /*************************************************************************************/
+
+    //商品预约-提交预约信息
+    @Override
+    public Result<?> addOrder(CarrentOrder carrentOrder) {
+        //返回信息
+        String message = "预约信息提交失败";
+        //执行结果
+        boolean result = false;
+
+        try{
+            //执行预约信息提交
+            result = carrentOrderService.save(carrentOrder);
+
+            //判断执行结果
+            if(result){
+                message = "预约信息提交成功！";
+            }else {
+                message = "预约信息提交失败！";
+            }
+
+            //返回执行结果
+            return Result.OK(message);
+
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message);
+        }
+
+    }
+
+    //商品预约-联系电话
+    @Override
+    public Result<?> queryPhone() {
+        return Result.OK("联系电话", "17676767676");
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java

@@ -0,0 +1,79 @@
+package org.jeecg.modules.apiService.impl;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiService.UserService;
+import org.jeecg.modules.carrentUser.entity.CarrentUser;
+import org.jeecg.modules.carrentUser.service.ICarrentUserService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class UserServiceImpl implements UserService {
+
+    /*************************************************************************************/
+    //个人信息
+    @Resource
+    private ICarrentUserService carrentUserService;
+    /*************************************************************************************/
+
+    //用户信息-个人注册
+    @Override
+    public Result<?> addUser(CarrentUser carrentUser) {
+        //返回信息
+        String message = "个人注册失败";
+        //执行结果
+        boolean result = false;
+
+        try{
+            //执行个人注册
+            result = carrentUserService.save(carrentUser);
+
+            //判断执行结果
+            if(result){
+                message = "个人注册成功！";
+            }else {
+                message = "个人注册失败！";
+            }
+
+            //返回执行结果
+            return Result.OK(message);
+
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.OK(message);
+        }
+
+    }
+
+    //用户信息-资料修改
+    @Override
+    public Result<?> updateUser(CarrentUser carrentUser) {
+        //返回信息
+        String message = "";
+        //执行结果
+        boolean result = false;
+
+        try{
+            //执行资料修改
+            result = carrentUserService.updateById(carrentUser);
+
+            //判断执行结果
+            if(result){
+                message = "个人资料修改成功！";
+            }else {
+                message = "个人资料修改失败！";
+            }
+
+            //返回执行结果
+            return Result.OK(message);
+
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message);
+        }
+
+    }
+}