Merge remote-tracking branch 'origin/master'

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

 package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.OrderInfo;
-
-import java.util.List;
 
 /**
 *@ Description: 月定时任务接口定义
@@ -13,11 +10,6 @@ import java.util.List;
  */
 public interface MonthTaskService {
 
-    /**
-     * 订单返佣-月任务
-     * @return true or false
-     */
-    R<Boolean> orderRebate();
 
     /**
      * 收益和业绩统计（月度肥料）-月任务

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

@@ -70,8 +70,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
     @XxlJob(value = "orderRebateDayTask")
     @Override
     public R<Boolean> orderRebate() {
-        log.info("测试执行定时任务，三分钟执行一次");
-        //获取返佣订单
+        log.info("订单返佣接口定时-日任务");
+        //        //获取返佣订单
         List<OrderInfo> list = orderMapper.getListBySuccessTime(new Date());
         log.info("shop-mall[]AccountServiceImpl[]orderRebate[]input.param.list:{}", list.size());
         if (CollectionUtils.isEmpty(list)) {
@@ -114,9 +114,11 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
         return R.ok(accountInfo);
     }
 
+    @XxlJob(value = "monthManureDayTask")
     @Override
     public R<Boolean> performanceCount() {
         //获取本月订单
+        log.info("月度肥料定时-日任务");
         List<OrderInfo> list = orderMapper.getByCreateTime(new Date());
         log.info("shop-mall[]AccountServiceImpl[]performanceCount[]input.param.list:{}", list.size());
         if (CollectionUtils.isEmpty(list)) {
@@ -211,6 +213,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo>
         return list;
     }
 
+    @XxlJob(value = "growthAwardDayTask")
     @Override
     public R<Boolean> progressPrizeCount() {
         log.info("shop-mall[]AccountServiceImpl[]performanceCount[]input.method");

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

@@ -46,16 +46,6 @@ 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获取失败——————————");
-        }
-    }
 
     /**
      * 根据订单的创建时间获取有赞的订单数据 插入本地数据库
@@ -63,10 +53,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
      * @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();
@@ -146,10 +136,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();

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/AccountController.java

@@ -19,7 +19,7 @@ import java.util.List;
 /**
  * @author 86187
  */
-@Api(tags = "账户管路")
+@Api(tags = "账户管理")
 @RestController
 @RequestMapping("/account")
 @Slf4j

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LastAccountController.java

@@ -2,6 +2,7 @@ package cn.wisenergy.web.admin.controller.app;
 
 
 import cn.wisenergy.service.app.AccountService;
+import cn.wisenergy.service.app.MonthTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -20,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class LastAccountController {
     @Autowired
-    private AccountService accountService;
+    private MonthTaskService monthTaskService;
 
-//    @ApiOperation(value = "复制表-结构和数据", notes = "复制表-结构和数据", httpMethod = "PUT")
-//    @PutMapping("/add")
-//    public void copyTable(){
-//        accountService.mirrorImage();
-//    }
+    @ApiOperation(value = "复制表-结构和数据", notes = "复制表-结构和数据", httpMethod = "PUT")
+    @PutMapping("/add")
+    public void copyTable() {
+        monthTaskService.mirrorImage();
+    }
 }