云联一号 5 days ago
parent
commit
61da553642

+ 2 - 0
fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -810,6 +810,7 @@ public class Task {
             if (erpOrderService != null){
                 ErpOrderQueryResponse response= null;
                 try {
+                    Thread.sleep(2000); // 1000毫秒 = 1秒
                     response = erpOrderService.getScrmOrder(request);
                     Thread.sleep(2000); // 1000毫秒 = 1秒
                 } catch (Exception e) {
@@ -828,6 +829,7 @@ public class Task {
                             if(orderQuery.getDeliverys()!=null&&orderQuery.getDeliverys().size()>0){
                                 for(ErpDeliverys delivery:orderQuery.getDeliverys()){
                                     if(delivery.getDelivery()&& StringUtils.isNotEmpty(delivery.getMail_no())){
+
                                         logger.info("调用erp获取订单详情接口:"+response);
                                         //更新商订单状态 删除REDIS
                                         fsStoreOrderService.deliveryOrderScrm(order.getOrderCode(),delivery.getMail_no(),delivery.getExpress_code(),delivery.getExpress_name());

+ 3 - 3
fs-service/src/main/java/com/fs/course/vo/FsCourseWatchLogStatisticsListVO.java

@@ -22,11 +22,11 @@ public class FsCourseWatchLogStatisticsListVO {
     @Excel(name = "小节名称")
     private String videoName;
 
-    @Excel(name = "待看课")
-    private String type1;
     @Excel(name = "看课中")
-    private String type2;
+    private String type1;
     @Excel(name = "已完课")
+    private String type2;
+    @Excel(name = "待看课")
     private String type3;
     @Excel(name = "看课中断")
     private String type4;