Merge remote-tracking branch 'origin/master'

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

@@ -14,6 +14,7 @@ import cn.wisenergy.service.Manager.PublicManager;
 import cn.wisenergy.service.app.AccountService;
 import cn.wisenergy.service.Manager.AccountManager;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.lang3.StringUtils;
@@ -66,9 +67,10 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
 
     private static final Integer TWENTY = 20;
 
+    @XxlJob(value = "orderRebateDayTask")
     @Override
     public R<Boolean> orderRebate() {
-
+        log.info("测试执行定时任务，三分钟执行一次");
         //获取返佣订单
         List<OrderInfo> list = orderMapper.getListBySuccessTime(new Date());
         log.info("shop-mall[]AccountServiceImpl[]orderRebate[]input.param.list:{}", list.size());

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

@@ -46,16 +46,27 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
     Date startUpdateDate = null;
     Date endUpdateDate = null;
     Date date = new Date();
+    Token token;
+
+    {
+        try {
+            token = youzanToken();
+        } catch (SDKException e) {
+            e.printStackTrace();
+            log.info("------有赞TOKEN获取失败——————————");
+        }
+    }
+
     /**
      * 根据订单的创建时间获取有赞的订单数据 插入本地数据库
      *
      * @return
      * @throws SDKException
      */
-    @XxlJob(value = "YouZanOrdersjobhandler")
+//    @XxlJob(value = "YouZanOrdersjobhandler")
     @Override
     public void getYouZanOrdersForCreateTime() throws SDKException {
-        Token token = youzanToken();
+//        Token token = youzanToken();
         YouzanTradesSoldGet youzanTradesSoldGet = new YouzanTradesSoldGet();
         //创建参数对象,并设置参数
         YouzanTradesSoldGetParams youzanTradesSoldGetParams = new YouzanTradesSoldGetParams();
@@ -135,10 +146,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
      * @return
      * @throws SDKException
      */
-    @XxlJob(value = "YouZanOrdersForUpdateTimejobhandler")
+//    @XxlJob(value = "YouZanOrdersForUpdateTimejobhandler")
     @Override
     public void getYouZanOrdersForUpdateTime() throws SDKException {
-        Token token = youzanToken();
+//        Token token = youzanToken();
         YouzanTradesSoldGet youzanTradesSoldGet = new YouzanTradesSoldGet();
         //创建参数对象,并设置参数
         YouzanTradesSoldGetParams youzanTradesSoldGetParams = new YouzanTradesSoldGetParams();