diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderGoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderGoodsController.java index dfb25b08..d4fe6fa2 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderGoodsController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderGoodsController.java @@ -44,6 +44,14 @@ public class OrderGoodsController extends BaseController { return prefix; } + @GetMapping(value = "/master") + public String orderMasterGoods(Long orderId, ModelMap mmap) { + OrderMaster orderMaster = orderMasterService.selectById(orderId); + mmap.put("orderId", orderId); + mmap.put("orderMaster", orderMaster); + return "order/masterGoods"; + } + // @RequiresPermissions("order:goods:list") @PostMapping("/list") @ResponseBody diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java index c9544b51..de0e917b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java @@ -10,6 +10,7 @@ import com.ghy.common.enums.WorkerStatus; import com.ghy.common.enums.WorkerType; import com.ghy.common.utils.CacheUtils; import com.ghy.common.utils.ExceptionUtil; +import com.ghy.common.utils.StringUtils; import com.ghy.goods.domain.Goods; import com.ghy.goods.domain.GoodsCategory; import com.ghy.goods.service.GoodsCategoryService; @@ -151,6 +152,9 @@ public class WorkerController extends BaseController { Worker worker = new Worker(); worker.setWorkerIds(CollectionUtils.isNotEmpty(resWorkerIds) ? resWorkerIds : null); worker.setKeyWords(workerListRequest.getWorkerName()); + if(StringUtils.isNotEmpty(workerListRequest.getWorkerPhone())){ + worker.setPhone(workerListRequest.getWorkerPhone()); + } if(this.getSysUser().getDept().getParentId() != 101){ worker.setDeptId(this.getSysUser().getDept().getParentId()); } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java index bc8d2785..8412c934 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java @@ -20,6 +20,8 @@ public class WorkerListRequest extends BaseEntity { private String workerName; + private String workerPhone; + private Long workerId; private Long exceptParentAreaId; diff --git a/ghy-admin/src/main/resources/templates/order/masterGoods.html b/ghy-admin/src/main/resources/templates/order/masterGoods.html new file mode 100644 index 00000000..c66c74cf --- /dev/null +++ b/ghy-admin/src/main/resources/templates/order/masterGoods.html @@ -0,0 +1,91 @@ + + + + + + + + + + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index f4a8d2bc..ce80a38c 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -831,7 +831,7 @@ } function detail(id) { - var url = "order/goods?orderId=" + id; + var url = "order/goods/master?orderId=" + id; $.modal.open("商品信息", url); } diff --git a/ghy-admin/src/main/resources/templates/order/orderWorker.html b/ghy-admin/src/main/resources/templates/order/orderWorker.html index 11c69802..20434329 100644 --- a/ghy-admin/src/main/resources/templates/order/orderWorker.html +++ b/ghy-admin/src/main/resources/templates/order/orderWorker.html @@ -92,6 +92,10 @@ +
+ + +
 搜索 @@ -215,7 +219,12 @@ checkbox: true }, { field: 'name', - title: '人员名称', + title: '昵称', + align: "left" + }, + { + field: 'realName', + title: '真实姓名', align: "left" }, { field: 'phone', diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index 262786f9..df98d9a9 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -102,6 +102,14 @@ - where w.worker_id in ( + SELECT + w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.wx_open_id, w.dept_id, w.status, w.worker_logo_url, + w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time, + w.remark, w.type, w.store_status, w.alipay_account, w.alipay_name,concat(wc.surname, wc.name) as realName, + sd.dept_name, sdc.banner_url + FROM worker w + LEFT JOIN sys_dept sd ON w.dept_id = sd.dept_id + LEFT JOIN sys_dept_config sdc ON w.dept_id = sdc.dept_id + LEFT JOIN worker_certification wc on w.worker_id = wc.worker_id + where w.worker_id in ( SELECT w.worker_id FROM worker w LEFT JOIN worker_area wa ON wa.worker_id = w.worker_id LEFT JOIN worker_goods_category wgc ON wgc.worker_id = w.worker_id