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

新增 后管财务中心运营商订单列表页

Browse Source
This commit is contained in:
Lemon
2023-07-06 17:38:30 +08:00
parent eb9e1fb0b1
commit 35efeb8993
11 changed files with 285 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
View File

@@ -6,6 +6,7 @@ import com.jsowell.pile.dto.IndexQueryDTO;
import com.jsowell.pile.dto.QueryOrderDTO;
import com.jsowell.pile.dto.QueryPersonPileDTO;
import com.jsowell.pile.dto.QueryStationInfoDTO;
import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.uniapp.OrderVO;
import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO;
@@ -210,4 +211,11 @@ public interface OrderBasicInfoMapper {
List<OrderDetail> getOrderDetailList(List<String> orderCodes);
List<OrderBasicInfo> tempQueryWeChatRefundOrders(@Param("startTime") String startTime, @Param("endTime") String endTime);
/**
* 获取运营商订单列表
* @param dto
* @return
*/
List<MerchantOrderInfoVO> getMerchantOrderInfoList(@Param("dto") QueryOrderDTO dto);
}

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

@@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.OrderDetail;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
@@ -270,4 +271,10 @@ public interface IOrderBasicInfoService {
* 生成订单日报
*/
void generateDailyOrderReports(String stationId);
/**
* 获取运营商订单列表
* @return
*/
List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryOrderDTO dto);
}

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

@@ -30,6 +30,7 @@ import com.jsowell.pile.mapper.OrderBasicInfoMapper;
import com.jsowell.pile.service.*;
import com.jsowell.pile.transaction.dto.OrderTransactionDTO;
import com.jsowell.pile.transaction.service.TransactionService;
import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
import com.jsowell.pile.vo.base.PileInfoVO;
@@ -1978,4 +1979,19 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
settleOrderReport.setTradeAmount(totalSettleAmount.subtract(tradeFee));
settleOrderReportService.insertSettleOrderReport(settleOrderReport);
}
/**
* 获取运营商订单列表
* @param dto
* @return
*/
@Override
public List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryOrderDTO dto) {
String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7));
startTime = dto.getStartTime() == null ? startTime : dto.getStartTime();
dto.setStartTime(startTime);
return orderBasicInfoMapper.getMerchantOrderInfoList(dto);
}
}

21
jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MerchantOrderInfoVO.java Normal file
View File

@@ -0,0 +1,21 @@
package com.jsowell.pile.vo.base;
import lombok.Data;
/**
* 运营商订单列表VO
*
* @author Lemon
* @Date 2023/7/6 16:12
*/
@Data
public class MerchantOrderInfoVO {
private String orderCode;
private String transactionCode;
private String orderStatus;
private String stationId;
private String stationName;
private String orderSource;
private String orderAmount;
private String orderSettleTime;
}