diff --git a/CatmDogd-Mall-Front-test/.env.development b/CatmDogd-Mall-Front-test/.env.development
index cf81341..1223dcb 100644
--- a/CatmDogd-Mall-Front-test/.env.development
+++ b/CatmDogd-Mall-Front-test/.env.development
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台
ENV = 'development'
# 若依管理系统/开发环境 https://pet-admin.hhlm1688.com/api
-VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/prod-api'
-# VUE_APP_BASE_API = 'http://localhost:8001/prod-api'
+# VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/prod-api'
+VUE_APP_BASE_API = 'http://localhost:8001/prod-api'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/CatmDogd-Mall-Front-test/src/api/model/AppletOrderItemDate.js b/CatmDogd-Mall-Front-test/src/api/model/AppletOrderItemDate.js
new file mode 100644
index 0000000..102df3c
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/api/model/AppletOrderItemDate.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询订单信息表列表
+export function listAppletOrderItemDate(query) {
+ return request({
+ url: '/model/AppletOrderItemDate/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询订单信息表详细
+export function getAppletOrderItemDate(id) {
+ return request({
+ url: '/model/AppletOrderItemDate/' + id,
+ method: 'get'
+ })
+}
+
+// 新增订单信息表
+export function addAppletOrderItemDate(data) {
+ return request({
+ url: '/model/AppletOrderItemDate',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改订单信息表
+export function updateAppletOrderItemDate(data) {
+ return request({
+ url: '/model/AppletOrderItemDate',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除订单信息表
+export function delAppletOrderItemDate(id) {
+ return request({
+ url: '/model/AppletOrderItemDate/' + id,
+ method: 'delete'
+ })
+}
+
+// 导出订单信息表
+export function exportAppletOrderItemDate(query) {
+ return request({
+ url: '/model/AppletOrderItemDate/export',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/CatmDogd-Mall-Front-test/src/api/model/AppletOrderItemDateLog.js b/CatmDogd-Mall-Front-test/src/api/model/AppletOrderItemDateLog.js
new file mode 100644
index 0000000..fa2154b
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/api/model/AppletOrderItemDateLog.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询订单信息表列表
+export function listAppletOrderItemDateLog(query) {
+ return request({
+ url: '/model/AppletOrderItemDateLog/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询订单信息表详细
+export function getAppletOrderItemDateLog(id) {
+ return request({
+ url: '/model/AppletOrderItemDateLog/' + id,
+ method: 'get'
+ })
+}
+
+// 新增订单信息表
+export function addAppletOrderItemDateLog(data) {
+ return request({
+ url: '/model/AppletOrderItemDateLog',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改订单信息表
+export function updateAppletOrderItemDateLog(data) {
+ return request({
+ url: '/model/AppletOrderItemDateLog',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除订单信息表
+export function delAppletOrderItemDateLog(id) {
+ return request({
+ url: '/model/AppletOrderItemDateLog/' + id,
+ method: 'delete'
+ })
+}
+
+// 导出订单信息表
+export function exportAppletOrderItemDateLog(query) {
+ return request({
+ url: '/model/AppletOrderItemDateLog/export',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletOrderItemDate/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletOrderItemDate/index.vue
new file mode 100644
index 0000000..6cc4d42
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletOrderItemDate/index.vue
@@ -0,0 +1,357 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请选择字典生成
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletOrderItemDateLog/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletOrderItemDateLog/index.vue
new file mode 100644
index 0000000..e516cf7
--- /dev/null
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletOrderItemDateLog/index.vue
@@ -0,0 +1,390 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+ {{showMoreCondition ? '收起条件' : '展开条件'}}
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemDateController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemDateController.java
new file mode 100644
index 0000000..8d5b901
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemDateController.java
@@ -0,0 +1,96 @@
+package com.ruoyi.model.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.model.domain.AppletOrderItemDate;
+import com.ruoyi.model.service.IAppletOrderItemDateService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 订单信息表Controller
+ *
+ * @author daixiande
+ * @date 2025-04-14
+ */
+@RestController
+@RequestMapping("/model/AppletOrderItemDate")
+public class AppletOrderItemDateController extends BaseController {
+ @Autowired
+ private IAppletOrderItemDateService appletOrderItemDateService;
+
+ /**
+ * 查询订单信息表列表
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(AppletOrderItemDate appletOrderItemDate) {
+ startPage();
+ List list = appletOrderItemDateService.selectAppletOrderItemDateList(appletOrderItemDate);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出订单信息表列表
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:export')")
+ @Log(title = "订单信息表", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(AppletOrderItemDate appletOrderItemDate) {
+ List list = appletOrderItemDateService.selectAppletOrderItemDateList(appletOrderItemDate);
+ ExcelUtil util = new ExcelUtil(AppletOrderItemDate.class);
+ return util.exportExcel(list, "订单信息表数据");
+ }
+
+ /**
+ * 获取订单信息表详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return AjaxResult.success(appletOrderItemDateService.selectAppletOrderItemDateById(id));
+ }
+
+ /**
+ * 新增订单信息表
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:add')")
+ @Log(title = "订单信息表", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody AppletOrderItemDate appletOrderItemDate) {
+ return toAjax(appletOrderItemDateService.insertAppletOrderItemDate(appletOrderItemDate));
+ }
+
+ /**
+ * 修改订单信息表
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:edit')")
+ @Log(title = "订单信息表", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody AppletOrderItemDate appletOrderItemDate) {
+ return toAjax(appletOrderItemDateService.updateAppletOrderItemDate(appletOrderItemDate));
+ }
+
+ /**
+ * 删除订单信息表
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDate:remove')")
+ @Log(title = "订单信息表", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(appletOrderItemDateService.deleteAppletOrderItemDateByIds(ids));
+ }
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemDateLogController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemDateLogController.java
new file mode 100644
index 0000000..19cf5f4
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderItemDateLogController.java
@@ -0,0 +1,96 @@
+package com.ruoyi.model.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.model.domain.AppletOrderItemDateLog;
+import com.ruoyi.model.service.IAppletOrderItemDateLogService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 订单信息表Controller
+ *
+ * @author daixiande
+ * @date 2025-04-14
+ */
+@RestController
+@RequestMapping("/model/AppletOrderItemDateLog")
+public class AppletOrderItemDateLogController extends BaseController {
+ @Autowired
+ private IAppletOrderItemDateLogService appletOrderItemDateLogService;
+
+ /**
+ * 查询订单信息表列表
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(AppletOrderItemDateLog appletOrderItemDateLog) {
+ startPage();
+ List list = appletOrderItemDateLogService.selectAppletOrderItemDateLogList(appletOrderItemDateLog);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出订单信息表列表
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:export')")
+ @Log(title = "订单信息表", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(AppletOrderItemDateLog appletOrderItemDateLog) {
+ List list = appletOrderItemDateLogService.selectAppletOrderItemDateLogList(appletOrderItemDateLog);
+ ExcelUtil util = new ExcelUtil(AppletOrderItemDateLog.class);
+ return util.exportExcel(list, "订单信息表数据");
+ }
+
+ /**
+ * 获取订单信息表详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return AjaxResult.success(appletOrderItemDateLogService.selectAppletOrderItemDateLogById(id));
+ }
+
+ /**
+ * 新增订单信息表
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:add')")
+ @Log(title = "订单信息表", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody AppletOrderItemDateLog appletOrderItemDateLog) {
+ return toAjax(appletOrderItemDateLogService.insertAppletOrderItemDateLog(appletOrderItemDateLog));
+ }
+
+ /**
+ * 修改订单信息表
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:edit')")
+ @Log(title = "订单信息表", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody AppletOrderItemDateLog appletOrderItemDateLog) {
+ return toAjax(appletOrderItemDateLogService.updateAppletOrderItemDateLog(appletOrderItemDateLog));
+ }
+
+ /**
+ * 删除订单信息表
+ */
+ @PreAuthorize("@ss.hasPermi('model:AppletOrderItemDateLog:remove')")
+ @Log(title = "订单信息表", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(appletOrderItemDateLogService.deleteAppletOrderItemDateLogByIds(ids));
+ }
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDate.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDate.java
new file mode 100644
index 0000000..385a246
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDate.java
@@ -0,0 +1,54 @@
+package com.ruoyi.model.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class AppletOrderItemDate {
+ private static final long serialVersionUID = 1L;
+
+ /** 唯一标识 */
+ private Long id;
+
+ /** 创建时间 */
+ private String createTime;
+
+ /** 创建者 */
+ private Integer createBy;
+
+ /** 修改时间 */
+ private String updateTime;
+
+ /** 修改者 */
+ private Integer updateBy;
+
+ /** 服务日期 */
+ @Excel(name = "服务日期")
+ private String serviceDate;
+
+ /** 等待上门0已完成1 */
+ @Excel(name = "等待上门0已完成1")
+ private Integer status;
+
+ /** 主订单标识 */
+ @Excel(name = "主订单标识")
+ private Long appletOrderId;
+
+ /** 下单小程序订单标识 */
+ @Excel(name = "下单小程序订单标识")
+ private Long orderId;
+
+ /** 下单小程序订单编码 */
+ @Excel(name = "下单小程序订单编码")
+ private String orderSn;
+
+ /** 服务地址 */
+ @Excel(name = "服务地址")
+ private String cityAddress;
+
+ /** 服务地址详情 */
+ @Excel(name = "服务地址详情")
+ private String address;
+
+}
\ No newline at end of file
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDateLog.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDateLog.java
new file mode 100644
index 0000000..0b400b7
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDateLog.java
@@ -0,0 +1,94 @@
+package com.ruoyi.model.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+/**
+ * 订单信息表对象 applet_order_item_date_log
+ *
+ * @author daixiande
+ */
+@Data
+public class AppletOrderItemDateLog {
+ private static final long serialVersionUID = 1L;
+
+ /** 唯一标识 */
+ private Long id;
+
+ /** 创建时间 */
+ private String createTime;
+
+ /** 创建者 */
+ private Integer createBy;
+
+ /** 修改时间 */
+ private String updateTime;
+
+ /** 修改者 */
+ private Integer updateBy;
+
+ /** 手套照片 */
+ @Excel(name = "手套照片")
+ private String glovePhoto;
+
+ /** 鞋套照片 */
+ @Excel(name = "鞋套照片")
+ private String shoeCoverPhoto;
+
+ /** 宠物照片 */
+ @Excel(name = "宠物照片")
+ private String petPhoto;
+
+ /** 伴宠师照片 */
+ @Excel(name = "伴宠师照片")
+ private String teacherPhoto;
+
+ /** 粮碗前后对比-前 */
+ @Excel(name = "粮碗前后对比-前")
+ private String grainBowlFront;
+
+ /** 粮碗前后对比-后 */
+ @Excel(name = "粮碗前后对比-后")
+ private String grainBowlAfter;
+
+ /** 水碗前后对比-前 */
+ @Excel(name = "水碗前后对比-前")
+ private String waterBowlFront;
+
+ /** 水碗前后对比-后 */
+ @Excel(name = "水碗前后对比-后")
+ private String waterBowlAfter;
+
+ /** 盆/尿垫前后对比-前 */
+ @Excel(name = "盆/尿垫前后对比-前")
+ private String basinFront;
+
+ /** 盆/尿垫前后对比-后 */
+ @Excel(name = "盆/尿垫前后对比-后")
+ private String basinAfter;
+
+ /** 溜狗 */
+ @Excel(name = "溜狗")
+ private String workDogImage;
+
+ /** 陪玩 */
+ @Excel(name = "陪玩")
+ private String workPalyImage;
+
+ /** 备注 */
+ @Excel(name = "备注")
+ private String notes;
+
+ /** 日订单标识 */
+ @Excel(name = "日订单标识")
+ private Long itemDateId;
+
+ /** 总订单标识 */
+ @Excel(name = "总订单标识")
+ private Long itemOrderId;
+
+ /** 订单标识 */
+ @Excel(name = "订单标识")
+ private Long orderId;
+
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateLogMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateLogMapper.java
new file mode 100644
index 0000000..6af1c53
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateLogMapper.java
@@ -0,0 +1,67 @@
+package com.ruoyi.model.mapper;
+
+import java.util.List;
+import com.ruoyi.model.domain.AppletOrderItemDateLog;
+
+/**
+ * 订单信息表Mapper接口
+ *
+ * @author daixiande
+ */
+public interface AppletOrderItemDateLogMapper {
+ /**
+ * 查询订单信息表
+ *
+ * @param id 订单信息表主键
+ * @return 订单信息表
+ */
+ AppletOrderItemDateLog selectById(Long id);
+
+ /**
+ * 查询订单信息表列表
+ *
+ * @param appletOrderItemDateLog 订单信息表
+ * @return 订单信息表集合
+ */
+ List selectList(AppletOrderItemDateLog appletOrderItemDateLog);
+
+ /**
+ * 新增订单信息表
+ *
+ * @param appletOrderItemDateLog 订单信息表
+ * @return 结果
+ */
+ int insert(AppletOrderItemDateLog appletOrderItemDateLog);
+
+ /**
+ * 修改订单信息表
+ *
+ * @param appletOrderItemDateLog 订单信息表
+ * @return 结果
+ */
+ int update(AppletOrderItemDateLog appletOrderItemDateLog);
+
+ /**
+ * 删除订单信息表
+ *
+ * @param id 订单信息表主键
+ * @return 结果
+ */
+ int deleteById(Long id);
+
+ /**
+ * 批量删除订单信息表
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ int deleteByIds(Long[] ids);
+
+ /**
+ * 更新或插入订单信息表
+ *
+ * @param appletOrderItemDateLog 订单信息表
+ * @return 结果
+ */
+ int insertOrUpdate(AppletOrderItemDateLog appletOrderItemDateLog);
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateMapper.java
new file mode 100644
index 0000000..f42fd64
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateMapper.java
@@ -0,0 +1,67 @@
+package com.ruoyi.model.mapper;
+
+import java.util.List;
+import com.ruoyi.model.domain.AppletOrderItemDate;
+
+/**
+ * 订单信息表Mapper接口
+ *
+ * @author daixiande
+ */
+public interface AppletOrderItemDateMapper {
+ /**
+ * 查询订单信息表
+ *
+ * @param id 订单信息表主键
+ * @return 订单信息表
+ */
+ AppletOrderItemDate selectById(Long id);
+
+ /**
+ * 查询订单信息表列表
+ *
+ * @param appletOrderItemDate 订单信息表
+ * @return 订单信息表集合
+ */
+ List selectList(AppletOrderItemDate appletOrderItemDate);
+
+ /**
+ * 新增订单信息表
+ *
+ * @param appletOrderItemDate 订单信息表
+ * @return 结果
+ */
+ int insert(AppletOrderItemDate appletOrderItemDate);
+
+ /**
+ * 修改订单信息表
+ *
+ * @param appletOrderItemDate 订单信息表
+ * @return 结果
+ */
+ int update(AppletOrderItemDate appletOrderItemDate);
+
+ /**
+ * 删除订单信息表
+ *
+ * @param id 订单信息表主键
+ * @return 结果
+ */
+ int deleteById(Long id);
+
+ /**
+ * 批量删除订单信息表
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ int deleteByIds(Long[] ids);
+
+ /**
+ * 更新或插入订单信息表
+ *
+ * @param appletOrderItemDate 订单信息表
+ * @return 结果
+ */
+ int insertOrUpdate(AppletOrderItemDate appletOrderItemDate);
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateLogService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateLogService.java
new file mode 100644
index 0000000..db06bd4
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateLogService.java
@@ -0,0 +1,59 @@
+package com.ruoyi.model.service;
+
+import java.util.List;
+import com.ruoyi.model.domain.AppletOrderItemDateLog;
+
+/**
+ * 订单信息表Service接口
+ *
+ * @author daixiande
+ */
+public interface IAppletOrderItemDateLogService {
+ /**
+ * 查询订单信息表
+ *
+ * @param id 订单信息表主键
+ * @return 订单信息表
+ */
+ AppletOrderItemDateLog selectAppletOrderItemDateLogById(Long id);
+
+ /**
+ * 查询订单信息表列表
+ *
+ * @param appletOrderItemDateLog 订单信息表
+ * @return 订单信息表集合
+ */
+ List selectAppletOrderItemDateLogList(AppletOrderItemDateLog appletOrderItemDateLog);
+
+ /**
+ * 新增订单信息表
+ *
+ * @param appletOrderItemDateLog 订单信息表
+ * @return 结果
+ */
+ int insertAppletOrderItemDateLog(AppletOrderItemDateLog appletOrderItemDateLog);
+
+ /**
+ * 修改订单信息表
+ *
+ * @param appletOrderItemDateLog 订单信息表
+ * @return 结果
+ */
+ int updateAppletOrderItemDateLog(AppletOrderItemDateLog appletOrderItemDateLog);
+
+ /**
+ * 批量删除订单信息表
+ *
+ * @param ids 需要删除的订单信息表主键集合
+ * @return 结果
+ */
+ int deleteAppletOrderItemDateLogByIds(Long[] ids);
+
+ /**
+ * 删除订单信息表信息
+ *
+ * @param id 订单信息表主键
+ * @return 结果
+ */
+ int deleteAppletOrderItemDateLogById(Long id);
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateService.java
new file mode 100644
index 0000000..8dbe0eb
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateService.java
@@ -0,0 +1,59 @@
+package com.ruoyi.model.service;
+
+import java.util.List;
+import com.ruoyi.model.domain.AppletOrderItemDate;
+
+/**
+ * 订单信息表Service接口
+ *
+ * @author daixiande
+ */
+public interface IAppletOrderItemDateService {
+ /**
+ * 查询订单信息表
+ *
+ * @param id 订单信息表主键
+ * @return 订单信息表
+ */
+ AppletOrderItemDate selectAppletOrderItemDateById(Long id);
+
+ /**
+ * 查询订单信息表列表
+ *
+ * @param appletOrderItemDate 订单信息表
+ * @return 订单信息表集合
+ */
+ List selectAppletOrderItemDateList(AppletOrderItemDate appletOrderItemDate);
+
+ /**
+ * 新增订单信息表
+ *
+ * @param appletOrderItemDate 订单信息表
+ * @return 结果
+ */
+ int insertAppletOrderItemDate(AppletOrderItemDate appletOrderItemDate);
+
+ /**
+ * 修改订单信息表
+ *
+ * @param appletOrderItemDate 订单信息表
+ * @return 结果
+ */
+ int updateAppletOrderItemDate(AppletOrderItemDate appletOrderItemDate);
+
+ /**
+ * 批量删除订单信息表
+ *
+ * @param ids 需要删除的订单信息表主键集合
+ * @return 结果
+ */
+ int deleteAppletOrderItemDateByIds(Long[] ids);
+
+ /**
+ * 删除订单信息表信息
+ *
+ * @param id 订单信息表主键
+ * @return 结果
+ */
+ int deleteAppletOrderItemDateById(Long id);
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemDateLogServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemDateLogServiceImpl.java
new file mode 100644
index 0000000..4bd9c1b
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemDateLogServiceImpl.java
@@ -0,0 +1,87 @@
+package com.ruoyi.model.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.model.mapper.AppletOrderItemDateLogMapper;
+import com.ruoyi.model.domain.AppletOrderItemDateLog;
+import com.ruoyi.model.service.IAppletOrderItemDateLogService;
+
+/**
+ * 订单信息表Service业务层处理
+ *
+ * @author daixiande
+ */
+@Service
+public class AppletOrderItemDateLogServiceImpl implements IAppletOrderItemDateLogService {
+ @Autowired
+ private AppletOrderItemDateLogMapper appletOrderItemDateLogMapper;
+
+ /**
+ * 查询订单信息表
+ *
+ * @param id 订单信息表主键
+ * @return 订单信息表
+ */
+ @Override
+ public AppletOrderItemDateLog selectAppletOrderItemDateLogById(Long id) {
+ return appletOrderItemDateLogMapper.selectById(id);
+ }
+
+ /**
+ * 查询订单信息表列表
+ *
+ * @param appletOrderItemDateLog 订单信息表
+ * @return 订单信息表
+ */
+ @Override
+ public List selectAppletOrderItemDateLogList(AppletOrderItemDateLog appletOrderItemDateLog) {
+ return appletOrderItemDateLogMapper.selectList(appletOrderItemDateLog);
+ }
+
+ /**
+ * 新增订单信息表
+ *
+ * @param appletOrderItemDateLog 订单信息表
+ * @return 结果
+ */
+ @Override
+ public int insertAppletOrderItemDateLog(AppletOrderItemDateLog appletOrderItemDateLog) {
+// appletOrderItemDateLog.setCreateTime(String.now());
+ return appletOrderItemDateLogMapper.insert(appletOrderItemDateLog);
+ }
+
+ /**
+ * 修改订单信息表
+ *
+ * @param appletOrderItemDateLog 订单信息表
+ * @return 结果
+ */
+ @Override
+ public int updateAppletOrderItemDateLog(AppletOrderItemDateLog appletOrderItemDateLog) {
+// appletOrderItemDateLog.setUpdateTime(DateUtils.getNowDate());
+ return appletOrderItemDateLogMapper.update(appletOrderItemDateLog);
+ }
+
+ /**
+ * 批量删除订单信息表
+ *
+ * @param ids 需要删除的订单信息表主键
+ * @return 结果
+ */
+ @Override
+ public int deleteAppletOrderItemDateLogByIds(Long[] ids) {
+ return appletOrderItemDateLogMapper.deleteByIds(ids);
+ }
+
+ /**
+ * 删除订单信息表信息
+ *
+ * @param id 订单信息表主键
+ * @return 结果
+ */
+ @Override
+ public int deleteAppletOrderItemDateLogById(Long id) {
+ return appletOrderItemDateLogMapper.deleteById(id);
+ }
+}
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemDateServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemDateServiceImpl.java
new file mode 100644
index 0000000..fea45e2
--- /dev/null
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemDateServiceImpl.java
@@ -0,0 +1,87 @@
+package com.ruoyi.model.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.model.mapper.AppletOrderItemDateMapper;
+import com.ruoyi.model.domain.AppletOrderItemDate;
+import com.ruoyi.model.service.IAppletOrderItemDateService;
+
+/**
+ * 订单信息表Service业务层处理
+ *
+ * @author daixiande
+ */
+@Service
+public class AppletOrderItemDateServiceImpl implements IAppletOrderItemDateService {
+ @Autowired
+ private AppletOrderItemDateMapper appletOrderItemDateMapper;
+
+ /**
+ * 查询订单信息表
+ *
+ * @param id 订单信息表主键
+ * @return 订单信息表
+ */
+ @Override
+ public AppletOrderItemDate selectAppletOrderItemDateById(Long id) {
+ return appletOrderItemDateMapper.selectById(id);
+ }
+
+ /**
+ * 查询订单信息表列表
+ *
+ * @param appletOrderItemDate 订单信息表
+ * @return 订单信息表
+ */
+ @Override
+ public List selectAppletOrderItemDateList(AppletOrderItemDate appletOrderItemDate) {
+ return appletOrderItemDateMapper.selectList(appletOrderItemDate);
+ }
+
+ /**
+ * 新增订单信息表
+ *
+ * @param appletOrderItemDate 订单信息表
+ * @return 结果
+ */
+ @Override
+ public int insertAppletOrderItemDate(AppletOrderItemDate appletOrderItemDate) {
+// appletOrderItemDate.setCreateTime(String.now());
+ return appletOrderItemDateMapper.insert(appletOrderItemDate);
+ }
+
+ /**
+ * 修改订单信息表
+ *
+ * @param appletOrderItemDate 订单信息表
+ * @return 结果
+ */
+ @Override
+ public int updateAppletOrderItemDate(AppletOrderItemDate appletOrderItemDate) {
+// appletOrderItemDate.setUpdateTime(DateUtils.getNowDate());
+ return appletOrderItemDateMapper.update(appletOrderItemDate);
+ }
+
+ /**
+ * 批量删除订单信息表
+ *
+ * @param ids 需要删除的订单信息表主键
+ * @return 结果
+ */
+ @Override
+ public int deleteAppletOrderItemDateByIds(Long[] ids) {
+ return appletOrderItemDateMapper.deleteByIds(ids);
+ }
+
+ /**
+ * 删除订单信息表信息
+ *
+ * @param id 订单信息表主键
+ * @return 结果
+ */
+ @Override
+ public int deleteAppletOrderItemDateById(Long id) {
+ return appletOrderItemDateMapper.deleteById(id);
+ }
+}
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateLogMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateLogMapper.xml
new file mode 100644
index 0000000..43a58bc
--- /dev/null
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateLogMapper.xml
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, create_time, create_by, update_time, update_by, glove_photo, shoe_cover_photo, pet_photo, teacher_photo, grain_bowl_front, grain_bowl_after, water_bowl_front, water_bowl_after, basin_front, basin_after, work_dog_image, work_paly_image, notes, item_date_id, item_order_id, order_id from applet_order_item_date_log
+
+
+
+
+
+
+
+ insert into applet_order_item_date_log
+
+ id,
+ create_time,
+ create_by,
+ update_time,
+ update_by,
+ glove_photo,
+ shoe_cover_photo,
+ pet_photo,
+ teacher_photo,
+ grain_bowl_front,
+ grain_bowl_after,
+ water_bowl_front,
+ water_bowl_after,
+ basin_front,
+ basin_after,
+ work_dog_image,
+ work_paly_image,
+ notes,
+ item_date_id,
+ item_order_id,
+ order_id,
+
+
+ #{id},
+ #{createTime},
+ #{createBy},
+ #{updateTime},
+ #{updateBy},
+ #{glovePhoto},
+ #{shoeCoverPhoto},
+ #{petPhoto},
+ #{teacherPhoto},
+ #{grainBowlFront},
+ #{grainBowlAfter},
+ #{waterBowlFront},
+ #{waterBowlAfter},
+ #{basinFront},
+ #{basinAfter},
+ #{workDogImage},
+ #{workPalyImage},
+ #{notes},
+ #{itemDateId},
+ #{itemOrderId},
+ #{orderId},
+
+
+
+
+ update applet_order_item_date_log
+
+ create_time = #{createTime},
+ create_by = #{createBy},
+ update_time = #{updateTime},
+ update_by = #{updateBy},
+ glove_photo = #{glovePhoto},
+ shoe_cover_photo = #{shoeCoverPhoto},
+ pet_photo = #{petPhoto},
+ teacher_photo = #{teacherPhoto},
+ grain_bowl_front = #{grainBowlFront},
+ grain_bowl_after = #{grainBowlAfter},
+ water_bowl_front = #{waterBowlFront},
+ water_bowl_after = #{waterBowlAfter},
+ basin_front = #{basinFront},
+ basin_after = #{basinAfter},
+ work_dog_image = #{workDogImage},
+ work_paly_image = #{workPalyImage},
+ notes = #{notes},
+ item_date_id = #{itemDateId},
+ item_order_id = #{itemOrderId},
+ order_id = #{orderId},
+
+ where id = #{id}
+
+
+
+ delete from applet_order_item_date_log where id = #{id}
+
+
+
+ delete from applet_order_item_date_log where id in
+
+ #{id}
+
+
+
+ insert into applet_order_item_date_log
+
+
+ id,
+
+ create_time, create_by, update_time, update_by, glove_photo, shoe_cover_photo, pet_photo, teacher_photo, grain_bowl_front, grain_bowl_after, water_bowl_front, water_bowl_after, basin_front, basin_after, work_dog_image, work_paly_image, notes, item_date_id, item_order_id, order_id,
+
+
+ values
+
+
+ #{id, jdbcType=BIGINT},
+
+ #{createTime, jdbcType=TIMESTAMP},#{createBy, jdbcType=INTEGER},#{updateTime, jdbcType=TIMESTAMP},#{updateBy, jdbcType=INTEGER},#{glovePhoto, jdbcType=VARCHAR},#{shoeCoverPhoto, jdbcType=VARCHAR},#{petPhoto, jdbcType=VARCHAR},#{teacherPhoto, jdbcType=VARCHAR},#{grainBowlFront, jdbcType=VARCHAR},#{grainBowlAfter, jdbcType=VARCHAR},#{waterBowlFront, jdbcType=VARCHAR},#{waterBowlAfter, jdbcType=VARCHAR},#{basinFront, jdbcType=VARCHAR},#{basinAfter, jdbcType=VARCHAR},#{workDogImage, jdbcType=VARCHAR},#{workPalyImage, jdbcType=VARCHAR},#{notes, jdbcType=VARCHAR},#{itemDateId, jdbcType=BIGINT},#{itemOrderId, jdbcType=BIGINT},#{orderId, jdbcType=BIGINT},
+
+
+ on duplicate key update
+
+
+ id = #{id,jdbcType=BIGINT},
+
+ create_time = #{createTime, jdbcType=TIMESTAMP},
+ create_by = #{createBy, jdbcType=INTEGER},
+ update_time = #{updateTime, jdbcType=TIMESTAMP},
+ update_by = #{updateBy, jdbcType=INTEGER},
+ glove_photo = #{glovePhoto, jdbcType=VARCHAR},
+ shoe_cover_photo = #{shoeCoverPhoto, jdbcType=VARCHAR},
+ pet_photo = #{petPhoto, jdbcType=VARCHAR},
+ teacher_photo = #{teacherPhoto, jdbcType=VARCHAR},
+ grain_bowl_front = #{grainBowlFront, jdbcType=VARCHAR},
+ grain_bowl_after = #{grainBowlAfter, jdbcType=VARCHAR},
+ water_bowl_front = #{waterBowlFront, jdbcType=VARCHAR},
+ water_bowl_after = #{waterBowlAfter, jdbcType=VARCHAR},
+ basin_front = #{basinFront, jdbcType=VARCHAR},
+ basin_after = #{basinAfter, jdbcType=VARCHAR},
+ work_dog_image = #{workDogImage, jdbcType=VARCHAR},
+ work_paly_image = #{workPalyImage, jdbcType=VARCHAR},
+ notes = #{notes, jdbcType=VARCHAR},
+ item_date_id = #{itemDateId, jdbcType=BIGINT},
+ item_order_id = #{itemOrderId, jdbcType=BIGINT},
+ order_id = #{orderId, jdbcType=BIGINT},
+
+
+
+
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateMapper.xml
new file mode 100644
index 0000000..8a5df1a
--- /dev/null
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateMapper.xml
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, create_time, create_by, update_time, update_by, service_date, status, applet_order_id, order_id, order_sn, city_address, address from applet_order_item_date
+
+
+
+
+
+
+
+ insert into applet_order_item_date
+
+ id,
+ create_time,
+ create_by,
+ update_time,
+ update_by,
+ service_date,
+ status,
+ applet_order_id,
+ order_id,
+ order_sn,
+ city_address,
+ address,
+
+
+ #{id},
+ #{createTime},
+ #{createBy},
+ #{updateTime},
+ #{updateBy},
+ #{serviceDate},
+ #{status},
+ #{appletOrderId},
+ #{orderId},
+ #{orderSn},
+ #{cityAddress},
+ #{address},
+
+
+
+
+ update applet_order_item_date
+
+ create_time = #{createTime},
+ create_by = #{createBy},
+ update_time = #{updateTime},
+ update_by = #{updateBy},
+ service_date = #{serviceDate},
+ status = #{status},
+ applet_order_id = #{appletOrderId},
+ order_id = #{orderId},
+ order_sn = #{orderSn},
+ city_address = #{cityAddress},
+ address = #{address},
+
+ where id = #{id}
+
+
+
+ delete from applet_order_item_date where id = #{id}
+
+
+
+ delete from applet_order_item_date where id in
+
+ #{id}
+
+
+
+ insert into applet_order_item_date
+
+
+ id,
+
+ create_time, create_by, update_time, update_by, service_date, status, applet_order_id, order_id, order_sn, city_address, address,
+
+
+ values
+
+
+ #{id, jdbcType=BIGINT},
+
+ #{createTime, jdbcType=TIMESTAMP},#{createBy, jdbcType=INTEGER},#{updateTime, jdbcType=TIMESTAMP},#{updateBy, jdbcType=INTEGER},#{serviceDate, jdbcType=VARCHAR},#{status, jdbcType=INTEGER},#{appletOrderId, jdbcType=BIGINT},#{orderId, jdbcType=BIGINT},#{orderSn, jdbcType=VARCHAR},#{cityAddress, jdbcType=VARCHAR},#{address, jdbcType=VARCHAR},
+
+
+ on duplicate key update
+
+
+ id = #{id,jdbcType=BIGINT},
+
+ create_time = #{createTime, jdbcType=TIMESTAMP},
+ create_by = #{createBy, jdbcType=INTEGER},
+ update_time = #{updateTime, jdbcType=TIMESTAMP},
+ update_by = #{updateBy, jdbcType=INTEGER},
+ service_date = #{serviceDate, jdbcType=VARCHAR},
+ status = #{status, jdbcType=INTEGER},
+ applet_order_id = #{appletOrderId, jdbcType=BIGINT},
+ order_id = #{orderId, jdbcType=BIGINT},
+ order_sn = #{orderSn, jdbcType=VARCHAR},
+ city_address = #{cityAddress, jdbcType=VARCHAR},
+ address = #{address, jdbcType=VARCHAR},
+
+
+