diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java index 7e13f5c..78633d1 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java @@ -11,6 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.util.List; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import io.swagger.v3.oas.annotations.Hidden; @@ -23,6 +24,7 @@ import lombok.Data; * @author zrb * @since 2024-10-15 */ +@EqualsAndHashCode(callSuper = true) @Data @TableName("hd_cloud_manage.yt_t_battery_station") @Schema(name = "BatteryStation", description = "换电站") diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/request/PageListWalletRequest.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/request/PageListWalletRequest.java index f1ee501..8222a1d 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/request/PageListWalletRequest.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/request/PageListWalletRequest.java @@ -19,6 +19,9 @@ public class PageListWalletRequest extends BasePageRequest { @Schema(description = "户主ID") private String ownerId; + @Schema(description = "用户名") + private String uname; + @Schema(description = "编码") private String code; diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/WalletAccountController.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/WalletAccountController.java index db6bf0b..2292a52 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/WalletAccountController.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/WalletAccountController.java @@ -54,6 +54,7 @@ public class WalletAccountController { public Result update(@ParameterObject WalletAccount wa) { return walletAccountService.update(wa); } + @Operation(summary = "查询") @GetMapping("/list") @@ -92,15 +93,19 @@ public class WalletAccountController { } @Operation(summary = "获取WalleCode") @PostMapping("/getWalleCode") - @ApiOperationSupport(order = 8) + @ApiOperationSupport(order = 9) public Result getWalleCode(String wuid) { return walletAccountService.getWalleCode(wuid); } @Operation(summary = "获取附加信息") @PostMapping("/getPayAttach") - @ApiOperationSupport(order = 8) + @ApiOperationSupport(order = 10) public Result getPayAttach(String wuid) { return walletAccountService.getPayAttach(wuid); } - + @PostMapping({"/updateName"}) + @ApiOperationSupport(order = 11) + public Result updateName(@ParameterObject WalletAccount wa) { + return walletAccountService.updateName(wa); + } } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WalletAccountService.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WalletAccountService.java index 9bbea58..4ffb45c 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WalletAccountService.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/WalletAccountService.java @@ -30,4 +30,6 @@ public interface WalletAccountService { public Result getWalleCode(String wuid); public Result getPayAttach(String wuid); + + public Result updateName(WalletAccount wa); } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WalletAccountServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WalletAccountServiceImpl.java index 6aa90a2..eaf0d53 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WalletAccountServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/WalletAccountServiceImpl.java @@ -125,23 +125,26 @@ public class WalletAccountServiceImpl implements WalletAccountService { if (n == 1) { return new Result().success(n); } + return new Result().error("更新资金账户失败！"); } @Override public Result> list(PageListWalletRequest plwr) { Page page = new Page(plwr.getPageNo(), plwr.getPageSize()); - - page = walletAccountDao.selectPage(page, new QueryWrapper() + QueryWrapper queryWrapper = new QueryWrapper() .eq(StringUtils.hasText(plwr.getCode()), "code", plwr.getCode()) + .like(StringUtils.hasText(plwr.getUname()), "acc_name", plwr.getUname()) .eq(StringUtils.hasText(plwr.getStationCode()), "station_code", plwr.getStationCode()) .eq(plwr.getOwnerType() != null, "owner_type", plwr.getOwnerType()) .eq(StringUtils.hasText(plwr.getOwnerId()), "owner_id", plwr.getOwnerId()) - .orderByDesc("pk_id")); + .orderByDesc("pk_id"); + page = walletAccountDao.selectPage(page, queryWrapper); if (page.getRecords().isEmpty()) { return new Result>().error(CodeMsg.DATABASE_RESULT_NULL); } + // 2. 转换为VO并查询用户信息 List voList = page.getRecords().stream().map(account -> { WalletAccountVO vo = new WalletAccountVO(); @@ -276,6 +279,22 @@ public class WalletAccountServiceImpl implements WalletAccountService { } } + @Override + public Result updateName(WalletAccount wa) { + if (wa == null) { + return new Result().error("参数不能为空"); + } + LambdaQueryWrapper walletAccountLambdaQueryWrapper = new LambdaQueryWrapper<>(); + walletAccountLambdaQueryWrapper.eq(WalletAccount::getOwnerId, wa.getOwnerId()); + WalletAccount walletAccount = walletAccountDao.selectOne(walletAccountLambdaQueryWrapper); + if (walletAccount != null) { + walletAccount.setAccName(wa.getAccName()); + walletAccountDao.updateById(walletAccount); + return new Result().success(1); + } + return new Result().error("未找到对应的账户"); + } + // 查询 WechatUser 的封装方法 private WechatUser queryWechatUserByWuid(String wuid) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java b/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java index fa907e9..fd4c66d 100644 --- a/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java +++ b/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java @@ -157,7 +157,7 @@ public class GZHMessageTemplateService { break; // 付款完成 case 3: - templateId = gzhProperties.getOrderSwapEndTemplateId(); + templateId = gzhProperties.getOrderEndTemplateId(); miniprogram.setPath(orderDetailPage); PayTemplateData payData = new PayTemplateData(); payData.setThing2(osb.getStationName()); @@ -170,6 +170,7 @@ public class GZHMessageTemplateService { break; //预约即将失效 case 4: + break; default: break; 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 b828321..2e02de9 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 @@ -45,6 +45,10 @@ public class WechatUserServiceImpl implements WechatUserService { if (n == 1) { return new Result().success(1); } + WalletAccount walletAccount = new WalletAccount(); + walletAccount.setOwnerId(wuser.getWuid()); + walletAccount.setAccName(wuser.getName()); + cloudService.updateName(walletAccount); return new Result().error("修改微信用户信息出错！"); } diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/service/rpc/CloudService.java b/wechat-server/src/main/java/com/evotech/hd/wechat/service/rpc/CloudService.java index f9970e5..e3e7930 100644 --- a/wechat-server/src/main/java/com/evotech/hd/wechat/service/rpc/CloudService.java +++ b/wechat-server/src/main/java/com/evotech/hd/wechat/service/rpc/CloudService.java @@ -93,4 +93,7 @@ public interface CloudService { @PostMapping(value = "/wallet/getPayAttach", consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE}) public Result getPayAttach(@NotBlank String wuid); + + @PostMapping(value = "/wallet/updateName", consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE}) + public Result updateName(@NotBlank WalletAccount wa); }