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

Merge branch 'dev'

Browse Source
This commit is contained in:
Guoqs
2025-10-10 16:04:46 +08:00
parent 6a937c1801 2ba0fb9370
commit bd4b615729
7 changed files with 262 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -979,4 +979,20 @@ public class TempController extends BaseController {
SmsResponse smsResponse = smsBlend.sendMessage("18521561107","888888");
logger.info("发送短信结果:{}, 详情:{}", smsResponse.isSuccess(), JSON.toJSONString(smsResponse));
}
/**
* 处理OrderSplitRecord中值为0的数据
*/
@PostMapping("/handleOrderSplitRecord")
public RestApiResponse<?> handleOrderSplitRecord(@RequestBody QueryOrderDTO dto) {
RestApiResponse<?> response;
try {
tempService.handleOrderSplitRecord(dto.getOrderCode());
response = new RestApiResponse<>();
} catch (Exception e) {
logger.error("处理OrderSplitRecord中值为0的数据 error,", e);
response = new RestApiResponse<>(e);
}
return response;
}
}

28
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -1396,5 +1396,33 @@ public class TempService {
});
}
/**
* 处理OrderSplitRecord中值为0的数据
* @throws BaseAdaPayException
*/
public void handleOrderSplitRecord(String orderCode) {
// 根据订单号查询订单信息
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
// 组装after参数
AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()
.orderCode(orderBasicInfo.getOrderCode())
.merchantId(orderBasicInfo.getMerchantId())
.stationId(orderBasicInfo.getStationId())
.orderPayAmount(orderBasicInfo.getPayAmount()) // 支付金额
.orderConsumeAmount(orderBasicInfo.getOrderAmount()) // 消费金额
.orderSettleAmount(orderBasicInfo.getSettleAmount()) // 结算金额
.orderElectricityAmount(orderDetail.getTotalElectricityAmount()) // 电费金额
.orderElectricityDiscountAmount(orderDetail.getDiscountElectricityAmount()) // 电费折扣金额
.orderServiceAmount(orderDetail.getTotalServiceAmount()) // 服务费金额
.orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount()) // 服务费折扣金额
.orderRefundAmount(orderBasicInfo.getRefundAmount()) // 退款金额
.orderBasicInfo(orderBasicInfo)
.build();
orderBasicInfoService.splittingMethodTemp(afterSettleOrderDTO);
}
}