ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java
@@ -27,7 +27,9 @@ @TableId("id") private Integer id; @ApiModelProperty("师傅填写备注") @TableField("remark") private String remark; @ApiModelProperty("下单城市") @TableField("city") private String city; ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
@@ -34,6 +34,9 @@ @ApiModelProperty("下单城市") @TableField("city") private String city; @ApiModelProperty("师傅填写备注") @TableField("remark") private String remark; @TableField("province_code") private String provinceCode; @TableField("are_code") ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderSubmitRequest.java
@@ -16,6 +16,8 @@ @ApiModelProperty("订单id") private String orderId; @ApiModelProperty("备注") private String remark; @ApiModelProperty("现场照片") private List<String> photo; ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -22,10 +22,7 @@ import com.ruoyi.admin.utils.util.HttpRequester; import com.ruoyi.admin.utils.util.HttpRespons; import com.ruoyi.admin.utils.util.Md5_Sign; import com.ruoyi.admin.vo.InfoDto; import com.ruoyi.admin.vo.MoneyRecentQuery; import com.ruoyi.admin.vo.PayDto; import com.ruoyi.admin.vo.RencentBalance; import com.ruoyi.admin.vo.*; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.GlobalException; @@ -136,8 +133,16 @@ franchiseeLambdaQueryWrapper = StringUtils.isNotBlank(name) ? franchiseeLambdaQueryWrapper.like(Franchisee::getName, name) : franchiseeLambdaQueryWrapper; franchiseeLambdaQueryWrapper = StringUtils.isNotBlank(head) ? franchiseeLambdaQueryWrapper.like(Franchisee::getHead, head) : franchiseeLambdaQueryWrapper; franchiseeLambdaQueryWrapper = StringUtils.isNotBlank(phone) ? franchiseeLambdaQueryWrapper.like(Franchisee::getHeadPhone, phone) : franchiseeLambdaQueryWrapper; franchiseeLambdaQueryWrapper = StringUtils.isNotBlank(city) ? franchiseeLambdaQueryWrapper.like(Franchisee::getCity, city) : franchiseeLambdaQueryWrapper; List<Franchisee> list = franchiseeService.list(franchiseeLambdaQueryWrapper); if (org.springframework.util.StringUtils.hasLength(city)){ String[] cityCodes = city.split(","); franchiseeLambdaQueryWrapper.and(e->{ List<String> list = Arrays.asList(cityCodes); e.like(Franchisee::getCityCode,list.get(0)); for (int i = 1; i < list.size(); i++) { e.or().like(Franchisee::getCityCode,list.get(i)); } }); } List<Franchisee> list = franchiseeService.list(franchiseeLambdaQueryWrapper); List<Integer> collect = list.stream().map(Franchisee::getId).collect(Collectors.toList()); if (collect.isEmpty())collect.add(-1); for (Franchisee franchisee : list) { @@ -730,37 +735,54 @@ /** * 加盟商信息分页列表 * * @param pageNum 页码 * @param pageSize 每页显示条数 */ @RequiresPermissions("franchisee_list") @ApiOperation(value = "加盟商信息分页查询列表", tags = {"后台-加盟商管理"}) @GetMapping(value = "/page") @ApiImplicitParams({ @ApiImplicitParam(value = "加盟商名称", name = "name", dataType = "String"), @ApiImplicitParam(value = "管理员", name = "head", dataType = "String"), @ApiImplicitParam(value = "手机号码", name = "phone", dataType = "String"), @ApiImplicitParam(value = "管辖城市", name = "city", dataType = "String"), @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true), @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true) }) public R<IPage<Franchisee>> queryPageList(String name, String head, String phone, String city, @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { @PostMapping(value = "/page") public R<IPage<Franchisee>> queryPageList(@RequestBody FranchiseeListDTO dto) { LambdaQueryChainWrapper<Franchisee> wrapper = franchiseeService.lambdaQuery(); wrapper = StringUtils.isNotBlank(name) ? wrapper.like(Franchisee::getName, name) : wrapper; wrapper = StringUtils.isNotBlank(head) ? wrapper.like(Franchisee::getHead, head) : wrapper; wrapper = StringUtils.isNotBlank(phone) ? wrapper.like(Franchisee::getHeadPhone, phone) : wrapper; wrapper = StringUtils.isNotBlank(city) ? wrapper.like(Franchisee::getCity, city) : wrapper; Page<Franchisee> page = wrapper.eq(Franchisee::getIsDelete, 0) .orderByDesc(Franchisee::getCreateTime).page(Page.of(pageNum, pageSize)); for (Franchisee record : page.getRecords()) { if (record.getSiteIds()!=null){ String[] split = record.getSiteIds().split(","); List<Site> list = siteService.lambdaQuery().in(Site::getId, split).list(); //用 , 拼接 record.setSiteStr(list.stream().map(Site::getSiteName).collect(Collectors.joining(","))); wrapper = StringUtils.isNotBlank(dto.getName()) ? wrapper.like(Franchisee::getName, dto.getName()) : wrapper; wrapper = StringUtils.isNotBlank(dto.getHead()) ? wrapper.like(Franchisee::getHead, dto.getHead()) : wrapper; wrapper = StringUtils.isNotBlank(dto.getPhone()) ? wrapper.like(Franchisee::getHeadPhone, dto.getPhone()) : wrapper; if (org.springframework.util.StringUtils.hasLength(dto.getCity())){ String[] cityCodes = dto.getCity().split(","); wrapper.and(e->{ List<String> list = Arrays.asList(cityCodes); e.like(Franchisee::getCityCode,list.get(0)); for (int i = 1; i < list.size(); i++) { e.or().like(Franchisee::getCityCode,list.get(i)); } }); } // if (StringUtils.isNotBlank(dto.getCity())) { // String[] cityCodes = Arrays.stream(dto.getCity().split(",")) // .map(String::trim) // .filter(StringUtils::isNotBlank) // .distinct() // .toArray(String[]::new); // // if (cityCodes.length > 0) { // wrapper.and(andWrapper -> { // Arrays.stream(cityCodes).forEach(code -> // andWrapper.or() // .apply("CONCAT(',', city_code, ',') LIKE CONCAT('%,', {0}, ',%')", code) // ); // }); // } // } wrapper.eq(Franchisee::getIsDelete, 0).orderByDesc(Franchisee::getCreateTime); Page<Franchisee> page = wrapper.page(Page.of(dto.getPageNum(), dto.getPageSize())); for (Franchisee record : page.getRecords()) { if (record.getSiteIds()!=null){ String[] split = record.getSiteIds().split(","); List<Site> list = siteService.lambdaQuery().in(Site::getId, split).list(); //用 , 拼接 record.setSiteStr(list.stream().map(Site::getSiteName).collect(Collectors.joining(","))); } } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -382,7 +382,7 @@ Order orderData = orderClient.detail(order.getOrderId()).getData(); if(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId())){ if(order.getTime()!=null&& order.getServerId()!=null&&(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId()))){ // 修改sys_change_dispatch 为已改派 dispatchClient.changeReason(order.getOrderId(),""); } @@ -612,31 +612,20 @@ */ @RequiresPermissions("order_count") @ApiOperation(value = "订单统计", tags = {"后台-订单管理"}) @GetMapping(value = "/orderCount") @ApiImplicitParams({ @ApiImplicitParam(value = "师傅姓名", name = "name", dataType = "String"), @ApiImplicitParam(value = "师傅电话", name = "phone", dataType = "String"), @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true), @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true) }) public R<Page<OrderCountVO>> orderCount(String name, String phone, @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { @PostMapping(value = "/orderCount") public R<Page<OrderCountVO>> orderCount(@RequestBody OrderCountDataRequest orderCountDataRequest) { LoginUser loginUser = tokenService.getLoginUser(); if (null == loginUser) { return R.loginExpire("登录失效！"); } List<String> cityList = new ArrayList<>(); if (loginUser.getIsFranchisee()) { cityList = loginUser.getCityList(); if (orderCountDataRequest.getCityList().isEmpty()) { List<String> cityList = new ArrayList<>(); if (loginUser.getIsFranchisee()) { cityList = loginUser.getCityList(); orderCountDataRequest.setCityList(cityList); } } // 查询参数 OrderCountDataRequest orderCountDataRequest = new OrderCountDataRequest(); orderCountDataRequest.setWorkerName(name); orderCountDataRequest.setWorkerPhone(phone); orderCountDataRequest.setCityList(cityList); orderCountDataRequest.setPageNum(pageNum); orderCountDataRequest.setPageSize(pageSize); Integer franchiseeId = loginUser.getSysUser().getFranchiseeId(); ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
@@ -217,6 +217,7 @@ orderInfo.setOrderNumber(order.getOrderNumber()); orderInfo.setPlaceOrderTime(order.getCreateTime()); orderInfo.setState(order.getState()); orderInfo.setRemark(order.getRemark()); orderInfo.setCompleteTime(order.getCompleteTime()); orderInfo.setReservationRemark(order.getReservationRemark()); } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/FranchiseeListDTO.java
New file @@ -0,0 +1,17 @@ package com.ruoyi.admin.vo; import com.ruoyi.admin.entity.Franchisee; import com.ruoyi.admin.entity.Region; import com.ruoyi.admin.entity.Site; import io.swagger.annotations.ApiModel; import lombok.Data; import java.util.List; @Data public class FranchiseeListDTO extends PageDto{ private String name ; private String head ; private String phone ; private String city ; } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderInfoVO.java
@@ -29,5 +29,7 @@ private Integer state; @ApiModelProperty("预约备注") private String reservationRemark; @ApiModelProperty("备注") private String remark; } ruoyi-service/ruoyi-admin/src/main/resources/template/订单记录.xlsxBinary files differ
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -755,6 +755,7 @@ order.setCompleteTime(new Date()); order.setState(Constants.THREE); order.setFake(orderSubmitRequest.getFake()); order.setRemark(orderSubmitRequest.getRemark()); boolean update = orderService.updateById(order); // 服务记录 ServeRecord serveRecord = new ServeRecord(); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
@@ -34,7 +34,9 @@ @ApiModelProperty("下单城市") @TableField("city") private String city; @ApiModelProperty("师傅填写备注") @TableField("remark") private String remark; @TableField("province_code") private String provinceCode;
@@ -16,7 +16,8 @@ @ApiModelProperty("订单id") private String orderId; @ApiModelProperty("师傅填写备注") private String remark; @ApiModelProperty("现场照片") private List<String> photo; @ApiModelProperty("是否虚假订单") ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
@@ -23,6 +23,7 @@ @ApiModelProperty("评价信息") private Evaluate evaluateInfo; public OrderDetailVO() { }
