From 649b915970ea5e206671429c0d9d9fee9bc6b42c Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Wed, 16 Apr 2025 08:53:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CatmDogd-Mall-Front-test/.env.development | 4 +- CatmDogd-Mall-Front-test/.env.production | 2 +- .../src/views/model/AppletOrder/index.vue | 4 +- .../src/main/resources/application-druid.yml | 6 +- ruoyi-admin/src/main/resources/application.yml | 2 +- .../applet/contoller/ApiAppletOrderController.java | 431 +++++++++++++++++---- .../contoller/ApiAppletOrderItemLogController.java | 80 ++++ .../ruoyi/applet/pojo/dto/AppletOrderDateVo.java | 14 + .../pojo/vo/AppletOrderDateAddressReturn.java | 50 +++ .../applet/pojo/vo/AppletOrderDateVoReturn.java | 24 ++ .../applet/service/impl/IMallOrderServiceImpl.java | 50 +++ .../model/controller/AppletOrderController.java | 3 +- .../com/ruoyi/model/domain/AppletOrderItem.java | 4 +- .../ruoyi/model/domain/AppletOrderItemDate.java | 20 + .../ruoyi/model/domain/AppletOrderItemDateLog.java | 4 + .../model/mapper/AppletOrderItemDateLogMapper.java | 1 + .../ruoyi/model/mapper/AppletOrderItemMapper.java | 2 + .../com/ruoyi/model/mapper/AppletOrderMapper.java | 5 +- .../service/IAppletOrderItemDateLogService.java | 1 + .../model/service/IAppletOrderItemService.java | 4 +- .../impl/AppletOrderItemDateLogServiceImpl.java | 8 + .../service/impl/AppletOrderItemServiceImpl.java | 9 +- .../mapper/model/AppletOrderItemDateLogMapper.xml | 5 + .../mapper/model/AppletOrderItemDateMapper.xml | 13 +- .../mapper/model/AppletOrderItemMapper.xml | 6 + .../resources/mapper/model/AppletOrderMapper.xml | 2 +- .../cyl/manager/oms/domain/OmsOrderService.java | 3 + 27 files changed, 656 insertions(+), 101 deletions(-) create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemLogController.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/AppletOrderDateVo.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletOrderDateAddressReturn.java create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletOrderDateVoReturn.java diff --git a/CatmDogd-Mall-Front-test/.env.development b/CatmDogd-Mall-Front-test/.env.development index 1223dcb..a8ce92c 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' +VUE_APP_BASE_API = 'http://localhost:8001' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/CatmDogd-Mall-Front-test/.env.production b/CatmDogd-Mall-Front-test/.env.production index 926d173..e638a8e 100644 --- a/CatmDogd-Mall-Front-test/.env.production +++ b/CatmDogd-Mall-Front-test/.env.production @@ -5,5 +5,5 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台 ENV = 'production' # 若依管理系统/生产环境 -VUE_APP_BASE_API = '/api/prod-api' +VUE_APP_BASE_API = '/api' VUE_APP_JUDGE_STAR = 0 diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue index 51daf10..1446fff 100644 --- a/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue +++ b/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue @@ -163,8 +163,8 @@ diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index b4ec417..704abcd 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -60,8 +60,10 @@ wechat: merchantSerialNumber: 6050244FC18200362585F1F9FD6557A1B291E8C0 apiV3key: 19971022197001121966060120240731 apiV2key: 19961022196901121965060120230731 - notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify - notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH +# notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify +# notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH + notifyUrl: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notify + notifyUrlForBCHSH: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notifyForBCHSH miniProgramAppId: wxd1a6ba7b5e17a5b6 miniProgramSecret: 06e946a2c9010f8eb9e306018a779a7f staffAppId: wx01f0f43759922fda diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 1badbb3..6f94617 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -23,7 +23,7 @@ server: port: 8001 servlet: # 应用的访问路径 - context-path: /prod-api + context-path: / tomcat: # tomcat的URI编码 uri-encoding: UTF-8 diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java index 8be0445..2fdcd10 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java @@ -1,18 +1,29 @@ package com.ruoyi.applet.contoller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.cyl.h5.pojo.vo.H5OrderVO; import com.cyl.h5.service.H5OrderService; import com.cyl.h5.service.H5PetCareService; import com.cyl.h5.service.H5PetService; import com.cyl.manager.oms.domain.OmsOrderService; +import com.cyl.manager.oms.domain.OrderItem; +import com.cyl.manager.oms.mapper.OmsOrderServiceMapper; +import com.cyl.manager.oms.mapper.OrderItemMapper; +import com.cyl.manager.oms.mapper.OrderMapper; import com.cyl.manager.oms.service.OrderService; +import com.cyl.manager.ums.domain.Pet; import com.cyl.manager.ums.domain.PetCare; +import com.cyl.manager.ums.mapper.PetMapper; import com.cyl.manager.ums.pojo.vo.PetVO; +import com.ruoyi.applet.pojo.dto.AppletOrderDateVo; +import com.ruoyi.applet.pojo.vo.AppletOrderDateAddressReturn; +import com.ruoyi.applet.pojo.vo.AppletOrderDateVoReturn; import com.ruoyi.applet.service.IMallOrderService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.model.domain.*; import com.ruoyi.model.service.*; import com.ruoyi.model.service.impl.AppletOrderItemServiceImpl; @@ -22,8 +33,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.LocalDateTime; import java.util.*; +import java.util.stream.Collectors; @Api(description = "订单模块 - 接单大厅流程") @RestController @@ -42,6 +55,8 @@ public class ApiAppletOrderController extends BaseController { private IAppletConfigService configService; @Autowired private IMallOrderService mallOrderService; + @Autowired + private IAppletOrderItemDateService appletOrderItemDateService; //下单小程序：那边来的订单信息 @Autowired private H5OrderService h5OrderService; @@ -49,10 +64,22 @@ public class ApiAppletOrderController extends BaseController { private OrderService service; @Autowired private AppletOrderItemServiceImpl appletOrderItemServiceImpl; + @Autowired private H5PetService h5PetService; @Autowired private H5PetCareService petCareService; + @Autowired + private PetMapper petMapper; + + @Autowired + private OrderMapper orderMapper; + + @Autowired + private OrderItemMapper orderItemMapper; + + @Autowired + private OmsOrderServiceMapper omsOrderServiceMapper; @ApiOperation("接单大厅列表-带分页") @@ -64,28 +91,22 @@ public class ApiAppletOrderController extends BaseController { if(appletOrder.getUserIdJson() == null){ return AjaxResult.error("userIdJson用户信息标识不能为空"); } - startPage(); + //根据用户标识得到用户信息 + AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletOrder.getUserId()); + BigDecimal petPayment = new BigDecimal(0); + //得到当前用户角色 + if(appUsers.getUserBcs()!=0){ + //根据当前等级得到当前的返点比例 + AppletConfig petPaymentBcs = configService.selectAppletConfigByClassAndNum("pet_payment_bcs", appUsers.getUserBcs()); + petPayment = petPaymentBcs.getParamValueNo(); + } + startPage(); List list = null; List itemList = null; if(appletOrder.getType().equals("0")){ + list = appletOrderService.selectAppletOrderListLikeUserIdJson(appletOrder); -// for (AppletOrder order:list){ -// H5OrderVO h5OrderVO = h5OrderService.orderDetail(order.getOrderId()); -// //得到服务信息 -// List service = h5OrderVO.getOrderServiceList(); -// List petVOList = new ArrayList<>(); -// for (OmsOrderService service1:service){ -// //宠物标识不为空的时候查询数据 -// if(service1.getPetId()!=null){ -// PetVO petVO = h5PetService.selectPetById(service1.getPetId()); -// service1.setPetVo(petVO); -// petVOList.add(petVO); -// } -// } -// h5OrderVO.setPetVOList(petVOList); -// order.setH5OrderVO(h5OrderVO); -// } for (AppletOrder order : list) { H5OrderVO h5OrderVO = h5OrderService.orderDetail(order.getOrderId()); // 得到服务信息 @@ -108,7 +129,14 @@ public class ApiAppletOrderController extends BaseController { } } } - + //得到当前用户角色 + if(appUsers.getUserBcs()!=0){ + //保留两位小数点 + BigDecimal multiply = order.getPrice().multiply(petPayment).setScale(2, RoundingMode.HALF_UP); + order.setOrderGive(multiply); + }else{ + order.setOrderGive(new BigDecimal(0)); + } h5OrderVO.setPetVOList(petVOList); order.setH5OrderVO(h5OrderVO); } @@ -116,37 +144,23 @@ public class ApiAppletOrderController extends BaseController { return AjaxResult.success(dataTable); } if (appletOrder.getType().equals("1")){ - list = appletOrderService.selectAppletOrderList(appletOrder); -// for (AppletOrder order:list){ -// H5OrderVO h5OrderVO = h5OrderService.orderDetail(order.getOrderId()); -// //得到服务信息 -// List service = h5OrderVO.getOrderServiceList(); -// List petVOList = new ArrayList<>(); -// for (OmsOrderService service1:service){ -// //宠物标识不为空的时候查询数据 -// if(service1.getPetId()!=null){ -// PetVO petVO = h5PetService.selectPetById(service1.getPetId()); -// service1.setPetVo(petVO); -// petVOList.add(petVO); -// } -// } -// h5OrderVO.setPetVOList(petVOList); -// order.setH5OrderVO(h5OrderVO); -// } + AppletOrder orderQ = new AppletOrder(); + orderQ.setUserIdJson(appletOrder.getUserIdJson()); + orderQ.setType("1"); + orderQ.setStatus(0); + list = appletOrderService.selectAppletOrderList(orderQ); + for (AppletOrder order : list) { H5OrderVO h5OrderVO = h5OrderService.orderDetail(order.getOrderId()); // 得到服务信息 List service = h5OrderVO.getOrderServiceList(); - // 使用一个 Set 来跟踪已经添加的 PetVO 的 id Set addedPetIds = new HashSet<>(); List petVOList = new ArrayList<>(); - for (OmsOrderService service1 : service) { // 宠物标识不为空的时候查询数据 if (service1.getPetId() != null) { PetVO petVO = h5PetService.selectPetById(service1.getPetId()); - // 检查 petVO 的 id 是否已经添加过 if (petVO != null && !addedPetIds.contains(petVO.getId())) { service1.setPetVo(petVO); @@ -155,9 +169,20 @@ public class ApiAppletOrderController extends BaseController { } } } - + //得到当前用户角色 + if(appUsers.getUserBcs()!=0){ + //保留两位小数点 + BigDecimal multiply = order.getPrice().multiply(petPayment).setScale(2, RoundingMode.HALF_UP); + order.setOrderGive(multiply); + }else{ + order.setOrderGive(new BigDecimal(0)); + } h5OrderVO.setPetVOList(petVOList); order.setH5OrderVO(h5OrderVO); + + + + } TableDataInfo dataTable = getDataTable(list); return AjaxResult.success(dataTable); @@ -167,36 +192,17 @@ public class ApiAppletOrderController extends BaseController { appletOrderItem.setStatus(2); appletOrderItem.setUserId(appletOrder.getUserId()); itemList = appletOrderItemService.selectAppletOrderItemList(appletOrderItem); -// for (AppletOrderItem orderItem:itemList){ -// H5OrderVO h5OrderVO = h5OrderService.orderDetail(orderItem.getOrderId()); -// //得到服务信息 -// List service = h5OrderVO.getOrderServiceList(); -// List petVOList = new ArrayList<>(); -// for (OmsOrderService service1:service){ -// //宠物标识不为空的时候查询数据 -// if(service1.getPetId()!=null){ -// PetVO petVO = h5PetService.selectPetById(service1.getPetId()); -// service1.setPetVo(petVO); -// petVOList.add(petVO); -// } -// } -// h5OrderVO.setPetVOList(petVOList); -// orderItem.setH5OrderVO(h5OrderVO); -// } for (AppletOrderItem orderItem:itemList){ H5OrderVO h5OrderVO = h5OrderService.orderDetail(orderItem.getOrderId()); // 得到服务信息 List service = h5OrderVO.getOrderServiceList(); - // 使用一个 Set 来跟踪已经添加的 PetVO 的 id Set addedPetIds = new HashSet<>(); List petVOList = new ArrayList<>(); - for (OmsOrderService service1 : service) { // 宠物标识不为空的时候查询数据 if (service1.getPetId() != null) { PetVO petVO = h5PetService.selectPetById(service1.getPetId()); - // 检查 petVO 的 id 是否已经添加过 if (petVO != null && !addedPetIds.contains(petVO.getId())) { service1.setPetVo(petVO); @@ -206,6 +212,7 @@ public class ApiAppletOrderController extends BaseController { } } + orderItem.setOrderGive(orderItem.getOrderGivePrice()); h5OrderVO.setPetVOList(petVOList); orderItem.setH5OrderVO(h5OrderVO); } @@ -225,12 +232,99 @@ public class ApiAppletOrderController extends BaseController { if(appletOrder.getId() == null){ return AjaxResult.error("订单标识不能为空"); } -// if(appletOrder.getUserId() == null){ -// return AjaxResult.error("用户标识不能为空"); -// } + if(appletOrder.getUserId() == null){ + return AjaxResult.error("用户标识不能为空"); + } + + //根据用户标识得到用户信息 + AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletOrder.getUserId()); + BigDecimal petPayment = new BigDecimal(0); + //得到当前用户角色 + if(appUsers.getUserBcs()!=0){ + //根据当前等级得到当前的返点比例 + AppletConfig petPaymentBcs = configService.selectAppletConfigByClassAndNum("pet_payment_bcs", appUsers.getUserBcs()); + petPayment = petPaymentBcs.getParamValueNo(); + } AppletOrder order = appletOrderService.selectAppletOrderById(appletOrder.getId()); - order.setH5OrderVO(h5OrderService.orderDetail(order.getOrderId())); - order.setManagerOrderDetailVO(service.selectById(order.getOrderId())); + //如果是流失订单 + if (order==null){ +// AppletOrderItem orderQ = new AppletOrderItem(); +// orderQ.setUserId(appletOrder.getUserId()); +// orderQ.setOrderId(appletOrder.getOrderId()); + AppletOrderItem orderItem = appletOrderItemService.selectAppletOrderItemById(appletOrder.getId()); + H5OrderVO h5OrderVO = h5OrderService.orderDetail(orderItem.getOrderId()); + // 得到服务信息 + List service = h5OrderVO.getOrderServiceList(); + // 使用一个 Set 来跟踪已经添加的 PetVO 的 id + Set addedPetIds = new HashSet<>(); + List petVOList = new ArrayList<>(); + for (OmsOrderService service1 : service) { + // 宠物标识不为空的时候查询数据 + if (service1.getPetId() != null) { + PetVO petVO = h5PetService.selectPetById(service1.getPetId()); + // 检查 petVO 的 id 是否已经添加过 + if (petVO != null && !addedPetIds.contains(petVO.getId())) { + service1.setPetVo(petVO); + petVOList.add(petVO); + addedPetIds.add(petVO.getId()); // 标记该 id 已添加 + } + } + + } + + //得到当前用户角色 + if(appUsers.getUserBcs()!=0){ + //保留两位小数点 + BigDecimal multiply = orderItem.getPrice().multiply(petPayment).setScale(2, RoundingMode.HALF_UP); + orderItem.setOrderGive(multiply); + }else{ + orderItem.setOrderGive(new BigDecimal(0)); + } + h5OrderVO.setPetVOList(petVOList); + orderItem.setH5OrderVO(h5OrderVO); +// order.setManagerOrderDetailVO(service.selectById(order.getOrderId())); + Map map = new HashMap(); + map.put("order",orderItem); + AppletConfig config = new AppletConfig(); + config.setParamClass("pet_payment_bcs"); + List appletConfigs = configService.selectAppletConfigList(config); + map.put("pet_payment_bcs",appletConfigs); + return AjaxResult.success("接单大厅查看详情",map); + } + + + + H5OrderVO h5OrderVO = h5OrderService.orderDetail(order.getOrderId()); + // 得到服务信息 + List service = h5OrderVO.getOrderServiceList(); + // 使用一个 Set 来跟踪已经添加的 PetVO 的 id + Set addedPetIds = new HashSet<>(); + List petVOList = new ArrayList<>(); + for (OmsOrderService service1 : service) { + // 宠物标识不为空的时候查询数据 + if (service1.getPetId() != null) { + PetVO petVO = h5PetService.selectPetById(service1.getPetId()); + // 检查 petVO 的 id 是否已经添加过 + if (petVO != null && !addedPetIds.contains(petVO.getId())) { + service1.setPetVo(petVO); + petVOList.add(petVO); + addedPetIds.add(petVO.getId()); // 标记该 id 已添加 + } + } + + } + + //得到当前用户角色 + if(appUsers.getUserBcs()!=0){ + //保留两位小数点 + BigDecimal multiply = order.getPrice().multiply(petPayment).setScale(2, RoundingMode.HALF_UP); + order.setOrderGive(multiply); + }else{ + order.setOrderGive(new BigDecimal(0)); + } + h5OrderVO.setPetVOList(petVOList); + order.setH5OrderVO(h5OrderVO); +// order.setManagerOrderDetailVO(service.selectById(order.getOrderId())); Map map = new HashMap(); map.put("order",order); AppletConfig config = new AppletConfig(); @@ -289,6 +383,7 @@ public class ApiAppletOrderController extends BaseController { appletOrderItem.setIsPet(0); appletOrderItem.setIsDate(0); appletOrderItem.setIsAddress(0); + appletOrderItem.setPayTime(order.getPayTime()); appletOrderItemService.insertAppletOrderItem(appletOrderItem); @@ -308,7 +403,9 @@ public class ApiAppletOrderController extends BaseController { //得到所有的伴宠师id String appletUserId = ""; for (AppUsers users : appUsersList) { - appletUserId += users.getUserId()+","; + if(!appletOrder.getUserId().equals(users.getUserId())){ + appletUserId += users.getUserId()+","; + } } appletOrder.setUserIdJson(appletUserId); @@ -333,8 +430,18 @@ public class ApiAppletOrderController extends BaseController { } AppletOrder order = appletOrderService.selectAppletOrderById(appletOrder.getId()); + if(order.getStatus() == 1){ + return AjaxResult.error("该订单已被接单"); + } + + + + + //生成我的订单信息 AppletOrderItem appletOrderItem = new AppletOrderItem(); + long id = System.currentTimeMillis(); + appletOrderItem.setId(id); appletOrderItem.setCreateTime(order.getCreateTime()); appletOrderItem.setType(order.getType()); appletOrderItem.setStatus(1); @@ -371,11 +478,35 @@ public class ApiAppletOrderController extends BaseController { appletOrderItemService.insertAppletOrderItem(appletOrderItem); + appletOrder.setStatus(1); + appletOrderService.updateAppletOrder(appletOrder); + + + + H5OrderVO h5OrderVO = h5OrderService.orderDetail(appletOrder.getOrderId()); + //根据服务频率 服务日期 生成日订单 + for (OmsOrderService service : h5OrderVO.getOrderServiceList()) { + AppletOrderItemDate appletOrderItemDate = new AppletOrderItemDate(); + + appletOrderItemDate.setUserId(appletOrder.getUserId()); + appletOrderItemDate.setOrderId(id); + appletOrderItemDate.setStatus(0); + appletOrderItemDate.setOrderServiceId(service.getId()); + appletOrderItemDate.setServiceDate(service.getServiceDate()); + appletOrderItemDate.setCityAddress(h5OrderVO.getReceiverProvince() + h5OrderVO.getReceiverCity() + h5OrderVO.getReceiverDistrict()); + appletOrderItemDate.setAddress(h5OrderVO.getReceiverDetailAddress()); + appletOrderItemDateService.insertAppletOrderItemDate(appletOrderItemDate); + + } + + + + + + - appletOrder.setStatus(1); - appletOrderService.updateAppletOrder(appletOrder); return AjaxResult.success("接单成功",appletOrder); } @@ -385,8 +516,8 @@ public class ApiAppletOrderController extends BaseController { @ApiOperation("小程序-我的订单流程-总订单") @GetMapping("/myList") public AjaxResult myList(AppletOrderItem orderItem){ - if(orderItem.getType()==null){ - return AjaxResult.error("type状态不能为空"); + if(orderItem.getOrderStatus()==null){ + return AjaxResult.error("orderStatus状态不能为空"); } if(orderItem.getUserId() == null){ return AjaxResult.error("userId用户信息标识不能为空"); @@ -431,6 +562,9 @@ public class ApiAppletOrderController extends BaseController { } } + + + h5OrderVO.setPetVOList(petVOList); item.setH5OrderVO(h5OrderVO); } @@ -441,6 +575,106 @@ public class ApiAppletOrderController extends BaseController { + //我的订单流程 + @ApiOperation("小程序-我的订单流程-日订单") + @GetMapping("/myDateList") + public AjaxResult myDateList(AppletOrderDateVo dateVo){ + if(dateVo.getUserId() == null){ + return AjaxResult.error("userId用户标识不能为空"); + } + if(dateVo.getStatus() == null){ + return AjaxResult.error("status当前状态不能为空"); + } + + //查询我所有的日订单数据 + AppletOrderItemDate date = new AppletOrderItemDate(); + date.setUserId(dateVo.getUserId()); + date.setStatus(dateVo.getStatus()); + List addressList = appletOrderItemDateService.selectAppletOrderItemDateList(date); + + Set uniqueDates = new HashSet<>(); + List dateVoReturnList = new ArrayList<>(); + + for (AppletOrderItemDate date1 : addressList) { + if (uniqueDates.add(date1.getServiceDate())) { + AppletOrderDateVoReturn dateVoReturn = new AppletOrderDateVoReturn(); + dateVoReturn.setServiceDate(date1.getServiceDate()); + dateVoReturnList.add(dateVoReturn); + } + } + + + + + //得到日订单集合 + for (AppletOrderDateVoReturn dateVoReturn : dateVoReturnList) { + //得到日订单日期 + String serviceDate = dateVoReturn.getServiceDate(); + + //订单下订单集合 + AppletOrderItemDate service = new AppletOrderItemDate(); + service.setServiceDate(serviceDate); + + List serviceList = appletOrderItemDateService.selectAppletOrderItemDateList(service); + List uniqueOrderDetails = serviceList.stream() + .collect(Collectors.toMap( + AppletOrderItemDate::getOrderId, // 使用orderId作为键 + item -> new AppletOrderDateAddressReturn(item.getOrderId(), item.getCityAddress(), item.getAddress()), // 创建OrderDetails对象作为值 + (existing, replacement) -> existing // 如果有重复的orderId，保留现有的（可以根据需要修改合并逻辑） + )) + .values() + .stream() + .collect(Collectors.toList()); + // 假设dateVoReturn有一个setOrderList方法 + + dateVoReturn.setOrderList(uniqueOrderDetails); + dateVoReturn.setNum(uniqueOrderDetails.size()); + + for (AppletOrderDateAddressReturn uniqueOrderDetail : uniqueOrderDetails) { + AppletOrderItemDate appletOrderItemDate = new AppletOrderItemDate(); + appletOrderItemDate.setOrderId(uniqueOrderDetail.getOrderId()); + appletOrderItemDate.setServiceDate(serviceDate); + + + List appletOrderItemDates = appletOrderItemDateService.selectAppletOrderItemDateList(appletOrderItemDate); + for (AppletOrderItemDate appletOrderItemDate1 : appletOrderItemDates) { + // 组装item + QueryWrapper orderItemQw = new QueryWrapper<>(); + orderItemQw.eq("order_service_id", appletOrderItemDate1.getOrderServiceId()); + List orderItemList = orderItemMapper.selectList(orderItemQw); + appletOrderItemDate1.setOrderItemList(orderItemList); + + + OmsOrderService omsOrderService = omsOrderServiceMapper.selectById(appletOrderItemDate1.getOrderServiceId()); + omsOrderService.setPetVo(h5PetService.selectPetById(omsOrderService.getPetId())); + appletOrderItemDate1.setOrderServiceList(omsOrderService); + } + + uniqueOrderDetail.setAppletOrderItemDate(appletOrderItemDates); + + + + } + + + } + + + + + + + + return AjaxResult.success("日订单数据",dateVoReturnList); + } + + + + + + + + //我的订单流程 @ApiOperation("小程序-我的订单流程订单详情") @@ -489,24 +723,45 @@ public class ApiAppletOrderController extends BaseController { H5OrderVO h5OrderVO = h5OrderService.orderDetail(orderId); // 得到服务信息 List service = h5OrderVO.getOrderServiceList(); - List petVOList = new ArrayList<>(); - Set addedPetIds = new HashSet<>(); // 用于跟踪已经添加的 PetVO 的 id + // 使用一个 Set 来跟踪已经添加的 PetVO 的 id + Set addedPetIds = new HashSet<>(); + List petList = new ArrayList<>(); for (OmsOrderService service1 : service) { // 宠物标识不为空的时候查询数据 if (service1.getPetId() != null) { - PetVO petVO = h5PetService.selectPetById(service1.getPetId()); - + Pet pet = petMapper.selectById(service1.getPetId()); // 检查 petVO 的 id 是否已经添加过 - if (petVO != null && !addedPetIds.contains(petVO.getId())) { - service1.setPetVo(petVO); - petVOList.add(petVO); - addedPetIds.add(Long.valueOf(petVO.getId())); // 标记该 id 已添加 + if (pet != null && !addedPetIds.contains(pet.getId())) { + service1.setPets(pet); + petList.add(pet); + addedPetIds.add(pet.getId()); // 标记该 id 已添加 } } + } - return AjaxResult.success("订单里面的宠物档案里面数据",petVOList); +// List pets = new ArrayList<>(); +// for (OmsOrderService service1 : service) { +// // 宠物标识不为空的时候查询数据 +// if (service1.getPetId() != null) { +// PetVO petVO = h5PetService.selectPetById(service1.getPetId()); +// // 检查 petVO 的 id 是否已经添加过 +// if (petVO != null && !addedPetIds.contains(petVO.getId())) { +// service1.setPetVo(petVO); +// pets.add(petVO); +// addedPetIds.add(petVO.getId()); // 标记该 id 已添加 +// } +// } +// +// } + + + + + + + return AjaxResult.success("订单里面的宠物档案里面数据",petList); } @@ -531,6 +786,13 @@ public class ApiAppletOrderController extends BaseController { + //根据宠物信息查询宠物档案信息 + @ApiOperation("根据宠物信息标识查询宠物档案信息列表带分页") + @GetMapping("/getPetCareByPetId/{petId}") + public AjaxResult petCareList(@PathVariable("petId") Integer petId) { + PetCare petCare1 = petCareService.selectPetCareByPetId(petId); + return AjaxResult.success("服务档案信息查询成功",petCare1); + } @@ -538,13 +800,14 @@ public class ApiAppletOrderController extends BaseController { -// //测试派单 -// @ApiOperation("派单") -// @GetMapping("/dispatch/{orderId}") -// public AjaxResult dispatch(@PathVariable("orderId")Long orderId){ -// mallOrderService.dispatch(orderId); -// return AjaxResult.success("派单成功"); -// } + + //测试派单 + @ApiOperation("派单") + @GetMapping("/dispatch/{orderId}") + public AjaxResult dispatch(@PathVariable("orderId")Long orderId){ + mallOrderService.dispatch(orderId); + return AjaxResult.success("派单成功"); + } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemLogController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemLogController.java new file mode 100644 index 0000000..6f617b8 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemLogController.java @@ -0,0 +1,80 @@ +package com.ruoyi.applet.contoller; + + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.model.domain.AppletOrder; +import com.ruoyi.model.domain.AppletOrderItem; +import com.ruoyi.model.domain.AppletOrderItemDateLog; +import com.ruoyi.model.domain.AppletPet; +import com.ruoyi.model.service.IAppletOrderItemDateLogService; +import com.ruoyi.model.service.IAppletOrderItemService; +import com.ruoyi.model.service.IAppletOrderService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(description = "订单模块 - 打卡记录") +@RestController +@RequestMapping("/applet/orderItemLog") +public class ApiAppletOrderItemLogController { + + @Autowired + private IAppletOrderItemDateLogService appletOrderItemDateLogService; + + @Autowired + private IAppletOrderService appletOrderService; + @Autowired + private IAppletOrderItemService appletOrderItemService; + + + + + + + + //增加或者修改打卡记录 + @ApiOperation("增加或者修改打卡记录") + @PostMapping("/addOrUpdate") + public AjaxResult addOrUpdate(@RequestBody AppletOrderItemDateLog appletOrderItemDateLog) + { + if(appletOrderItemDateLog.getId()!=null){ + int i = appletOrderItemDateLogService.updateAppletOrderItemDateLog(appletOrderItemDateLog); + + }else{ + int i = appletOrderItemDateLogService.insertAppletOrderItemDateLog(appletOrderItemDateLog); + + } + + if(appletOrderItemDateLog.getSubmitFlag()!= null){ + //根据订单标识查询订单信息 + AppletOrderItem orderItem = new AppletOrderItem(); + orderItem.setId(appletOrderItemDateLog.getItemOrderId()); + AppletOrderItem appletOrder = appletOrderItemService.selectAppletOrderItemById(appletOrderItemDateLog.getItemOrderId()); + appletOrder.setOrderStatus(appletOrderItemDateLog.getSubmitFlag()); + appletOrderItemService.updateAppletOrderItem(appletOrder); + } + return AjaxResult.success("打卡成功"); + } + + + //根据订单标识查询打卡记录 + @ApiOperation("根据订单标识查询打卡记录") + @GetMapping(value = "/getByOrderId/{itemDateId}") + public AjaxResult getInfo(@PathVariable("itemDateId") Long itemDateId) { + AppletOrderItemDateLog appletOrderItemDateLog = new AppletOrderItemDateLog(); + appletOrderItemDateLog.setItemOrderId(itemDateId); + AppletOrderItemDateLog appletOrderItemDateLog1 = appletOrderItemDateLogService.selectAppletOrderItemDateLogByItemDateId(itemDateId); + return AjaxResult.success(appletOrderItemDateLog1); + } + + + + + + + + + + +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/AppletOrderDateVo.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/AppletOrderDateVo.java new file mode 100644 index 0000000..69be7a2 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/dto/AppletOrderDateVo.java @@ -0,0 +1,14 @@ +package com.ruoyi.applet.pojo.dto; + + +import lombok.Data; + +@Data +public class AppletOrderDateVo { + + private Integer status; + +// private String date; + + private Long userId; +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletOrderDateAddressReturn.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletOrderDateAddressReturn.java new file mode 100644 index 0000000..c4c3057 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletOrderDateAddressReturn.java @@ -0,0 +1,50 @@ +package com.ruoyi.applet.pojo.vo; + +import com.ruoyi.model.domain.AppletOrderItemDate; +import lombok.Data; +import org.w3c.dom.stylesheets.LinkStyle; + +import java.util.List; + +@Data +public class AppletOrderDateAddressReturn { + + + private Long orderId; + private String cityAddress; + private String address; + + + private List appletOrderItemDate; + + + + public AppletOrderDateAddressReturn(Long orderId, String cityAddress, String address) { + this.orderId = orderId; + this.cityAddress = cityAddress; + this.address = address; + } + + // Getters and setters (optional, depending on your needs) + public Long getOrderId() { + return orderId; + } + + public String getCityAddress() { + return cityAddress; + } + + public String getAddress() { + return address; + } + + @Override + public String toString() { + return "AppletOrderDateAddressReturn{" + + "orderId=" + orderId + + ", cityAddress='" + cityAddress + '\'' + + ", address='" + address + '\'' + + '}'; + } + +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletOrderDateVoReturn.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletOrderDateVoReturn.java new file mode 100644 index 0000000..b2d92e9 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletOrderDateVoReturn.java @@ -0,0 +1,24 @@ +package com.ruoyi.applet.pojo.vo; + +import com.ruoyi.model.domain.AppletOrderItem; +import com.ruoyi.model.domain.AppletOrderItemDate; +import lombok.Data; + +import java.util.List; + +@Data +public class AppletOrderDateVoReturn { + + + + private String serviceDate; + + private Integer num; + + private List orderList; + +// private AppletOrderItem appletOrderItem; +// +// private List itemDateList; + +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java index 3e00e67..7e5ad3e 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java @@ -2,11 +2,15 @@ package com.ruoyi.applet.service.impl; import com.cyl.h5.pojo.vo.H5OrderVO; import com.cyl.h5.service.H5OrderService; +import com.cyl.manager.oms.domain.OmsOrderService; import com.ruoyi.applet.service.IMallOrderService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.model.domain.AppUsers; import com.ruoyi.model.domain.AppletOrder; +import com.ruoyi.model.domain.AppletOrderItem; +import com.ruoyi.model.domain.AppletOrderItemDate; import com.ruoyi.model.service.IAppUsersService; +import com.ruoyi.model.service.IAppletOrderItemDateService; import com.ruoyi.model.service.IAppletOrderService; import com.ruoyi.model.service.IAppletUsersTeacherService; import lombok.Data; @@ -34,6 +38,9 @@ public class IMallOrderServiceImpl implements IMallOrderService { @Autowired private IAppletOrderService appletOrderService; + @Autowired + private IAppletOrderItemDateService appletOrderItemDateService; + //点击派单：进入派单逻辑 @@ -76,6 +83,8 @@ public class IMallOrderServiceImpl implements IMallOrderService { acceptDispatchAll(h5OrderVO); AjaxResult.error();; } + long l = System.currentTimeMillis(); + appletOrder.setId(l); appletOrder.setPayTime(LocalDateTime.now()); appletOrder.setCreateTime(LocalDateTime.now()); appletOrder.setType("1"); //指定人接单 @@ -91,6 +100,22 @@ public class IMallOrderServiceImpl implements IMallOrderService { appletOrder.setOrderSn(h5OrderVO.getOrderSn()); appletOrder.setOrderId(h5OrderVO.getOrderId()); appletOrderService.insertAppletOrder(appletOrder); + + +// //根据服务频率 服务日期 生成日订单 +// for (OmsOrderService service : h5OrderVO.getOrderServiceList()) { +// AppletOrderItemDate appletOrderItemDate = new AppletOrderItemDate(); +// +// appletOrderItemDate.setOrderId(l); +// appletOrderItemDate.setStatus(0); +// appletOrderItemDate.setOrderServiceId(service.getId()); +// appletOrderItemDate.setServiceDate(service.getServiceDate()); +// appletOrderItemDate.setCityAddress(h5OrderVO.getReceiverProvince() + h5OrderVO.getReceiverCity() + h5OrderVO.getReceiverDistrict()); +// appletOrderItemDate.setAddress(h5OrderVO.getReceiverDetailAddress()); +// appletOrderItemDateService.insertAppletOrderItemDate(appletOrderItemDate); +// +// } + }else { //接单大厅接单 acceptDispatchAll(h5OrderVO); @@ -110,6 +135,8 @@ public class IMallOrderServiceImpl implements IMallOrderService { } AppletOrder appletOrder = new AppletOrder(); + long l = System.currentTimeMillis(); + appletOrder.setId(l); appletOrder.setPayTime(LocalDateTime.now()); appletOrder.setCreateTime(LocalDateTime.now()); appletOrder.setType("0"); //系统派单 @@ -137,6 +164,29 @@ public class IMallOrderServiceImpl implements IMallOrderService { appletOrder.setOrderSn(h5OrderVO.getOrderSn()); appletOrder.setOrderId(h5OrderVO.getOrderId()); appletOrderService.insertAppletOrder(appletOrder); + + + +// //根据服务频率 服务日期 生成日订单 +// for (OmsOrderService service : h5OrderVO.getOrderServiceList()) { +// AppletOrderItemDate appletOrderItemDate = new AppletOrderItemDate(); +// +// appletOrderItemDate.setOrderId(l); +// appletOrderItemDate.setStatus(0); +// appletOrderItemDate.setOrderServiceId(service.getId()); +// appletOrderItemDate.setServiceDate(service.getServiceDate()); +// appletOrderItemDate.setCityAddress(h5OrderVO.getReceiverProvince() + h5OrderVO.getReceiverCity() + h5OrderVO.getReceiverDistrict()); +// appletOrderItemDate.setAddress(h5OrderVO.getReceiverDetailAddress()); +// appletOrderItemDateService.insertAppletOrderItemDate(appletOrderItemDate); +// +// } + + + + + + + return AjaxResult.success(); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderController.java index 7f8f30d..d655b76 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderController.java @@ -103,7 +103,8 @@ public class AppletOrderController extends BaseController return AjaxResult.error("userIdJson不能为空"); } //指定用户派单 - Long appletUserId =Long.getLong(appletOrder.getUserIdJson()); +// Long appletUserId =Long.getLong(appletOrder.getUserIdJson()); + Long appletUserId = Long.valueOf(appletOrder.getUserIdJson()); AjaxResult ajaxResult = mallOrderService.acceptDispatch(appletUserId, h5OrderVO); return ajaxResult; }else{ diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItem.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItem.java index 3a6ff61..d6f9921 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItem.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItem.java @@ -131,5 +131,7 @@ public class AppletOrderItem { @Excel(name = "确认宠物信息") private Integer isPet; - + //给用户的返点 + @TableField(exist = false) + private BigDecimal orderGive; } \ No newline at end of file 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 index 385a246..458676e 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDate.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDate.java @@ -1,9 +1,15 @@ package com.ruoyi.model.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.cyl.manager.oms.domain.OmsOrderService; +import com.cyl.manager.oms.domain.OrderItem; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data public class AppletOrderItemDate { private static final long serialVersionUID = 1L; @@ -51,4 +57,18 @@ public class AppletOrderItemDate { @Excel(name = "服务地址详情") private String address; + /** 服务标识 */ + @Excel(name = "服务标识") + private Long orderServiceId; + + /** 用户标识 */ + @Excel(name = "用户标识") + private Long userId; + + @TableField(exist = false) + private List orderItemList; + + @TableField(exist = false) + private OmsOrderService orderServiceList; + } \ 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 index 0b400b7..d08cbbf 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDateLog.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderItemDateLog.java @@ -1,5 +1,6 @@ package com.ruoyi.model.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import lombok.Data; @@ -91,4 +92,7 @@ public class AppletOrderItemDateLog { @Excel(name = "订单标识") private Long orderId; + + @TableField(exist = false) + private Integer submitFlag; } 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 index 6af1c53..9893283 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateLogMapper.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemDateLogMapper.java @@ -16,6 +16,7 @@ public interface AppletOrderItemDateLogMapper { * @return 订单信息表 */ AppletOrderItemDateLog selectById(Long id); + AppletOrderItemDateLog selectAppletOrderItemDateLogByItemDateId(Long itemDateId); /** * 查询订单信息表列表 diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemMapper.java index d34b38f..9df4ec4 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemMapper.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.model.mapper; import com.ruoyi.model.domain.AppletOrderItem; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,6 +20,7 @@ public interface AppletOrderItemMapper * @return 订单信息 */ public AppletOrderItem selectAppletOrderItemById(Long id); + public AppletOrderItem selectAppletOrderItemByOrderIdUserId(@Param("orderId") Long orderId, @Param("userId")Long userId); public AppletOrderItem selectAppletOrderItemByOrderId(Long orderId); /** diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderMapper.java index 23115bb..7d0fdf8 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderMapper.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.model.mapper; import java.util.List; import com.ruoyi.model.domain.AppletOrder; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * 订单信息Mapper接口 @@ -18,7 +20,8 @@ public interface AppletOrderMapper * @return 订单信息 */ public AppletOrder selectAppletOrderById(Long id); - public AppletOrder selectAppletOrderByOrderId(Long orderId); + + public AppletOrder selectAppletOrderByOrderId(@Param("orderId") Long orderId); /** * 查询订单信息列表 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 index db06bd4..0d8c3d0 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateLogService.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemDateLogService.java @@ -16,6 +16,7 @@ public interface IAppletOrderItemDateLogService { * @return 订单信息表 */ AppletOrderItemDateLog selectAppletOrderItemDateLogById(Long id); + AppletOrderItemDateLog selectAppletOrderItemDateLogByItemDateId(Long itemDateId); /** * 查询订单信息表列表 diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemService.java index 9933ae3..a054b99 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemService.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemService.java @@ -20,7 +20,8 @@ public interface IAppletOrderItemService * @return 订单信息 */ public AppletOrderItem selectAppletOrderItemById(Long id); - public AppletOrderItem selectAppletOrderItemByOrderId(Long orderId); + public AppletOrderItem selectAppletOrderItemByOrderIdUserId(AppletOrderItem appletOrderItem); + public AppletOrderItem selectAppletOrderItemByOrderId(AppletOrderItem appletOrderItem); /** * 查询订单信息列表 @@ -62,4 +63,5 @@ public interface IAppletOrderItemService * @return 结果 */ public int deleteAppletOrderItemById(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 index 4bd9c1b..24b5f7a 100644 --- 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 @@ -28,6 +28,14 @@ public class AppletOrderItemDateLogServiceImpl implements IAppletOrderItemDateLo return appletOrderItemDateLogMapper.selectById(id); } + @Override + public AppletOrderItemDateLog selectAppletOrderItemDateLogByItemDateId(Long itemDateId) { + return appletOrderItemDateLogMapper.selectAppletOrderItemDateLogByItemDateId(itemDateId); + } + + + + /** * 查询订单信息表列表 * diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemServiceImpl.java index f2a6b40..dea3986 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemServiceImpl.java @@ -34,11 +34,14 @@ public class AppletOrderItemServiceImpl implements IAppletOrderItemService { return appletOrderItemMapper.selectAppletOrderItemById(id); } - + @Override + public AppletOrderItem selectAppletOrderItemByOrderIdUserId(AppletOrderItem appletOrderItem){ + return appletOrderItemMapper.selectAppletOrderItemByOrderIdUserId(appletOrderItem.getOrderId(),appletOrderItem.getUserId()); + } @Override - public AppletOrderItem selectAppletOrderItemByOrderId(Long orderId){ - return appletOrderItemMapper.selectAppletOrderItemByOrderId(orderId); + public AppletOrderItem selectAppletOrderItemByOrderId(AppletOrderItem appletOrderItem){ + return appletOrderItemMapper.selectAppletOrderItemByOrderId(appletOrderItem.getOrderId()); } /** diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateLogMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateLogMapper.xml index 43a58bc..1a7427a 100644 --- a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateLogMapper.xml +++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateLogMapper.xml @@ -59,6 +59,11 @@ where id = #{id} + + insert into applet_order_item_date_log diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateMapper.xml index 8a5df1a..b29fbcb 100644 --- a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateMapper.xml +++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemDateMapper.xml @@ -17,12 +17,15 @@ + + - 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 + select id, create_time, create_by, update_time, update_by, service_date, status, applet_order_id, order_id, order_sn, city_address, address, order_service_id from applet_order_item_date + @@ -56,6 +61,8 @@ order_sn, city_address, address, + order_service_id, + user_id, #{id}, @@ -70,6 +77,8 @@ #{orderSn}, #{cityAddress}, #{address}, + #{orderServiceId}, + #{userId}, @@ -87,6 +96,8 @@ order_sn = #{orderSn}, city_address = #{cityAddress}, address = #{address}, + order_service_id = #{orderServiceId}, + user_id = #{userId}, where id = #{id} diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemMapper.xml index 575bfcf..026f578 100644 --- a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemMapper.xml +++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderItemMapper.xml @@ -106,6 +106,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml index 4175312..1ecd640 100644 --- a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml +++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - type = #{type} and user_id_json like concat('%', #{userIdJson}, '%') + type = #{type} and status = 0 and user_id_json like concat('%', #{userIdJson}, '%') diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OmsOrderService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OmsOrderService.java index 948e482..e526244 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OmsOrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OmsOrderService.java @@ -65,5 +65,8 @@ public class OmsOrderService extends BaseAudit { /** 宠物信息 */ @TableField(exist = false) private PetVO petVo; + /** 宠物信息 */ + @TableField(exist = false) + private Pet pets; }