审核地区权限

src/main/java/com/example/demo/domain/vo/RechargeAudit.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @program: gold-java
@@ -29,7 +30,9 @@ public class RechargeAudit {
     private String orderCode;   // 订单号
     private String activity; // 活动名称
     private String market; // 所属地区
-    private Byte refundType; // 退款类型
+    private List<String> markets; // 所属地区
+    private String refundType; // 退款类型
+    private Byte refundModel; // 退款类型
     private Integer sumGold; //充值金额
     private Integer permanentGold; // 永久金币
     private Integer freeGold; // 免费金币

src/main/java/com/example/demo/domain/vo/RefundAudit.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @program: gold-java
@@ -27,6 +28,7 @@ public class RefundAudit {
     private Integer jwcode; // 精网号
     private String orderCode;   // 订单号
     private String market; // 所属地区
+    private List<String> markets; // 所属地区
     private Integer refundModel; // 退款方式-全额 部分
     private String goodsName; // 商品名称
     private Integer sumGold; // 退款金额

src/main/java/com/example/demo/mapper/AuditMapper.java

@@ -35,7 +35,7 @@ public interface AuditMapper {
     List<RechargeAudit> selectRechargeBy(@Param("pageNum") Integer pageNum,
                                  @Param("pageSize") Integer pageSize,
                                  @Param("rechargeAudit") RechargeAudit rechargeAudit);
-    //多条件查询消费审核订单
+    //多条件查询退款审核订单
     List<RefundAudit> selectRefundBy(@Param("pageNum") Integer pageNum,
                                  @Param("pageSize") Integer pageSize,
                                  @Param("refundAudit") RefundAudit refundAudit);

src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java

@@ -9,12 +9,16 @@ import com.example.demo.domain.vo.RechargeAudit;
 import com.example.demo.domain.vo.RefundAudit;
 import com.example.demo.mapper.AuditMapper;
 import com.example.demo.mapper.UserMapper;
+import com.example.demo.service.AdminService;
 import com.example.demo.service.AuditService;
+import com.example.demo.service.GeneralService;
+import com.example.demo.service.PermissionService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -33,6 +37,10 @@ public class AuditServiceImpl implements AuditService {
     private AuditMapper auditMapper;
     @Autowired
     private UserMapper userMapper;
+    @Autowired
+    private AdminService adminService;
+    @Autowired
+    private GeneralService generalService;
     /*
     审核订单并修改用户余额等
      */
@@ -127,8 +135,10 @@ public class AuditServiceImpl implements AuditService {
      */
     @Override
     public PageInfo<RechargeAudit> selectRechargeBy(Integer pageNum, Integer pageSize, RechargeAudit rechargeAudit) {
+        String account = adminService.getCurrentAdminAccount();
+        List<String> markets = generalService.getRoleMarket(account);
+        rechargeAudit.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
-
         List<RechargeAudit> rechargeAudits = auditMapper.selectRechargeBy(pageNum, pageSize, rechargeAudit);
        // rechargeAudit.setFreeGold(rechargeAudit.getFreeJune()+rechargeAudit.getFreeDecember());
         return new PageInfo<>(rechargeAudits);
@@ -138,6 +148,9 @@ public class AuditServiceImpl implements AuditService {
     */
     @Override
     public PageInfo<RefundAudit> selectRefundBy(Integer pageNum, Integer pageSize, RefundAudit refundAudit) {
+        String account = adminService.getCurrentAdminAccount();
+        List<String> markets = generalService.getRoleMarket(account);
+        refundAudit.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
 
         List<RefundAudit> refundAudits = auditMapper.selectRefundBy(pageNum, pageSize, refundAudit);
@@ -149,6 +162,9 @@ public class AuditServiceImpl implements AuditService {
      */
     @Override
     public Gold sumRechargeGold(Integer pageNum, Integer pageSize, RechargeAudit rechargeAudit) {
+        String account = adminService.getCurrentAdminAccount();
+        List<String> markets = generalService.getRoleMarket(account);
+        rechargeAudit.setMarkets(markets);
         Gold gold = new Gold();
         //获取充值审核订单列表
         List<RechargeAudit> rechargeAudits = auditMapper.selectRechargeBy(1, 500000, rechargeAudit);
@@ -182,6 +198,9 @@ public class AuditServiceImpl implements AuditService {
      */
     @Override
     public Gold sumRefundGold(Integer pageNum, Integer pageSize, RefundAudit refundAudit) {
+        String account = adminService.getCurrentAdminAccount();
+        List<String> markets = generalService.getRoleMarket(account);
+        refundAudit.setMarkets(markets);
         Gold gold = new Gold();
         //获取充值审核订单列表
         List<RefundAudit> refundAudits = auditMapper.selectRefundBy(1, 500000, refundAudit);

src/main/resources/application.yml

@@ -4,9 +4,9 @@ spring:
       fail-on-unknown-properties: false
   datasource:
     mysql1:
-      jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgoldc?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true
-      username: hwgoldc
-      password: zB48T55wCsHC8KPz
+      jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true
+      username: hwgold
+      password: aDiw7MERSATdfGta
       driver-class-name: com.mysql.cj.jdbc.Driver
       hikari:
         pool-name: mysql1HikariCP

src/main/resources/mapper/AuditMapper.xml

@@ -61,6 +61,13 @@
             <if test="rechargeAudit.activity != null and rechargeAudit.activity != ''">
                 AND ugr.activity = #{rechargeAudit.activity}
             </if>
+            <if test="rechargeAudit.markets != null and rechargeAudit.markets.size() > 0 and '总部' not in rechargeAudit.markets">
+                AND (
+                <foreach collection="rechargeAudit.markets" item="market" separator=" OR ">
+                    u.market LIKE CONCAT('%', #{market}, '%')
+                </foreach>
+                )
+            </if>
             <if test="rechargeAudit.payModel != null and rechargeAudit.payModel != ''">
                 AND ugr.pay_model = #{rechargeAudit.payModel}
             </if>
@@ -115,6 +122,20 @@
             <if test="refundAudit.market != null and refundAudit.market != ''">
                 AND u.market = #{refundAudit.market}
             </if>
+            <if test="rechargeAudit.markets != null and rechargeAudit.markets.size() > 0 and '总部' not in rechargeAudit.markets">
+                AND (
+                <foreach collection="rechargeAudit.markets" item="market" separator=" OR ">
+                    u.market LIKE CONCAT('%', #{market}, '%')
+                </foreach>
+                )
+            </if>
+            <if test="refundAudit.markets != null and refundAudit.markets.size() > 0 and '总部' not in refundAudit.markets">
+                AND (
+                <foreach collection="refundAudit.markets" item="market" separator=" OR ">
+                    u.market LIKE CONCAT('%', #{market}, '%')
+                </foreach>
+                )
+            </if>
             <if test="refundAudit.startTime != null and refundAudit.endTime != null ">
                 AND ugr.create_time between #{refundAudit.startTime} and #{refundAudit.endTime}
             </if>