mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 19:45:09 +08:00
update 新增重新分账接口
This commit is contained in:
@@ -28,4 +28,6 @@ public class QueryOrderSplitRecordDTO {
|
||||
private String orderCode;
|
||||
|
||||
private String transactionCode;
|
||||
|
||||
private String merchantId;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.jsowell.pile.mapper;
|
||||
import com.alipay.api.domain.ChargeOrderInfo;
|
||||
import com.jsowell.pile.domain.OrderBasicInfo;
|
||||
import com.jsowell.pile.domain.OrderDetail;
|
||||
import com.jsowell.pile.domain.OrderSplitRecord;
|
||||
import com.jsowell.pile.domain.UserFrequentedStationInfo;
|
||||
import com.jsowell.pile.dto.*;
|
||||
import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
|
||||
@@ -416,4 +417,11 @@ public interface OrderBasicInfoMapper {
|
||||
List<OrderBasicInfo> getOrderBasicInfoByTimeInterval(@Param("stationIds") List<String> stationIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
|
||||
|
||||
List<SupStationStatsVO> queryOrderListByStationIdAndTime(@Param("stationId") String stationId , @Param("startTime") String startTime , @Param("endTime") String endTime);
|
||||
|
||||
/**
|
||||
* 查询分账订单信息
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
List<OrderSplitRecord> getSplitOrders(@Param("dto") QueryOrderSplitRecordDTO dto);
|
||||
}
|
||||
|
||||
@@ -606,4 +606,11 @@ public interface OrderBasicInfoService{
|
||||
* @param orderCode
|
||||
*/
|
||||
void closeOrderByOrderCode(String orderCode);
|
||||
|
||||
/**
|
||||
* 获取订单分账记录
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
List<OrderSplitRecord> getSplitOrders(QueryOrderSplitRecordDTO dto);
|
||||
}
|
||||
|
||||
@@ -5635,5 +5635,15 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
orderBasicInfo.setOrderStatus(OrderStatusEnum.ORDER_CLOSE_TIMEOUT.getValue());
|
||||
updateOrderBasicInfo(orderBasicInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取订单分账信息
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<OrderSplitRecord> getSplitOrders(QueryOrderSplitRecordDTO dto) {
|
||||
return orderBasicInfoMapper.getSplitOrders(dto);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ import com.huifu.adapay.model.AdapayCommon;
|
||||
import com.jsowell.adapay.dto.PaymentConfirmParam;
|
||||
import com.jsowell.adapay.dto.SplitData;
|
||||
import com.jsowell.adapay.response.PaymentConfirmResponse;
|
||||
import com.jsowell.adapay.service.AdapayService;
|
||||
import com.jsowell.common.constant.Constants;
|
||||
import com.jsowell.common.core.domain.model.LoginUser;
|
||||
import com.jsowell.common.core.page.PageResponse;
|
||||
@@ -27,6 +28,7 @@ import com.jsowell.pile.dto.QueryOrderSplitDTO;
|
||||
import com.jsowell.pile.dto.QueryOrderSplitRecordDTO;
|
||||
import com.jsowell.pile.dto.SplitConfigStationDTO;
|
||||
import com.jsowell.pile.dto.SplitOrderDTO;
|
||||
import com.jsowell.pile.mapper.OrderBasicInfoMapper;
|
||||
import com.jsowell.pile.mapper.OrderSplitRecordMapper;
|
||||
import com.jsowell.pile.service.AdapayMemberAccountService;
|
||||
import com.jsowell.pile.service.OrderSplitRecordService;
|
||||
@@ -56,6 +58,9 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
|
||||
@Autowired
|
||||
private AdapayMemberAccountService adapayMemberAccountService;
|
||||
|
||||
@Autowired
|
||||
private OrderBasicInfoMapper orderBasicInfoMapper;
|
||||
|
||||
@Override
|
||||
public int batchInsert(List<OrderSplitRecord> list) {
|
||||
return orderSplitRecordMapper.batchInsert(list);
|
||||
@@ -667,6 +672,8 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
|
||||
return orderSplitRecordMapper.deleteOrderSplitRecord(orderCode);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 根据汇付会员id查询分账汇总数据
|
||||
* @param dto
|
||||
|
||||
Reference in New Issue
Block a user