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

@@ -10,9 +10,15 @@ import com.ghy.customer.domain.Customer;
 import com.ghy.customer.domain.CustomerAddress;
 import com.ghy.customer.service.CustomerAddressService;
 import com.ghy.customer.service.CustomerService;
-import com.ghy.goods.domain.*;
+import com.ghy.goods.domain.DeptGoodsCategory;
+import com.ghy.goods.domain.Goods;
+import com.ghy.goods.domain.GoodsImgs;
+import com.ghy.goods.domain.GoodsStandard;
 import com.ghy.goods.request.AppGoodsRequest;
-import com.ghy.goods.service.*;
+import com.ghy.goods.service.DeptGoodsCategoryService;
+import com.ghy.goods.service.GoodsImgsService;
+import com.ghy.goods.service.GoodsService;
+import com.ghy.goods.service.GoodsStandardService;
 import com.ghy.order.domain.*;
 import com.ghy.order.request.AppOrderAssignRequest;
 import com.ghy.order.request.AppOrderRequest;
@@ -105,9 +111,6 @@ public class OrderController extends BaseController {
     @Resource
     private GoodsImgsService goodsImgsService;
 
-    @Resource
-    private GoodsCategoryService goodsCategoryService;
-
 
     @GetMapping("/imgs")
     public String orderImgs(Long orderId, ModelMap mmap){
@@ -263,9 +266,6 @@ 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());
@@ -390,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();
@@ -1389,36 +1389,6 @@ public class OrderController extends BaseController {
             GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId());
 
             Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
-            // 填充商品三级类目
-            if(goods.getDeptGoodsCategoryId() != null){
-                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){
-                            GoodsCategory three = goodsCategoryService.selectById(two.getParentCategoryId());
-                            if(three != null){
-                                goods.setGoodsName(three.getGoodsCategoryName()
-                                        + "-" + two.getGoodsCategoryName()
-                                        + "-" + one.getGoodsCategoryName());
-                            }
-                        }
-                    }
-                }
-            }
 
             // 财务信息
             FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(master.getId());
@@ -1522,36 +1492,6 @@ public class OrderController extends BaseController {
             GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId());
 
             Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
-            // 填充商品三级类目
-            if(goods.getDeptGoodsCategoryId() != null){
-                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){
-                            GoodsCategory three = goodsCategoryService.selectById(two.getParentCategoryId());
-                            if(three != null){
-                                goods.setGoodsName(three.getGoodsCategoryName()
-                                        + "-" + two.getGoodsCategoryName()
-                                        + "-" + one.getGoodsCategoryName());
-                            }
-                        }
-                    }
-                }
-            }
 
             // 财务信息
             FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(detail.getId());

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

@@ -205,21 +205,13 @@ public class OrderDetailController extends BaseController {
                     detail.setGoods(good);
                     // 填充商品三级类目
                     if(good.getDeptGoodsCategoryId() != null){
-                        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();
-                            }
+                        DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(good.getDeptGoodsCategoryId());
+                        if(deptGoodsCategory == null){
+                            deptGoodsCategory = new DeptGoodsCategory();
+                            deptGoodsCategory.setGoodsCategoryId(good.getDeptGoodsCategoryId());
                         }
-                        if(categoryId != null){
-                            GoodsCategory one = goodsCategoryService.selectById(categoryId);
+                        if(deptGoodsCategory != null){
+                            GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
                             if(one != null && one.getParentCategoryId() != null){
                                 GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
                                 if(two != null && two.getParentCategoryId() != null){
@@ -325,34 +317,21 @@ public class OrderDetailController extends BaseController {
             // 商品信息
             GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId());
 
-            Goods goods = goodsService.selectById(orderMaster.getGoodsId());
+            Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
             if (goods != null) {
                 // 填充商品三级类目
                 if(goods.getDeptGoodsCategoryId() != null){
-                    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);
+                    DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
+                    if(deptGoodsCategory != null){
+                        GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
                         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){
-                                    goods.setGoodsName(three.getGoodsCategoryName()
+                                    orderListResponse.setTotalName(three.getGoodsCategoryName()
                                             + "-" + two.getGoodsCategoryName()
                                             + "-" + one.getGoodsCategoryName());
-                                    orderListResponse.setTotalName(goods.getGoodsName());
                                 }
                             }
                         }
@@ -564,37 +543,8 @@ public class OrderDetailController extends BaseController {
             // 商品信息
             GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId());
 
-            Goods goods = goodsService.selectById(orderMaster.getGoodsId());
-            // 填充商品三级类目
-            if(goods.getDeptGoodsCategoryId() != null){
-                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){
-                                goods.setGoodsName(three.getGoodsCategoryName()
-                                        + "-" + two.getGoodsCategoryName()
-                                        + "-" + one.getGoodsCategoryName());
-                            }
-                        }
-                    }
-                }
-            }
+            Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
+
             // 财务信息
             FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(detail.getId());
             BigDecimal detailPayMoney = financialDetail.getPayMoney();
@@ -684,7 +634,6 @@ 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);

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

@@ -639,21 +639,13 @@ public class OrderMasterController extends BaseController {
             Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
             // 填充商品三级类目
             if(goods.getDeptGoodsCategoryId() != null){
-                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();
-                    }
+                DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
+                if(deptGoodsCategory == null){
+                    deptGoodsCategory = new DeptGoodsCategory();
+                    deptGoodsCategory.setGoodsCategoryId(goods.getDeptGoodsCategoryId());
                 }
-                if(categoryId != null){
-                    GoodsCategory one = goodsCategoryService.selectById(categoryId);
+                if(deptGoodsCategory != null){
+                    GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
                     if(one != null && one.getParentCategoryId() != null){
                         GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
                         if(two != null && two.getParentCategoryId() != null){
@@ -1062,21 +1054,9 @@ public class OrderMasterController extends BaseController {
             if (goods != null) {
                 // 填充商品三级类目
                 if(goods.getDeptGoodsCategoryId() != null){
-                    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);
+                    DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
+                    if(deptGoodsCategory != null){
+                        GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
                         if(one != null && one.getParentCategoryId() != null){
                             GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
                             if(two != null && two.getParentCategoryId() != null){
@@ -1231,21 +1211,13 @@ public class OrderMasterController extends BaseController {
                 master.setGoods(good);
                 // 填充商品三级类目
                 if(good.getDeptGoodsCategoryId() != null){
-                    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();
-                        }
+                    DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(good.getDeptGoodsCategoryId());
+                    if(deptGoodsCategory == null){
+                        deptGoodsCategory = new DeptGoodsCategory();
+                        deptGoodsCategory.setGoodsCategoryId(good.getDeptGoodsCategoryId());
                     }
-                    if(categoryId != null){
-                        GoodsCategory one = goodsCategoryService.selectById(categoryId);
+                    if(deptGoodsCategory != null){
+                        GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
                         if(one != null && one.getParentCategoryId() != null){
                             GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId());
                             if(two != null && two.getParentCategoryId() != null){

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

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

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

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

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

@@ -89,8 +89,8 @@
                     </div>
                 </div>
                 <div class="flex-board input-content m-t">
-                    <label class="form-control-label">名称/手机号：</label>
-                    <input name="keyWords" type="text" class="form-control normal-input m-r">
+                    <label class="form-control-label">人员名称：</label>
+                    <input name="workerName" 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

ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java

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

ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml

@@ -66,10 +66,6 @@
                         #{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>