diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index e90b605..829b510 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -135,6 +135,7 @@
org.mybatis
mybatis
+
com.baomidou
@@ -145,6 +146,12 @@
org.springdoc
springdoc-openapi-starter-webmvc-ui
+
+
+
+ org.projectlombok
+ lombok
+
diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayOrderController.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayOrderController.java
index df87f0f..6b6abfc 100644
--- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayOrderController.java
+++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayOrderController.java
@@ -93,7 +93,9 @@ public class PayOrderController extends BaseController
{
payOrder.setUserId(getUserId());
payOrder.setOrderNumber(snowflakeidworker.nextId().toString());
- return toAjax(payOrderService.insertPayOrder(payOrder));
+ AjaxResult result = toAjax(payOrderService.insertPayOrder(payOrder));
+ result.put(AjaxResult.DATA_TAG, result);
+ return result;
}
/**
@@ -108,6 +110,18 @@ public class PayOrderController extends BaseController
return toAjax(payOrderService.updatePayOrder(payOrder));
}
+ /**
+ * 删除订单
+ */
+ @Operation(summary = "通过订单号删除订单")
+ @PreAuthorize("@ss.hasPermi('pay:order:remove')")
+ @Log(title = "订单", businessType = BusinessType.DELETE)
+ @DeleteMapping("/orderNumber/{orderNumber}")
+ public AjaxResult removeByOrderNumber(@PathVariable( name = "orderNumber" ) String orderNumbers)
+ {
+ return toAjax(payOrderService.deletePayOrderByOrderNumber(orderNumbers));
+ }
+
/**
* 删除订单
*/
diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/mapper/PayOrderMapper.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/mapper/PayOrderMapper.java
index 73bdcb6..1c68132 100644
--- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/mapper/PayOrderMapper.java
+++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/mapper/PayOrderMapper.java
@@ -67,4 +67,6 @@ public interface PayOrderMapper
* @return 结果
*/
public int deletePayOrderByOrderIds(Long[] orderIds);
+
+ public int deletePayOrderByOrderNumber(String orderNumber);
}
diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayOrderService.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayOrderService.java
index 332c466..116cc26 100644
--- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayOrderService.java
+++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayOrderService.java
@@ -59,6 +59,15 @@ public interface IPayOrderService {
*/
public int deletePayOrderByOrderIds(Long[] orderIds);
+
+ /**
+ * 删除订单信息
+ *
+ * @param orderId 订单主键
+ * @return 结果
+ */
+ public int deletePayOrderByOrderNumber(String orderNumber);
+
/**
* 删除订单信息
*
diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayOrderServiceImpl.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayOrderServiceImpl.java
index fd0820b..d70feaa 100644
--- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayOrderServiceImpl.java
+++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayOrderServiceImpl.java
@@ -96,4 +96,15 @@ public class PayOrderServiceImpl implements IPayOrderService {
public int deletePayOrderByOrderId(Long orderId) {
return payOrderMapper.deletePayOrderByOrderId(orderId);
}
+
+ /**
+ * 删除订单信息
+ *
+ * @param orderIds 需要删除的订单主键
+ * @return 结果
+ */
+ @Override
+ public int deletePayOrderByOrderNumber(String orderNumber) {
+ return payOrderMapper.deletePayOrderByOrderNumber(orderNumber);
+ }
}
diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayOrderMapper.xml b/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayOrderMapper.xml
index d7041a8..7a707c0 100644
--- a/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayOrderMapper.xml
+++ b/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayOrderMapper.xml
@@ -20,14 +20,10 @@
and user_id = #{userId}
- and order_number = #{orderNumber}
- and order_status = #{orderStatus}
- and total_amount = #{totalAmount}
- and order_content =
+ and order_number = #{orderNumber}
+ and order_status = #{orderStatus}
+ and total_amount = #{totalAmount}
+ and order_content =
#{orderContent}
and order_remark
= #{orderRemark}
@@ -37,65 +33,63 @@
+
+ where pay_order.order_id = #{orderId}
+
+ where pay_order.order_number = #{orderNumber}
- insert into pay_order
- order_id,
- user_id,
- order_number,
-
+ insert into pay_order
+ order_id,
+ user_id,
+ order_number,
+
order_status,
- total_amount,
- order_content,
-
+ total_amount,
+ order_content,
+
order_remark,
- order_message,
-
-
- #{orderId},
- #{userId},
- #{orderNumber},
-
+ order_message,
+
+
+ #{orderId},
+ #{userId},
+ #{orderNumber},
+
#{orderStatus},
- #{totalAmount},
- #{orderContent},
-
+ #{totalAmount},
+ #{orderContent},
+
#{orderRemark},
- #{orderMessage},
-
-
+ #{orderMessage},
+
+
- update pay_order
- user_id = #{userId},
- order_number
+ update pay_order
+ user_id = #{userId},
+ order_number
= #{orderNumber},
- order_status = #{orderStatus},
- total_amount = #{totalAmount},
- order_content = #{orderContent},
- order_remark = #{orderRemark},
- order_message = #{orderMessage},
-
+ order_status = #{orderStatus},
+ total_amount = #{totalAmount},
+ order_content = #{orderContent},
+ order_remark = #{orderRemark},
+ order_message = #{orderMessage},
+
where pay_order.order_id = #{orderId}
- delete from pay_order where order_id
- = #{orderId}
+
+ delete from pay_order where order_id = #{orderId}
+
- delete from pay_order where
- order_id in
- #{orderId}
-
+
+ delete from pay_order where order_number= #{orderNumber}
+
+
+
+ delete from pay_order where order_id in
+
+ #{orderId}
+
+
\ No newline at end of file
diff --git a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java
index 1a1cbd2..fd99882 100644
--- a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java
+++ b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java
@@ -30,11 +30,11 @@ public class SQBController extends BaseController {
@Operation(summary = "获取支付url")
@Parameters(value = {
- @Parameter(name = "id", description = "订单号", required = true)
+ @Parameter(name = "orderNumber", description = "订单号", required = true)
})
@PostMapping("/payUrl")
@Anonymous
- public R payUrl(@RequestParam("id") String orderNumber) throws Exception {
+ public R payUrl(@RequestParam("orderNumber") String orderNumber) throws Exception {
PayOrder payOrder = payOrderServicer.selectPayOrderByOrderNumber(orderNumber);
String url = sqbServiceImpl.payUrl(payOrder);
return R.ok(url);
@@ -42,11 +42,11 @@ public class SQBController extends BaseController {
@Operation(summary = "查询支付状态")
@Parameters(value = {
- @Parameter(name = "id", description = "订单号", required = true)
+ @Parameter(name = "orderNumber", description = "订单号", required = true)
})
@PostMapping("/query")
@Anonymous
- public AjaxResult query(@RequestParam("id") String orderNumber) throws Exception {
+ public AjaxResult query(@RequestParam("orderNumber") String orderNumber) throws Exception {
PayOrder payOrder = payOrderServicer.selectPayOrderByOrderNumber(orderNumber);
return success(sqbServiceImpl.query(payOrder));
}