From 943fbccf38a353ac6465c1241d7e72ae5e8cab0b Mon Sep 17 00:00:00 2001 From: jevononlie <728254585@qq.com> Date: Mon, 29 Apr 2024 14:24:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nxhs-service/pom.xml | 5 +++++ .../src/main/java/cc/yunxi/domain/dto/UserDTO.java | 4 ++++ .../src/main/java/cc/yunxi/domain/po/EnterpriseWallet.java | 2 +- .../src/main/java/cc/yunxi/domain/query/WalletQuery.java | 3 +++ .../main/java/cc/yunxi/domain/vo/enterprise/WalletVO.java | 2 +- .../src/main/java/cc/yunxi/mapper/WalletMapper.java | 5 +++++ .../java/cc/yunxi/service/impl/BillRuleServiceImpl.java | 3 +-- .../src/main/java/cc/yunxi/service/impl/CommonService.java | 2 ++ .../cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java | 7 ++----- 9 files changed, 24 insertions(+), 9 deletions(-) diff --git a/nxhs-service/pom.xml b/nxhs-service/pom.xml index a2e098c..4f4fbae 100644 --- a/nxhs-service/pom.xml +++ b/nxhs-service/pom.xml @@ -53,6 +53,11 @@ IJPay-All 2.9.10 + + com.github.yulichang + mybatis-plus-join-core + 1.4.10 + diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java b/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java index cb65526..69468e0 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java @@ -37,6 +37,10 @@ public class UserDTO { @ApiModelProperty(value = "访问token", required = false) private String token; // 返回时有用 + + @ApiModelProperty(value = "公司id", required = false) + private String companyId; + @ApiModelProperty(value = "是否单位散户", required = false) private String isClientUnit; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseWallet.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseWallet.java index 4665f2e..aa49d63 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseWallet.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseWallet.java @@ -21,7 +21,7 @@ import java.util.Date; * @since 2024-03-10 09:04:53 */ @Data -@TableName("base_wallet") +@TableName("nx_wallet") @ApiModel(value = "Enterprise钱包流水对象", description = "钱包流水对象") public class EnterpriseWallet { diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/query/WalletQuery.java b/nxhs-service/src/main/java/cc/yunxi/domain/query/WalletQuery.java index a18031e..e48b8a9 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/query/WalletQuery.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/query/WalletQuery.java @@ -16,4 +16,7 @@ public class WalletQuery extends PageQuery { @ApiModelProperty("联系电话") private String mobilePhone; + @ApiModelProperty("企业/公司id") + private String companyId; + } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/WalletVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/WalletVO.java index c815f9e..bae860e 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/WalletVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/WalletVO.java @@ -42,7 +42,7 @@ public class WalletVO { @ApiModelProperty("费用项目(1：预存款)") private String expenseType; - @ApiModelProperty("单据状态(1：未入账 2：已出账)") + @ApiModelProperty("单据状态(1：未入账 2：已入账)") private String orderStatus; @ApiModelProperty("充值状态(1：未充值 2：已充值)") diff --git a/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java b/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java index 1ce04df..5e61f86 100644 --- a/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java +++ b/nxhs-service/src/main/java/cc/yunxi/mapper/WalletMapper.java @@ -5,10 +5,14 @@ import cc.yunxi.domain.po.Enterprise; import cc.yunxi.domain.po.EnterpriseWallet; import cc.yunxi.domain.po.RecycleOrder; import cc.yunxi.domain.po.RecycleStation; +import cc.yunxi.domain.query.WalletQuery; import cn.hutool.core.util.StrUtil; +import cn.hutool.db.PageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +29,5 @@ public interface WalletMapper extends BaseMapper { Page queryPageByPhone(@Param("phone") String phone); + } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/BillRuleServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/BillRuleServiceImpl.java index 118445f..7be725d 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/BillRuleServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/BillRuleServiceImpl.java @@ -53,11 +53,10 @@ import java.util.List; public class BillRuleServiceImpl extends ServiceImpl implements IBillRuleService { - @Override public BillRule getBillRuleByCode(String enCode) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(BillRule::getEnCode, enCode); + wrapper.eq(BillRule::getPrefix, enCode); BillRule entity = this.getOne(wrapper); return entity; diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java index 09456be..3a6075e 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java @@ -143,6 +143,8 @@ public class CommonService implements ICommonService { userDTO.setUserType(UserTypeEnum.RECYCLER); userDTO.setUsername(recycler.getStaffsName()); userDTO.setToken(this.createToken(userDTO)); + userDTO.setCompanyId(recycler.getCompanyId()); + return userDTO; } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java index 4f296fe..87b2c66 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java @@ -68,13 +68,10 @@ public class EnterpriseWalletServiceImpl extends ServiceImpl queryWalletByPage(WalletQuery walletQuery){ LambdaQueryWrapperX wrapperX = new LambdaQueryWrapperX<>(); - wrapperX.eqIfPresent(EnterpriseWallet::getPhoto, walletQuery.getMobilePhone()); - Page pageDO = walletQuery.buildPage(); + wrapperX.eqIfPresent(EnterpriseWallet::getCompanyId, walletQuery.getCompanyId()); + Page pageDO = walletQuery.buildPage(); return this.page(pageDO, wrapperX); -// -// Page res = walletMapper.selectPage(wrapperX,walletQuery); -// return res; } private String getNumber(String enCode) {