diff --git a/CatmDogd-Mall-Front-test/.env.development b/CatmDogd-Mall-Front-test/.env.development index 1223dcb..cf81341 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/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java index ad40c12..a8c72b3 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,8 +1,14 @@ package com.ruoyi.applet.contoller; +import com.cyl.h5.pojo.vo.H5OrderVO; import com.cyl.h5.service.H5OrderService; +import com.cyl.h5.service.H5PetService; +import com.cyl.manager.oms.domain.OmsOrderService; import com.cyl.manager.oms.service.OrderService; +import com.cyl.manager.ums.domain.Pet; +import com.cyl.manager.ums.pojo.vo.PetVO; +import com.google.gson.JsonObject; import com.ruoyi.applet.pojo.vo.PetDate; import com.ruoyi.applet.service.IMallOrderService; import com.ruoyi.common.core.controller.BaseController; @@ -16,6 +22,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.web.bind.annotation.*; +import springfox.documentation.spring.web.json.Json; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -50,6 +57,8 @@ public class ApiAppletOrderController extends BaseController { private OrderService service; @Autowired private AppletOrderItemServiceImpl appletOrderItemServiceImpl; + @Autowired + private H5PetService h5PetService; @ApiOperation("接单大厅列表-带分页") @@ -68,8 +77,20 @@ public class ApiAppletOrderController extends BaseController { if(appletOrder.getType().equals("0")){ list = appletOrderService.selectAppletOrderListLikeUserIdJson(appletOrder); for (AppletOrder order:list){ - order.setH5OrderVO(h5OrderService.orderDetail(order.getOrderId())); - order.setManagerOrderDetailVO(service.selectById(order.getOrderId())); + 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); } TableDataInfo dataTable = getDataTable(list); return AjaxResult.success(dataTable); @@ -77,8 +98,20 @@ public class ApiAppletOrderController extends BaseController { if (appletOrder.getType().equals("1")){ list = appletOrderService.selectAppletOrderList(appletOrder); for (AppletOrder order:list){ - order.setH5OrderVO(h5OrderService.orderDetail(order.getOrderId())); - order.setManagerOrderDetailVO(service.selectById(order.getOrderId())); + 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); } TableDataInfo dataTable = getDataTable(list); return AjaxResult.success(dataTable); @@ -89,8 +122,20 @@ public class ApiAppletOrderController extends BaseController { appletOrderItem.setUserId(appletOrder.getUserId()); itemList = appletOrderItemService.selectAppletOrderItemList(appletOrderItem); for (AppletOrderItem orderItem:itemList){ - orderItem.setH5OrderVO(h5OrderService.orderDetail(orderItem.getOrderId())); - orderItem.setManagerOrderDetailVO(service.selectById(orderItem.getOrderId())); + 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); } TableDataInfo dataTable = getDataTable(itemList); return AjaxResult.success(dataTable); @@ -275,9 +320,21 @@ public class ApiAppletOrderController extends BaseController { return AjaxResult.error("userId用户信息标识不能为空"); } List itemList = appletOrderItemService.selectAppletOrderItemList(orderItem); - for (AppletOrderItem orderItem1:itemList){ - orderItem1.setH5OrderVO(h5OrderService.orderDetail(orderItem.getOrderId())); - orderItem1.setManagerOrderDetailVO(service.selectById(orderItem.getOrderId())); + for (AppletOrderItem item:itemList){ + H5OrderVO h5OrderVO = h5OrderService.orderDetail(item.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); + item.setH5OrderVO(h5OrderVO); } TableDataInfo dataTable = getDataTable(itemList); return AjaxResult.success("我的订单数据列表",dataTable); diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/OrderPetH5Vo.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/OrderPetH5Vo.java new file mode 100644 index 0000000..4c1e698 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/OrderPetH5Vo.java @@ -0,0 +1,28 @@ +package com.ruoyi.applet.pojo.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.cyl.h5.pojo.vo.H5OrderVO; +import com.cyl.manager.oms.domain.OmsOrderService; +import com.cyl.manager.oms.domain.OrderItem; +import com.cyl.manager.ums.domain.Pet; +import com.cyl.manager.ums.pojo.vo.PetVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class OrderPetH5Vo { + + + + private PetVO pet; + + + @ApiModelProperty("订单Item") + private List orderItemList; + + @ApiModelProperty("订单service") + private List orderServiceList; + +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java index 99ed9e6..7c9600f 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.cyl.h5.pojo.vo.H5OrderVO; import com.cyl.manager.oms.pojo.vo.ManagerOrderDetailVO; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.applet.pojo.vo.OrderPetH5Vo; import lombok.Data; import com.ruoyi.common.annotation.Excel; @@ -98,4 +99,9 @@ public class AppletOrder { @TableField(exist = false) private BigDecimal orderGive; + + @TableField(exist = false) + private OrderPetH5Vo orderPetH5Vo; + + } \ No newline at end of file diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/H5OrderVO.java b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/H5OrderVO.java index d2d6f63..0063122 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/H5OrderVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/H5OrderVO.java @@ -1,7 +1,9 @@ package com.cyl.h5.pojo.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.cyl.manager.oms.domain.OmsOrderService; import com.cyl.manager.oms.domain.OrderItem; +import com.cyl.manager.ums.pojo.vo.PetVO; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -83,4 +85,8 @@ public class H5OrderVO { @ApiModelProperty("员工id") private Long staffId; + + @TableField(exist = false) + private List petVOList; + } 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 18cd7a3..948e482 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 @@ -1,6 +1,9 @@ package com.cyl.manager.oms.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.cyl.manager.ums.domain.Pet; +import com.cyl.manager.ums.pojo.vo.PetVO; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseAudit; @@ -56,4 +59,11 @@ public class OmsOrderService extends BaseAudit { @Excel(name = "专业喂养次数") private Integer feedCount; + + + + /** 宠物信息 */ + @TableField(exist = false) + private PetVO petVo; + }