商铺名称

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java

@@ -22,7 +22,8 @@ public class RechargeOrderPageReqVO extends PageParam {
 
     @Schema(description = "租户id")
     private Long tenantId;
-
+    @Schema(description = "商铺名称")
+    private String tenantName;
     @Schema(description = "用户id", example = "28969")
     private Long uid;
 

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderRespVO.java

@@ -19,6 +19,9 @@ public class RechargeOrderRespVO extends RechargeOrderBaseVO {
     private String stringCreateTime;
     @Schema(description = "档次")
     private String grade;
+
+    @Schema(description = "商铺名称")
+    private String tenantName;
     @Schema(description = "组织名称")
     private String parentOrganizationName;
     @Schema(description = "推广员名称")

yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml

@@ -39,6 +39,7 @@
         select
         a.order_id,
         a.pay_serial_number,
+        e.name as tenantName,
         a.out_trade_no,
         a.pay_time,
         b.nickname,
@@ -54,6 +55,7 @@
         from cy_recharge_order a
         left join member_user b on a.promoter_id = b.id
         left join system_dept d on d.id = a.dept_id
+        left join system_tenant e on e.id = a.tenant_id
         <include refid="baseWhere">
         </include>
     </select>
@@ -108,6 +110,9 @@
             <if test="data.tenantId !=null and data.tenantId!=1">
                 and a.tenant_id =#{data.tenantId}
             </if>
+            <if test="data.tenantName !=null and data.tenantName!=''">
+                and d.name like CONCAT('%',#{data.tenantName},'%')
+            </if>
             <if test="data.paySerialNumber !=null and data.paySerialNumber!=''">
                 and a.pay_serial_number like CONCAT('%',#{data.paySerialNumber},'%')
             </if>