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 7f99115b..efe645c3 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,10 +4,13 @@ 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.page.PageDomain; import com.ghy.common.core.page.TableDataInfo; +import com.ghy.common.core.page.TableSupport; import com.ghy.common.enums.BusinessType; import com.ghy.common.utils.ExceptionUtil; import com.ghy.common.utils.ObjectUtils; +import com.ghy.common.utils.StringUtils; import com.ghy.common.utils.poi.ExcelUtil; import com.ghy.customer.domain.Customer; import com.ghy.customer.domain.CustomerAddress; @@ -27,16 +30,14 @@ import com.ghy.payment.domain.FinancialDetail; import com.ghy.payment.domain.FinancialMaster; import com.ghy.payment.service.FinancialDetailService; import com.ghy.payment.service.FinancialMasterService; -import com.ghy.web.pojo.vo.OrderDetailsResponseVo; -import com.ghy.web.pojo.vo.OrderListResponse; -import com.ghy.web.pojo.vo.OrderStandard; -import com.ghy.web.pojo.vo.OrderStandardDetail; +import com.ghy.web.pojo.vo.*; import com.ghy.worker.domain.Worker; import com.ghy.worker.service.WorkerService; import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.util.CollectionUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -93,6 +94,7 @@ public class OrderMasterController extends BaseController { @PostMapping("/app/list") @ResponseBody public TableDataInfo appList(@RequestBody OrderMaster orderMaster) { + TableDataInfo rspData = new TableDataInfo(); startPage(); List orderListResponses = new ArrayList<>(); List list = orderMasterService.selectOrderMasterList(orderMaster); @@ -153,7 +155,23 @@ public class OrderMasterController extends BaseController { orderListResponses.add(orderListResponse); }); - return voDataTable(orderListResponses, list); + + PageDomain pageDomain = TableSupport.buildPageRequest(); + if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) + { + rspData.setRows(orderListResponses); + rspData.setTotal(orderListResponses.size()); + return rspData; + } + Integer pageNum = (pageDomain.getPageNum() - 1) * 10; + Integer pageSize = pageDomain.getPageNum() * 10; + if (pageSize > orderListResponses.size()) + { + pageSize = orderListResponses.size(); + } + rspData.setRows(orderListResponses.subList(pageNum, pageSize)); + rspData.setTotal(orderListResponses.size()); + return rspData; } @PostMapping("/app/detail") @@ -265,102 +283,42 @@ public class OrderMasterController extends BaseController { @PostMapping("/list") @ResponseBody public TableDataInfo list(OrderMaster orderMaster) { + TableDataInfo rspData = new TableDataInfo(); startPage(); + List orderMasterResponseVos = new ArrayList<>(); List orderMasterList = orderMasterService.selectOrderMasterList(orderMaster); - // 数据处理。待返回的数据信息。 - List orderDetailsResponseVoList = new ArrayList<>(); - // 存在数据在进行数据查询处理。 - if (orderMasterList != null && orderMasterList.size() > 0) { - // 第一次循环 进行拿到对应用户数据集合信息与实体集合数据信息， - // 消费者相关集合 - List customIdList = new ArrayList<>(); - // 师傅相关集合 - List workerIdList = new ArrayList<>(); - // 订单编号数据信息。 - List orderIdList = new ArrayList<>(); - for (OrderMaster orderMasterByListData : orderMasterList) { - // 订单Id - if (ObjectUtils.isNotNull(orderMasterByListData.getId())) { - orderIdList.add(orderMasterByListData.getId()); - } - // 消费者id - if (ObjectUtils.isNotNull(orderMasterByListData.getCustomerId())) { - customIdList.add(orderMasterByListData.getCustomerId()); - } - // 师傅id - if (ObjectUtils.isNotNull(orderMasterByListData.getWorkerId())) { - workerIdList.add(orderMasterByListData.getWorkerId()); - } - } - // 消费者 - Map longCustomerMap = customerService.byCustomerUseridInMap(customIdList); - // 师傅 - Map longWorkerMap = workerService.byWorkUserIdInMap(workerIdList); - // 订单数据 - Map> longOrderDetailMap = orderDetailService.byOrderIdInMap(orderIdList); - Map> longOrderGoodsMap = orderGoodsService.byOrderIdInMap(orderIdList); - // 消费者的上级邀请人信息。 - List customByPlaceIdList = new ArrayList<>(); - // 循环数据赋值。 - for (OrderMaster orderMasterByListData : orderMasterList) { - OrderDetailsResponseVo orderDetailsResponseVo = new OrderDetailsResponseVo(); - // 订单基本信息。 - orderDetailsResponseVo.setOrderId(orderMasterByListData.getId()); - orderDetailsResponseVo.setCode(orderMasterByListData.getCode()); - // 基本信息。 - List orderGoodsList = longOrderGoodsMap.get(orderMasterByListData.getId()); - if (orderGoodsList != null && orderGoodsList.size() > 0) { - List orderDetailsList = new ArrayList<>(); - // 用于订单附表数据查询。 - List orderDetailsIdList = new ArrayList<>(); - for (OrderGoods orderGoods : orderGoodsList) { - orderDetailsIdList.add(orderGoods.getOrderId()); - } - // 财务数据信息。 - Map longFinancialDetailMap = financialDetailService.byOrderIdInMap(orderDetailsIdList); - for (OrderGoods orderGoods : orderGoodsList) { - OrderDetailsResponseVo.OrderDetails orderDetails = OrderDetailsResponseVo.OrderDetails.modelDataSupplement(orderGoods); - FinancialDetail financialDetail = longFinancialDetailMap.get(orderGoods.getOrderGoodsId()); - if (ObjectUtils.isNotNull(financialDetail)) { - orderDetails.setDiscountMoney(financialDetail.getDiscountMoney()); - orderDetails.setPayMoney(financialDetail.getPayMoney()); - orderDetails.setTotalMoney(financialDetail.getTotalMoney()); - } - orderDetailsList.add(orderDetails); - } - orderDetailsResponseVo.setDetailsList(orderDetailsList); - } - // 订单接单信息。 现在都取接单人。 - Worker workerByReceivingUser = longWorkerMap.get(orderMasterByListData.getWorkerId()); - Worker workerByOperationUser = longWorkerMap.get(orderMasterByListData.getWorkerId()); - orderDetailsResponseVo.setReceiving(OrderDetailsResponseVo.OrderReceiving.modelDataSupplement(workerByReceivingUser, workerByOperationUser)); - // 订单状态。 - orderDetailsResponseVo.setState(OrderDetailsResponseVo.OrderState.modelDataSupplement(orderMasterByListData)); - // 消费者相关。 - Customer customer = longCustomerMap.get(orderMasterByListData.getCustomerId()); - if (ObjectUtils.isNotNull(customer)) { - // 地址信息 这里默认取第一条数据既可以了 - List customerAddressList = customerAddressService.selectByCustomerId(customer.getCustomerId()); - if (customerAddressList != null && customerAddressList.size() > 0) { - orderDetailsResponseVo.setCustomDetails(OrderDetailsResponseVo.OrderCustomDetails.modelDataSupplement(customerAddressList.get(0))); - } - customByPlaceIdList.add(customer.getCustomerPlace()); - } - // 数据添加处理。 - orderDetailsResponseVoList.add(orderDetailsResponseVo); - } - // 第三次数据循环处理 用于邀请人相关补充， - Map longCustomerByPlaceMap = customerService.byCustomerUseridInMap(customByPlaceIdList); - for (OrderDetailsResponseVo vo : orderDetailsResponseVoList) { - if (ObjectUtils.isNotNull(vo.getCustomDetails())) { - Customer customer = longCustomerByPlaceMap.get(vo.getCustomDetails().getCustomerId()); - if (ObjectUtils.isNotNull(customer)) { - vo.setInvitee(OrderDetailsResponseVo.OrderInvitee.modelDataSupplement(customer)); - } - } + for (OrderMaster master : orderMasterList) { + OrderMasterResponseVo orderMasterResponseVo = new OrderMasterResponseVo(); + // 将公共属性复制过去 + BeanUtils.copyProperties(master, orderMasterResponseVo); + // 师傅信息 + if(StringUtils.isNotNull(master.getWorkerId())){ + Worker worker = workerService.selectById(master.getWorkerId()); + orderMasterResponseVo.setWorkerName(worker.getName()); } + // 消费者信息 + Customer customer = customerService.selectByCustomerId(master.getCustomerId()); + orderMasterResponseVo.setCustomerName(customer.getName()); + + orderMasterResponseVos.add(orderMasterResponseVo); } - return voDataTable(orderDetailsResponseVoList, orderMasterList); + // 存在数据在进行数据查询处理。 + PageDomain pageDomain = TableSupport.buildPageRequest(); + if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) + { + rspData.setRows(orderMasterResponseVos); + rspData.setTotal(orderMasterResponseVos.size()); + return rspData; + } + Integer pageNum = (pageDomain.getPageNum() - 1) * 10; + Integer pageSize = pageDomain.getPageNum() * 10; + if (pageSize > orderMasterResponseVos.size()) + { + pageSize = orderMasterResponseVos.size(); + } + rspData.setRows(orderMasterResponseVos.subList(pageNum, pageSize)); + rspData.setTotal(orderMasterResponseVos.size()); + return rspData; } @Log(title = "主订单管理", businessType = BusinessType.EXPORT) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java index f06227b2..dd24bbc5 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java @@ -7,6 +7,7 @@ import com.ghy.common.core.page.TableDataInfo; import com.ghy.common.enums.BusinessType; import com.ghy.common.enums.WorkerCertifyStatus; import com.ghy.common.enums.WorkerStatus; +import com.ghy.common.json.JSONObject; import com.ghy.common.utils.ExceptionUtil; import com.ghy.common.utils.poi.ExcelUtil; import com.ghy.system.domain.SysArea; @@ -185,4 +186,21 @@ public class WorkerCertificationController extends BaseController return AjaxResult.error(e.getMessage()); } } + + @PostMapping("/changeStatus") + @ResponseBody + public AjaxResult changeStatus(String ids,Integer status){ + try { + int result = workerCertificationService.changeStatus(ids, status); + if(result > 0){ + return AjaxResult.success("操作成功!"); + }else { + return AjaxResult.warn("操作失败!"); + } + }catch (Exception e){ + e.printStackTrace(); + logger.error(ExceptionUtil.getExceptionMessage(e)); + return AjaxResult.error("操作失败!"); + } + } } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderMasterResponseVo.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderMasterResponseVo.java new file mode 100644 index 00000000..54249453 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderMasterResponseVo.java @@ -0,0 +1,18 @@ +package com.ghy.web.pojo.vo; + +import com.ghy.order.domain.OrderMaster; +import lombok.Data; + +/** + * @author clunt + * 后台主单视图对象 + */ +@Data +public class OrderMasterResponseVo extends OrderMaster { + + private String workerName; + + private String customerName; + + +} diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index 74d91119..7a2853ab 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -1,12 +1,10 @@ - -
@@ -21,6 +19,12 @@
  • 订单号：
    • +
  • + 订单状态： +
  •  搜索 @@ -52,6 +56,8 @@ \ No newline at end of file diff --git a/ghy-generator/src/main/resources/vm/java/controller.java.vm b/ghy-generator/src/main/resources/vm/java/controller.java.vm index 3498ac1a..8b81384a 100644 --- a/ghy-generator/src/main/resources/vm/java/controller.java.vm +++ b/ghy-generator/src/main/resources/vm/java/controller.java.vm @@ -5,11 +5,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import com.ghy.common.annotation.Log; import com.ghy.common.enums.BusinessType; import ${packageName}.domain.${ClassName}; @@ -59,6 +55,19 @@ public class ${ClassName}Controller extends BaseController List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); return getDataTable(list); } + + /** + * App查询${functionName}列表 + */ + @PostMapping("/app/list") + @ResponseBody + public TableDataInfo appList(@RequestBody ${ClassName} ${className}) + { + startPage(); + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return getDataTable(list); + } + #elseif($table.tree) /** * 查询${functionName}树列表 diff --git a/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerCertificationMapper.java b/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerCertificationMapper.java index 411af766..b00bc237 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerCertificationMapper.java +++ b/ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerCertificationMapper.java @@ -2,6 +2,7 @@ package com.ghy.worker.mapper; import java.util.List; import com.ghy.worker.domain.WorkerCertification; +import org.apache.ibatis.annotations.Param; /** * 师傅实名审核Mapper接口 @@ -72,4 +73,12 @@ public interface WorkerCertificationMapper * @param workerId 师傅ID */ int deleteCertificationByWorkerId(Long workerId); + + /** + * @param ids 审核记录id + * @param status 审核后状态 + * @return 成功条数 + */ + int changeStatus(@Param("ids") String ids, @Param("status") Integer status); + } diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/IWorkerCertificationService.java b/ghy-worker/src/main/java/com/ghy/worker/service/IWorkerCertificationService.java index dbce6328..c265cde6 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/service/IWorkerCertificationService.java +++ b/ghy-worker/src/main/java/com/ghy/worker/service/IWorkerCertificationService.java @@ -2,6 +2,7 @@ package com.ghy.worker.service; import java.util.List; import com.ghy.worker.domain.WorkerCertification; +import org.apache.ibatis.annotations.Param; /** * 师傅实名审核Service接口 @@ -74,4 +75,12 @@ public interface IWorkerCertificationService * @return 结果 */ int deleteCertificationByWorkerId(Long workerId); + + /** + * @param ids 操作的审核记录 + * @param status 审核后的状态 + * @return 成功条数 + */ + int changeStatus(@Param("ids") String ids, @Param("status") Integer status); + } diff --git a/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerCertificationServiceImpl.java b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerCertificationServiceImpl.java index 12305424..55423cbd 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerCertificationServiceImpl.java +++ b/ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerCertificationServiceImpl.java @@ -105,4 +105,9 @@ public class WorkerCertificationServiceImpl implements IWorkerCertificationServi public int deleteCertificationByWorkerId(Long workerId) { return workerCertificationMapper.deleteCertificationByWorkerId(workerId); } + + @Override + public int changeStatus(String ids, Integer status) { + return workerCertificationMapper.changeStatus(ids, status); + } } diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml index 902796f5..fd4919c3 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml @@ -166,4 +166,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" DELETE FROM worker_certification WHERE worker_id = #{workerId} + + + UPDATE worker_certification set status = #{status} + WHERE worker_certification_id in ( #{ids} ) +