mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-25 13:35:15 +08:00
update 汇付协议
This commit is contained in:
@@ -404,7 +404,7 @@ public interface OrderBasicInfoService{
|
||||
* @param endTime
|
||||
* @return
|
||||
*/
|
||||
List<OrderPayDetailVO> queryOrderPayDetail(String startTime, String endTime);
|
||||
List<OrderPaymentDetailVO> queryOrderPayDetail(String startTime, String endTime);
|
||||
|
||||
/**
|
||||
* 根据车牌号查询订单信息(宁夏交投 用)
|
||||
|
||||
@@ -58,7 +58,6 @@ import com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO;
|
||||
import com.jsowell.pile.vo.uniapp.customer.*;
|
||||
import com.jsowell.pile.vo.web.*;
|
||||
import com.jsowell.wxpay.common.WeChatPayParameter;
|
||||
import com.jsowell.wxpay.dto.WechatSendMsgDTO;
|
||||
import com.jsowell.wxpay.response.WechatPayRefundRequest;
|
||||
import com.jsowell.wxpay.response.WechatPayRefundResponse;
|
||||
import com.jsowell.wxpay.service.WxAppletRemoteService;
|
||||
@@ -3652,7 +3651,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
* 根据时间端范围查询订单支付单id
|
||||
*/
|
||||
@Override
|
||||
public List<OrderPayDetailVO> queryOrderPayDetail(String startTime, String endTime) {
|
||||
public List<OrderPaymentDetailVO> queryOrderPayDetail(String startTime, String endTime) {
|
||||
return orderBasicInfoMapper.queryOrderPayDetail(startTime, endTime);
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import com.jsowell.pile.domain.OrderPayRecord;
|
||||
import com.jsowell.pile.domain.WxpayCallbackRecord;
|
||||
import com.jsowell.pile.mapper.OrderPayRecordMapper;
|
||||
import com.jsowell.pile.service.*;
|
||||
import com.jsowell.pile.vo.OrderPayRecordVO;
|
||||
import com.jsowell.pile.vo.web.OrderDetailInfoVO;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -91,6 +92,38 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService {
|
||||
return resultList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询订单支付信息
|
||||
*/
|
||||
public List<OrderPayRecordVO> selectOrderPayRecordList(String orderCode) {
|
||||
// 缓存
|
||||
String redisKey = CacheConstants.SELECT_ORDER_PAY_INFO_LIST + orderCode;
|
||||
List<OrderPayRecordVO> resultList = redisCache.getCacheList(redisKey);
|
||||
if (CollectionUtils.isNotEmpty(resultList)) {
|
||||
return resultList;
|
||||
}
|
||||
|
||||
// 订单信息
|
||||
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
|
||||
if (orderBasicInfo == null) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
|
||||
resultList = orderPayRecordMapper.selectOrderPayRecordList(orderCode);
|
||||
|
||||
if (CollectionUtils.isEmpty(resultList)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
|
||||
for (OrderPayRecordVO orderPayRecordVO : resultList) {
|
||||
|
||||
}
|
||||
|
||||
return resultList;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询订单支付信息
|
||||
* 加缓存
|
||||
@@ -112,6 +145,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService {
|
||||
if (orderBasicInfo == null) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
|
||||
// 支付流水
|
||||
List<OrderPayRecord> orderPayRecordList = getOrderPayRecordList(orderCode);
|
||||
if (CollectionUtils.isEmpty(orderPayRecordList)) {
|
||||
|
||||
Reference in New Issue
Block a user