wangtao 3 سال پیش
والد
کامیت
2b37c48148

+ 1 - 1
lb-module/src/main/java/com/ydd/module/service/IDspDeliveryService.java

@@ -69,7 +69,7 @@ public interface IDspDeliveryService extends IService<DspDelivery> {
     DspDelivery findById(Long id);
 
     List<DspDelivery> selectDspDeliverysByTime();
-  //  void fengNiaoTask();
+    void fengNiaoTask();
 
     /**
      * 查询门店没有绑定的运力

+ 1 - 1
lb-module/src/main/java/com/ydd/module/service/IShopDeliveryService.java

@@ -89,7 +89,7 @@ public interface IShopDeliveryService extends IService<ShopDelivery> {
 
     List<ShopDelivery> selectShopDeliverys(long startTime ,long endTime);
 
-//     void shanSongTask();
+     void shanSongTask();
 
     /**
      * 根据门店id查询提交的运力

+ 2 - 2
lb-module/src/main/java/com/ydd/module/service/IShopWaimaiService.java

@@ -48,7 +48,7 @@ public interface IShopWaimaiService extends IService<ShopWaimai> {
 
     List<ShopWaimai> selectShopWaimai(long startTime, long endTime);
 
-    //void elemeTask();
+    void elemeTask();
     List<ShopWaimai> eleShopList();
     List<ShopWaimai> selectEleRetailShopWaimai();
     List<ShopWaimai> selectEleRetailShop();
@@ -63,7 +63,7 @@ public interface IShopWaimaiService extends IService<ShopWaimai> {
 
 
     List<WaimaiListDto> findWMList(  Long shopId);
-//    void refreshSgToken();
+    void refreshSgToken();
 
     List<WaimaiAuthListDto> findWMListByMobile(String mobile, String waimaiId);
 

+ 51 - 0
lb-module/src/main/java/com/ydd/module/service/impl/AutoCancelOrder.java

@@ -0,0 +1,51 @@
+package com.ydd.module.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.module.domain.Order;
+import com.ydd.module.enums.CancelOrderEnum;
+import com.ydd.module.producer.RabbitSender;
+import com.ydd.module.service.IOrderService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class AutoCancelOrder {
+
+    private final IOrderService iOrderService;
+
+    private final RabbitSender rabbitSender;
+
+    /**
+     * 自动30分钟
+     */
+    //@Scheduled(cron = "0 */1 * * * ? ")
+    public void cancel(Integer time) {
+        //查询所有待接单的订单
+        String cancelReason = time + "分钟未接单自动取消";
+        List<Order> list = iOrderService.queryTimeOutOrder(time);
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (Order order : list) {
+                order.setCancelReason(cancelReason);
+            }
+            rabbitSender.send(JSONObject.toJSONString(list), "order.cancel");
+        }
+    }
+
+    public void cancelOrder(Long orderId, Order order) {
+        List<Order> list = iOrderService.list(new QueryWrapper<Order>().eq("id", orderId));
+        list.forEach(o -> {
+            if (order.getCancelOrderId() != null && !order.getCancelOrderId().equals("")) {
+                o.setCancelReason(CancelOrderEnum.getNameById(order.getCancelOrderId()).getName());
+            }
+        });
+        rabbitSender.send(JSONObject.toJSONString(list), "order.cancel");
+    }
+}

+ 28 - 0
lb-module/src/main/java/com/ydd/module/service/impl/AutoFinishOrder.java

@@ -0,0 +1,28 @@
+package com.ydd.module.service.impl;
+
+import com.ydd.module.service.IOrderService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 外卖订单超过6小时未配送自动变为其他平台完成
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class AutoFinishOrder {
+
+    private final IOrderService iOrderService;
+
+
+    /**
+     * 自动30分钟
+     */
+    //@Scheduled(cron = "0 */1 * * * ? ")
+    public void finish() {
+        iOrderService.autofinish();
+    }
+
+}

+ 129 - 0
lb-module/src/main/java/com/ydd/module/service/impl/AutoSyncWaiMaiOrder.java

@@ -0,0 +1,129 @@
+package com.ydd.module.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ydd.api.EleRetailApi;
+import com.ydd.api.ElemeApi;
+import com.ydd.common.utils.DateUtils;
+import com.ydd.module.domain.ShopWaimai;
+import com.ydd.module.producer.RabbitSender;
+import com.ydd.module.service.IShopWaimaiService;
+import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.order.OOrder;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.order.OrderList;
+import com.ydd.third.waimai.eleRetai.vo.OrderEBaiInfo;
+import com.ydd.third.waimai.eleRetai.vo.OrderEBaiList;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 外卖订单超过6小时未配送自动变为其他平台完成
+ */
+@Slf4j
+@Component(value = "autoSyncWaiMaiOrder")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class AutoSyncWaiMaiOrder {
+
+
+    private final ElemeApi elemeClient;
+    private final EleRetailApi eleRetaiClient;
+    private final IShopWaimaiService iShopWaimaiService;
+    private final RabbitSender rabbitSender;
+
+    public void syncEleOrder() {
+        List<ShopWaimai> list = iShopWaimaiService.eleShopList();
+
+
+        for (ShopWaimai shopWaimai : list) {
+            int i = 1;
+            Integer pageNo = 1;
+            Integer pages = 0;
+            Integer pageSize = 50;
+            while (i > 0) {
+                ResObject<OrderList> resObject = elemeClient.getAllOrders(shopWaimai.getAuthToken(), Long.valueOf(shopWaimai.getThirdShopId()), pageNo, pageSize, DateUtils.getDate());
+                if (resObject.getCode() == 0) {
+                    Integer total = resObject.getData().getTotal();
+                    List<OOrder> oOrders = resObject.getData().getList();
+                    if (total <= oOrders.size()) {
+                        i = 0;
+                    }
+                    if (total > oOrders.size() && pageNo == 1) {
+                        // 还需要拉取的次数
+                        pages = (total - oOrders.size()) / pageSize;
+                        Integer a = (total - oOrders.size()) % pageSize;
+                        if (a > 0) {
+                            pages = pages + 1;
+                        }
+                        i = pages;
+                    }
+                    if (pageNo > 1 && pages > 0) {
+                        i--;
+                    }
+                    pageNo++;
+                    if (resObject.getData() != null) {
+                        //只取最近5分钟已处理的订单
+                        List<OOrder> orders = resObject.getData().getList().stream().filter(OOrder -> (getTime(OOrder.getCreatedAt(), new Date())) < 10 && OOrder.getStatus().name().equals("valid"))
+                                .collect(Collectors.toList());
+                        if (CollectionUtils.isNotEmpty(oOrders)) {
+                            rabbitSender.send(JSONObject.toJSONString(resObject.getData()), "ele.syncWm");
+                        }
+                    }
+                }
+            }
+
+        }
+
+    }
+
+    public void syncEleRetailOrder() {
+        List<ShopWaimai> list = iShopWaimaiService.selectEleRetailShopWaimai();
+        long startTime = (com.ydd.third.common.utils.DateUtils.getAutoTime(new Date(), 0, 0, 0)) / 1000;
+        long endTime = System.currentTimeMillis() / 1000;
+
+        for (ShopWaimai shopWaimai : list) {
+            int i = 1;
+            Integer pageNo = 1;
+            Integer pages = 0;
+            Integer pageSize = 50;
+            while (i > 0) {
+                ResObject<OrderEBaiList> resObject = eleRetaiClient.getOrderList(shopWaimai.getThirdShopId(), pageNo, pageSize, String.valueOf(startTime), String.valueOf(endTime), "5");
+                if (resObject.getCode() == 0) {
+                    OrderEBaiList listList = resObject.getData();
+                    List<OrderEBaiInfo> oOrders = listList.getList();
+                    Integer total = listList.getTotal();
+                    if (total <= oOrders.size()) {
+                        i = 0;
+                    }
+                    if (total > oOrders.size() && pageNo == 1) {
+                        // 还需要拉取的次数
+                        pages = (total - oOrders.size()) / pageSize;
+                        Integer a = (total - oOrders.size()) % pageSize;
+                        if (a > 0) {
+                            pages = pages + 1;
+                        }
+                        i = pages;
+                    }
+                    if (pageNo > 1 && pages > 0) {
+                        i--;
+                    }
+                    pageNo++;
+                    if (resObject.getData() != null && CollectionUtils.isNotEmpty(resObject.getData().getList())) {
+                        rabbitSender.send(JSONObject.toJSONString(resObject.getData()), "eBai.syncWm");
+                    }
+                }
+            }
+        }
+    }
+
+    // 获取两个时间相差分钟数
+    public static long getTime(Date oldTime, Date newTime) {
+        long diff = (newTime.getTime() - oldTime.getTime()) / 1000 / 60;
+        return diff;
+    }
+}

+ 28 - 82
lb-module/src/main/java/com/ydd/module/service/impl/DspDeliveryServiceImpl.java

@@ -3,6 +3,7 @@ package com.ydd.module.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.ydd.api.DeliveryService;
 import com.ydd.common.core.domain.entity.SysUser;
 import com.ydd.common.core.page.PageResult;
 import com.ydd.common.enums.DeliveryTypeEnums;
@@ -23,6 +24,8 @@ import com.ydd.module.service.*;
 import com.ydd.system.mapper.SysConfigMapper;
 import com.ydd.system.service.ISysConfigService;
 
+import com.ydd.third.common.dto.FengniaoV3Token;
+import com.ydd.third.common.vo.ResObject;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -55,8 +58,8 @@ public class DspDeliveryServiceImpl extends ServiceImpl<DspDeliveryMapper, DspDe
 
     @Resource
     private IMemberService iMemberService;
-//    @Resource
-//    private FengniaoClient fengniaoClient;
+    @Resource
+    private DeliveryService fengniaoClient;
     @Resource
     private IMemberConfigService iMemberConfigService;
     @Resource
@@ -407,63 +410,6 @@ public class DspDeliveryServiceImpl extends ServiceImpl<DspDeliveryMapper, DspDe
                 }
 
 
-                //达达和点我达特殊处理
-                /*if (info.getType().equals(DeliveryTypeEnums.DADA.getType()) ||
-                        info.getType().equals(DeliveryTypeEnums.DADA_YZ.getType()) ||
-                        info.getType().equals(DeliveryTypeEnums.DWD.getType()) ||
-                        info.getType().equals(DeliveryTypeEnums.FENG_NIAO.getType()) ||
-                        info.getType().equals(DeliveryTypeEnums.HUO_LA_LA.getType()) ||
-                        info.getType().equals(DeliveryTypeEnums.MEI_TUAN.getType())||
-                        info.getType().equals(DeliveryTypeEnums.SHAN_SONG.getType()) ||
-                        info.getType().equals(DeliveryTypeEnums.SHUN_FENG.getType())) {
-                    ShopDelivery sd = iShopDeliveryService.getOne(new QueryWrapper<ShopDelivery>().eq("merchant_id", member.getMerchantId()).eq("delivery_id", delivery.getId())
-                            .eq("deleted", IsDeleteEnum.NORMAL.status).eq("shop_id", shopId).eq("bind_status",1));
-                    if (info.getType().equals(DeliveryTypeEnums.DADA.getType()) || info.getType().equals(DeliveryTypeEnums.DADA_YZ.getType())){
-                        if (sd != null&&sd.getThirdShopId()!=null){
-                            info.setShopId(sd.getThirdShopId());
-                            if (isMine == 1){
-                                if (info.getType().equals(DeliveryTypeEnums.DADA.getType())){
-                                    info.setShopId(sd.getDadaShopNo());
-                                    info.setDadaThirdShopId(sd.getThirdShopId());
-                                }else {
-                                    info.setShopId(sd.getDadaYzShopNo());
-                                    info.setDadaThirdShopId(sd.getThirdShopId());
-                                }
-                            }
-                        }else {
-                            //如果默认店铺被删了,则取列表第一个
-                            List<ShopDelivery> deliveries = iShopDeliveryService.list(new QueryWrapper<ShopDelivery>().eq("merchant_id", member.getMerchantId()).eq("delivery_id", delivery.getId())
-                                    .eq("deleted", IsDeleteEnum.NORMAL.status).isNotNull("third_shop_id"));
-                            if (CollectionUtils.isNotEmpty(deliveries)){
-                                info.setShopId(deliveries.get(0).getThirdShopId());
-                                if (isMine == 1){
-                                    if (info.getType().equals(DeliveryTypeEnums.DADA.getType())){
-                                        info.setShopId(deliveries.get(0).getDadaShopNo());
-                                        info.setDadaThirdShopId(deliveries.get(0).getThirdShopId());
-                                    }else {
-                                        info.setShopId(deliveries.get(0).getDadaYzShopNo());
-                                        info.setDadaThirdShopId(deliveries.get(0).getThirdShopId());
-                                    }
-                                }
-                            }
-                        }
-                    }
-//                    if (sd != null&&sd.getThirdShopId()!=null &&(info.getType().equals(DeliveryTypeEnums.DADA.getType()) ||
-//                            info.getType().equals(DeliveryTypeEnums.DADA_YZ.getType()) )) {
-//                        info.setShopId(sd.getThirdShopId());
-//                    }
-                    if(sd != null&&sd.getThirdShopId()!=null &&(info.getType().equals(DeliveryTypeEnums.FENG_NIAO.getType()) ||
-                            info.getType().equals(DeliveryTypeEnums.HUO_LA_LA.getType())|| info.getType().equals(DeliveryTypeEnums.MEI_TUAN.getType()))){
-                        info.setThirdShopId(sd.getThirdShopId());
-                    }
-                    if (DeliveryTypeEnums.SHAN_SONG.getType().equals(info.getType())) {
-                        if(sd != null && sd.getThirdShopId() != null){
-                            info.setShopId(sd.getThirdShopId());
-                        } else {
-                            info.setShopId(null);
-                        }
-                    }
-                }*/
         }
             if ((delivery.getType().equals(DeliveryTypeEnums.DADA.getType()) || delivery.getType().equals(DeliveryTypeEnums.DADA_YZ.getType())) && member.getMemberType().equals(MemberTypeEnum.PERSON.type)){
                 info.setIsMerchant(StatusEnum.SHOW.status);
@@ -485,29 +431,29 @@ public class DspDeliveryServiceImpl extends ServiceImpl<DspDeliveryMapper, DspDe
         List<DspDelivery> dspDeliveries = baseMapper.selectDspDeliverysByTime();
         return dspDeliveries;
     }
-//    @Override
-//    public void fengNiaoTask() {
-//        try {
-//            List<DspDelivery> deliverys = baseMapper.selectDspDeliverysByTime();
-//            if (deliverys != null && deliverys.size() > 0) {
-//                for (DspDelivery delivery : deliverys) {
-//                    if ((System.currentTimeMillis()-delivery.getCreateTime().getTime())/1000>delivery.getReExpireIn()){
-//                        log.error("蜂鸟刷新token商户id:"+delivery.getShopId()+"刷新token失败,token过期");
-//                        continue;
-//                    }
-//                    ResObject<FengniaoV3Token> resObject = fengniaoClient.refreshToken(delivery.getRefreshToken(), delivery.getShopId());
-//                        delivery.setExpiresIn(resObject.getData().getExpireIn());
-//                        delivery.setRefreshToken(resObject.getData().getRefreshToken());
-//                        delivery.setAuthToken(resObject.getData().getAccessToken());
-//                        delivery.setCreateTime(new Date());
-//                        baseMapper.updateById(delivery);
-//                }
-//            }
-//        } catch (Exception e) {
-//            log.error("蜂鸟刷新token定时任务出现异常", e);
-//            e.printStackTrace();
-//        }
-//    }
+    @Override
+    public void fengNiaoTask() {
+        try {
+            List<DspDelivery> deliverys = baseMapper.selectDspDeliverysByTime();
+            if (deliverys != null && deliverys.size() > 0) {
+                for (DspDelivery delivery : deliverys) {
+                    if ((System.currentTimeMillis()-delivery.getCreateTime().getTime())/1000>delivery.getReExpireIn()){
+                        log.error("蜂鸟刷新token商户id:"+delivery.getShopId()+"刷新token失败,token过期");
+                        continue;
+                    }
+                    ResObject<FengniaoV3Token> resObject = fengniaoClient.fengniaoRefreshToken(delivery.getRefreshToken(), delivery.getShopId());
+                        delivery.setExpiresIn(resObject.getData().getExpireIn());
+                        delivery.setRefreshToken(resObject.getData().getRefreshToken());
+                        delivery.setAuthToken(resObject.getData().getAccessToken());
+                        delivery.setCreateTime(new Date());
+                        baseMapper.updateById(delivery);
+                }
+            }
+        } catch (Exception e) {
+            log.error("蜂鸟刷新token定时任务出现异常", e);
+            e.printStackTrace();
+        }
+    }
 
     /**
      * 查询门店没有绑定的运力

+ 28 - 22
lb-module/src/main/java/com/ydd/module/service/impl/ShopDeliveryServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydd.api.DeliveryService;
 import com.ydd.common.core.domain.entity.SysUser;
 import com.ydd.common.core.page.PageResult;
 import com.ydd.common.enums.UserTypeEnums;
@@ -18,6 +19,8 @@ import com.ydd.module.enums.BindStatusEnum;
 import com.ydd.module.enums.IsDeleteEnum;
 import com.ydd.module.mapper.ShopDeliveryMapper;
 import com.ydd.module.service.*;
+import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.callback.ShansongTokenVo;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +72,9 @@ public class ShopDeliveryServiceImpl extends ServiceImpl<ShopDeliveryMapper, Sho
     @Resource
     private IShopDeliveryBindService iShopDeliveryBindService;
 
+    @Resource
+    private DeliveryService shansongClient;
+
     @Override
     public List<ShopDelivery> queryList(ShopDelivery shopDelivery) {
         LambdaQueryWrapper<ShopDelivery> lqw = Wrappers.lambdaQuery();
@@ -384,28 +390,28 @@ public class ShopDeliveryServiceImpl extends ServiceImpl<ShopDeliveryMapper, Sho
         List<ShopDelivery> deliverys = baseMapper.selectShopDeliverys();
         return deliverys;
     }
-//    @Override
-//    public void shanSongTask() {
-//        try {
-//            List<ShopDeliveryBind> bindDeliveryList = iShopDeliveryBindService.getShopBindDeliveryList();
-////            List<ShopDelivery> deliverys = baseMapper.selectShopDeliverys();
-//            if (bindDeliveryList != null && bindDeliveryList.size() > 0) {
-//                for (ShopDeliveryBind delivery : bindDeliveryList) {
-//                    ResObject<ShansongTokenVo> resObject = shansongClient.refreshToken(delivery.getRefreshToken(), delivery.getThirdShopId());
-//                    if (resObject.getCode()==0) {
-//                        delivery.setAuthToken(resObject.getData().getAccessToken());
-//                        delivery.setRefreshToken(resObject.getData().getRefreshToken());
-//                        delivery.setExpiresIn(resObject.getData().getExpireIn());
-//                        delivery.setCreateTime(new Date());
-//                        iShopDeliveryBindService.updateById(delivery);
-//                    }
-//                }
-//            }
-//        } catch (Exception e) {
-//            log.error("闪送刷新token定时任务出现异常", e);
-//            e.printStackTrace();
-//        }
-//    }
+    @Override
+    public void shanSongTask() {
+        try {
+            List<ShopDeliveryBind> bindDeliveryList = iShopDeliveryBindService.getShopBindDeliveryList();
+//            List<ShopDelivery> deliverys = baseMapper.selectShopDeliverys();
+            if (bindDeliveryList != null && bindDeliveryList.size() > 0) {
+                for (ShopDeliveryBind delivery : bindDeliveryList) {
+                    ResObject<ShansongTokenVo> resObject = shansongClient.ssRefreshToken(delivery.getRefreshToken(), delivery.getThirdShopId());
+                    if (resObject.getCode()==0) {
+                        delivery.setAuthToken(resObject.getData().getAccessToken());
+                        delivery.setRefreshToken(resObject.getData().getRefreshToken());
+                        delivery.setExpiresIn(resObject.getData().getExpireIn());
+                        delivery.setCreateTime(new Date());
+                        iShopDeliveryBindService.updateById(delivery);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("闪送刷新token定时任务出现异常", e);
+            e.printStackTrace();
+        }
+    }
 
     /**
      * 根据门店id查询提交的运力

+ 54 - 50
lb-module/src/main/java/com/ydd/module/service/impl/ShopWaimaiServiceImpl.java

@@ -2,6 +2,7 @@ package com.ydd.module.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.sankuai.meituan.shangou.open.sdk.domain.OAuthTokenParam;
+import com.ydd.api.ElemeApi;
 import com.ydd.module.domain.Shop;
 import com.ydd.module.dto.WaimaiAuthListDto;
 import com.ydd.module.dto.WaimaiDto;
@@ -9,8 +10,11 @@ import com.ydd.module.dto.WaimaiListDto;
 import com.ydd.module.enums.BindStatusEnum;
 import com.ydd.module.enums.IsDeleteEnum;
 import com.ydd.module.mapper.ShopWaimaiMapper;
+import com.ydd.third.common.config.WaimaiConfig;
 import com.ydd.third.common.request.MtSgAuthRequest;
 
+import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.waimai.eleme.oauth.response.Token;
 import lombok.SneakyThrows;
 import org.apache.commons.collections4.CollectionUtils;
 
@@ -36,10 +40,10 @@ import java.util.List;
 @Service
 public class ShopWaimaiServiceImpl extends ServiceImpl<ShopWaimaiMapper, ShopWaimai> implements IShopWaimaiService {
 
-//    @Resource
-//    private ElemeAuthClient elemeAuthClient;
-//    @Resource
-//    private  WaimaiConfig waimaiConfig;
+    @Resource
+    private ElemeApi elemeAuthClient;
+    @Resource
+    private WaimaiConfig waimaiConfig;
 
     @Override
     public List<ShopWaimai> queryList(ShopWaimai shopWaimai) {
@@ -91,28 +95,28 @@ public class ShopWaimaiServiceImpl extends ServiceImpl<ShopWaimaiMapper, ShopWai
         List<ShopWaimai> list = baseMapper.selectShopWaimai();
         return list;
     }
-//    @Override
-//    public void elemeTask() {
-//        try {
-//            log.debug("饿了么刷新token任务执行");
-//            List<ShopWaimai> list = baseMapper.selectShopWaimai();
-//            if (list != null && list.size() > 0) {
-//                for (ShopWaimai waimai : list) {
-//                    ResObject<Token> resObject = elemeAuthClient.doRefreshToken(waimai.getRefreshToken());
-//                    if (resObject.getCode()==0) {
-//                        waimai.setExpiresIn(resObject.getData().getExpiresIn());
-//                        waimai.setRefreshToken(resObject.getData().getRefreshToken());
-//                        waimai.setAuthToken(resObject.getData().getAccessToken());
-//                        waimai.setCreateTime(new Date());
-//                        baseMapper.updateById(waimai);
-//                    }
-//                }
-//            }
-//        } catch (Exception e) {
-//            log.error("饿了么刷新token定时任务出现异常", e);
-//            e.printStackTrace();
-//        }
-//    }
+    @Override
+    public void elemeTask() {
+        try {
+            log.debug("饿了么刷新token任务执行");
+            List<ShopWaimai> list = baseMapper.selectShopWaimai();
+            if (list != null && list.size() > 0) {
+                for (ShopWaimai waimai : list) {
+                    ResObject<Token> resObject = elemeAuthClient.doRefreshToken(waimai.getRefreshToken());
+                    if (resObject.getCode()==0) {
+                        waimai.setExpiresIn(resObject.getData().getExpiresIn());
+                        waimai.setRefreshToken(resObject.getData().getRefreshToken());
+                        waimai.setAuthToken(resObject.getData().getAccessToken());
+                        waimai.setCreateTime(new Date());
+                        baseMapper.updateById(waimai);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("饿了么刷新token定时任务出现异常", e);
+            e.printStackTrace();
+        }
+    }
 
     @Override
     public  List<ShopWaimai> eleShopList() {
@@ -176,28 +180,28 @@ public class ShopWaimaiServiceImpl extends ServiceImpl<ShopWaimaiMapper, ShopWai
         return null;
     }
 
-//    @SneakyThrows
-//    @Transactional(rollbackFor = Exception.class)
-//    @Override
-//    public void refreshSgToken() {
-//       List<ShopWaimai> list = baseMapper.selectList(new QueryWrapper<ShopWaimai>()
-//                .eq("waimai_id", 14)
-//                .eq("deleted", IsDeleteEnum.NORMAL.status)
-//                .eq("bind_status", BindStatusEnum.BIND.status)
-//               .isNotNull("refresh_token"));
-//        /**
-//         * token 提前1天刷新
-//         */
-//        if(CollectionUtils.isNotEmpty(list)){
-//            for(ShopWaimai shopWaimai :list){
-//                if(shopWaimai.getUpdateTime().getTime()/1000-shopWaimai.getExpiresIn()<86400){
-//                    OAuthTokenParam tokenParam = MtSgAuthRequest.refreshOauthToken(waimaiConfig.getMeituansgAppid(), waimaiConfig.getMeituansgAppScert(), shopWaimai.getRefreshToken());
-//                    shopWaimai.setAuthToken(tokenParam.getAccess_token());
-//                    shopWaimai.setRefreshToken(tokenParam.getRefresh_token());
-//                    shopWaimai.setExpiresIn(tokenParam.getExpires_in());
-//                    baseMapper.updateById(shopWaimai);
-//                }
-//            }
-//        }
-//    }
+    @SneakyThrows
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void refreshSgToken() {
+       List<ShopWaimai> list = baseMapper.selectList(new QueryWrapper<ShopWaimai>()
+                .eq("waimai_id", 14)
+                .eq("deleted", IsDeleteEnum.NORMAL.status)
+                .eq("bind_status", BindStatusEnum.BIND.status)
+               .isNotNull("refresh_token"));
+        /**
+         * token 提前1天刷新
+         */
+        if(CollectionUtils.isNotEmpty(list)){
+            for(ShopWaimai shopWaimai :list){
+                if(shopWaimai.getUpdateTime().getTime()/1000-shopWaimai.getExpiresIn()<86400){
+                    OAuthTokenParam tokenParam = MtSgAuthRequest.refreshOauthToken(waimaiConfig.getMeituansgAppid(), waimaiConfig.getMeituansgAppScert(), shopWaimai.getRefreshToken());
+                    shopWaimai.setAuthToken(tokenParam.getAccess_token());
+                    shopWaimai.setRefreshToken(tokenParam.getRefresh_token());
+                    shopWaimai.setExpiresIn(tokenParam.getExpires_in());
+                    baseMapper.updateById(shopWaimai);
+                }
+            }
+        }
+    }
 }