diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerPlaceController.java b/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerPlaceController.java index 05e8a12c..dd8b1304 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerPlaceController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerPlaceController.java @@ -125,15 +125,19 @@ public class CustomerPlaceController extends BaseController // 验证码校验正确 if(CacheUtils.get(customerPlace.getPhone()).toString().equals(customerPlace.getCode())){ int result = customerPlaceService.insertCustomerPlace(customerPlace); - Customer params = new Customer(); - params.setCustomerId(customerPlace.getCustomerId()); - params.setPlaceStatus(PlaceStatus.PLACE_APPLYING.getCode()); - int updateStatusResult = customerService.updateCustomer(params); + + int updateStatusResult = 1; + if (customerPlace.getType().equals("distribution")) { + Customer params = new Customer(); + params.setCustomerId(customerPlace.getCustomerId()); + params.setPlaceStatus(PlaceStatus.PLACE_APPLYING.getCode()); + updateStatusResult = customerService.updateCustomer(params); + } if(result > 0 && updateStatusResult > 0){ CacheUtils.remove(customerPlace.getPhone()); - return AjaxResult.success("分销申请成功!"); + return AjaxResult.success("申请成功!"); }else { - return AjaxResult.error("分销申请失败!"); + return AjaxResult.error("申请失败!"); } }else { return AjaxResult.error("验证码错误!"); 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 e53bf39a..aa1f9c05 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 @@ -229,6 +229,11 @@ public class OrderMasterController extends BaseController { return voDataTable(orderListResponses, list); } + @PostMapping("/app/count") + @ResponseBody + public AjaxResult countAppList(@RequestBody OrderMaster orderMaster) { + return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster)); + } @PostMapping("/after/list") @ResponseBody @@ -374,6 +379,45 @@ public class OrderMasterController extends BaseController { return voDataTable(orderListResponses, list); } + @PostMapping("/after/count") + @ResponseBody + public AjaxResult countAfterList(@RequestBody OrderMaster orderMaster) { + // 查所有售后的单 + AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); + afterServiceRecord.setExcludeAfterServiceFinished(Boolean.TRUE); + List afterServiceRecordList = afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); + // 踢重后的子单ids + List detailIds = afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList()); + StringBuilder orderDetailIds = new StringBuilder(); + OrderDetail orderDetail = new OrderDetail(); + orderDetail.setCustomerId(orderMaster.getCustomerId()); + orderDetail.setDeptId(orderMaster.getDeptId()); + detailIds.forEach(id->{ + orderDetailIds.append(id).append(","); + }); + String ids = orderDetailIds.toString(); + if(StringUtils.isNotEmpty(ids)){ + orderDetail.setOrderDetailIds(ids.substring(0, ids.length()-1)); + }else { + orderDetail.setOrderDetailIds("0"); + } + // 所有售后的子单 + List orderDetailList = orderDetailService.selectOrderDetailList(orderDetail); + StringBuilder orderMasterIds = new StringBuilder(); + orderDetailList.stream().map(OrderDetail::getOrderMasterId).distinct() + .collect(Collectors.toList()).forEach(id->{ + orderMasterIds.append(id).append(","); + }); + String orderIds = orderMasterIds.toString(); + if(StringUtils.isNotEmpty(orderIds)){ + orderMaster.setOrderMasterIds(orderIds.substring(0, orderIds.length()-1)); + }else { + orderMaster.setOrderMasterIds("0"); + } + + return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster)); + } + @PostMapping("/app/detail") @ResponseBody public AjaxResult appDetail(@RequestBody OrderMaster request) { diff --git a/ghy-custom/src/main/java/com/ghy/customer/domain/CustomerPlace.java b/ghy-custom/src/main/java/com/ghy/customer/domain/CustomerPlace.java index 15a438c3..2dc0cd80 100644 --- a/ghy-custom/src/main/java/com/ghy/customer/domain/CustomerPlace.java +++ b/ghy-custom/src/main/java/com/ghy/customer/domain/CustomerPlace.java @@ -38,6 +38,10 @@ public class CustomerPlace extends BaseEntity public Integer status; + private String type; + + private String subType; + public void setId(String id) { this.id = id; @@ -100,6 +104,22 @@ public class CustomerPlace extends BaseEntity this.status = status; } + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getSubType() { + return subType; + } + + public void setSubType(String subType) { + this.subType = subType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -113,6 +133,8 @@ public class CustomerPlace extends BaseEntity .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) + .append("type", getType()) + .append("subType", getSubType()) .toString(); } -} \ No newline at end of file +} diff --git a/ghy-custom/src/main/resources/mapper/customer/CustomerPlaceMapper.xml b/ghy-custom/src/main/resources/mapper/customer/CustomerPlaceMapper.xml index 163ba922..75bf25f7 100644 --- a/ghy-custom/src/main/resources/mapper/customer/CustomerPlaceMapper.xml +++ b/ghy-custom/src/main/resources/mapper/customer/CustomerPlaceMapper.xml @@ -29,7 +29,9 @@ and customer_id = #{customerId} and phone = #{phone} and city = #{city} + and type = #{type} + order by create_time desc