diff --git a/CatmDogd-Mall-Front-test/.env.development b/CatmDogd-Mall-Front-test/.env.development index a8ce92c..4950b78 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' -VUE_APP_BASE_API = 'http://localhost:8001' +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/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java index 2dd372c..1102977 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java @@ -1,8 +1,7 @@ package com.ruoyi.applet.contoller; import com.ruoyi.applet.pojo.dto.ApiQueryIIdDTO; -import com.ruoyi.applet.pojo.vo.AppletIcon; -import com.ruoyi.applet.utils.conf.AppletUtil; +import com.ruoyi.applet.pojo.vo.AppletIconVo; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; @@ -37,27 +36,27 @@ public class ApiAppletHhrWorkInController extends BaseController { @ApiOperation("已加入的工作台图标配置查询") @GetMapping("/indexConfig") public TableDataInfo getIndexConfig(){ - List list = new ArrayList<>(); - AppletIcon icon1 = new AppletIcon(); + List list = new ArrayList<>(); + AppletIconVo icon1 = new AppletIconVo(); icon1.setType(0); icon1.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/1.png"); icon1.setName("用户绑定"); icon1.setUrl("/otherPages/workbenchManage/bindUser/index"); - AppletIcon icon2 = new AppletIcon(); + AppletIconVo icon2 = new AppletIconVo(); icon2.setType(0); icon2.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/2.png"); icon2.setName("我的用户"); //icon2.setUrl("/otherPages/workbenchManage/myUser/"); icon2.setUrl("/otherPages/workbenchManage/myUser/index"); - AppletIcon icon3 = new AppletIcon(); + AppletIconVo icon3 = new AppletIconVo(); icon3.setType(0); icon3.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/3.png"); icon3.setName("我的等级"); icon3.setUrl("/otherPages/workbenchManage/myLevel/index"); - AppletIcon icon4 = new AppletIcon(); + AppletIconVo icon4 = new AppletIconVo(); icon4.setType(0); icon4.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/4.png"); icon4.setName("我的钱包"); @@ -69,31 +68,31 @@ public class ApiAppletHhrWorkInController extends BaseController { list.add(icon4); - AppletIcon icon5 = new AppletIcon(); + AppletIconVo icon5 = new AppletIconVo(); icon5.setType(1); icon5.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/5.png"); icon5.setName("服务信息"); icon5.setUrl("/otherPages/authentication/serve/index"); - AppletIcon icon6 = new AppletIcon(); + AppletIconVo icon6 = new AppletIconVo(); icon6.setType(1); icon6.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/6.png"); icon6.setName("服务记录"); icon6.setUrl("/otherPages/authentication/serve/record"); - AppletIcon icon7 = new AppletIcon(); + AppletIconVo icon7 = new AppletIconVo(); icon7.setType(1); icon7.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/7.png"); icon7.setName("平台手册"); icon7.setUrl(""); - AppletIcon icon8 = new AppletIcon(); + AppletIconVo icon8 = new AppletIconVo(); icon8.setType(1); icon8.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/8.png"); icon8.setName("我的评价"); icon8.setUrl("/otherPages/orderTakingManage/evaluate/index"); - AppletIcon icon9 = new AppletIcon(); + AppletIconVo icon9 = new AppletIconVo(); icon9.setType(1); icon9.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/9.png"); icon9.setName("接单地址"); 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 2fdcd10..536bdcc 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 @@ -483,7 +483,7 @@ public class ApiAppletOrderController extends BaseController { - H5OrderVO h5OrderVO = h5OrderService.orderDetail(appletOrder.getOrderId()); + H5OrderVO h5OrderVO = h5OrderService.orderDetail(order.getOrderId()); //根据服务频率 服务日期 生成日订单 for (OmsOrderService service : h5OrderVO.getOrderServiceList()) { AppletOrderItemDate appletOrderItemDate = new AppletOrderItemDate(); 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 index 6f617b8..45f43c7 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemLogController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemLogController.java @@ -2,11 +2,9 @@ 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.domain.*; import com.ruoyi.model.service.IAppletOrderItemDateLogService; +import com.ruoyi.model.service.IAppletOrderItemDateService; import com.ruoyi.model.service.IAppletOrderItemService; import com.ruoyi.model.service.IAppletOrderService; import io.swagger.annotations.Api; @@ -27,6 +25,8 @@ public class ApiAppletOrderItemLogController { @Autowired private IAppletOrderItemService appletOrderItemService; + @Autowired + private IAppletOrderItemDateService appletOrderItemDateService; @@ -38,6 +38,7 @@ public class ApiAppletOrderItemLogController { @PostMapping("/addOrUpdate") public AjaxResult addOrUpdate(@RequestBody AppletOrderItemDateLog appletOrderItemDateLog) { + // if(appletOrderItemDateLog.getId()!=null){ int i = appletOrderItemDateLogService.updateAppletOrderItemDateLog(appletOrderItemDateLog); @@ -47,12 +48,24 @@ public class ApiAppletOrderItemLogController { } 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); + + if(appletOrder !=null){ + appletOrder.setOrderStatus(appletOrderItemDateLog.getSubmitFlag()); + appletOrderItemService.updateAppletOrderItem(appletOrder); + } + + + + //修改日订单状态 + AppletOrderItemDate appletOrderItem = appletOrderItemDateService.selectAppletOrderItemDateById(appletOrderItemDateLog.getItemDateId()); + if(appletOrderItem !=null){ + appletOrderItem.setStatus(appletOrderItemDateLog.getSubmitFlag()); + appletOrderItemDateService.updateAppletOrderItemDate(appletOrderItem); + } + + } return AjaxResult.success("打卡成功"); } @@ -63,7 +76,7 @@ public class ApiAppletOrderItemLogController { @GetMapping(value = "/getByOrderId/{itemDateId}") public AjaxResult getInfo(@PathVariable("itemDateId") Long itemDateId) { AppletOrderItemDateLog appletOrderItemDateLog = new AppletOrderItemDateLog(); - appletOrderItemDateLog.setItemOrderId(itemDateId); + appletOrderItemDateLog.setItemDateId(itemDateId); AppletOrderItemDateLog appletOrderItemDateLog1 = appletOrderItemDateLogService.selectAppletOrderItemDateLogByItemDateId(itemDateId); return AjaxResult.success(appletOrderItemDateLog1); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletIcon.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletIconVo.java similarity index 93% rename from ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletIcon.java rename to ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletIconVo.java index 580ea57..4c83fb6 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletIcon.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/pojo/vo/AppletIconVo.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class AppletIcon { +public class AppletIconVo { @ApiModelProperty(value = "名称")