oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

回退 'Pull Request !216 : feat(pay,mall-trade): 小程序商品订单详情path配置支持'

Browse Source
This commit is contained in:
芋道源码
2025-11-21 13:21:34 +00:00
committed by Gitee
parent 32260511d9
commit f63b837300
8 changed files with 7 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApi.java
View File

@@ -39,8 +39,4 @@ public interface PayOrderApi {
CommonResult<Boolean> updatePayOrderPrice(@RequestParam("id") Long id,
@RequestParam("payPrice") Integer payPrice);
@PostMapping(PREFIX + "/getMerchantOrderIdByNo")
@Operation(summary = "根据支付订单编号获取商户订单编号")
@Parameter(name = "no", description = "支付单编号", example = "Pxxxx", required = true)
CommonResult<String> getMerchantOrderIdByPayOrderNo(@RequestParam("no") String no);
}

4
yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApiImpl.java
View File

@@ -37,8 +37,4 @@ public class PayOrderApiImpl implements PayOrderApi {
return success(true);
}
@Override
public CommonResult<String> getMerchantOrderIdByPayOrderNo(String no) {
return success(payOrderService.getMerchantOrderIdByNo(no));
}
}

4
yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/order/PayOrderMapper.java
View File

@@ -48,10 +48,6 @@ public interface PayOrderMapper extends BaseMapperX<PayOrderDO> {
PayOrderDO::getMerchantOrderId, merchantOrderId);
}
default PayOrderDO selectByNo(String no) {
return selectOne(PayOrderDO::getNo, no);
}
default int updateByIdAndStatus(Long id, Integer status, PayOrderDO update) {
return update(update, new LambdaQueryWrapper<PayOrderDO>()
.eq(PayOrderDO::getId, id).eq(PayOrderDO::getStatus, status));

8
yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderService.java
View File

@@ -40,13 +40,6 @@ public interface PayOrderService {
*/
PayOrderDO getOrder(Long appId, String merchantOrderId);
/**
* 获得商户订单编号
*
* @param no 编号
* @return merchantOrderId
*/
String getMerchantOrderIdByNo(String no);
/**
* 获得支付订单列表
*
@@ -162,4 +155,5 @@ public interface PayOrderService {
* @return 过期的订单数量
*/
int expireOrder();
}

11
yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
View File

@@ -84,17 +84,6 @@ public class PayOrderServiceImpl implements PayOrderService {
return orderMapper.selectByAppIdAndMerchantOrderId(appId, merchantOrderId);
}
@Override
public String getMerchantOrderIdByNo(String no) {
if(no.contains(payProperties.getOrderNoPrefix())){
PayOrderDO order = orderMapper.selectByNo(no);
if(ObjectUtil.isNotNull(order)){
return order.getMerchantOrderId();
}
}
return null;
}
@Override
public List<PayOrderDO> getOrderList(Collection<Long> ids) {
if (CollUtil.isEmpty(ids)) {