Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java

@@ -214,4 +214,18 @@ public interface UsersMapper extends BaseMapper<User> {
      * @return
      */
     User getuserByBeInvitedCode(String beInvitedCode);
+
+    /**
+     * 获取在团队中处于同一位置的用户集合
+     * @param beInvitedCode
+     * @return
+     */
+    List<User> getListUserByBeInvitedCode(String beInvitedCode);
+
+    /**
+     * 通过邀请码获取用户信息
+     * @param inviteCode
+     * @return
+     */
+    User getUserByInviteCode(String inviteCode);
 }

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -411,4 +411,22 @@
         invite_code = #{be_invited_code}
     </select>
 
+    <select id="getListUserByBeInvitedCode" resultType="cn.wisenergy.model.app.User">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        where
+        be_invited_code = #{be_invited_code}
+    </select>
+
+    <select id="getUserByInviteCode" resultType="cn.wisenergy.model.app.User">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        where
+        invite_code = #{inviteCode}
+    </select>
+
 </mapper>

wisenergy-service/src/main/java/cn/wisenergy/service/app/AerialDeliveryUserService.java

@@ -7,4 +7,11 @@ public interface AerialDeliveryUserService {
      * 空投池用户随机分配推荐人邀请码
      */
     void aerialDeliveryUserRand();
+
+    /**
+     * 设置邀请码接口
+     * @param userId  当前用户id
+     * @param userInvitedId  推荐人用户id
+     */
+    void userSetBeinviteCode(String userId, String userInvitedId);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java

@@ -68,7 +68,6 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
             orderMapper.updateById(orderInfo);
         }
         log.info("-------------------------用户升级结束--------------------------------------");
-
     }
 
     @Override

wisenergy-web-admin/src/main/java/cn/wisenergy/Application.java

@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
@@ -14,6 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication(exclude = {MultipartAutoConfiguration.class})
 @EnableSwagger2
 @EnableScheduling
+@Configuration
 public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/FileUploadConfig.java

 package cn.wisenergy.web.config;
 
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.multipart.MultipartResolver;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
 /**
  * 文件上传配置
  *
  * @author wyy
  * @date 2019-08-22 19:20
  */
-//@Configuration
-//public class FileUploadConfig {
-//
-//    /**
-//     * 重新定义文件上传对象【springBoot request转化成MultipartHttpServletRequest】
-//     */
-//    @Bean(name = "multipartResolver")
-//    public MultipartResolver multipartResolver() {
-//        CommonsMultipartResolver resolver = new CommonsMultipartResolver();
-//        resolver.setDefaultEncoding("UTF-8");
-//        resolver.setResolveLazily(true);
-//        resolver.setMaxInMemorySize(1024 * 1024 * 1024);
-//        resolver.setMaxUploadSize(1024 * 1024 * 1024);
-//        resolver.setMaxUploadSizePerFile(1024 * 1024 * 1024);
-//        return resolver;
-//    }
-//
-//}
+@Configuration
+public class FileUploadConfig {
+
+    /**
+     * 重新定义文件上传对象【springBoot request转化成MultipartHttpServletRequest】
+     */
+    @Bean(name = "multipartResolver")
+    public MultipartResolver multipartResolver() {
+        CommonsMultipartResolver resolver = new CommonsMultipartResolver();
+        resolver.setDefaultEncoding("UTF-8");
+        resolver.setResolveLazily(true);
+        resolver.setMaxInMemorySize(1024 * 1024 * 1024);
+        resolver.setMaxUploadSize(1024 * 1024 * 1024);
+        resolver.setMaxUploadSizePerFile(1024 * 1024 * 1024);
+        return resolver;
+    }
+
+}

wisenergy-web-admin/src/main/resources/application-dev.yml

 spring:
+  main:
+    allow-bean-definition-overriding: true
+  # jackson时间格式化
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  servlet:
+    multipart:
+      max-file-size: 1024MB
+      max-request-size: 2048MB
+      enabled: true
+  mvc:
+    throw-exception-if-no-handler-found: true
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:

wisenergy-web-admin/src/main/resources/application-test.yml

 spring:
+  main:
+    allow-bean-definition-overriding: true
+  # jackson时间格式化
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  servlet:
+    multipart:
+      max-file-size: 1024MB
+      max-request-size: 2048MB
+      enabled: true
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
@@ -32,6 +43,7 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+
   #/www/server/redis/src/redis-server
   redis:
     open: false  # 是否开启redis缓存  true开启   false关闭

wisenergy-web-admin/src/main/resources/application.yml

@@ -6,6 +6,8 @@ server:
       min-spare: 30
     max-swallow-size: 1024MB
     max-http-form-post-size: 1024MB
+
+  #      1 073 741 824
   port: 8997
   servlet:
     context-path: /shop-mall
@@ -25,7 +27,6 @@ spring:
       max-file-size: 1024MB
       max-request-size: 2048MB
       enabled: true
-      resolve-lazily: true
   mvc:
     throw-exception-if-no-handler-found: true
 #  resources: