Browse Source

训练营刷新开机数量

mac 2 years ago
parent
commit
e3e806c0c9

+ 28 - 0
kxs-common/kxs-common-oss/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.kxs</groupId>
+        <artifactId>kxs-common</artifactId>
+        <version>1.1.0</version>
+    </parent>
+
+    <artifactId>kxs-common-oss</artifactId>
+    <packaging>jar</packaging>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!--hutool-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+        </dependency>
+    </dependencies>
+</project>

+ 27 - 0
kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/UploadController.java

@@ -0,0 +1,27 @@
+package com.kxs.system.biz.controller.kxsapp;
+
+import cn.hutool.core.date.DatePattern;
+import com.kxs.common.core.util.R;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 上传控制器
+ *
+ * @author 没秃顶的码农
+ * @date 2024-04-18
+ */
+@RestController
+@RequestMapping("upload")
+@RequiredArgsConstructor
+public class UploadController {
+
+}

+ 2 - 4
kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampServiceImpl.java

@@ -325,11 +325,8 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
                 if(resR.getStatus() == 1){
                     if(resR.getData() != null){
                         JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(resR.getData()));
-                        int total = jsonObject.getInteger("SelfPosMerchantCount")
-                                + jsonObject.getInteger("TeamPosMerchantCount")
-                                + jsonObject.getInteger("SelfSimMerchantCount")
+                        int total = jsonObject.getInteger("TeamPosMerchantCount")
                                 + jsonObject.getInteger("TeamSimMerchantCount")
-                                + jsonObject.getInteger("SelfMpMerchantCount")
                                 + jsonObject.getInteger("TeamMpMerchantCount");
                         openNum += total;
                         kxsCampUser.setTeamOpenNum(kxsCampUser.getTeamOpenNum() + total);
@@ -366,5 +363,6 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
         });
         return pageData;
     }
+
 }
 

+ 1 - 0
pom.xml

@@ -81,6 +81,7 @@
         <module>kxs-product</module>
         <module>kxs-visual</module>
         <module>kxs-transfer</module>
+        <module>kxs-common/kxs-common-oss</module>
     </modules>
 
     <dependencyManagement>