1

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

@@ -21,7 +21,70 @@ import java.util.List;
  */
 public interface IDspDeliveryService extends IService<DspDelivery> {
 
+    List<DspDelivery> queryList(SysUser user);
 
-    void fengNiaoTask();
+    PageResult queryPage(Page page, DspDelivery dspDelivery);
+
+    Integer statisticsUseDeliveryNum(Long id,Integer status);
+
+    Boolean createDspDelivery(DspDelivery dspDelivery);
+
+    void changeStatus(Long id,SysUser user);
+
+    List<DspDelivery> getSysConfig();
+
+    List<DspDelivery> selectDspDeliverys();
+
+    List<DspDelivery> selectDspDeliverysTwo();
+
+    List<DspDelivery> selectOrderDspDeliverys();
+
+    List<DspDelivery> queryPageDspDeliverys(Page page);
+
+    void createList(List<DspDelivery> list);
+
+    List<DeliveryDto> floorList();
+
+    Boolean updateDspDeliveryById(DspDelivery dspDelivery,SysUser user);
+
+    /**
+     * 查询服务商运力
+     * @param type
+     * @return
+     */
+    DspDelivery findOne(Integer type);
+
+    /**
+     * 运力详情
+     * @return
+     */
+    DeliveryInfo findInfoOne(Integer id,Long merchantId);
+
+    /**
+     * 查询能匹配的配送平台
+     * @return
+     */
+    List<DeliveryInfo> findList(Member member,Long shopId, Integer transport, List<Integer> types, Integer defaultShop);
+
+    DspDelivery findById(Long id);
+
+    List<DspDelivery> selectDspDeliverysByTime();
+  //  void fengNiaoTask();
+
+    /**
+     * 查询门店没有绑定的运力
+     * @param dtos
+     * @return
+     */
+    List<DspDelivery> findNotBindByIds(List<DeliveryDto> dtos);
+
+
+    List<ShopDeliveryBindDto> getDeliveryList();
+
+    /**
+     * 客服中心列表
+     * @return 列表
+     */
+    List<DspDeliveryListDto> getCustomerServiceList();
 
 }

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

@@ -17,9 +17,50 @@ import java.util.List;
  */
 public interface IShopWaimaiService extends IService<ShopWaimai> {
 
+    /**
+     * 查询列表
+     * @param shopWaimai 实体
+     * @return 列表
+     */
+    List<ShopWaimai> queryList(ShopWaimai shopWaimai);
 
+    /**
+     * 绑定外卖平台列表
+     * @param shopId
+     * @return
+     */
+    List<WaimaiDto> findList(Long shopId);
 
-    void elemeTask();
+    /**
+     * 根据门店ID外卖ID查询
+     * @param shopId
+     * @param waimaiId
+     * @return
+     */
+    ShopWaimai findById(Long shopId, Long waimaiId);
 
-    void refreshSgToken();
+    /**
+     * 取消所有其他的绑定
+     * @param poiId
+     */
+    void updateStatus(String poiId);
+
+    List<ShopWaimai> selectShopWaimai(long startTime, long endTime);
+
+    //void elemeTask();
+    List<ShopWaimai> eleShopList();
+    List<ShopWaimai> selectEleRetailShopWaimai();
+    List<ShopWaimai> selectEleRetailShop();
+
+    void updateStatusById(Long id);
+
+    List<WaimaiListDto> findWaimaiList( Long waimaiId,  Long merchantId, Long shopId);
+
+    ShopWaimai findByThirdShopId(Long shopId, Long waimaiId,String thirdShopId);
+
+    ShopWaimai findByToken(Long shopId, Long waimaiId,String token);
+
+
+    List<WaimaiListDto> findWMList(  Long shopId);
+ //   void refreshSgToken();
 }

lb-module/src/main/java/com/ydd/module/service/impl/WaimaiFoodImgServiceImpl.java

@@ -105,12 +105,12 @@ public class WaimaiFoodImgServiceImpl extends ServiceImpl<WaimaiFoodImgMapper, W
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void syncEleRetailFood() {
-        List<ShopWaimai> shops = iShopWaimaiService.selectEleRetailShop();
-        if (CollectionUtils.isNotEmpty(shops)) {
-            for (ShopWaimai shop : shops) {
-                this.syncEleRetailFoodImgByShop(shop.getEpoid(), shop.getShopId().intValue(),shop.getThirdShopId());
-            }
-        }
+//        List<ShopWaimai> shops = iShopWaimaiService.selectEleRetailShop();
+//        if (CollectionUtils.isNotEmpty(shops)) {
+//            for (ShopWaimai shop : shops) {
+//                this.syncEleRetailFoodImgByShop(shop.getEpoid(), shop.getShopId().intValue(),shop.getThirdShopId());
+//            }
+//        }
     }
 
     @Override

pom.xml

@@ -17,7 +17,7 @@
         <module>lb-third</module>
         <module>lb-core</module>
         <module>lb-framework</module>
-        <module>lb-task</module>
+<!--        <module>lb-task</module>-->
         <module>lb-feginclient</module>
     </modules>