clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

需求开发

This commit is contained in:
kuang.yife 2024-03-18 18:17:49 +08:00
parent 0fcc7efb8e
commit 739976b1f9
8 changed files with 134 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -263,6 +263,9 @@ public class OrderController extends BaseController {
orderMaster.setGoodsBrand(request.getGoodsBrand());
orderMaster.setGoodsSpecification(request.getGoodsSpecification());
orderMaster.setConsultMode(request.getConsultMode());
if("01".equalsIgnoreCase(orderMaster.getConsultMode())){
orderMaster.setOrderMode("02");
}
// 存在登陆用户的情况下
if(getSysUser() != null){
orderMaster.setCreateBy(getSysUser().getUserId().toString());
@ -387,7 +390,7 @@ public class OrderController extends BaseController {
return AjaxResult.error("派单金额不能大于订单总金额");
}
boolean checkInTeam = workerService.checkInTeam(assignWorker.getWorkerId(), acceptWorker.getWorkerId());
Assert.isTrue(checkInTeam, "接单师傅不在本团队");
// Assert.isTrue(checkInTeam, "接单师傅不在本团队");
}
// 创建子订单
OrderDetail od = new OrderDetail();
@ -1388,13 +1391,21 @@ public class OrderController extends BaseController {
Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
// 填充商品三级类目
if(goods.getDeptGoodsCategoryId() != null){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory == null){
deptGoodsCategory = new DeptGoodsCategory();
deptGoodsCategory.setGoodsCategoryId(goods.getDeptGoodsCategoryId());
Long categoryId = null;
// 前端发单和后台派单
if(com.ghy.common.utils.StringUtils.isEmpty(orderMaster.getOrderMode())){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}else {
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}
if(deptGoodsCategory != null){
GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
if(categoryId != null){
GoodsCategory one = goodsCategoryService.selectById(categoryId);
if(one != null && one.getParentCategoryId() != null){
GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
if(two != null && two.getParentCategoryId() != null){
@ -1513,13 +1524,21 @@ public class OrderController extends BaseController {
Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
// 填充商品三级类目
if(goods.getDeptGoodsCategoryId() != null){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory == null){
deptGoodsCategory = new DeptGoodsCategory();
deptGoodsCategory.setGoodsCategoryId(goods.getDeptGoodsCategoryId());
Long categoryId = null;
// 前端发单和后台派单
if(com.ghy.common.utils.StringUtils.isEmpty(orderMaster.getOrderMode())){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}else {
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}
if(deptGoodsCategory != null){
GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
if(categoryId != null){
GoodsCategory one = goodsCategoryService.selectById(categoryId);
if(one != null && one.getParentCategoryId() != null){
GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
if(two != null && two.getParentCategoryId() != null){

66
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -205,13 +205,21 @@ public class OrderDetailController extends BaseController {
detail.setGoods(good);
// 填充商品三级类目
if(good.getDeptGoodsCategoryId() != null){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(good.getDeptGoodsCategoryId());
if(deptGoodsCategory == null){
deptGoodsCategory = new DeptGoodsCategory();
deptGoodsCategory.setGoodsCategoryId(good.getDeptGoodsCategoryId());
Long categoryId = null;
// 前端发单和后台派单
if(StringUtils.isEmpty(orderMaster.getOrderMode())){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(good.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}else {
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(good.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}
if(deptGoodsCategory != null){
GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
if(categoryId != null){
GoodsCategory one = goodsCategoryService.selectById(categoryId);
if(one != null && one.getParentCategoryId() != null){
GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
if(two != null && two.getParentCategoryId() != null){
@ -317,21 +325,34 @@ public class OrderDetailController extends BaseController {
// 商品信息
GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId());
Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
Goods goods = goodsService.selectById(orderMaster.getGoodsId());
if (goods != null) {
// 填充商品三级类目
if(goods.getDeptGoodsCategoryId() != null){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
Long categoryId = null;
// 前端发单和后台派单
if(StringUtils.isEmpty(orderMaster.getOrderMode())){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}else {
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}
if(categoryId != null){
GoodsCategory one = goodsCategoryService.selectById(categoryId);
if(one != null && one.getParentCategoryId() != null){
GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
if(two != null && two.getParentCategoryId() != null){
GoodsCategory three = goodsCategoryService.selectById(two.getParentCategoryId());
if(three != null){
orderListResponse.setTotalName(three.getGoodsCategoryName()
goods.setGoodsName(three.getGoodsCategoryName()
+ "-" + two.getGoodsCategoryName()
+ "-" + one.getGoodsCategoryName());
orderListResponse.setTotalName(goods.getGoodsName());
}
}
}
@ -543,16 +564,24 @@ public class OrderDetailController extends BaseController {
// 商品信息
GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId());
Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
Goods goods = goodsService.selectById(orderMaster.getGoodsId());
// 填充商品三级类目
if(goods.getDeptGoodsCategoryId() != null){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory == null){
deptGoodsCategory = new DeptGoodsCategory();
deptGoodsCategory.setGoodsCategoryId(goods.getDeptGoodsCategoryId());
Long categoryId = null;
// 前端发单和后台派单
if(StringUtils.isEmpty(orderMaster.getOrderMode())){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}else {
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}
if(deptGoodsCategory != null){
GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
if(categoryId != null){
GoodsCategory one = goodsCategoryService.selectById(categoryId);
if(one != null && one.getParentCategoryId() != null){
GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
if(two != null && two.getParentCategoryId() != null){
@ -655,6 +684,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setDrawCashTime(detail.getDrawCashTime());
orderListResponse.setDrawCashStatus(detail.getDrawCashStatus());
orderListResponse.setArrivalTime(detail.getArrivalTime());
orderListResponse.setConsultMode(orderMaster.getConsultMode());
orderListResponses.add(orderListResponse);
});
return voDataTable(orderListResponses, list);

58
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -639,13 +639,21 @@ public class OrderMasterController extends BaseController {
Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
// 填充商品三级类目
if(goods.getDeptGoodsCategoryId() != null){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory == null){
deptGoodsCategory = new DeptGoodsCategory();
deptGoodsCategory.setGoodsCategoryId(goods.getDeptGoodsCategoryId());
Long categoryId = null;
// 前端发单和后台派单
if(com.ghy.common.utils.StringUtils.isEmpty(master.getOrderMode())){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}else {
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}
if(deptGoodsCategory != null){
GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
if(categoryId != null){
GoodsCategory one = goodsCategoryService.selectById(categoryId);
if(one != null && one.getParentCategoryId() != null){
GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
if(two != null && two.getParentCategoryId() != null){
@ -1054,9 +1062,21 @@ public class OrderMasterController extends BaseController {
if (goods != null) {
// 填充商品三级类目
if(goods.getDeptGoodsCategoryId() != null){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
Long categoryId = null;
// 前端发单和后台派单
if(com.ghy.common.utils.StringUtils.isEmpty(orderMaster.getOrderMode())){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}else {
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}
if(categoryId != null){
GoodsCategory one = goodsCategoryService.selectById(categoryId);
if(one != null && one.getParentCategoryId() != null){
GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
if(two != null && two.getParentCategoryId() != null){
@ -1211,13 +1231,21 @@ public class OrderMasterController extends BaseController {
master.setGoods(good);
// 填充商品三级类目
if(good.getDeptGoodsCategoryId() != null){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(good.getDeptGoodsCategoryId());
if(deptGoodsCategory == null){
deptGoodsCategory = new DeptGoodsCategory();
deptGoodsCategory.setGoodsCategoryId(good.getDeptGoodsCategoryId());
Long categoryId = null;
// 前端发单和后台派单
if(com.ghy.common.utils.StringUtils.isEmpty(master.getOrderMode())){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(good.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}else {
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(good.getDeptGoodsCategoryId());
if(deptGoodsCategory != null){
categoryId = deptGoodsCategory.getGoodsCategoryId();
}
}
if(deptGoodsCategory != null){
GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
if(categoryId != null){
GoodsCategory one = goodsCategoryService.selectById(categoryId);
if(one != null && one.getParentCategoryId() != null){
GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
if(two != null && two.getParentCategoryId() != null){

2
ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
View File

@ -150,7 +150,7 @@ public class WorkerController extends BaseController {
startPage();
Worker worker = new Worker();
worker.setWorkerIds(CollectionUtils.isNotEmpty(resWorkerIds) ? resWorkerIds : null);
worker.setName(workerListRequest.getWorkerName());
worker.setKeyWords(workerListRequest.getWorkerName());
if(this.getSysUser().getDept().getParentId() != 101){
worker.setDeptId(this.getSysUser().getDept().getParentId());
}

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java
View File

@ -24,4 +24,6 @@ public class WorkerListRequest {
private Long exceptParentAreaId;
private boolean justShowCurWorkerArea;
private String keyWords;
}

4
ghy-admin/src/main/resources/templates/order/assignWholeOrder.html
View File

@ -89,8 +89,8 @@
</div>
</div>
<div class="flex-board input-content m-t">
<label class="form-control-label">人员名称：</label>
<input name="workerName" type="text" class="form-control normal-input m-r">
<label class="form-control-label">名称/手机号：</label>
<input name="keyWords" type="text" class="form-control normal-input m-r">
</div>
<div class="m-t">
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('workerForm')"><i

2
ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
View File

@ -91,4 +91,6 @@ public class Worker extends BaseEntity {
private List<Long> goodsCategoryIds;
private Long exceptParentAreaId;
private String keyWords;
}

4
ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
View File

@ -66,6 +66,10 @@
#{item}
</foreach>
</if>
<if test="keyWords != null and keyWords != ''">
AND (w.name LIKE '%${keyWords}%'
OR w.phone LIKE '%${keyWords}%')
</if>
<if test="name != null and name != ''">
AND w.name LIKE '%${name}%'
</if>