suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #98 into master from cc_20260408_trans

Browse Source 
feat:mock 处理

* cc_20260408_trans: (22 commits squashed)

  - feat：分账

  - feat：分账接口

  - feat：分账单管理

  - feat：分账管理

  - feat：分账管理

  - feat：userIdName

  - feat：提现

  - feat：调整

  - feat：accountName

  - feat：accountName

  - feat：mock

  - feat：关联门店

  - feat：待充值待认款

  - feat：待充值待认款

  - feat：payer_account_no

  - feat：payeeAccountName

  - feat：payeeAccountNo

  - feat：page

  - feat：枚举

  - feat：接口请求方式调整get->post

  - feat:mock 处理

  - Merge branch 'master' into cc_20260408_trans
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/98
This commit is contained in:
正新
2026-04-14 09:55:00 +00:00
parent 9ad7fa0f5a
commit 1bbb6f7097
80 changed files with 4204 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
coolstore-partner-dao/src/main/java/com/cool/store/dao/AdjustmentOrderDAO.java Normal file
View File

@@ -0,0 +1,128 @@
package com.cool.store.dao;
import com.cool.store.entity.AdjustmentOrderDO;
import com.cool.store.mapper.AdjustmentOrderMapper;
import com.cool.store.request.AdjustmentOrderPageRequest;
import com.cool.store.response.AdjustmentOrderResponse;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* 费用调整单 DAO
*/
@Repository
public class AdjustmentOrderDAO {
@Resource
private AdjustmentOrderMapper AdjustmentOrderMapper;
/**
* 根据ID查询
*/
public AdjustmentOrderDO getById(Long id) {
if (id == null) {
return null;
}
return AdjustmentOrderMapper.selectByPrimaryKey(id);
}
/**
* 根据调整单号查询
*/
public AdjustmentOrderDO getByAdjustmentNo(String adjustmentNo) {
if (StringUtils.isBlank(adjustmentNo)) {
return null;
}
return AdjustmentOrderMapper.getByAdjustmentNo(adjustmentNo);
}
/**
* 根据状态查询
*/
public List<AdjustmentOrderDO> listByStatus(Integer status) {
return AdjustmentOrderMapper.listByStatus(status);
}
/**
* 根据关联分账单号查询
*/
public List<AdjustmentOrderDO> listByRelatedSplitNo(String relatedSplitNo) {
if (StringUtils.isBlank(relatedSplitNo)) {
return new ArrayList<>();
}
return AdjustmentOrderMapper.listByRelatedSplitNo(relatedSplitNo);
}
/**
* 根据门店ID查询
*/
public List<AdjustmentOrderDO> listByStoreId(String storeId) {
if (StringUtils.isBlank(storeId)) {
return new ArrayList<>();
}
return AdjustmentOrderMapper.listByStoreId(storeId);
}
/**
* 新增
*/
public int insert(AdjustmentOrderDO record) {
if (record == null) {
return 0;
}
return AdjustmentOrderMapper.insertSelective(record);
}
/**
* 更新
*/
public int update(AdjustmentOrderDO record) {
if (record == null || record.getId() == null) {
return 0;
}
return AdjustmentOrderMapper.updateByPrimaryKeySelective(record);
}
/**
* 批量更新状态
*/
public int batchUpdateStatus(List<Long> ids, Integer status) {
if (CollectionUtils.isEmpty(ids) || status == null) {
return 0;
}
return AdjustmentOrderMapper.batchUpdateStatus(ids, status);
}
/**
* 根据ID更新关联分账单号
*/
public int updateRelatedSplitNo(Long id, String relatedSplitNo) {
if (id == null || StringUtils.isBlank(relatedSplitNo)) {
return 0;
}
return AdjustmentOrderMapper.updateRelatedSplitNo(id, relatedSplitNo);
}
/**
* 分页查询
*/
public List<AdjustmentOrderResponse> pageQuery(AdjustmentOrderPageRequest request) {
return AdjustmentOrderMapper.pageQuery(request);
}
/**
* 删除
*/
public int delete(Long id) {
if (id == null) {
return 0;
}
return AdjustmentOrderMapper.deleteByPrimaryKey(id);
}
}

121
coolstore-partner-dao/src/main/java/com/cool/store/dao/ExpenseMappingDAO.java Normal file
View File

@@ -0,0 +1,121 @@
package com.cool.store.dao;
import com.cool.store.entity.ExpenseMappingDO;
import com.cool.store.mapper.ExpenseMappingMapper;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
/**
* 费用单流水调整单映射表 DAO
*/
@Repository
public class ExpenseMappingDAO {
@Resource
private ExpenseMappingMapper expenseMappingMapper;
/**
* 根据ID查询
*/
public ExpenseMappingDO getById(Long id) {
if (id == null) {
return null;
}
return expenseMappingMapper.selectByPrimaryKey(id);
}
/**
* 根据网商交易流水号查询
*/
public ExpenseMappingDO getByTradeNo(String trandNo) {
if (StringUtils.isBlank(trandNo)) {
return null;
}
return expenseMappingMapper.getByTradeNo(trandNo);
}
/**
* 根据费用单号查询
*/
public ExpenseMappingDO getByRelatedAdjustmentNo(String relatedAdjustmentNo) {
if (StringUtils.isBlank(relatedAdjustmentNo)) {
return null;
}
return expenseMappingMapper.getByRelatedAdjustmentNo(relatedAdjustmentNo);
}
/**
* 新增
*/
public int insert(ExpenseMappingDO record) {
if (record == null) {
return 0;
}
return expenseMappingMapper.insertSelective(record);
}
/**
* 更新
*/
public int update(ExpenseMappingDO record) {
if (record == null || record.getId() == null) {
return 0;
}
return expenseMappingMapper.updateByPrimaryKeySelective(record);
}
/**
* 删除
*/
public int delete(Long id) {
if (id == null) {
return 0;
}
return expenseMappingMapper.deleteByPrimaryKey(id);
}
/**
* 批量插入
*/
public int batchInsert(List<ExpenseMappingDO> list) {
if (CollectionUtils.isEmpty(list)) {
return 0;
}
return expenseMappingMapper.batchInsert(list);
}
/**
* 根据交易流水号列表批量查询
*/
public List<ExpenseMappingDO> listByTradeNos(List<String> tradeNos) {
if (CollectionUtils.isEmpty(tradeNos)) {
return Collections.emptyList();
}
return expenseMappingMapper.listByTradeNos(tradeNos);
}
/**
* 根据费用单号查询列表
*/
public List<ExpenseMappingDO> listByRelatedAdjustmentNo(String relatedAdjustmentNo) {
if (StringUtils.isBlank(relatedAdjustmentNo)) {
return Collections.emptyList();
}
return expenseMappingMapper.listByRelatedAdjustmentNo(relatedAdjustmentNo);
}
/**
* 根据费用单号列表批量查询
*/
public List<ExpenseMappingDO> listByRelatedAdjustmentNoList(List<String> relatedAdjustmentNos) {
if (CollectionUtils.isEmpty(relatedAdjustmentNos)) {
return Collections.emptyList();
}
return expenseMappingMapper.listByRelatedAdjustmentNoList(relatedAdjustmentNos);
}
}

124
coolstore-partner-dao/src/main/java/com/cool/store/dao/SplitOrderDAO.java Normal file
View File

@@ -0,0 +1,124 @@
package com.cool.store.dao;
import com.cool.store.entity.SplitOrderDO;
import com.cool.store.mapper.SplitOrderMapper;
import com.cool.store.request.SplitOrderPageRequest;
import com.cool.store.response.SplitOrderResponse;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* 分账主表 DAO
*/
@Repository
public class SplitOrderDAO {
@Resource
private SplitOrderMapper zxjpSplitOrderMapper;
/**
* 根据ID查询
*/
public SplitOrderDO getById(Long id) {
if (id == null) {
return null;
}
return zxjpSplitOrderMapper.selectByPrimaryKey(id);
}
/**
* 根据分账单号查询
*/
public SplitOrderDO getBySplitNo(String splitNo) {
if (StringUtils.isBlank(splitNo)) {
return null;
}
return zxjpSplitOrderMapper.getBySplitNo(splitNo);
}
/**
* 根据状态查询
*/
public List<SplitOrderDO> listByStatus(String status) {
return zxjpSplitOrderMapper.listByStatus(status);
}
/**
* 根据关联单据号查询
*/
public List<SplitOrderDO> listByRelatedDocNo(String relatedDocNo,List<Integer> statusList) {
if (StringUtils.isBlank(relatedDocNo)||CollectionUtils.isEmpty(statusList)) {
return new ArrayList<>();
}
return zxjpSplitOrderMapper.listByRelatedDocNo(relatedDocNo,statusList);
}
/**
* 根据门店ID查询
*/
public List<SplitOrderDO> listByStoreId(String storeId) {
if (StringUtils.isBlank(storeId)) {
return new ArrayList<>();
}
return zxjpSplitOrderMapper.listByStoreId(storeId);
}
/**
* 新增
*/
public int insert(SplitOrderDO record) {
if (record == null) {
return 0;
}
return zxjpSplitOrderMapper.insertSelective(record);
}
/**
* 更新
*/
public int update(SplitOrderDO record) {
if (record == null || record.getId() == null) {
return 0;
}
return zxjpSplitOrderMapper.updateByPrimaryKeySelective(record);
}
/**
* 批量更新状态
*/
public int batchUpdateStatus(List<Long> ids, String status) {
if (CollectionUtils.isEmpty(ids) || StringUtils.isBlank(status)) {
return 0;
}
return zxjpSplitOrderMapper.batchUpdateStatus(ids, status);
}
/**
* 分页页查询
*/
public List<SplitOrderDO> pageQuery(SplitOrderPageRequest request) {
return zxjpSplitOrderMapper.pageQuery(request);
}
/**
* 分页查询（关联门店信息）
*/
public List<SplitOrderResponse> pageQueryWithStore(SplitOrderPageRequest request) {
return zxjpSplitOrderMapper.pageQueryWithStore(request);
}
/**
* 删除
*/
public int delete(Long id) {
if (id == null) {
return 0;
}
return zxjpSplitOrderMapper.deleteByPrimaryKey(id);
}
}

70
coolstore-partner-dao/src/main/java/com/cool/store/dao/WithdrawApplicationDAO.java Normal file
View File

@@ -0,0 +1,70 @@
package com.cool.store.dao;
import com.cool.store.dto.wallet.WithdrawApplicationDTO;
import com.cool.store.entity.WithdrawApplicationDO;
import com.cool.store.mapper.WithdrawApplicationMapper;
import com.cool.store.request.WithdrawApplicationPageRequest;
import com.cool.store.response.WithdrawApplicationResponse;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.List;
/**
* 提现申请 DAO
*/
@Repository
public class WithdrawApplicationDAO {
@Resource
private WithdrawApplicationMapper withdrawApplicationMapper;
/**
* 根据ID查询
*/
public WithdrawApplicationDO getById(Long id) {
if (id == null) {
return null;
}
return withdrawApplicationMapper.selectByPrimaryKey(id);
}
/**
* 插入
*/
public int insert(WithdrawApplicationDO record) {
if (record == null) {
return 0;
}
return withdrawApplicationMapper.insertSelective(record);
}
/**
* 更新
*/
public int update(WithdrawApplicationDO record) {
if (record == null || record.getId() == null) {
return 0;
}
return withdrawApplicationMapper.updateByPrimaryKeySelective(record);
}
/**
* 分页查询
*/
public List<WithdrawApplicationDTO> pageQuery(WithdrawApplicationPageRequest request) {
return withdrawApplicationMapper.pageQuery(request);
}
/**
* 根据提现单号查询
*/
public WithdrawApplicationDO getByWithdrawNo(String withdrawNo) {
if (withdrawNo == null) {
return null;
}
return withdrawApplicationMapper.selectOne(WithdrawApplicationDO.builder().withdrawNo(withdrawNo).build());
}
}

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/wallet/WalletTradeDAO.java
View File

@@ -67,6 +67,10 @@ public class WalletTradeDAO {
return walletTradeMapper.getPayingOrderBatchCode(module, type);
}
public List<WalletTradeDO> transferTradeList(String module, Integer type) {
return walletTradeMapper.transferTradeList(module, type);
}
/**
* 根据批次号更新支付状态
* @param batchCode 批次号

51
coolstore-partner-dao/src/main/java/com/cool/store/mapper/AdjustmentOrderMapper.java Normal file
View File

@@ -0,0 +1,51 @@
package com.cool.store.mapper;
import com.cool.store.entity.AdjustmentOrderDO;
import com.cool.store.request.AdjustmentOrderPageRequest;
import com.cool.store.response.AdjustmentOrderResponse;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
/**
* 费用调整单 Mapper
*/
public interface AdjustmentOrderMapper extends Mapper<AdjustmentOrderDO> {
/**
* 根据调整单号查询
*/
AdjustmentOrderDO getByAdjustmentNo(@Param("adjustmentNo") String adjustmentNo);
/**
* 根据状态查询
*/
List<AdjustmentOrderDO> listByStatus(@Param("status") Integer status);
/**
* 根据关联分账单号查询
*/
List<AdjustmentOrderDO> listByRelatedSplitNo(@Param("relatedSplitNo") String relatedSplitNo);
/**
* 根据门店ID查询
*/
List<AdjustmentOrderDO> listByStoreId(@Param("storeId") String storeId);
/**
* 批量更新状态
*/
int batchUpdateStatus(@Param("ids") List<Long> ids, @Param("status") Integer status);
/**
* 根据ID更新关联分账单号
*/
int updateRelatedSplitNo(@Param("id") Long id, @Param("relatedSplitNo") String relatedSplitNo);
/**
* 分页查询
*/
List<AdjustmentOrderResponse> pageQuery(@Param("request") AdjustmentOrderPageRequest request);
}

43
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ExpenseMappingMapper.java Normal file
View File

@@ -0,0 +1,43 @@
package com.cool.store.mapper;
import com.cool.store.entity.ExpenseMappingDO;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
/**
* 费用单流水调整单映射表 Mapper
*/
public interface ExpenseMappingMapper extends Mapper<ExpenseMappingDO> {
/**
* 根据网商交易流水号查询
*/
ExpenseMappingDO getByTradeNo(@Param("tradeNo") String tradeNo);
/**
* 根据费用单号查询
*/
ExpenseMappingDO getByRelatedAdjustmentNo(@Param("relatedAdjustmentNo") String relatedAdjustmentNo);
/**
* 批量插入
*/
int batchInsert(@Param("list") List<ExpenseMappingDO> list);
/**
* 根据交易流水号列表批量查询
*/
List<ExpenseMappingDO> listByTradeNos(@Param("tradeNos") List<String> tradeNos);
/**
* 根据费用单号查询列表
*/
List<ExpenseMappingDO> listByRelatedAdjustmentNo(@Param("relatedAdjustmentNo") String relatedAdjustmentNo);
/**
* 根据费用单号列表批量查询
*/
List<ExpenseMappingDO> listByRelatedAdjustmentNoList(@Param("relatedAdjustmentNos") List<String> relatedAdjustmentNos);
}

51
coolstore-partner-dao/src/main/java/com/cool/store/mapper/SplitOrderMapper.java Normal file
View File

@@ -0,0 +1,51 @@
package com.cool.store.mapper;
import com.cool.store.entity.SplitOrderDO;
import com.cool.store.request.SplitOrderPageRequest;
import com.cool.store.response.SplitOrderResponse;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
/**
* 分账主表 Mapper
*/
public interface SplitOrderMapper extends Mapper<SplitOrderDO> {
/**
* 根据分账单号查询
*/
SplitOrderDO getBySplitNo(@Param("splitNo") String splitNo);
/**
* 根据状态查询
*/
List<SplitOrderDO> listByStatus(@Param("status") String status);
/**
* 根据关联单据号查询
*/
List<SplitOrderDO> listByRelatedDocNo(@Param("relatedDocNo") String relatedDocNo,
@Param("statusList") List<Integer> statusList);
/**
* 根据门店ID查询
*/
List<SplitOrderDO> listByStoreId(@Param("storeId") String storeId);
/**
* 批量更新状态
*/
int batchUpdateStatus(@Param("ids") List<Long> ids, @Param("status") String status);
/**
* 分页查询
*/
List<SplitOrderDO> pageQuery(@Param("request") SplitOrderPageRequest request);
/**
* 分页查询（关联门店信息）
*/
List<SplitOrderResponse> pageQueryWithStore(@Param("request") SplitOrderPageRequest request);
}

20
coolstore-partner-dao/src/main/java/com/cool/store/mapper/WithdrawApplicationMapper.java Normal file
View File

@@ -0,0 +1,20 @@
package com.cool.store.mapper;
import com.cool.store.dto.wallet.WithdrawApplicationDTO;
import com.cool.store.entity.WithdrawApplicationDO;
import com.cool.store.request.WithdrawApplicationPageRequest;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
/**
* 提现申请 Mapper
*/
public interface WithdrawApplicationMapper extends Mapper<WithdrawApplicationDO> {
/**
* 分页查询
*/
List<WithdrawApplicationDTO> pageQuery(@Param("request") WithdrawApplicationPageRequest request);
}

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/wallet/WalletTradeMapper.java
View File

@@ -20,4 +20,6 @@ public interface WalletTradeMapper extends Mapper<WalletTradeDO> {
* @return 批次号列表
*/
List<String> getPayingOrderBatchCode(@Param("module") String module, @Param("type") Integer type);
List<WalletTradeDO> transferTradeList(@Param("module") String module, @Param("type") Integer type);
}