testSettleOrderLogicV2

This commit is contained in:
Guoqs
2025-03-26 20:32:12 +08:00
parent 670a35c9a1
commit fdee4a7d8c
5 changed files with 51 additions and 10 deletions

View File

@@ -766,6 +766,24 @@ public class TempController extends BaseController {
return response;
}
/**
* 调试结算订单逻辑
* http://localhost:8080/temp/testSettleOrderLogic
*/
@PostMapping("/testSettleOrderLogicV2")
public RestApiResponse<?> testSettleOrderLogicV2(@RequestBody QueryOrderDTO dto) {
RestApiResponse<?> response;
try {
// 调试结算订单逻辑
tempService.testSettleOrderLogicV2(dto.getOrderCode());
response = new RestApiResponse<>();
} catch (Exception e) {
logger.error("调试结算订单逻辑V2error,", e);
response = new RestApiResponse<>();
}
return response;
}
/**
* 重试订单退款接口/重试退款按钮 (批量)

View File

@@ -30,7 +30,6 @@ import com.jsowell.pile.dto.ApplyRefundDTO;
import com.jsowell.pile.dto.QueryOrderDTO;
import com.jsowell.pile.dto.SettleOrderReportDTO;
import com.jsowell.pile.mapper.OrderBasicInfoMapper;
import com.jsowell.pile.mapper.PileMsgRecordMapper;
import com.jsowell.pile.service.*;
import com.jsowell.pile.service.programlogic.AbstractProgramLogic;
import com.jsowell.pile.service.programlogic.ProgramLogicFactory;
@@ -47,6 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -102,7 +102,7 @@ public class TempService {
private MemberAdapayRecordService memberAdapayRecordService;
@Autowired
private PileMsgRecordMapper pileMsgRecordMapper;
private PileMsgRecordService pileMsgRecordService;
@Autowired
private OrderDetailService orderDetailService;
@@ -126,7 +126,7 @@ public class TempService {
// 根据充电桩编号,查询报文
for (OrderListVO orderVO : orderListVOS) {
String pileSn = orderVO.getPileSn();
List<PileMsgRecord> pileFeedList = pileMsgRecordMapper.getPileFeedList(pileSn);
// List<PileMsgRecord> pileFeedList = pileMsgRecordMapper.getPileFeedList(pileSn);
}
//
@@ -892,15 +892,25 @@ public class TempService {
orderCode, memberId, discountAmount, electricityAmountDiscount, serviceAmountDiscount, totalConsumeAmount);
}
public void testSettleOrderLogicV2(String orderCode) {
// 查询订单主表
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
LocalDateTime localDateTime = DateUtils.date2LocalDateTime(orderBasicInfo.getSettlementTime());
// 开始时间为localDateTime减30秒
LocalDateTime startTime = localDateTime.minusSeconds(30);
// 结束时间为localDateTime加30秒
LocalDateTime endTime = localDateTime.plusSeconds(30);
// 查询这笔订单的交易记录原始数据
List<PileMsgRecord> pileFeedListV2 = pileMsgRecordService.getPileFeedListV2(orderBasicInfo.getPileSn(), "0x3B", startTime, endTime);
logger.info("testSettleOrderLogicV2, orderCode:{}, pileSn:{}, startTime:{}, endTime:{}, pileFeedListV2:{}",
orderCode, orderBasicInfo.getPileSn(), startTime, endTime, JSON.toJSONString(pileFeedListV2));
}
public void testSettleOrderLogic(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
AbstractProgramLogic programLogic = ProgramLogicFactory.getProgramLogic("1");
// 获取更新数据后的orderBasicInfo对象
// programLogic.returnUpdateOrderBasicInfo(orderBasicInfo, data);
// 获取更新数据后的orderDetail对象/更新订单详情 查询订单详情 修改订单数据
// OrderDetail orderDetail = programLogic.returnUpdateOrderDetail(orderBasicInfo, data);
// 查询订单详情
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderBasicInfo.getOrderCode());