autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-16 13:19:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

add 后管新增退款保险金额按钮

Browse Source
This commit is contained in:
Lemon
2025-10-11 16:07:37 +08:00
parent f59201129f
commit ca83cffffa
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -438,6 +438,8 @@ public class OrderService {
order.setDiscountAmount(String.valueOf(orderBasicInfo.getDiscountAmount())); order.setDiscountAmount(String.valueOf(orderBasicInfo.getDiscountAmount()));
order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount())); order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount()));
order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime())); order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime()));
order.setMerchantId(orderBasicInfo.getMerchantId());
order.setInsuranceAmount(String.valueOf(orderBasicInfo.getInsuranceAmount()));
vo.setOrderInfo(order); vo.setOrderInfo(order);
// 设备信息 // 设备信息

20
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -344,4 +344,24 @@ public class OrderBasicInfoController extends BaseController {
return response; return response;
} }
/**
* 订单保险金额退款
* @return
*/
@PostMapping("/refundInsuranceAmount")
public RestApiResponse<?> refundInsuranceAmount(@RequestBody OrderBasicInfo orderBasicInfo) {
RestApiResponse<?> response = null;
try {
orderBasicInfoService.refundInsurance(orderBasicInfo);
response = new RestApiResponse<>();
} catch (BusinessException e) {
logger.error("订单保险金额退款 error,", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("订单保险金额退款 error,", e);
response = new RestApiResponse<>(e);
}
logger.info("订单保险金额退款 params:{}, result:{}", JSON.toJSONString(orderBasicInfo), response);
return response;
}
} }

6
jsowell-admin/src/test/java/PaymentTestController.java
View File

@@ -484,10 +484,10 @@ public class PaymentTestController {
*/ */
@Test @Test
public void createPaymentReverseRequestTest() { public void createPaymentReverseRequestTest() {
String paymentId = "002212025092509265410817097978174926848"; String paymentId = "002212025100513581210820790129447211008";
BigDecimal refundAmount = new BigDecimal("0.5"); BigDecimal refundAmount = new BigDecimal("0.5");
String memberId = "65622699"; String memberId = "84488845";
String orderCode = "C23464104497"; String orderCode = "C82180436213";
// 延迟分账未确认调撤销调撤销接口退款 // 延迟分账未确认调撤销调撤销接口退款
PaymentReverseOperation operation = new PaymentReverseOperation(); PaymentReverseOperation operation = new PaymentReverseOperation();

2
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
View File

@@ -68,6 +68,8 @@ public class OrderDetailInfoVO {
private String createTime; // 订单创建时间 private String createTime; // 订单创建时间
private String startSOC; // 开始SOC private String startSOC; // 开始SOC
private String endSOC; // 结束SOC private String endSOC; // 结束SOC
private String merchantId; // 运营商id
private String insuranceAmount; // 保险金额
private String orderAmount; // 订单消费金额 private String orderAmount; // 订单消费金额
private String discountAmount; // 订单优惠金额 private String discountAmount; // 订单优惠金额
private String settleAmount;// 结算金额 private String settleAmount;// 结算金额