fix："优化子账户无法申请优惠码问题"

pom.xml

@@ -250,11 +250,11 @@
         <!--			<artifactId>spring-boot-starter-web</artifactId>-->
         <!--		</dependency>-->
 
-<!--        <dependency>-->
-<!--            <groupId>com.squareup.okhttp3</groupId>-->
-<!--            <artifactId>okhttp</artifactId>-->
-<!--            <version>4.9.3</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.3</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -296,7 +296,6 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
         </dependency>
 
         <!-- amazon ses -->

src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -346,6 +346,10 @@ public class TPromoCodeController {
             }
         }
         TAdmin admin = adminService.getById(adminId);
+        // 判断是否是子账户
+        if (admin.getType() == 3) {
+            admin = adminService.getById(admin.getParentId());
+        }
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime startOfToday = now.with(LocalTime.MIN);
         LocalDateTime endOfToday = now.with(LocalTime.MAX);
@@ -394,14 +398,15 @@ public class TPromoCodeController {
             }
             return R.ok(null, "生成成功");
         }
+
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getAdminId, admin.getId());
         List<TEquipment> list = tEquipmentService.list(query);
-        TEquipment equipment = list.get(0);
         if (list.size() == 0) {
             // "要有机器才能购买优惠码";
             return R.fail("没有机器");
         }
+        TEquipment equipment = list.get(0);
         //0折优惠码需要支付
         if (type.equals("0") && discount.equals(0)) {
             if (admin.getPromoCodeOpen() == null || admin.getPromoCodeOpen().equals("1")) {
@@ -581,8 +586,12 @@ public class TPromoCodeController {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
         if (StringUtils.isNotEmpty(adminId)) {
             TAdmin admin = adminService.getById(adminId);
+            if (admin.getType() == 3) {
+                // 是否是子账户,是就查询主账户的优惠码
+                admin = adminService.getById(admin.getParentId());
+            }
             if (admin.getType() != 0 && admin.getType() != 1) {
-                query.eq(TPromoCode::getAdminId, adminId);
+                query.eq(TPromoCode::getAdminId, admin.getId());
             }
             if (admin.getId() == 2738) {
                 LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
@@ -623,7 +632,7 @@ public class TPromoCodeController {
         return R.ok(iPage);
     }
 
-    @ApiOperation(value = "导出制作记录")
+    @ApiOperation(value = "导出")
     @PostMapping("/exportList")
     public void exportList(@RequestBody PromoCodeParam param, HttpServletResponse response) {
         String adminId = param.getAdminId();
@@ -638,12 +647,16 @@ public class TPromoCodeController {
         String head = "优惠码数据-";
         if (StringUtils.isNotEmpty(adminId)) {
             TAdmin admin = adminService.getById(adminId);
+            if (admin.getType() == 3) {
+                // 是否是子账户,是就查询主账户的优惠码
+                admin = adminService.getById(admin.getParentId());
+            }
             if (StringUtils.isNotEmpty(admin.getIfForeign()) && admin.getIfForeign().equals("1")) {
                 ifForeign = admin.getIfForeign();
                 head = "PromoCode-";
             }
             if (admin.getType() != 0 && admin.getType() != 1) {
-                query.eq(TPromoCode::getAdminId, adminId);
+                query.eq(TPromoCode::getAdminId, admin.getId());
             }
             // 申泽平台管理员
             if (admin.getId() == 2738) {