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

wisenergy-common/src/main/java/cn/wisenergy/common/utils/Constants.java

@@ -21,7 +21,7 @@ public class Constants {
         public final static Integer DECIMAL_DIGITS = 2;
 
         //头像地址
-        public final static String HEAD_POTRAIT= "/upload/14c54de0d-ee41-4e90-8c3e-ae6b93a2ad91.png";
+        public final static String HEAD_POTRAIT= "/upload/touxiang.png";
     }
     //访问来源
     public static class SourceType{

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

@@ -58,4 +58,6 @@ public interface OrderMapper extends BaseMapper<OrderInfo> {
     List<OrderInfo> getByCreateTime(@Param("created") Date created);
 
     List<OrderInfo> getByLevelStatus(int levelStatus);
+
+    List<OrderInfo> getByMonthOrderStatus(int monthOrderStatus);
 }

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

@@ -165,4 +165,13 @@
         </where>
     </select>
 
+    <select id="getByMonthOrderStatus" resultType="cn.wisenergy.model.app.OrderInfo">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        where
+        month_order_status = #{monthOrderStatus}
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -13,6 +13,7 @@ import org.bouncycastle.pqc.crypto.newhope.NHOtherInfoGenerator;
 import org.bytedeco.javacpp.presets.opencv_core;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -79,6 +80,7 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
     }
 
     @Override
+    @Transactional
     public void userSetBeinviteCode(String userId, String userInvitedId){
         //3、上级用户的直推表数据维护
         recommendInfoDataPreserve(userId,userInvitedId);

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

@@ -17,18 +17,24 @@ public class LastMonthUserInfoServiceImpl implements LastMonthUserInfoService {
     @Override
     public void userInfoMirrorImage() {
         //把用户表user_info备份
+        log.info("user_info表进行镜像开始");
         lastAccountMapper.copyTable("user_info","user_info_image");
         lastAccountMapper.deleteTable("user_info_backup");
         lastAccountMapper.updateTableName("user_info_image","user_info_backup");
+        log.info("user_info表进行镜像成功");
 
         //recommend_user表备份
+        log.info("user_info表进行镜像开始");
         lastAccountMapper.copyTable("recommend_user","recommend_user_image");
         lastAccountMapper.deleteTable("recommend_user_backup");
         lastAccountMapper.updateTableName("recommend_user_image","recommend_user_backup");
+        log.info("user_info表进行镜像成功");
 
         //team_user_info表备份
+        log.info("user_info表进行镜像开始");
         lastAccountMapper.copyTable("team_user_info","team_user_info_image");
         lastAccountMapper.deleteTable("team_user_info_backup");
         lastAccountMapper.updateTableName("team_user_info_image","team_user_info_backup");
+        log.info("user_info表进行镜像成功");
     }
 }

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

@@ -323,12 +323,12 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             return R.error("推荐人不能是自己!");
         }
 
-        //更新推荐用户的等级或者直推人数
-        aerialDeliveryUserService.userSetBeinviteCode(userId, userCode.getUserId());
-
         //5、设置用户被邀请码
         user.setBeInvitedCode(inviteCode);
         int count = usersMapper.edit(user);
+
+        //更新推荐用户的等级或者直推人数
+        aerialDeliveryUserService.userSetBeinviteCode(userId, userCode.getUserId());
         if (count == 0) {
             return R.ok(1, false);
         }