【同步】BOOT 和 CLOUD 的功能（BPM）

2025-02-09 11:34:58 +08:00
parent 2ec1327214
commit d27536ffc1
68 changed files with 532 additions and 338 deletions
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.http
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.http
@@ -1,4 +1,4 @@
 ### 获得商品 SPU 明细
 GET {{baseUrl}}/product/spu/get-detail?id=4
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.http
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.http
@@ -1,18 +1,18 @@
 ### 获得订单交易的分页（默认）
 GET {{appApi}}/product/spu/page?pageNo=1&pageSize=10
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 ### 获得订单交易的分页（价格）
 GET {{appApi}}/product/spu/page?pageNo=1&pageSize=10&sortField=price&sortAsc=true
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 ### 获得订单交易的分页（销售）
 GET {{appApi}}/product/spu/page?pageNo=1&pageSize=10&sortField=salesCount&sortAsc=true
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 ### 获得商品 SPU 明细
 GET {{appApi}}/product/spu/get-detail?id=102
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.http
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.http
@@ -2,4 +2,4 @@
 GET {{appApi}}/promotion/activity/list-by-spu-ids?spuIds=222&spuIds=633
 Authorization: Bearer {{appToken}}
 Content-Type: application/json
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainHelpController.http
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainHelpController.http
@@ -2,7 +2,7 @@
 POST {{appApi}}/promotion/bargain-help/create
 Authorization: Bearer test248
 Content-Type: application/json
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 {
  "recordId": 26
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.http
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.http
@@ -2,7 +2,7 @@
 POST {{appApi}}/promotion/bargain-record/create
 Authorization: Bearer {{appToken}}
 Content-Type: application/json
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 {
  "activityId": 1
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/TradeAfterSaleController.http
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/TradeAfterSaleController.http
@@ -1,18 +1,18 @@
 ### 获得交易售后分页 => 成功
 GET {{baseUrl}}/trade/after-sale/page?pageNo=1&pageSize=10
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 ### 同意售后 => 成功
 PUT {{baseUrl}}/trade/after-sale/agree?id=7
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
 Content-Type: application/json

 ### 拒绝售后 => 成功
 PUT {{baseUrl}}/trade/after-sale/disagree
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
 Content-Type: application/json

 {
@@ -23,11 +23,11 @@ Content-Type: application/json
 ### 确认退款 => 成功
 PUT {{baseUrl}}/trade/after-sale/refund?id=6
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
 Content-Type: application/json

 ### 确认收货 => 成功
 PUT {{baseUrl}}/trade/after-sale/receive?id=7
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
 Content-Type: application/json
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.http
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.http
@@ -1,14 +1,14 @@
 ### 获得交易订单分页 => 成功
 GET {{baseUrl}}/trade/order/page?pageNo=1&pageSize=10
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 ### 获得交易订单分页 => 成功
 GET {{baseUrl}}/trade/order/get-detail?id=21
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 ### 获得交易订单的物流轨迹 => 成功
 GET {{baseUrl}}/trade/order/get-express-track-list?id=21
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/AppCartController.http
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/AppCartController.http
@@ -1,6 +1,6 @@
 ### 请求 /trade/cart/add 接口 => 成功
 POST {{appApi}}/trade/cart/add
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}
 Authorization: Bearer {{appToken}}
 Content-Type: application/json

@@ -12,7 +12,7 @@ Content-Type: application/json

 ### 请求 /trade/cart/update 接口 => 成功
 PUT {{appApi}}/trade/cart/update
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}
 Authorization: Bearer {{appToken}}
 Content-Type: application/json

@@ -23,20 +23,20 @@ Content-Type: application/json

 ### 请求 /trade/cart/delete 接口 => 成功
 DELETE {{appApi}}/trade/cart/delete?ids=1
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}
 Authorization: Bearer {{appToken}}

 ### 请求 /trade/cart/get-count 接口 => 成功
 GET {{appApi}}/trade/cart/get-count
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}
 Authorization: Bearer {{appToken}}

 ### 请求 /trade/cart/get-count-map 接口 => 成功
 GET {{appApi}}/trade/cart/get-count-map
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}
 Authorization: Bearer {{appToken}}

 ### 请求 /trade/cart/list 接口 => 成功
 GET {{appApi}}/trade/cart/list
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}
 Authorization: Bearer {{appToken}}
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
@@ -1,18 +1,18 @@
 ### /trade-order/settlement 获得订单结算信息（基于商品）
 GET {{appApi}}/trade/order/settlement?type=0&items[0].skuId=1&items[0].count=2&items[1].skuId=2&items[1].count=3&couponId=1
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 ### /trade-order/settlement 获得订单结算信息（基于购物车）
 GET {{appApi}}/trade/order/settlement?type=0&items[0].cartId=50&couponId=1
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 ### /trade-order/create 创建订单（基于商品）【快递】
 POST {{appApi}}/trade/order/create
 Content-Type: application/json
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 {
  "pointStatus": true,
@@ -31,7 +31,7 @@ tenant-id: {{appTenentId}}
 POST {{appApi}}/trade/order/create
 Content-Type: application/json
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 {
  "pointStatus": true,
@@ -51,19 +51,19 @@ tenant-id: {{appTenentId}}
 ### 获得订单交易的分页
 GET {{appApi}}/trade/order/page?pageNo=1&pageSize=10
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 ### 获得订单交易的详细
 GET {{appApi}}/trade/order/get-detail?id=21
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 ### 获得交易订单的物流轨迹
 GET {{appApi}}/trade/order/get-express-track-list?id=70
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}

 ### /trade-order/settlement-product 获得商品结算信息
 GET {{appApi}}/trade/order/settlement-product?spuIds=633
 Authorization: Bearer {{appToken}}
-tenant-id: {{appTenentId}}
+tenant-id: {{appTenantId}}
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
@@ -91,7 +91,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
    public PageResult<TradeOrderDO> getOrderPage(TradeOrderPageReqVO reqVO) {
        // 根据用户查询条件构建用户编号列表
        Set<Long> userIds = buildQueryConditionUserIds(reqVO);
-        if (userIds == null) { // 没查询到用户，说明肯定也没他的订单
+        if (CollUtil.isEmpty(userIds)) { // 没查询到用户，说明肯定也没他的订单
            return PageResult.empty();
        }
        // 分页查询
@@ -122,7 +122,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
    public TradeOrderSummaryRespVO getOrderSummary(TradeOrderPageReqVO reqVO) {
        // 根据用户查询条件构建用户编号列表
        Set<Long> userIds = buildQueryConditionUserIds(reqVO);
-        if (userIds == null) { // 没查询到用户，说明肯定也没他的订单
+        if (CollUtil.isEmpty(userIds)) { // 没查询到用户，说明肯定也没他的订单
            return new TradeOrderSummaryRespVO();
        }
        // 查询每个售后状态对应的数量、金额