From 73f9cd14e6c8c5327d5bf627a28b4475c3c3ba02 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Sun, 1 Oct 2023 01:37:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=B8=8B=E5=8D=95=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E6=B5=81=E7=A8=8B=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=90=84?= =?UTF-8?q?=E7=B1=BB=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderController.java | 6 ++++- .../order/OrderMasterController.java | 22 ++++++++++++++++--- .../resources/templates/order/pc-master.html | 8 +++++++ .../mapper/order/OrderMasterMapper.xml | 11 +++++++++- 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 0bdb146a..30f8b522 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -151,7 +151,7 @@ public class OrderController extends BaseController { // 判断是否有客户 SysUser sysUser = getSysUser(); - Long deptId = sysUser.getDept().getParentId(); + Long deptId = sysUser.getDept().getDeptId(); String loginName = sysUser.getLoginName(); Customer customer = customerService.selectByAccount("sys_" + loginName); if (customer == null) { @@ -230,6 +230,10 @@ public class OrderController extends BaseController { orderMaster.setGoodsId(goods.getGoodsId()); orderMaster.setPayType(0); orderMaster.setOrderMode(request.getOrderMode()); + // 存在登陆用户的情况下 + if(getSysUser() != null){ + orderMaster.setCreateBy(getSysUser().getUserId().toString()); + } // 服务时间 String[] split = request.getServTime().split("-"); try { diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index d11eb5c9..584458ce 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -4,6 +4,7 @@ import com.ghy.common.annotation.Log; import com.ghy.common.constant.UserConstants; import com.ghy.common.core.controller.BaseController; import com.ghy.common.core.domain.AjaxResult; +import com.ghy.common.core.domain.entity.SysUser; import com.ghy.common.core.page.PageDomain; import com.ghy.common.core.page.TableDataInfo; import com.ghy.common.core.page.TableSupport; @@ -45,6 +46,7 @@ import com.ghy.worker.domain.WorkerCertification; import com.ghy.worker.service.IWorkerCertificationService; import com.ghy.worker.service.WorkerService; import com.huifu.adapay.core.exception.BaseAdaPayException; +import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -633,8 +635,13 @@ public class OrderMasterController extends BaseController { } startPage(); - if (this.getSysUser().getDept().getParentId() != 101) { - orderMaster.setDeptId(this.getSysUser().getDept().getParentId()); + // 非管理员 + if (this.getSysUser().getRoles().get(0).getRoleId() != 1) { + orderMaster.setDeptId(this.getSysUser().getDeptId()); + } + // PC师傅 + if (this.getSysUser().getRoles().get(0).getRoleId() == 101L) { + orderMaster.setCreateBy(this.getSysUser().getUserId().toString()); } List orderMasterList = orderMasterService.selectOrderMasterList(orderMaster); Set orderMasterIds = orderMasterList.stream().map(OrderMaster::getId).collect(Collectors.toSet()); @@ -674,9 +681,11 @@ public class OrderMasterController extends BaseController { // 地址信息 CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId()); if (customerAddress != null) { + SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId()); + String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress(); master.setAddressName(customerAddress.getName()); master.setAddressPhone(customerAddress.getPhone()); - master.setAddress(customerAddress.getAddress()); + master.setAddress(completeAddress); } } return getDataTable(orderMasterList); @@ -910,12 +919,19 @@ public class OrderMasterController extends BaseController { @GetMapping("/differentStatus/count") @ResponseBody public AjaxResult differentStatusOrderCount(OrderMaster orderMaster) { + SysUser user = this.getSysUser(); + if(user != null && user.getRoles().get(0).getRoleId() == 101L ){ + orderMaster.setCreateBy(this.getSysUser().getUserId().toString()); + } return AjaxResult.success(orderMasterService.differentStatusOrderCount(orderMaster)); } @GetMapping("/count") @ResponseBody public AjaxResult OrderMasterCount(OrderMaster orderMaster) { + if(this.getSysUser() != null && this.getSysUser().getRoles().get(0).getRoleId() == 101L){ + orderMaster.setCreateBy(this.getSysUser().getUserId().toString()); + } return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster)); } } diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html index 3154d5ed..27601ead 100644 --- a/ghy-admin/src/main/resources/templates/order/pc-master.html +++ b/ghy-admin/src/main/resources/templates/order/pc-master.html @@ -188,6 +188,7 @@