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

Merge branch 'dev' into dev-zza

Browse Source
This commit is contained in:
Lemon
2025-03-27 08:40:10 +08:00
parent bcbb4514d3 399d119d92
commit f7aecd1c31
12 changed files with 785 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
View File

@@ -4,22 +4,15 @@ import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap;
import com.jsowell.adapay.dto.BalancePaymentRequestDTO;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.YouDianUtils;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
import com.jsowell.common.enums.ebike.EBikeStopReasonEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.pile.domain.AdapayMemberAccount;
import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.PileMerchantInfo;
import com.jsowell.pile.domain.ebike.deviceupload.EBikeMessageCmd03;
import com.jsowell.pile.domain.*;
import com.jsowell.pile.domain.ykcCommond.EBikeStartChargingCommand;
import com.jsowell.pile.domain.ykcCommond.ReservationChargingCommand;
import com.jsowell.pile.domain.ykcCommond.StopChargingCommand;
@@ -733,6 +726,64 @@ public class TempController extends BaseController {
return response;
}
/**
* 查询订单折扣接口
* http://localhost:8080/temp/queryOrderDiscount
*/
@PostMapping("/queryOrderDiscount")
public RestApiResponse<?> queryOrderDiscount(@RequestBody QueryOrderDTO dto) {
RestApiResponse<?> response;
try {
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(dto.getOrderCode());
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderBasicInfo.getOrderCode());
// 计算订单折扣
tempService.calculateOrderDiscountsV2(orderBasicInfo, orderDetail);
response = new RestApiResponse<>();
} catch (Exception e) {
logger.error("查询订单折扣接口 error,", e);
response = new RestApiResponse<>();
}
return response;
}
/**
* 调试结算订单逻辑
* http://localhost:8080/temp/testSettleOrderLogic
*/
@PostMapping("/testSettleOrderLogic")
public RestApiResponse<?> testSettleOrderLogic(@RequestBody TransactionRecordsData data) {
RestApiResponse<?> response;
try {
String transactionCode = data.getTransactionCode();
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
// 调试结算订单逻辑
tempService.testSettleOrderLogic(data, orderBasicInfo);
response = new RestApiResponse<>();
} catch (Exception e) {
logger.error("调试结算订单逻辑error,", e);
response = new RestApiResponse<>();
}
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;
}
/**
* 重试订单退款接口/重试退款按钮 (批量)