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 b51d212..0e1122d 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 @@ -1,8 +1,6 @@ package com.evotech.hd.common.core.entity.wechat; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; @@ -68,4 +66,9 @@ public class WechatUser extends BaseEntity implements Serializable { @Schema(description = "审核状态：1-待审核，2-审核成功，3-审核失败") private Integer state; + + @Schema(description = "审核通过时间（即绑定公司时间）") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date bindtime; } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/CompanyServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/CompanyServiceImpl.java index b3b47df..9f3a193 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/CompanyServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/CompanyServiceImpl.java @@ -76,6 +76,8 @@ public class CompanyServiceImpl implements CompanyService { Map m = new HashMap(); m.put("ccode", one.getCcode()); m.put("cname", one.getCname()); + m.put("address", one.getAddress()); + m.put("phone", one.getPhone()); return new Result>().success(m); } 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 481d839..ee74e25 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 @@ -1,5 +1,9 @@ package com.evotech.hd.cloud.service.impl; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import org.springframework.stereotype.Service; @@ -63,8 +67,25 @@ public class WechatUserServiceImpl implements WechatUserService { if (!(StringUtils.hasText(wuid) || StringUtils.hasText(state))) { return new Result().error(CodeMsg.PARAM_IS_NULL); } + WechatUser user = new WechatUser(); user.setState(Integer.valueOf(state)); + + Date currentDate = new Date(); + // 创建一个SimpleDateFormat对象，并设置格式 + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + // 格式化Date对象 + String formattedDate = formatter.format(currentDate); + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + Date date = dateFormat.parse(formattedDate); + user.setBindtime(date); + } catch (ParseException e) { + e.printStackTrace(); + } + + + int n = wechatUserDao.update(user, new QueryWrapper().eq("wuid", wuid)); if (n == 1) { return new Result().success(n); 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 25c2f4f..83f3fc3 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 @@ -2,7 +2,11 @@ package com.evotech.hd.wechat.controller; import java.util.List; +import com.evotech.hd.common.core.entity.cloud.Company; +import com.evotech.hd.wechat.service.rpc.CloudService; +import jakarta.validation.Valid; import org.springdoc.core.annotations.ParameterObject; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -29,6 +33,8 @@ public class WechatUserController { @Resource private WechatUserService wechatUserService; + @Resource + private CloudService cloudService; @Operation(summary = "修改") @@ -49,9 +55,10 @@ public class WechatUserController { @Operation(summary = "小程序端-绑定公司") @PostMapping("/bindcompany") @ApiOperationSupport(order = 3) - public Result bindCompany(String wuid, String code, String name) { - return wechatUserService.bindCompany(wuid, code, name); + public Result bindCompany(String wuid, String pcode, String pname) { + return wechatUserService.bindCompany(wuid, pcode, pname); } + @Operation(summary = "开通钱包账户") @PostMapping("/wallet/open") @@ -82,4 +89,12 @@ public class WechatUserController { return wechatUserService.isOpenAccount(wuid,request); } + + @Operation(summary = "小程序端-查询公司列表") + @GetMapping("/companylist") + @ApiOperationSupport(order = 8) + public Result> companylist( @ParameterObject BasePageRequest bpr) { + return cloudService.companylist(bpr); + } + } diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/service/WechatUserService.java b/wechat-server/src/main/java/com/evotech/hd/wechat/service/WechatUserService.java index aa21b44..cb1a33f 100644 --- a/wechat-server/src/main/java/com/evotech/hd/wechat/service/WechatUserService.java +++ b/wechat-server/src/main/java/com/evotech/hd/wechat/service/WechatUserService.java @@ -16,7 +16,7 @@ public interface WechatUserService { public Result userByUid(String wuid); - public Result bindCompany(String wuid, String code, String name); + public Result bindCompany(String wuid, String pcode, String pname); public Result openWallet(String wuid, HttpServletRequest request); 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 0d1f78b..5cd5c70 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,11 +65,11 @@ public class WechatUserServiceImpl implements WechatUserService { } @Override - public Result bindCompany(String wuid, String code, String name) { + public Result bindCompany(String wuid, String pcode, String pname) { WechatUser user = new WechatUser(); user.setType(2); - user.setPcode(code); - user.setPname(name); + user.setPcode(pcode); + user.setPname(pname); user.setState(1);//用户刚刚申请的时候，待审核状态 int n = wechatUserDao.update(user, new QueryWrapper().eq("wuid", wuid)); if (n == 1) { 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 e3e7930..35c59a8 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 @@ -1,5 +1,6 @@ package com.evotech.hd.wechat.service.rpc; +import com.evotech.hd.common.core.entity.BasePageRequest; import com.evotech.hd.common.core.entity.Result; import com.evotech.hd.common.core.entity.cloud.*; import com.evotech.hd.common.core.entity.cloud.request.BatterySwapResponse; @@ -96,4 +97,8 @@ public interface CloudService { @PostMapping(value = "/wallet/updateName", consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE}) public Result updateName(@NotBlank WalletAccount wa); + + @GetMapping(value = "/company/list", + consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE}) + public Result> companylist(@RequestParam BasePageRequest bpr); }