From ad2196834617aefd22de0476f6b9ce2b62756fdf Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Thu, 1 Jun 2023 10:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E4=BD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/recharge/RechargeOrderMapper.xml   |   1 +
 .../controller/admin/dept/DeptController.java |   5 +++++
 .../admin/dept/vo/dept/DeptListReqVO.java     |   5 ++++-
 .../system/dal/mysql/dept/DeptMapper.java     |   1 +
 .../src/main/resources/application-test.yaml  |  18 +++++++++---------
 .../resources/{2 => test}/apiclient_cert.p12  | Bin
 .../resources/{2 => test}/apiclient_cert.pem  |   0
 .../resources/{2 => test}/apiclient_key.pem   |   0
 8 files changed, 20 insertions(+), 10 deletions(-)
 rename yudao-server/src/main/resources/{2 => test}/apiclient_cert.p12 (100%)
 rename yudao-server/src/main/resources/{2 => test}/apiclient_cert.pem (100%)
 rename yudao-server/src/main/resources/{2 => test}/apiclient_key.pem (100%)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
index 05c9c5d84..b9ee82a3a 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
@@ -125,6 +125,7 @@
         left join system_tenant e on e.id = a.tenant_id
         <include refid="baseWhere">
         </include>
+        order by a.pay_time desc
     </select>
     <select id="promoterOrderCount" resultType="java.math.BigDecimal">
         select sum(pay_price) from cy_recharge_order
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
index e6d3bea38..61e58f410 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.system.controller.admin.dept;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.*;
 import cn.iocoder.yudao.module.system.convert.dept.DeptConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
@@ -61,6 +63,9 @@ public class DeptController {
     @Operation(summary = "获取部门列表")
     @PreAuthorize("@ss.hasPermission('system:dept:query')")
     public CommonResult<List<DeptRespVO>> getDeptList(DeptListReqVO reqVO) {
+        if(!TenantContextHolder.ID_SYSTEM.equals(SecurityFrameworkUtils.getLoginUser().getTenantId())){
+            reqVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
+        }
         List<DeptDO> list = deptService.getDeptList(reqVO);
         list.sort(Comparator.comparing(DeptDO::getSort));
         return success(DeptConvert.INSTANCE.convertList(list));
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java
index 469dc6ac6..be83f2b99 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java
@@ -6,7 +6,10 @@ import lombok.Data;
 @Schema(description = "管理后台 - 部门列表 Request VO")
 @Data
 public class DeptListReqVO {
-
+    /**
+     * 多租户编号
+     */
+    private Long tenantId;
     @Schema(description = "部门名称,模糊匹配", example = "芋道")
     private String name;
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
index def79df69..3b586bb79 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
@@ -13,6 +13,7 @@ public interface DeptMapper extends BaseMapperX<DeptDO> {
 
     default List<DeptDO> selectList(DeptListReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<DeptDO>()
+                .eq(DeptDO::getTenantId,reqVO.getTenantId())
                 .likeIfPresent(DeptDO::getName, reqVO.getName())
                 .eqIfPresent(DeptDO::getStatus, reqVO.getStatus()));
     }
diff --git a/yudao-server/src/main/resources/application-test.yaml b/yudao-server/src/main/resources/application-test.yaml
index 96125b299..d3e646ff2 100644
--- a/yudao-server/src/main/resources/application-test.yaml
+++ b/yudao-server/src/main/resources/application-test.yaml
@@ -144,7 +144,7 @@ logging:
 wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
   mp:
     # 公众号配置(必填)
-    app-id: wx041349c6f39b268b
+    app-id: wx3b3b17449cc13a8a
     secret: 5abee519483bc9f8cb37ce280e814bd0
     # 存储配置，解决 AccessToken 的跨节点的共享
     config-storage:
@@ -161,16 +161,16 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
   pay:
     one:
       enabled: true
-      app-id: wxb1826c88da21d81e
-      mch-id: 1641993417
+      app-id: wx3b3b17449cc13a8a
+      mch-id: 1642042589
       mch-key: qdn2I7Cmx4JeiKOt2CDjiu6UHgLTsOsM
       apiv3-key: cyywl666666cyywl888888cyywl66666
-      private-cert-path: classpath:/1/apiclient_cert.pem
-      private-key-path: classpath:/1/apiclient_key.pem
-      key-path: classpath:/1/apiclient_cert.p12
-      cert-serial-no: 58FDB503F92B6C0E258C9940BB726C2BF6022E56
-      notify-url: http://yuxy.perrymake.com/app-api/pay/wxpay/pay_notify
-      refund-notify-url: http://yuxy.perrymake.com/app-api/pay/wxpay/refund_notify
+      private-cert-path: classpath:/test/apiclient_cert.pem
+      private-key-path: classpath:/test/apiclient_key.pem
+      key-path: classpath:/test/apiclient_cert.p12
+      cert-serial-no: 47F04D51F958FFEF56A6DFC25BDE83CF89353E19
+      notify-url: https://yuxy.perrymake.com/app-api/pay/wxpay/pay_notify
+      refund-notify-url: https://yuxy.perrymake.com/app-api/pay/wxpay/refund_notify
     two:
       enabled: true
       app-id: wxb1826c88da21d81e
diff --git a/yudao-server/src/main/resources/2/apiclient_cert.p12 b/yudao-server/src/main/resources/test/apiclient_cert.p12
similarity index 100%
rename from yudao-server/src/main/resources/2/apiclient_cert.p12
rename to yudao-server/src/main/resources/test/apiclient_cert.p12
diff --git a/yudao-server/src/main/resources/2/apiclient_cert.pem b/yudao-server/src/main/resources/test/apiclient_cert.pem
similarity index 100%
rename from yudao-server/src/main/resources/2/apiclient_cert.pem
rename to yudao-server/src/main/resources/test/apiclient_cert.pem
diff --git a/yudao-server/src/main/resources/2/apiclient_key.pem b/yudao-server/src/main/resources/test/apiclient_key.pem
similarity index 100%
rename from yudao-server/src/main/resources/2/apiclient_key.pem
rename to yudao-server/src/main/resources/test/apiclient_key.pem