diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java index 3047caa..b120b58 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java @@ -84,4 +84,7 @@ public class WechatUser implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date uptime; + + @Schema(description = "审核状态：1-待审核，2-审核成功，3-审核失败") + private Integer state; } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java index c52cdea..8f32717 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java @@ -42,11 +42,17 @@ public class WechatUserController { } - @Operation(summary = "关联公司") + @Operation(summary = "pc-微信用户-关联公司") @PostMapping("/companyrelation") public Result companyRelation(String wuid, String pcode, String pname) { return wechatUserService.companyRelation(wuid, pcode, pname); } + + @Operation(summary = "处理待审核数据") + @PostMapping("/alterState") + public Result alterState(String wuid, String state) { + return wechatUserService.alterState(wuid, state); + } } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/OrderSwapBatteryController.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/OrderSwapBatteryController.java index 47ab80c..4342b50 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/OrderSwapBatteryController.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/OrderSwapBatteryController.java @@ -165,4 +165,11 @@ public class OrderSwapBatteryController { return orderSwapBatteryService.getStartSwap(wuid,orderId); } + @Operation(summary = "未完成订单查询：plateNum") + @GetMapping("/checkList") + @ApiOperationSupport(order = 18) + public Result checkList(@ParameterObject PageListSwapOrderRequest plsor) { + return orderSwapBatteryService.checkList(plsor); + } + } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListVehicleRequest.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListVehicleRequest.java index 255a9e3..08959ad 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListVehicleRequest.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListVehicleRequest.java @@ -42,4 +42,7 @@ public class PageListVehicleRequest extends BasePageRequest { @Schema(description = "公司编码") private String ccode; + @Schema(description = "运营商Id") + private String proxyOperaterId; + } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/OrderSwapBatteryService.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/OrderSwapBatteryService.java index 8a069c2..98fe4ee 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/OrderSwapBatteryService.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/OrderSwapBatteryService.java @@ -49,4 +49,6 @@ public interface OrderSwapBatteryService { public Result startSwap(String wuid,String orderId); public Result getStartSwap(String wuid, String orderId); + + public Result checkList(PageListSwapOrderRequest plsor); } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WechatUserService.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WechatUserService.java index c95ddfe..40d171b 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WechatUserService.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WechatUserService.java @@ -16,4 +16,6 @@ public interface WechatUserService { public WechatUser selectUcode(String phone, String uname); + + public Result alterState(String wuid, String state); } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderSwapBatteryServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderSwapBatteryServiceImpl.java index b7079e1..5547b3d 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderSwapBatteryServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderSwapBatteryServiceImpl.java @@ -566,4 +566,46 @@ public class OrderSwapBatteryServiceImpl implements OrderSwapBatteryService { return new Result().error("系统获取换电状态时发生异常"); } } + + + @Override + public Result checkList(PageListSwapOrderRequest plsor) { + + Page page = new Page(plsor.getPageNo(), plsor.getPageSize()); + List statusList = new ArrayList(); + String strs= "1,2,3,4,5,6"; + if (StringUtils.hasText(strs)) {//订单状态”已完成“之前的状态 + statusList = Arrays.asList(strs.split(",")).stream().map(Integer::valueOf).toList(); + } + + page = orderSwapBatteryDao.selectPage(page, new QueryWrapper() + .eq(StringUtils.hasText(plsor.getOrderNo()), "order_no", plsor.getOrderNo()) + .eq(StringUtils.hasText(plsor.getPlateNum()), "plate_num", plsor.getPlateNum()) + .in(!statusList.isEmpty(), "status", statusList) + .ge(plsor.getOrderTimeBegin() != null, "order_time", plsor.getOrderTimeBegin()) + .le(plsor.getOrderTimeEnd() != null, "order_time", plsor.getOrderTimeEnd()) + .eq(StringUtils.hasText(plsor.getStationCode()), "station_code", plsor.getStationCode()) + .like(StringUtils.hasText(plsor.getStationName()), "station_name", plsor.getStationName()) + .eq(StringUtils.hasText(plsor.getUserId()), "order_pre_uid", plsor.getUserId()) + .eq(StringUtils.hasText(plsor.getTradeNo()), "trade_no", plsor.getTradeNo()) + .ne("del_flag", 1) + .orderByDesc("pk_id")); + if (!page.getRecords().isEmpty()) { + return new Result().error("该车辆有未结算的订单，请确认后重试！"); + } + + + /*Page page1 = new Page(plsor.getPageNo(), plsor.getPageSize()); + page1 = orderSwapBatteryPreDao.selectPage(page1, new QueryWrapper() + .eq(StringUtils.hasText("1"), "status", "1") + .eq(StringUtils.hasText(plsor.getPlateNum()), "plate_num", plsor.getPlateNum()) + .orderByDesc("pk_id")); + if (!page1.getRecords().isEmpty()) { + return new Result().error("该车辆有预约成功的订单，请处理后重试！"); + }*/ + + + return new Result().success(0); + } + } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WechatUserServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WechatUserServiceImpl.java index 6401f1b..481d839 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WechatUserServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WechatUserServiceImpl.java @@ -58,6 +58,21 @@ public class WechatUserServiceImpl implements WechatUserService { return new Result().error("修改微信用户信息出错！"); } + @Override + public Result alterState(String wuid, String state) { + if (!(StringUtils.hasText(wuid) || StringUtils.hasText(state))) { + return new Result().error(CodeMsg.PARAM_IS_NULL); + } + WechatUser user = new WechatUser(); + user.setState(Integer.valueOf(state)); + int n = wechatUserDao.update(user, new QueryWrapper().eq("wuid", wuid)); + if (n == 1) { + return new Result().success(n); + } + + return new Result().error("修改微信用户信息出错！"); + } + @Override public Result companyRelation(String wuid, String pcode, String pname) { if (!(StringUtils.hasText(pcode) && StringUtils.hasText(pname))) { diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/controller/WechatUserController.java b/wechat-server/src/main/java/com/evotech/hd/wechat/controller/WechatUserController.java index dedf323..25c2f4f 100644 --- a/wechat-server/src/main/java/com/evotech/hd/wechat/controller/WechatUserController.java +++ b/wechat-server/src/main/java/com/evotech/hd/wechat/controller/WechatUserController.java @@ -46,7 +46,7 @@ public class WechatUserController { return wechatUserService.userByUid(wuid); } - @Operation(summary = "绑定公司") + @Operation(summary = "小程序端-绑定公司") @PostMapping("/bindcompany") @ApiOperationSupport(order = 3) public Result bindCompany(String wuid, String code, String name) { diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/WechatUserServiceImpl.java b/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/WechatUserServiceImpl.java index 10a6f64..fa4eaa6 100644 --- a/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/WechatUserServiceImpl.java +++ b/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/WechatUserServiceImpl.java @@ -65,6 +65,7 @@ public class WechatUserServiceImpl implements WechatUserService { user.setType(2); user.setPcode(code); user.setPname(name); + user.setState(1);//用户刚刚申请的时候，待审核状态 int n = wechatUserDao.update(user, new QueryWrapper().eq("wuid", wuid)); if (n == 1) { return new Result().success(1);