商户流水

nxhs-service/pom.xml

@@ -53,6 +53,11 @@
             <artifactId>IJPay-All</artifactId>
             <version>2.9.10</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-core</artifactId>
+            <version>1.4.10</version>
+        </dependency>
     </dependencies>
 
     <build>

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;
 }

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 {
 

nxhs-service/src/main/java/cc/yunxi/domain/query/WalletQuery.java

@@ -16,4 +16,7 @@ public class WalletQuery extends PageQuery<EnterpriseWallet> {
     @ApiModelProperty("联系电话")
     private String mobilePhone;
 
+    @ApiModelProperty("企业/公司id")
+    private String companyId;
+
 }

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：已充值)")

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<EnterpriseWallet> {
     Page<EnterpriseWallet>  queryPageByPhone(@Param("phone") String phone);
 
 
+
 }

nxhs-service/src/main/java/cc/yunxi/service/impl/BillRuleServiceImpl.java

@@ -53,11 +53,10 @@ import java.util.List;
 public class BillRuleServiceImpl extends ServiceImpl<BillRuleMapper, BillRule> implements IBillRuleService {
 
 
-
     @Override
     public BillRule getBillRuleByCode(String enCode) {
         LambdaQueryWrapper<BillRule> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(BillRule::getEnCode, enCode);
+        wrapper.eq(BillRule::getPrefix, enCode);
 
         BillRule entity = this.getOne(wrapper);
         return entity;

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;
     }
 

nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseWalletServiceImpl.java

@@ -68,13 +68,10 @@ public class EnterpriseWalletServiceImpl extends ServiceImpl<WalletMapper, Enter
     public Page<EnterpriseWallet> queryWalletByPage(WalletQuery walletQuery){
 
         LambdaQueryWrapperX<EnterpriseWallet> wrapperX = new LambdaQueryWrapperX<>();
-        wrapperX.eqIfPresent(EnterpriseWallet::getPhoto, walletQuery.getMobilePhone());
-        Page<EnterpriseWallet> pageDO = walletQuery.buildPage();
+        wrapperX.eqIfPresent(EnterpriseWallet::getCompanyId, walletQuery.getCompanyId());
 
+        Page<EnterpriseWallet> pageDO = walletQuery.buildPage();
         return this.page(pageDO, wrapperX);
-//
-//        Page<EnterpriseWallet> res = walletMapper.selectPage(wrapperX,walletQuery);
-//        return res;
 
     }
     private String getNumber(String enCode) {