Merge remote-tracking branch 'origin/master'

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

@@ -116,7 +116,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
     @Override
     public R<Boolean> performanceCount() {
         //获取本月订单
-        log.info("月度肥料定时-日任务");
+        log.info("月度肥料定时-日任务开启");
         List<OrderInfo> list = orderMapper.getByCreateTime(new Date());
         log.info("shop-mall[]AccountServiceImpl[]performanceCount[]input.param.list:{}", list.size());
         if (CollectionUtils.isEmpty(list)) {
@@ -218,6 +218,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
         if (!bool) {
             return R.ok(1, false);
         }
+        log.info("月度肥料定时-日任务执行成功");
         return R.ok(0, true);
     }
 
@@ -225,7 +226,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
      * 获取用户的上级列表
      *
      * @param userId 用户id
-     * @return  用户的上级列表
+     * @return 用户的上级列表
      */
     @Override
     public List<User> getByList(String userId) {
@@ -241,6 +242,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
     @Override
     public R<Boolean> progressPrizeCount() {
         log.info("shop-mall[]AccountServiceImpl[]performanceCount[]input.method");
+        log.info("本月最大进步奖日定时任务开启");
         Date date = new Date();
         String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
 
@@ -311,6 +313,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
                     return R.ok(1, false);
                 }
             }
+            log.info("本月最大进步奖日定时任务执行成功");
             return R.ok(0, true);
         }
 
@@ -333,6 +336,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
         if (!bool) {
             return R.ok(1, false);
         }
+        log.info("本月最大进步奖日定时任务执行成功");
         return R.ok(0, true);
     }