autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-26 05:55:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-10-19 11:21:10 +08:00
parent bd0a9d6dac a90584443d
commit d3e946c1e3
21 changed files with 188 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayCallbackRecordService.java
View File

@@ -2,10 +2,14 @@ package com.jsowell.pile.service;
import com.jsowell.pile.domain.AdapayCallbackRecord;
import java.util.List;
public interface AdapayCallbackRecordService {
void saveAdapayCallbackRecord(AdapayCallbackRecord callbackRecord);
AdapayCallbackRecord selectByOrderCode(String orderCode);
AdapayCallbackRecord selectByPaymentId(String paymentId);
List<AdapayCallbackRecord> selectByDateTime(String startTime, String endTime);
}

1
jsowell-pile/src/main/java/com/jsowell/pile/service/ClearingWithdrawInfoService.java
View File

@@ -8,7 +8,6 @@ import com.jsowell.pile.vo.web.WithdrawInfoVO;
import java.util.List;
public interface ClearingWithdrawInfoService{
int deleteByPrimaryKey(Integer id);
int insert(ClearingWithdrawInfo record);

2
jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java
View File

@@ -70,4 +70,6 @@ public interface IAdapayMemberAccountService {
void deleteByMemberId(String memberId);
void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount);
AdapayMemberAccount getDefault();
}

13
jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
View File

@@ -5,8 +5,10 @@ import com.jsowell.adapay.response.PaymentReverseResponse;
import com.jsowell.adapay.vo.OrderSettleResult;
import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
import com.jsowell.pile.domain.*;
import com.jsowell.pile.domain.nanrui.NROrderInfo;
import com.jsowell.pile.domain.AdapayMemberAccount;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.OrderDetail;
import com.jsowell.pile.domain.SettleOrderReport;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
import com.jsowell.pile.service.orderlogic.AbstractOrderLogic;
@@ -18,10 +20,7 @@ import com.jsowell.pile.vo.nanrui.NROrderInfoVO;
import com.jsowell.pile.vo.uniapp.OrderVO;
import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO;
import com.jsowell.pile.vo.uniapp.SendMessageVO;
import com.jsowell.pile.vo.web.BalanceDeductionAmountVO;
import com.jsowell.pile.vo.web.IndexOrderInfoVO;
import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.pile.vo.web.OrderTotalDataVO;
import com.jsowell.pile.vo.web.*;
import com.jsowell.wxpay.response.WechatPayRefundResponse;
import java.math.BigDecimal;
@@ -370,4 +369,6 @@ public interface IOrderBasicInfoService {
* @return
*/
List<NROrderInfoVO> getNROrderInfos(NRQueryOrderDTO dto);
List<OrderPayDetailVO> queryOrderPayDetail(String startTime, String endTime);
}

7
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayCallbackRecordServiceImpl.java
View File

@@ -10,6 +10,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Slf4j
@Service
public class AdapayCallbackRecordServiceImpl implements AdapayCallbackRecordService {
@@ -75,4 +77,9 @@ public class AdapayCallbackRecordServiceImpl implements AdapayCallbackRecordServ
}
return record;
}
@Override
public List<AdapayCallbackRecord> selectByDateTime(String startTime, String endTime) {
return adapayCallbackRecordMapper.selectByDateTime(startTime, endTime);
}
}

8
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.jsowell.pile.service.impl;
import com.google.common.collect.Lists;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils;
@@ -161,4 +162,11 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
public void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount) {
adapayMemberAccountMapper.updateAdapayMemberAccountByMemberId(adapayMemberAccount);
}
@Override
public AdapayMemberAccount getDefault() {
AdapayMemberAccount account = new AdapayMemberAccount();
account.setAdapayMemberId(Constants.ZERO);
return account;
}
}

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java
View File

@@ -118,7 +118,7 @@ public class ClearingWithdrawInfoServiceImpl implements ClearingWithdrawInfoServ
vo.setWithdrawCode(withdrawCode);
vo.setApplicationTime(DateUtils.formatDateTime(clearingWithdrawInfo.getApplicationTime()));
vo.setStatusDesc(clearingWithdrawInfo.getWithdrawStatus());
vo.setCashAmt(String.valueOf(clearingWithdrawInfo.getCreditedAmt()));
vo.setCashAmt(clearingWithdrawInfo.getCreditedAmt());
resultList.add(vo);
}
return resultList;

8
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -3378,4 +3378,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
pileTransactionService.doCreateOrder(createOrderTransactionDTO);
return orderBasicInfo;
}
/**
* 根据时间端范围查询订单支付单id
*/
@Override
public List<OrderPayDetailVO> queryOrderPayDetail(String startTime, String endTime) {
return orderBasicInfoMapper.queryOrderPayDetail(startTime, endTime);
}
}