2

lb-app/src/main/java/com/ydd/app/OrderEntityUtils.java

@@ -1,7 +1,5 @@
 package com.ydd.app;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.ydd.app.dto.AddressReq;
 import com.ydd.app.dto.OrderReq;
@@ -12,15 +10,13 @@ import com.ydd.ecloud.core.utils.JsonMapper;
 import com.ydd.module.domain.WaimaiOrderDetail;
 import com.ydd.module.dto.DeliveryInfo;
 import com.ydd.module.dto.SfShopDto;
-import com.ydd.module.enums.TakeTypeEnum;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.dada.config.DadaConstant;
-import com.ydd.third.delivery.dada.domain.order.GoodsInfo;
-import com.ydd.third.delivery.meituan.vo.OpenApiGood;
-import com.ydd.third.delivery.vo.order.OrderVo;
-import com.ydd.third.delivery.vo.order.ProductVo;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.domain.order.GoodsInfo;
+import com.ydd.third.common.vo.vo.order.OrderVo;
+
+import com.ydd.third.common.vo.vo.order.ProductVo;
+import com.ydd.third.common.vo.waimai.meituan.OpenApiGood;
 import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

lb-app/src/main/java/com/ydd/app/OrderTipUtils.java

@@ -6,7 +6,7 @@ import com.ydd.common.utils.StringUtils;
 import com.ydd.ecloud.core.utils.JsonMapper;
 import com.ydd.module.dto.OrderTipDto;
 import com.ydd.module.dto.SfShopDto;
-import com.ydd.third.delivery.vo.order.OrderTipsVo;
+import com.ydd.third.common.vo.vo.order.OrderTipsVo;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.math.BigDecimal;

lb-app/src/main/java/com/ydd/app/QueryAmountEntityUtils.java

@@ -2,7 +2,7 @@ package com.ydd.app;
 
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.dto.DeliveryInfo;
-import com.ydd.third.delivery.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.shop.QueryAmount;
 
 /**
  * Project：lb-server
@@ -22,7 +22,7 @@ public class QueryAmountEntityUtils {
      * @Author peakren
      * @Date 2021/3/26 3:21 PM
      */
-    public static QueryAmount queryAmount(DeliveryInfo delivery,Long merchantId,Integer isMine) {
+    public static QueryAmount queryAmount(DeliveryInfo delivery, Long merchantId, Integer isMine) {
         return queryAmounts(delivery, merchantId,isMine);
     }
 

lb-app/src/main/java/com/ydd/app/ShopEditUtils.java

@@ -4,8 +4,7 @@ import com.ydd.app.dto.ShopReq;
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.DspDelivery;
 import com.ydd.module.domain.Merchant;
-import com.ydd.module.domain.Shop;
-import com.ydd.third.delivery.vo.shop.ShopVo;
+import com.ydd.third.common.vo.shop.ShopVo;
 
 import java.math.BigDecimal;
 

lb-app/src/main/java/com/ydd/app/ShopEntityUtils.java

@@ -4,7 +4,7 @@ import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.DspDelivery;
 import com.ydd.module.domain.Merchant;
 import com.ydd.module.domain.Shop;
-import com.ydd.third.delivery.vo.shop.ShopVo;
+import com.ydd.third.common.vo.shop.ShopVo;
 
 import java.math.BigDecimal;
 

lb-app/src/main/java/com/ydd/app/callback/controller/AiptDeliveryCallback.java

@@ -2,20 +2,22 @@ package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryCallbackApi;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.service.ApiDeliveryBindService;
 import com.ydd.app.service.ApiDeliveryService;
 import com.ydd.app.service.ApiOrderBackService;
 import com.ydd.app.service.impl.ApiCallBackApt;
 import com.ydd.app.service.impl.ApiCallBackContent;
+import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.OrderDelivery;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.service.IOrderDeliveryService;
+import com.ydd.third.common.dto.AiptAuthDto;
+import com.ydd.third.common.dto.AptCallbackOrderVo;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.aipt.AiptClient;
-import com.ydd.third.delivery.aipt.dto.AiptAuthDto;
-import com.ydd.third.delivery.aipt.dto.AptCallbackOrderVo;
-import com.ydd.third.delivery.aipt.utils.AIPTCallback;
+import com.ydd.third.common.vo.callback.CallBackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,14 +34,11 @@ import java.util.Map;
 @RequestMapping("/app/delivery/aipt/callback")
 public class AiptDeliveryCallback {
 
-    @Autowired
-    private AIPTCallback aiptCallback;
-
     @Resource
     private ApiDeliveryService apiDeliveryService;
 
     @Autowired
-    private AiptClient aiptClient;
+    private DeliveryCallbackApi aiptClient;
 
     @Resource
     private ApiOrderBackService apiOrderService;
@@ -78,7 +77,10 @@ public class AiptDeliveryCallback {
     public String doOrder(@RequestParam Map<String, String> params){
         log.info("爱跑腿回调参数："+JSONObject.toJSONString(params));
         JSONObject res = new JSONObject();
-        ResObject<AptCallbackOrderVo> callbackRes = aiptClient.doOrder(params);
+        CallBackOrderVo vo = new CallBackOrderVo();
+        vo.setLbClient(DeliveryTypeEnums.AIPT.getName());
+        vo.setMap(params);
+        ResObject<AptCallbackOrderVo> callbackRes = ( ResObject<AptCallbackOrderVo> )aiptClient.doOrder(vo);
         if (callbackRes.getCode() == 0) {
             AptCallbackOrderVo orderVo = callbackRes.getData();
             ApiCallBackContent content = new ApiCallBackContent(new ApiCallBackApt(orderVo));

lb-app/src/main/java/com/ydd/app/callback/controller/DadaDeliveryCallback.java

@@ -2,6 +2,7 @@ package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryCallbackApi;
 import com.ydd.app.service.ApiDeliveryBindService;
 import com.ydd.app.service.ApiDeliveryService;
 import com.ydd.app.service.ApiOrderBackService;
@@ -13,8 +14,8 @@ import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.service.IOrderDeliveryService;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.dada.DadaCallback;
-import com.ydd.third.delivery.vo.callback.DadaCallbackOrderVo;
+import com.ydd.third.common.vo.callback.CallBackOrderVo;
+import com.ydd.third.common.vo.callback.DadaCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +28,7 @@ import java.util.Map;
 @RequestMapping("/app/delivery/dada/callback")
 public class DadaDeliveryCallback {
     @Autowired
-    private DadaCallback callback;
+    private DeliveryCallbackApi callback;
 
     @Resource
     private ApiOrderBackService apiOrderService;
@@ -49,7 +50,10 @@ public class DadaDeliveryCallback {
         }
         log.info("达达回调参数 :" + jsonParam);
         //@RequestParam Map<String, String> params
-        ResObject<DadaCallbackOrderVo> callbackRes = callback.doOrder(jsonParam);
+        CallBackOrderVo vo = new CallBackOrderVo();
+        vo.setLbClient(DeliveryTypeEnums.DADA.getName());
+        vo.setParams(jsonParam);
+        ResObject<DadaCallbackOrderVo> callbackRes = (ResObject<DadaCallbackOrderVo>)callback.doOrder(vo);
         if (callbackRes.getCode() == 0) {
             DadaCallbackOrderVo orderVo = callbackRes.getData();
             orderVo.setType(DeliveryTypeEnums.DADA.getType());

lb-app/src/main/java/com/ydd/app/callback/controller/DadaYzDeliveryCallback.java

@@ -2,6 +2,7 @@ package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryCallbackApi;
 import com.ydd.app.service.ApiDeliveryBindService;
 import com.ydd.app.service.ApiDeliveryService;
 import com.ydd.app.service.ApiOrderBackService;
@@ -13,8 +14,8 @@ import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.service.IOrderDeliveryService;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.dada.DadaCallback;
-import com.ydd.third.delivery.vo.callback.DadaCallbackOrderVo;
+import com.ydd.third.common.vo.callback.CallBackOrderVo;
+import com.ydd.third.common.vo.callback.DadaCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,7 +30,7 @@ import java.util.Map;
 @RequestMapping("/app/delivery/dada/yz/callback")
 public class DadaYzDeliveryCallback {
     @Autowired
-    private DadaCallback callback;
+    private DeliveryCallbackApi callback;
 
     @Resource
     private ApiOrderBackService apiOrderService;
@@ -51,7 +52,10 @@ public class DadaYzDeliveryCallback {
         }
         log.info("达达优质回调参数 :" + jsonParam);
         //@RequestParam Map<String, String> params
-        ResObject<DadaCallbackOrderVo> callbackRes = callback.doOrder(jsonParam);
+        CallBackOrderVo vo = new CallBackOrderVo();
+        vo.setLbClient(DeliveryTypeEnums.DADA_YZ.getName());
+        vo.setParams(jsonParam);
+        ResObject<DadaCallbackOrderVo> callbackRes = (ResObject<DadaCallbackOrderVo>)callback.doOrder(vo);
         if (callbackRes.getCode() == 0) {
             DadaCallbackOrderVo orderVo = callbackRes.getData();
             orderVo.setType(DeliveryTypeEnums.DADA_YZ.getType());

lb-app/src/main/java/com/ydd/app/callback/controller/DwdDeliveryCallback.java

@@ -1,58 +1,58 @@
-package com.ydd.app.callback.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.ydd.app.service.ApiOrderBackService;
-import com.ydd.app.service.ApiOrderService;
-import com.ydd.app.service.impl.ApiCallBackContent;
-import com.ydd.app.service.impl.ApiCallBackDaDa;
-import com.ydd.ecloud.core.utils.JsonMapper;
-import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.dada.DadaCallback;
-import com.ydd.third.delivery.dianwoda.DwdCallback;
-import com.ydd.third.delivery.dianwoda.config.AppConfig;
-import com.ydd.third.delivery.dianwoda.response.CallBackResponse;
-import com.ydd.third.delivery.dianwoda.response.CityQueryResponse;
-import com.ydd.third.delivery.dianwoda.response.DwdCallbackOrderResponse;
-import com.ydd.third.delivery.dianwoda.response.OpenResponse;
-import com.ydd.third.delivery.dianwoda.utils.DwdSignUtils;
-import com.ydd.third.delivery.vo.callback.DadaCallbackOrderVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-
-/**
- * 点我达订单回调
- */
-@RestController
-@RequestMapping("/app/delivery/dwd/callback")
-public class DwdDeliveryCallback {
-
-    @Autowired
-    private DwdCallback callback;
-
-    @Resource
-    private ApiOrderBackService apiOrderService;
-
-    @PostMapping("/doOrder")
-    public String handle(Long timestamp,String nonce,String type,String sign,@RequestBody String body){
-        if(Math.abs(System.currentTimeMillis() - timestamp) > 5 * 60 * 1000L){
-            return "{\"code\":\"fail\",\"message\":\"过期请求\"}";
-        }
-
-        if("dianwoda.order.status-update".equals(type)){
-            CallBackResponse<DwdCallbackOrderResponse> message = JsonMapper.nonNullMapper().fromJson(body, new TypeReference<CallBackResponse<DwdCallbackOrderResponse>>() {
-            });
-            callback.doOrder(message.getContent());
-        }
-
-
-        return "{\"code\":\"success\"}";
-    }
-
-}
+//package com.ydd.app.callback.controller;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.fasterxml.jackson.core.type.TypeReference;
+//import com.ydd.app.service.ApiOrderBackService;
+//import com.ydd.app.service.ApiOrderService;
+//import com.ydd.app.service.impl.ApiCallBackContent;
+//import com.ydd.app.service.impl.ApiCallBackDaDa;
+//import com.ydd.ecloud.core.utils.JsonMapper;
+//import com.ydd.third.common.vo.ResObject;
+//import com.ydd.third.delivery.dada.DadaCallback;
+//import com.ydd.third.delivery.dianwoda.DwdCallback;
+//import com.ydd.third.delivery.dianwoda.config.AppConfig;
+//import com.ydd.third.delivery.dianwoda.response.CallBackResponse;
+//import com.ydd.third.delivery.dianwoda.response.CityQueryResponse;
+//import com.ydd.third.delivery.dianwoda.response.DwdCallbackOrderResponse;
+//import com.ydd.third.delivery.dianwoda.response.OpenResponse;
+//import com.ydd.third.delivery.dianwoda.utils.DwdSignUtils;
+//import com.ydd.third.delivery.vo.callback.DadaCallbackOrderVo;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.annotation.Resource;
+//
+//
+///**
+// * 点我达订单回调
+// */
+//@RestController
+//@RequestMapping("/app/delivery/dwd/callback")
+//public class DwdDeliveryCallback {
+//
+//    @Autowired
+//    private DwdCallback callback;
+//
+//    @Resource
+//    private ApiOrderBackService apiOrderService;
+//
+//    @PostMapping("/doOrder")
+//    public String handle(Long timestamp,String nonce,String type,String sign,@RequestBody String body){
+//        if(Math.abs(System.currentTimeMillis() - timestamp) > 5 * 60 * 1000L){
+//            return "{\"code\":\"fail\",\"message\":\"过期请求\"}";
+//        }
+//
+//        if("dianwoda.order.status-update".equals(type)){
+//            CallBackResponse<DwdCallbackOrderResponse> message = JsonMapper.nonNullMapper().fromJson(body, new TypeReference<CallBackResponse<DwdCallbackOrderResponse>>() {
+//            });
+//            callback.doOrder(message.getContent());
+//        }
+//
+//
+//        return "{\"code\":\"success\"}";
+//    }
+//
+//}

lb-app/src/main/java/com/ydd/app/callback/controller/ElemeRetailWaiMaiCallback.java

@@ -1,22 +1,18 @@
 package com.ydd.app.callback.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.api.EleRetailApi;
 import com.ydd.app.service.ApiWaimaiPlatformService;
 import com.ydd.app.service.ApiWaimaiService;
 import com.ydd.module.service.IWaimaiOrderService;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.waimai.eleRetai.EleRetaiClient;
+import com.ydd.third.common.vo.waimai.ElemeRetailMerchantResultVo;
 import com.ydd.third.waimai.eleRetai.common.EleRetaiApi;
-import com.ydd.third.waimai.eleRetai.param.OrderGetResult;
 import com.ydd.third.waimai.eleRetai.vo.EleReatiVO;
 import com.ydd.third.waimai.eleRetai.vo.EleRetailResultVO;
 import com.ydd.third.waimai.eleRetai.vo.SourceOrderVO;
-import com.ydd.third.waimai.elemeretail.ElemeretailCallback;
-import com.ydd.third.waimai.vo.ElemeRetailMerchantResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -32,13 +28,13 @@ public class ElemeRetailWaiMaiCallback {
     @Resource
     private ApiWaimaiService apiWaimaiService;
 
-    @Autowired
-    private ElemeretailCallback callback;
+//    @Autowired
+//    private ElemeretailCallback callback;
 
     @Autowired
     private IWaimaiOrderService iWaimaiOrderService;
     @Autowired
-    private EleRetaiClient eleRetaiClient;
+    private EleRetailApi eleRetaiClient;
     @Autowired
     ApiWaimaiPlatformService apiWaimaiPlatformService;
     //   @RequestMapping("/saveShop")
@@ -87,7 +83,7 @@ public class ElemeRetailWaiMaiCallback {
         if (null == params || params.size() == 0) {
             return resultVO;
         }
-        ResObject<ElemeRetailMerchantResultVo> callbackRes = callback.doStoreMap(params);
+        ResObject<ElemeRetailMerchantResultVo> callbackRes = eleRetaiClient.doStoreMap(params);
         /**门店绑定*/
         if (params.get("cmd").equals(EleRetaiApi.ELE_RETAI_SHOP_BIND_MSG)) {
             ElemeRetailMerchantResultVo vo = JSONObject.parseObject(callbackRes.getData().getBody(), ElemeRetailMerchantResultVo.class);
@@ -167,7 +163,7 @@ public class ElemeRetailWaiMaiCallback {
             vo.setBody(reatiVO);
             return vo;
         }
-        ResObject<ElemeRetailMerchantResultVo> callbackRes = callback.doStoreMap(jsonParams);
+        ResObject<ElemeRetailMerchantResultVo> callbackRes = eleRetaiClient.doStoreMap(jsonParams);
         /**门店绑定*/
         if (jsonParams.get("cmd").equals(EleRetaiApi.ELE_RETAI_SHOP_BIND_MSG)) {
             ElemeRetailMerchantResultVo elemeRetailMerchantResultVo = JSONObject.parseObject(callbackRes.getData().getBody(), ElemeRetailMerchantResultVo.class);

lb-app/src/main/java/com/ydd/app/callback/controller/ElemeWaiMaiCallback.java

@@ -1,33 +1,24 @@
 package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydd.app.service.ApiMemberService;
-import com.ydd.app.service.ApiOrderService;
+import com.ydd.api.ElemeApi;
 import com.ydd.app.service.ApiWaimaiPlatformService;
 import com.ydd.app.service.ApiWaimaiService;
-import com.ydd.module.domain.Order;
-import com.ydd.module.domain.WaimaiOrder;
 import com.ydd.module.enums.DeliveryStatusEnum;
 import com.ydd.module.push.MessagePushService;
-import com.ydd.module.service.IMemberService;
-import com.ydd.module.service.IOrderService;
-import com.ydd.module.service.IWaimaiOrderService;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.waimai.eleme.ElemeAuthClient;
-import com.ydd.third.waimai.eleme.ElemeCallback;
-import com.ydd.third.waimai.eleme.api.entity.user.OAuthorizedShop;
-import com.ydd.third.waimai.eleme.oauth.response.Token;
-import com.ydd.third.waimai.vo.*;
+import com.ydd.third.common.vo.waimai.*;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.user.OAuthorizedShop;
+import com.ydd.third.common.vo.waimai.eleme.oauth.response.Token;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -35,10 +26,9 @@ import java.util.Map;
 @RestController
 @RequestMapping("/app/waimai/eleme/callback")
 public class ElemeWaiMaiCallback {
+
     @Autowired
-    private ElemeAuthClient elmoAuthClient;
-    @Autowired
-    private ElemeCallback elemeCallback;
+    private ElemeApi elemeCallback;
     @Autowired
     private MessagePushService messagePushService;
     @Resource
@@ -60,7 +50,7 @@ public class ElemeWaiMaiCallback {
         String code = params.get("code");
         String state = params.get("state");
         if (StringUtils.isNotBlank(code) && StringUtils.isNotBlank(state)) {
-            ResObject<ElemeMerchantResultVo> res = elmoAuthClient.doOAuthToken(code, state);
+            ResObject<ElemeMerchantResultVo> res = elemeCallback.doOAuthToken(code, state);
             if (res.getCode() == 0) {
                 log.info("饿了么res++++++++"+JSONObject.toJSONString(res));
                 ElemeMerchantResultVo resultVo = res.getData();

lb-app/src/main/java/com/ydd/app/callback/controller/FengniaoDeliveryCallback.java

@@ -3,25 +3,23 @@ package com.ydd.app.callback.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ydd.api.DeliveryCallbackApi;
 import com.ydd.app.service.ApiOrderBackService;
-import com.ydd.app.service.ApiOrderService;
-import com.ydd.app.service.ApiShopDeviceService;
 import com.ydd.app.service.ApiShopService;
 import com.ydd.app.service.impl.ApiCallBackContent;
-import com.ydd.app.service.impl.ApiCallBackDaDa;
 import com.ydd.app.service.impl.ApiCallBackFengNiao;
+import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.DspDelivery;
 import com.ydd.module.domain.OrderDelivery;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.service.IDspDeliveryService;
 import com.ydd.module.service.IOrderDeliveryService;
-import com.ydd.module.service.IShopDeliveryService;
+import com.ydd.third.common.dto.FengniaoV3Token;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.fengniao.FengniaoCallback;
-import com.ydd.third.delivery.fengniao.entity.FengniaoV3Token;
-import com.ydd.third.delivery.vo.callback.FengniaoV3CallbackOrderVo;
-import com.ydd.third.delivery.vo.callback.FengniaoV3CallbackStoreVo;
+import com.ydd.third.common.vo.callback.CallBackOrderVo;
+import com.ydd.third.common.vo.callback.FengniaoV3CallbackOrderVo;
+import com.ydd.third.common.vo.callback.FengniaoV3CallbackStoreVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,7 +34,7 @@ import javax.annotation.Resource;
 @RequestMapping("/app/delivery/fengniao/callback")
 public class FengniaoDeliveryCallback {
     @Autowired
-    private FengniaoCallback callback;
+    private DeliveryCallbackApi callback;
 
     @Resource
     private ApiShopService apiShopService;
@@ -107,7 +105,10 @@ public class FengniaoDeliveryCallback {
         log.info("蜂鸟回调参数"+jsonParam);
         if (businessType.equals("orderStatusNotify") || businessType.equals("abnormalReportNotify")
             || businessType.equals("cookingFinishNotify")) {
-            ResObject<FengniaoV3CallbackOrderVo> callbackRes = callback.doOrder(jsonParam);
+            CallBackOrderVo vo = new CallBackOrderVo();
+            vo.setLbClient(DeliveryTypeEnums.FENG_NIAO.getName());
+            vo.setParams(jsonParam);
+            ResObject<FengniaoV3CallbackOrderVo> callbackRes = (ResObject<FengniaoV3CallbackOrderVo>) callback.doOrder(vo);
             if (callbackRes.getCode() == 0) {
                 FengniaoV3CallbackOrderVo orderVo = callbackRes.getData();
                 Integer orderStatus = orderVo.getOrderStatus();

lb-app/src/main/java/com/ydd/app/callback/controller/HuoLaLaDeliveryCallback.java

@@ -3,36 +3,30 @@ package com.ydd.app.callback.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ydd.api.DeliveryCallbackApi;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.service.ApiDeliveryService;
 import com.ydd.app.service.ApiOrderBackService;
-import com.ydd.app.service.impl.ApiCallBackApt;
 import com.ydd.app.service.impl.ApiCallBackContent;
 import com.ydd.app.service.impl.ApiCallBackHuoLaLa;
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.DspDelivery;
-import com.ydd.module.domain.Order;
 import com.ydd.module.domain.OrderDelivery;
-import com.ydd.module.domain.ShopDelivery;
 import com.ydd.module.dto.CallBackOrderDto;
-import com.ydd.module.enums.DeliveryTypeEnum;
-import com.ydd.module.enums.IsDeleteEnum;
 import com.ydd.module.service.IDspDeliveryService;
 import com.ydd.module.service.IOrderDeliveryService;
 import com.ydd.module.service.IOrderService;
 import com.ydd.module.service.IShopDeliveryService;
+import com.ydd.third.common.huolalaresponse.TokenResponse;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.huolala.HuolalaCallback;
-import com.ydd.third.delivery.huolala.HuolalaClient;
-import com.ydd.third.delivery.huolala.response.TokenResponse;
-import com.ydd.third.delivery.vo.callback.HuolalaCallbackOrderVo;
+import com.ydd.third.common.vo.callback.CallBackOrderVo;
+import com.ydd.third.common.vo.callback.HuolalaCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.Date;
 
 /**
  * @author xsx
@@ -45,9 +39,9 @@ import java.util.Date;
 public class HuoLaLaDeliveryCallback {
 
     @Resource
-    private HuolalaCallback huolalaCallback;
+    private DeliveryCallbackApi huolalaCallback;
     @Resource
-    private HuolalaClient huolalaClient;
+    private DeliveryService huolalaClient;
     @Resource
     private ApiDeliveryService apiDeliveryService;
     @Resource
@@ -70,7 +64,7 @@ public class HuoLaLaDeliveryCallback {
             return;
         }
         log.info("收到货拉拉用户绑定"+code);
-        String result = huolalaClient.getTokenByCode(code);
+        String result = huolalaCallback.huolalaAuth(code);
         JSONObject parseObject = JSONObject.parseObject(result);
 
         if ("0".equals(parseObject.getString("ret"))){
@@ -114,7 +108,11 @@ public class HuoLaLaDeliveryCallback {
 //                        .eq("deleted", IsDeleteEnum.NORMAL.status).isNull("shop_id").eq("bind_status",1));
 //                token=shopDelivery.getAuthToken();
 //            }
-            ResObject<HuolalaCallbackOrderVo> callbackRes = huolalaCallback.doOrder(jsonParam,token);
+            CallBackOrderVo vo = new CallBackOrderVo();
+            vo.setLbClient(DeliveryTypeEnums.HUO_LA_LA.getName());
+            vo.setParams(jsonParam);
+            vo.setToken(token);
+            ResObject<HuolalaCallbackOrderVo> callbackRes = (ResObject<HuolalaCallbackOrderVo>)huolalaCallback.doOrder(vo);
             if (callbackRes.getCode()==0){
                 HuolalaCallbackOrderVo orderVo = callbackRes.getData();
                 ApiCallBackContent content = new ApiCallBackContent(new ApiCallBackHuoLaLa(orderVo));

lb-app/src/main/java/com/ydd/app/callback/controller/JdHomeWaiMaiCallback.java

@@ -1,21 +1,15 @@
 package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.api.JdHomeApi;
 import com.ydd.app.service.ApiWaimaiPlatformService;
 import com.ydd.app.service.ApiWaimaiService;
 import com.ydd.module.domain.ShopJdHomeCode;
 import com.ydd.module.enums.DeliveryStatusEnum;
 import com.ydd.third.common.utils.JSONUtil;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.waimai.jdHome.JdHomeCallback;
-import com.ydd.third.waimai.jdHome.dto.OrderInfoDTO;
+import com.ydd.third.common.vo.waimai.jdHome.vo.JdHomeOrderResultVo;
 import com.ydd.third.waimai.jdHome.vo.JdHomeCallBackVo;
-import com.ydd.third.waimai.jdHome.vo.JdHomeParamJsonVo;
-import com.ydd.third.waimai.jdHome.vo.JdHomeResultVo;
-import com.ydd.third.waimai.vo.ConfirmOrderVo;
-import com.ydd.third.waimai.vo.JdHomeOrderResultVo;
-import com.ydd.third.waimai.vo.JdHomeShopMappingResultVo;
-import com.ydd.third.waimai.vo.MeituanSgOrderResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -38,7 +31,7 @@ import java.util.Map;
 public class JdHomeWaiMaiCallback {
 
     @Autowired
-    private JdHomeCallback callback;
+    private JdHomeApi callback;
 
     @Autowired
     ApiWaimaiPlatformService apiWaimaiPlatformService;

lb-app/src/main/java/com/ydd/app/callback/controller/KFDeliveryCallback.java

@@ -2,19 +2,21 @@ package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryCallbackApi;
 import com.ydd.app.service.ApiDeliveryBindService;
 import com.ydd.app.service.ApiDeliveryService;
 import com.ydd.app.service.ApiOrderBackService;
 import com.ydd.app.service.impl.ApiCallBackContent;
 import com.ydd.app.service.impl.ApiCallBackKF;
+import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.OrderDelivery;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.service.IOrderDeliveryService;
+import com.ydd.third.common.dto.KfAuthDto;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.kuaifu.dto.KfAuthDto;
-import com.ydd.third.delivery.kuaifu.util.KfCallback;
-import com.ydd.third.delivery.vo.callback.KfCallbackOrderVo;
+import com.ydd.third.common.vo.callback.CallBackOrderVo;
+import com.ydd.third.common.vo.callback.KfCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +29,7 @@ import java.util.Map;
 @RequestMapping("/app/delivery/kf/callback")
 public class KFDeliveryCallback {
     @Autowired
-    private KfCallback callback;
+    private DeliveryCallbackApi callback;
 
     @Resource
     private ApiOrderBackService apiOrderService;
@@ -49,7 +51,10 @@ public class KFDeliveryCallback {
             return res.toJSONString();
         }
         log.info("快服回调返回参数========" + JSONObject.toJSONString(jsonParam));
-        ResObject<KfCallbackOrderVo> callbackRes = callback.doOrder(jsonParam);
+        CallBackOrderVo vo = new CallBackOrderVo();
+        vo.setLbClient(DeliveryTypeEnums.KUAI_FU.getName());
+        vo.setParams(jsonParam);
+        ResObject<KfCallbackOrderVo> callbackRes =(ResObject<KfCallbackOrderVo>) callback.doOrder(vo);
         if (callbackRes.getCode() == 0) {
             KfCallbackOrderVo orderVo = callbackRes.getData();
             ApiCallBackContent content = new ApiCallBackContent(new ApiCallBackKF(orderVo));

lb-app/src/main/java/com/ydd/app/callback/controller/MeituanDeliveryCallback.java

@@ -2,14 +2,15 @@ package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryCallbackApi;
 import com.ydd.app.service.ApiOrderBackService;
 import com.ydd.app.service.impl.ApiCallBackContent;
 import com.ydd.app.service.impl.ApiCallBackMeiTuan;
 import com.ydd.app.service.impl.ApiCallBackMeiTuanZb;
+import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.Order;
 import com.ydd.module.domain.OrderDelivery;
 import com.ydd.module.domain.ShopDelivery;
-import com.ydd.module.domain.ShopDeliveryBind;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.enums.BindStatusEnum;
 import com.ydd.module.enums.OrderStatusEnum;
@@ -19,12 +20,11 @@ import com.ydd.module.service.IShopDeliveryBindService;
 import com.ydd.module.service.IShopDeliveryService;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.meituan.MeituanAuthClient;
-import com.ydd.third.delivery.meituan.MeituanCallback;
-import com.ydd.third.delivery.meituan.vo.MeituanShop;
-import com.ydd.third.delivery.meituan.vo.MeituanToken;
-import com.ydd.third.delivery.vo.callback.MeituanCallbackOrderVo;
-import com.ydd.third.delivery.vo.callback.MeituanZbCallbackOrderVo;
+import com.ydd.third.common.vo.callback.CallBackOrderVo;
+import com.ydd.third.common.vo.callback.MeituanCallbackOrderVo;
+import com.ydd.third.common.vo.callback.MeituanZbCallbackOrderVo;
+import com.ydd.third.common.vo.waimai.meituan.MeituanShop;
+import com.ydd.third.common.vo.waimai.meituan.MeituanToken;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -42,10 +42,10 @@ import java.util.Map;
 public class MeituanDeliveryCallback {
 
     @Autowired
-    private MeituanAuthClient meituanAuthClient;
+    private DeliveryCallbackApi meituanClient;
 
-    @Autowired
-    private MeituanCallback callback;
+//    @Autowired
+//    private MeituanCallback callback;
 
     @Resource
     private ApiOrderBackService apiOrderService;
@@ -72,7 +72,7 @@ public class MeituanDeliveryCallback {
         String code = params.get("code");
         String state = params.get("state");
         if (StringUtils.isNotBlank(code) && StringUtils.isNotBlank(state)) {
-            ResObject<MeituanToken>  res = meituanAuthClient.doOAuthToken(params);
+            ResObject<MeituanToken>  res = meituanClient.mtAuth(params);
             if (res.getCode() == 0) {
                 MeituanToken meituanToken = res.getData();
                 String accessToken = meituanToken.getAccessToken(); //访问token
@@ -107,7 +107,10 @@ public class MeituanDeliveryCallback {
             return res.toJSONString();
         }
 
-        ResObject<MeituanCallbackOrderVo> callbackRes = callback.doOrder(params);
+        CallBackOrderVo vo = new CallBackOrderVo();
+        vo.setLbClient(DeliveryTypeEnums.MEI_TUAN.getName());
+        vo.setMap(params);
+        ResObject<MeituanCallbackOrderVo> callbackRes =( ResObject<MeituanCallbackOrderVo>) meituanClient.doOrder(vo);
         if (callbackRes.getCode() == 0) {
             MeituanCallbackOrderVo orderVo = callbackRes.getData();
             log.info(JSONObject.toJSONString(orderVo));
@@ -150,7 +153,11 @@ public class MeituanDeliveryCallback {
         if (null == params) {
             return res.toJSONString();
         }
-        ResObject<MeituanZbCallbackOrderVo> callbackRes = callback.doZbOrder(params);
+        CallBackOrderVo vo = new CallBackOrderVo();
+        vo.setLbClient(DeliveryTypeEnums.MEI_TUAN_ZB.getName());
+        vo.setMap(params);
+        ResObject<MeituanZbCallbackOrderVo> callbackRes =( ResObject<MeituanZbCallbackOrderVo>) meituanClient.doOrder(vo);
+
         if (callbackRes.getCode() == 0) {
             MeituanZbCallbackOrderVo orderVo = callbackRes.getData();
             //订单状态发生变化 作要应的处理

lb-app/src/main/java/com/ydd/app/callback/controller/MeituanWaiMaiCallback.java

@@ -2,6 +2,7 @@ package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.MeiTuanApi;
 import com.ydd.app.service.ApiWaimaiPlatformService;
 import com.ydd.app.service.ApiWaimaiService;
 import com.ydd.common.enums.WaimaiTypeEnums;
@@ -14,9 +15,8 @@ import com.ydd.module.service.IShopWaimaiService;
 import com.ydd.third.common.utils.JSONUtil;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.waimai.meituan.MeituanCallback;
-import com.ydd.third.waimai.meituan.MeituanClient;
-import com.ydd.third.waimai.vo.*;
+import com.ydd.third.common.vo.waimai.*;
+import com.ydd.third.print.request.MeituanWmDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,8 +30,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("/app/waimai/meituan/callback")
 public class MeituanWaiMaiCallback {
-    @Autowired
-    private MeituanCallback callback;
+//    @Autowired
+//    private MeituanCallback callback;
 
     @Resource
     private ApiWaimaiService apiWaimaiService;
@@ -40,7 +40,7 @@ public class MeituanWaiMaiCallback {
   //  private IShopService iShopService;
 
     @Autowired
-    MeituanClient meituanClient;
+    MeiTuanApi meituanClient;
 
     @Autowired
     private IShopWaimaiService iShopWaimaiService;
@@ -64,7 +64,7 @@ public class MeituanWaiMaiCallback {
             return res.toJSONString();
         }
         log.info("美团门店映射回调："+JSONUtil.toJson(params));
-        ResObject<MeituanShopMappingResultVo> callbackRes = callback.doStoreMap(params);
+        ResObject<MeituanShopMappingResultVo> callbackRes = meituanClient.doStoreMap(params);
         if (callbackRes.getCode() == 0) {
             MeituanShopMappingResultVo shopMappingVo = callbackRes.getData();
             //需对下列数据作保存在后期的相关操作中需要
@@ -96,7 +96,7 @@ public class MeituanWaiMaiCallback {
             return res.toJSONString();
         }
         log.info("美团门店解除绑定回调："+JSONUtil.toJson(params));
-        ResObject<MeituanShopReleaseBindResultVo> callbackRes = callback.doShopReleaseBind(params);
+        ResObject<MeituanShopReleaseBindResultVo> callbackRes = meituanClient.doShopReleaseBind(params);
         if (callbackRes.getCode() == 0) {
             MeituanShopReleaseBindResultVo shopMappingVo = callbackRes.getData();
             //需对下列数据作保存在后期的相关操作中需要
@@ -124,7 +124,7 @@ public class MeituanWaiMaiCallback {
             return res.toJSONString();
         }
         log.info("美团隐私号-降级回调："+JSONUtil.toJson(params));
-        ResObject callbackRes = callback.doPrivacyNoDecline(params);
+        ResObject callbackRes = meituanClient.doPrivacyNoDecline(params);
         // JSONObject json = callBack.doPrivacyNoDecline(params);
         if (callbackRes.getCode() == 0) {
             /**
@@ -153,7 +153,7 @@ public class MeituanWaiMaiCallback {
             return res.toJSONString();
         }
       //  log.info("美团推送新订单回调："+JSONUtil.toJson(params));
-        ResObject<MeituanOrderResultVo> callbackRes = callback.doNewOrder(params);
+        ResObject<MeituanOrderResultVo> callbackRes = meituanClient.doNewOrder(params);
         // JSONObject json = callBack.doNewOrder(params);
         if (callbackRes.getCode() == 0) {
             MeituanOrderResultVo orderVo = callbackRes.getData();
@@ -188,7 +188,7 @@ public class MeituanWaiMaiCallback {
         String ss = JSONUtil.toJson(params);
         JSONObject jsonObject = JSONObject.parseObject(ss);
        // log.info("美团外卖非接单推送新订单回调："+ss);
-        ResObject<MeituanWmoperOrderResultVo> callbackRes = callback.doWmNewOrder(jsonObject);
+        ResObject<MeituanWmoperOrderResultVo> callbackRes = meituanClient.doWmNewOrder(jsonObject);
         if (callbackRes.getCode() == 0) {
             if (callbackRes.getData().getStatus() == 4){
                 // 新订单，查询订单详情
@@ -208,7 +208,11 @@ public class MeituanWaiMaiCallback {
                         if (getRecipientInfo.getCode() == 0){
                             vo = getRecipientInfo.getData();
                         }
-                        MeituanOrderResultVo orderVo = callback.convert(resultVoResObject.getData(),callbackRes.getData(),vo);
+                        MeituanWmDto dto = new MeituanWmDto();
+                        dto.setResultVo(resultVoResObject.getData());
+                        dto.setOrderResultVo(callbackRes.getData());
+                        dto.setGetInfo(vo);
+                        MeituanOrderResultVo orderVo = meituanClient.convert(dto);
                         orderVo.setLogisticsCode("0001");
                         apiWaimaiService.doConfirmOrder(orderVo);
                     }
@@ -269,7 +273,7 @@ public class MeituanWaiMaiCallback {
             return res.toJSONString();
         }
         log.info("美团订单被取消回调："+JSONUtil.toJson(params));
-        ResObject<MeituanOrderCancelResultVo> callbackRes = callback.doCancelOrder(params);
+        ResObject<MeituanOrderCancelResultVo> callbackRes = meituanClient.doCancelOrder(params);
         // JSONObject json = callBack.doNewOrder(params);
         if (callbackRes.getCode() == 0) {
             MeituanOrderCancelResultVo orderCancelVo = callbackRes.getData();
@@ -296,7 +300,7 @@ public class MeituanWaiMaiCallback {
             return res.toJSONString();
         }
         log.info("美团订单退款回调回调："+JSONUtil.toJson(params));
-        ResObject<MeituanOrderRefundResultVo> callbackRes = callback.doOrderRefund(params);
+        ResObject<MeituanOrderRefundResultVo> callbackRes = meituanClient.doOrderRefund(params);
         // JSONObject json = callBack.doNewOrder(params);
         if (callbackRes.getCode() == 0) {
             MeituanOrderRefundResultVo orderRefundVo = callbackRes.getData();
@@ -345,7 +349,7 @@ public class MeituanWaiMaiCallback {
             return res.toJSONString();
         }
     //    log.info("美团商家已确认订单的回调："+JSONUtil.toJson(params));
-        ResObject<MeituanOrderResultVo> callbackRes = callback.doConfirmOrder(params);
+        ResObject<MeituanOrderResultVo> callbackRes = meituanClient.doConfirmOrder(params);
         if (callbackRes.getCode() == 0) {
             MeituanOrderResultVo orderVo = callbackRes.getData();
             String ePoiId = orderVo.getEPoiId(); //门店绑定时，传入的ERP厂商分配给门店的唯一标识
@@ -374,7 +378,7 @@ public class MeituanWaiMaiCallback {
             return res.toJSONString();
         }
    //     log.info("美团订单完成后的回调："+JSONUtil.toJson(params));
-        ResObject<MeituanOrderResultVo> callbackRes = callback.doFinishOrder(params);
+        ResObject<MeituanOrderResultVo> callbackRes = meituanClient.doFinishOrder(params);
         if (callbackRes.getCode() == 0) {
             MeituanOrderResultVo orderVo = callbackRes.getData();
 //            String ePoiId = orderVo.getEPoiId(); //门店绑定时，传入的ERP厂商分配给门店的唯一标识
@@ -407,7 +411,7 @@ public class MeituanWaiMaiCallback {
         }
 
         log.info("美团订单部分退款的回调："+JSONUtil.toJson(params));
-        ResObject<MeituanOrderPartRefundResultVo> callbackRes = callback.doOrderPartRefund(params);
+        ResObject<MeituanOrderPartRefundResultVo> callbackRes = meituanClient.doOrderPartRefund(params);
         // JSONObject json = callBack.doNewOrder(params);
         if (callbackRes.getCode() == 0) {
             MeituanOrderPartRefundResultVo orderPartRefundVo = callbackRes.getData();
@@ -450,7 +454,7 @@ public class MeituanWaiMaiCallback {
         }
 
         log.info("美团用户催单后的回调："+JSONUtil.toJson(params));
-        ResObject<MeituanRemindOrderResultVo> callbackRes = callback.doRemindOrder(params);
+        ResObject<MeituanRemindOrderResultVo> callbackRes = meituanClient.doRemindOrder(params);
         // JSONObject json = callBack.doNewOrder(params);
         if (callbackRes.getCode() == 0) {
             MeituanRemindOrderResultVo remindOrderResultVo = callbackRes.getData();
@@ -465,4 +469,22 @@ public class MeituanWaiMaiCallback {
         }
         return "";
     }
+
+
+    @RequestMapping("/deliveryStatus")
+    public String deliveryStatus(@RequestParam Map<String, String> params) {
+        JSONObject res = new JSONObject();
+        if (null == params||params.size()==0) {
+            res.put("data", "OK");
+            return res.toJSONString();
+        }
+        log.info("订单配送状态的回调："+JSONUtil.toJson(params));
+            /**
+             * 此时异步调用拉取订单并通知客户
+             */
+            //{“data”.“OK”}
+            res.put("data", "OK");
+            return res.toJSONString();
+
+    }
 }

lb-app/src/main/java/com/ydd/app/callback/controller/MeituanWaiMaiSgCallback.java

@@ -1,6 +1,8 @@
 package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.api.MeiTuanApi;
+import com.ydd.api.MeiTuanSgApi;
 import com.ydd.app.service.ApiWaimaiPlatformService;
 import com.ydd.app.service.ApiWaimaiService;
 import com.ydd.module.enums.DeliveryStatusEnum;
@@ -9,10 +11,7 @@ import com.ydd.module.service.IShopService;
 import com.ydd.third.common.utils.JSONUtil;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.waimai.meituan.MeituanCallback;
-import com.ydd.third.waimai.meituan.MeituanClient;
-import com.ydd.third.waimai.meituanSg.MeituanSgCallback;
-import com.ydd.third.waimai.vo.*;
+import com.ydd.third.common.vo.waimai.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,10 +27,10 @@ import java.util.Map;
 @RequestMapping("/app/waimai/meituan/sg/callback")
 public class MeituanWaiMaiSgCallback {
     @Autowired
-    private MeituanSgCallback callback;
+    private MeiTuanSgApi callback;
 
-    @Autowired
-    private MeituanCallback meituanCallback;
+//    @Autowired
+//    private MeituanCallback meituanCallback;
 
     @Resource
     private ApiWaimaiService apiWaimaiService;
@@ -40,7 +39,7 @@ public class MeituanWaiMaiSgCallback {
     private IShopService iShopService;
 
     @Autowired
-    MeituanClient meituanClient;
+    MeiTuanApi meituanClient;
 
 
 

lb-app/src/main/java/com/ydd/app/callback/controller/ShansongDeliveryCallback.java

@@ -2,21 +2,21 @@ package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryCallbackApi;
 import com.ydd.app.service.ApiDeliveryBindService;
 import com.ydd.app.service.ApiDeliveryService;
 import com.ydd.app.service.ApiOrderBackService;
-import com.ydd.app.service.ApiOrderService;
 import com.ydd.app.service.impl.ApiCallBackContent;
 import com.ydd.app.service.impl.ApiCallBackShanSong;
+import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.OrderDelivery;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.service.IOrderDeliveryService;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.shansong.ShansongCallback;
-import com.ydd.third.delivery.shansong.ShansongClient;
-import com.ydd.third.delivery.vo.callback.ShansongCallbackOrderVo;
-import com.ydd.third.delivery.vo.callback.ShansongTokenVo;
+import com.ydd.third.common.vo.callback.CallBackOrderVo;
+import com.ydd.third.common.vo.callback.ShansongCallbackOrderVo;
+import com.ydd.third.common.vo.callback.ShansongTokenVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,10 +31,9 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/app/delivery/shansong/callback")
 public class ShansongDeliveryCallback {
+
     @Autowired
-    private ShansongClient shansongClient;
-    @Autowired
-    private ShansongCallback callback;
+    private DeliveryCallbackApi callback;
     @Resource
     private ApiOrderBackService apiOrderService;
 
@@ -57,7 +56,7 @@ public class ShansongDeliveryCallback {
         // String code = params.get("code");
         // String state = params.get("state");
         if (StringUtils.isNotBlank(code) && StringUtils.isNotBlank(state)) {
-            ResObject<ShansongTokenVo> res = shansongClient.doOAuthToken(code, thirdStoreId, state);
+            ResObject<ShansongTokenVo> res = callback.shansongAuth(code, thirdStoreId, state);
             log.info("res:" + JSONObject.toJSONString(res));
             if (res.getCode() == 0) {
                 ShansongTokenVo tokenVo = res.getData();
@@ -84,7 +83,10 @@ public class ShansongDeliveryCallback {
         JSONObject res = new JSONObject();
         //@RequestParam Map<String, String> params
         //ShansongCallback callback = new ShansongCallback();
-        ResObject<ShansongCallbackOrderVo> callbackRes = callback.doOrder(jsonParam);
+        CallBackOrderVo vo = new CallBackOrderVo();
+        vo.setLbClient(DeliveryTypeEnums.SHAN_SONG.getName());
+        vo.setParams(jsonParam);
+        ResObject<ShansongCallbackOrderVo> callbackRes = (ResObject<ShansongCallbackOrderVo>)callback.doOrder(vo);
         if (callbackRes.getCode() == 0) {
             ShansongCallbackOrderVo orderVo = callbackRes.getData();
             ApiCallBackContent content = new ApiCallBackContent(new ApiCallBackShanSong(orderVo));

lb-app/src/main/java/com/ydd/app/callback/controller/ShantangCallback.java

@@ -19,11 +19,11 @@ import com.ydd.module.service.IDspDeliveryService;
 import com.ydd.module.service.IOrderDeliveryService;
 import com.ydd.module.service.IOrderService;
 import com.ydd.module.service.IWaimaiOrderService;
+import com.ydd.third.common.config.WaimaiConfig;
 import com.ydd.third.common.utils.JSONUtil;
 import com.ydd.third.common.utils.StringUtils;
-import com.ydd.third.waimai.config.WaimaiConfig;
-import com.ydd.third.waimai.vo.ShanTangOrderCancelResultVo;
-import com.ydd.third.waimai.vo.ShanTangOrderResultVo;
+import com.ydd.third.common.vo.waimai.ShanTangOrderCancelResultVo;
+import com.ydd.third.common.vo.waimai.ShanTangOrderResultVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

lb-app/src/main/java/com/ydd/app/callback/controller/ShunfengDeliveryCallback.java

@@ -2,25 +2,24 @@ package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryCallbackApi;
 import com.ydd.app.service.ApiOrderBackService;
-import com.ydd.app.service.ApiOrderService;
 import com.ydd.app.service.impl.ApiCallBackContent;
 import com.ydd.app.service.impl.ApiCallBackShunFeng;
+import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.OrderDelivery;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.service.IOrderDeliveryService;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.vo.callback.ShunfengCallbackOrderVo;
-import com.ydd.third.delivery.shunfeng.ShunfengCallback;
+import com.ydd.third.common.vo.callback.CallBackOrderVo;
+import com.ydd.third.common.vo.callback.ShunfengCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-//import com.ydd.third.waimai.meituan.callback.MTCallBa
-
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -30,7 +29,7 @@ import javax.servlet.http.HttpServletRequest;
 @RequestMapping("/app/delivery/shunfeng/callback")
 public class ShunfengDeliveryCallback {
     @Autowired
-    private ShunfengCallback callback;
+    private DeliveryCallbackApi callback;
 
     @Resource
     private ApiOrderBackService apiOrderService;
@@ -57,7 +56,11 @@ public class ShunfengDeliveryCallback {
         }
 
         //@RequestParam Map<String, String> params
-        ResObject<ShunfengCallbackOrderVo>  callbackRes = callback.doOrder(sign, jsonParam);
+        CallBackOrderVo vo = new CallBackOrderVo();
+        vo.setLbClient(DeliveryTypeEnums.SHUN_FENG.getName());
+        vo.setParams(jsonParam);
+        vo.setSign(sign);
+        ResObject<ShunfengCallbackOrderVo>  callbackRes = (ResObject<ShunfengCallbackOrderVo> )callback.doOrder(vo);
         if (callbackRes.getCode() == 0) {
             ShunfengCallbackOrderVo orderVo = callbackRes.getData();
             log.info(JSONObject.toJSONString(orderVo));

lb-app/src/main/java/com/ydd/app/callback/controller/UUPTDeliveryCallback.java

@@ -2,16 +2,17 @@ package com.ydd.app.callback.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryCallbackApi;
 import com.ydd.app.service.ApiOrderBackService;
-import com.ydd.app.service.ApiOrderService;
 import com.ydd.app.service.impl.ApiCallBackContent;
 import com.ydd.app.service.impl.ApiCallBackUUPT;
+import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.OrderDelivery;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.service.IOrderDeliveryService;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.uupt.utils.UUPTCallback;
-import com.ydd.third.delivery.vo.callback.UUPTCallbackOrderVo;
+import com.ydd.third.common.vo.callback.CallBackOrderVo;
+import com.ydd.third.common.vo.callback.UUPTCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,7 +29,7 @@ import javax.annotation.Resource;
 @RequestMapping("/app/delivery/uupt/callback")
 public class UUPTDeliveryCallback {
     @Autowired
-    private UUPTCallback callback;
+    private DeliveryCallbackApi callback;
 
     @Resource
     private ApiOrderBackService apiOrderService;
@@ -45,7 +46,10 @@ public class UUPTDeliveryCallback {
             res.put("code", 1);
             return res.toJSONString();
         }
-        ResObject<UUPTCallbackOrderVo> callbackRes = callback.doOrder(jsonObject);
+        CallBackOrderVo vo = new CallBackOrderVo();
+        vo.setLbClient(DeliveryTypeEnums.UUPT.getName());
+        vo.setParams(jsonObject);
+        ResObject<UUPTCallbackOrderVo> callbackRes = (ResObject<UUPTCallbackOrderVo>)callback.doOrder(vo);
         if (callbackRes.getCode() == 0) {
             UUPTCallbackOrderVo orderVo = callbackRes.getData();
             ApiCallBackContent content = new ApiCallBackContent(new ApiCallBackUUPT(orderVo));

lb-app/src/main/java/com/ydd/app/config/WaimaiConfig.java

@@ -1,55 +0,0 @@
-package com.ydd.app.config;
-
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-
-/**
- * @Description: 外卖平台的配置信息
- * @Date: 2021/3/25
- * @Author: ranfi
- */
-@Data
-@Configuration
-public class WaimaiConfig {
-
-    @Value("${waimai.meituan.developerId}")
-    private String meituanDeveloperId;
-
-    @Value("${waimai.meituan.signKey}")
-    private String meituanSignKey;
-
-    @Value("${waimai.ele.appKey}")
-    private String eleAppKey;
-
-    @Value("${waimai.ele.appScert}")
-    private String eleAppSecret;
-
-    @Value("${waimai.ele.callbackUrl}")
-    private String eleCallbackUrl;
-
-    @Value("${waimai.ele.callBackState}")
-    private String eleCallBackState;
-
-    @Value("${waimai.isTest}")
-    private boolean isTest;
-
-    @Value("${waimai.eleretail.url}")
-    private String eleRetailUrl;
-
-    @Value("${waimai.eleretail.appid}")
-    private String eleRetailAppid;
-
-    @Value("${waimai.eleretail.appScert}")
-    private String eleRetailAppScert;
-    @Value("${waimai.meituansg.url}")
-    private String meituansgUrl;
-
-    @Value("${waimai.meituansg.appid}")
-    private String meituansgAppid;
-
-    @Value("${waimai.meituansg.appScert}")
-    private String meituansgAppScert;
-}

lb-app/src/main/java/com/ydd/app/consumer/AutoCancelOrderListener.java

@@ -2,38 +2,19 @@ package com.ydd.app.consumer;
 
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydd.app.service.ApiOrderCancelService;
-import com.ydd.app.service.ApiOrderService;
-import com.ydd.app.service.ApiWaimaiService;
-import com.ydd.common.enums.WaimaiTypeEnums;
-import com.ydd.common.utils.SnCodeUtils;
-import com.ydd.module.domain.*;
+import com.ydd.module.domain.Order;
 import com.ydd.module.enums.DeliveryStatusEnum;
-import com.ydd.module.enums.IsDeleteEnum;
 import com.ydd.module.enums.OrderCancelTypeEnum;
 import com.ydd.module.enums.OrderTypeEnum;
 import com.ydd.module.push.MessagePushService;
-import com.ydd.module.service.IDspWaimaiService;
-import com.ydd.module.service.IShopService;
-import com.ydd.module.service.IShopWaimaiService;
-import com.ydd.module.service.IWaimaiOrderService;
-import com.ydd.third.waimai.eleRetai.EleRetaiClient;
-import com.ydd.third.waimai.eleme.api.entity.order.OOrder;
-import com.ydd.third.waimai.eleme.api.entity.order.OrderList;
-import com.ydd.third.waimai.vo.ElemeOrderResultVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.BeanUtils;
 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;
 
 @Slf4j
 @Component

lb-app/src/main/java/com/ydd/app/consumer/EBaiListener.java

@@ -3,11 +3,11 @@ package com.ydd.app.consumer;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.EleRetailApi;
 import com.ydd.app.service.ApiWaimaiService;
 import com.ydd.common.utils.SnCodeUtils;
 import com.ydd.module.domain.WaimaiOrder;
 import com.ydd.module.service.IWaimaiOrderService;
-import com.ydd.third.waimai.eleRetai.EleRetaiClient;
 import com.ydd.third.waimai.eleRetai.param.OrderGetResult;
 import com.ydd.third.waimai.eleRetai.vo.OrderEBaiInfo;
 import com.ydd.third.waimai.eleRetai.vo.OrderEBaiList;
@@ -34,7 +34,7 @@ public class EBaiListener {
     @Autowired
     private ApiWaimaiService apiWaimaiService;
     @Autowired
-    private EleRetaiClient eleRetaiClient;
+    private EleRetailApi eleRetaiClient;
 
     @Autowired
     public RedisTemplate redisTemplate;

lb-app/src/main/java/com/ydd/app/consumer/EleTopicListener.java

@@ -3,6 +3,7 @@ package com.ydd.app.consumer;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.EleRetailApi;
 import com.ydd.app.service.ApiWaimaiService;
 import com.ydd.common.enums.WaimaiTypeEnums;
 import com.ydd.common.utils.SnCodeUtils;
@@ -15,10 +16,9 @@ import com.ydd.module.service.IDspWaimaiService;
 import com.ydd.module.service.IShopService;
 import com.ydd.module.service.IShopWaimaiService;
 import com.ydd.module.service.IWaimaiOrderService;
-import com.ydd.third.waimai.eleRetai.EleRetaiClient;
-import com.ydd.third.waimai.eleme.api.entity.order.OOrder;
-import com.ydd.third.waimai.eleme.api.entity.order.OrderList;
-import com.ydd.third.waimai.vo.ElemeOrderResultVo;
+import com.ydd.third.common.vo.waimai.ElemeOrderResultVo;
+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 lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
@@ -46,7 +46,7 @@ public class EleTopicListener {
     @Autowired
     private ApiWaimaiService apiWaimaiService;
     @Autowired
-    private EleRetaiClient eleRetaiClient;
+    private EleRetailApi eleRetaiClient;
 
     @RabbitListener(queues = "topic.syncEleWm")
     @RabbitHandler

lb-app/src/main/java/com/ydd/app/controller/DeliveryApi.java

@@ -5,13 +5,11 @@ import com.ydd.common.annotation.AccessToken;
 import com.ydd.common.annotation.ControllerLog;
 import com.ydd.common.core.controller.BaseController;
 import com.ydd.common.core.domain.BaseResult;
-import com.ydd.common.utils.ip.IpUtils;
 import com.ydd.module.dto.DeliveryDto;
 import com.ydd.module.dto.MemberConfigDto;
-import com.ydd.third.delivery.aipt.dto.AiptUnBindDto;
-import com.ydd.third.delivery.huolala.vo.HCityInfo;
-import com.ydd.third.delivery.huolala.vo.HPoiSearch;
-import com.ydd.third.delivery.huolala.vo.Haddress;
+import com.ydd.third.common.vo.huolalavo.HCityInfo;
+import com.ydd.third.common.vo.huolalavo.HPoiSearch;
+import com.ydd.third.common.vo.huolalavo.Haddress;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

lb-app/src/main/java/com/ydd/app/controller/DeliveryBindApi.java

@@ -11,7 +11,7 @@ import com.ydd.module.domain.Member;
 import com.ydd.module.dto.ShopBindDto;
 import com.ydd.module.dto.ShopDeliveryBindDto;
 import com.ydd.module.dto.UpdateDadaShopNoDto;
-import com.ydd.third.delivery.aipt.dto.AiptUnBindDto;
+import com.ydd.third.common.dto.AiptUnBindDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

lb-app/src/main/java/com/ydd/app/controller/HllTest.java

@@ -1,19 +1,17 @@
 package com.ydd.app.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.dto.AddressReq;
 import com.ydd.app.dto.OrderReq;
-import com.ydd.app.dto.ValuationRes;
 import com.ydd.common.core.controller.BaseController;
-import com.ydd.common.core.domain.BaseResult;
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.utils.DateUtils;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.enums.TakeTypeEnum;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
-import com.ydd.third.delivery.vo.order.OrderVo;
+import com.ydd.third.common.vo.vo.order.OrderResultVo;
+import com.ydd.third.common.vo.vo.order.OrderVo;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -34,7 +32,7 @@ import java.util.Date;
 public class HllTest extends BaseController {
 
     @Resource
-    private final Client client;
+    private final DeliveryService client;
 
     /**
      * 计价

lb-app/src/main/java/com/ydd/app/listener/AddTipEvent.java

@@ -1,13 +1,11 @@
 package com.ydd.app.listener;
 
-import com.ydd.app.dto.ValuationRes;
 import com.ydd.module.domain.Order;
 import com.ydd.module.dto.DeliveryInfo;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
+import com.ydd.third.common.vo.vo.order.OrderResultVo;
 import org.springframework.context.ApplicationEvent;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 保底监听

lb-app/src/main/java/com/ydd/app/listener/AddTipListener.java

@@ -2,27 +2,21 @@ package com.ydd.app.listener;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.OrderTipUtils;
 import com.ydd.common.enums.DeliveryTypeEnums;
-import com.ydd.common.utils.SnCodeUtils;
 import com.ydd.module.domain.Order;
-import com.ydd.module.domain.OrderTip;
 import com.ydd.module.dto.DeliveryInfo;
 import com.ydd.module.dto.OrderTipDto;
 import com.ydd.module.enums.DeliveryStatusEnum;
 import com.ydd.module.enums.IsDeleteEnum;
-import com.ydd.module.enums.PayStatusEnum;
-import com.ydd.module.enums.PaymentTypeEnum;
-import com.ydd.module.expection.CustomAppException;
 import com.ydd.module.service.IOrderDeliveryService;
 import com.ydd.module.service.IOrderService;
-import com.ydd.module.service.IOrderTipService;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
-import com.ydd.third.delivery.vo.order.OrderTipsResultVo;
-import com.ydd.third.delivery.vo.order.OrderTipsVo;
+import com.ydd.third.common.vo.vo.order.OrderResultVo;
+import com.ydd.third.common.vo.vo.order.OrderTipsResultVo;
+import com.ydd.third.common.vo.vo.order.OrderTipsVo;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -54,7 +48,7 @@ public class AddTipListener {
 
     private final Executor executor;
 
-    private final Client client;
+    private final DeliveryService client;
 
     private final DeliveryConfig deliveryConfig;
 

lb-app/src/main/java/com/ydd/app/listener/DeliveryOrderListener.java

@@ -2,36 +2,22 @@ package com.ydd.app.listener;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydd.app.OrderEntityUtils;
-import com.ydd.app.dto.AddressReq;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.dto.OrderReq;
 import com.ydd.app.dto.ValuationRes;
 import com.ydd.app.service.ApiCouponService;
 import com.ydd.app.service.ApiOrderBackService;
 import com.ydd.app.service.ApiOrderNewService;
 import com.ydd.common.constant.BillingConstant;
-import com.ydd.common.enums.DeliveryTypeEnums;
-import com.ydd.common.enums.WaimaiTypeEnums;
-import com.ydd.common.utils.DateUtils;
-import com.ydd.common.utils.SnCodeUtils;
-import com.ydd.common.utils.StringUtils;
 import com.ydd.module.domain.*;
 import com.ydd.module.dto.CouponDto;
-import com.ydd.module.dto.DeliveryInfo;
 import com.ydd.module.dto.OrderDetailDto;
 import com.ydd.module.enums.*;
 import com.ydd.module.service.*;
-import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
-import com.ydd.third.delivery.vo.order.OrderVo;
-import com.ydd.third.waimai.eleme.ElemeAuthClient;
-import com.ydd.third.waimai.meituan.MeituanClient;
+import com.ydd.third.common.config.DeliveryConfig;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -68,7 +54,7 @@ public class DeliveryOrderListener {
 
     private final Executor executor;
 
-    private final Client client;
+    private final DeliveryService client;
 
     private final DeliveryConfig deliveryConfig;
 

lb-app/src/main/java/com/ydd/app/listener/DoCreateOrder.java

@@ -2,6 +2,7 @@ package com.ydd.app.listener;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.OrderEntityUtils;
 import com.ydd.app.dto.AddressReq;
 import com.ydd.app.dto.OrderReq;
@@ -14,13 +15,15 @@ import com.ydd.common.utils.StringUtils;
 import com.ydd.module.domain.*;
 import com.ydd.module.dto.CouponDto;
 import com.ydd.module.dto.DeliveryInfo;
-import com.ydd.module.enums.*;
+import com.ydd.module.enums.CouponTypeEnum;
+import com.ydd.module.enums.DeliveryStatusEnum;
+import com.ydd.module.enums.IsDeleteEnum;
+import com.ydd.module.enums.MemberCouponStatusEnum;
 import com.ydd.module.service.*;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
-import com.ydd.third.delivery.vo.order.OrderVo;
+import com.ydd.third.common.vo.vo.order.OrderResultVo;
+import com.ydd.third.common.vo.vo.order.OrderVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -31,7 +34,6 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -46,7 +48,7 @@ public class DoCreateOrder {
 
     // private final Executor executor;
 
-    private final Client client;
+    private final DeliveryService client;
 
     private final DeliveryConfig deliveryConfig;
 

lb-app/src/main/java/com/ydd/app/service/ApiDeliveryBindService.java

@@ -4,10 +4,10 @@ import com.ydd.module.domain.Member;
 import com.ydd.module.dto.ShopBindDto;
 import com.ydd.module.dto.ShopDeliveryBindDto;
 import com.ydd.module.dto.UpdateDadaShopNoDto;
-import com.ydd.third.delivery.aipt.dto.AiptAuthDto;
-import com.ydd.third.delivery.aipt.dto.AiptUnBindDto;
-import com.ydd.third.delivery.kuaifu.dto.KfAuthDto;
-import com.ydd.third.delivery.vo.callback.ShansongTokenVo;
+import com.ydd.third.common.dto.AiptAuthDto;
+import com.ydd.third.common.dto.AiptUnBindDto;
+import com.ydd.third.common.dto.KfAuthDto;
+import com.ydd.third.common.vo.callback.ShansongTokenVo;
 
 import java.util.List;
 

lb-app/src/main/java/com/ydd/app/service/ApiDeliveryService.java

@@ -2,14 +2,14 @@ package com.ydd.app.service;
 
 import com.ydd.module.dto.DeliveryDto;
 import com.ydd.module.dto.MemberConfigDto;
-import com.ydd.third.delivery.aipt.dto.AiptAuthDto;
-import com.ydd.third.delivery.aipt.dto.AiptUnBindDto;
-import com.ydd.third.delivery.huolala.response.TokenResponse;
-import com.ydd.third.delivery.huolala.vo.HCityInfo;
-import com.ydd.third.delivery.huolala.vo.HPoiSearch;
-import com.ydd.third.delivery.huolala.vo.Haddress;
-import com.ydd.third.delivery.kuaifu.dto.KfAuthDto;
-import com.ydd.third.delivery.vo.callback.ShansongTokenVo;
+import com.ydd.third.common.dto.AiptAuthDto;
+import com.ydd.third.common.dto.AiptUnBindDto;
+import com.ydd.third.common.dto.KfAuthDto;
+import com.ydd.third.common.huolalaresponse.TokenResponse;
+import com.ydd.third.common.vo.callback.ShansongTokenVo;
+import com.ydd.third.common.vo.huolalavo.HCityInfo;
+import com.ydd.third.common.vo.huolalavo.HPoiSearch;
+import com.ydd.third.common.vo.huolalavo.Haddress;
 
 import java.util.List;
 

lb-app/src/main/java/com/ydd/app/service/ApiOrderBackService.java

@@ -3,8 +3,8 @@ package com.ydd.app.service;
 import com.ydd.module.domain.Order;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.vo.order.CancelOrderResultVo;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
+import com.ydd.third.common.vo.vo.order.CancelOrderResultVo;
+import com.ydd.third.common.vo.vo.order.OrderResultVo;
 
 /**
  * 订单回调类

lb-app/src/main/java/com/ydd/app/service/ApiRiderLocationService.java

@@ -1,27 +1,9 @@
 package com.ydd.app.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.DspDelivery;
 import com.ydd.module.domain.Order;
 import com.ydd.module.domain.OrderDelivery;
 import com.ydd.module.dto.OrderDto;
-import com.ydd.module.enums.DeliveryStatusEnum;
-import com.ydd.module.service.IDspDeliveryService;
-import com.ydd.module.service.IOrderDeliveryService;
-import com.ydd.third.common.utils.CoordinateUtils;
-import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.vo.order.OrderQueryResultVo;
-import com.ydd.third.delivery.vo.order.OrderQueryVo;
-import com.ydd.third.delivery.vo.order.RiderLocationResultVo;
-import com.ydd.third.delivery.vo.order.RiderLocationVo;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
 
 /**
  * Project：lb-server

lb-app/src/main/java/com/ydd/app/service/ApiShanTangService.java

@@ -1,13 +1,7 @@
 package com.ydd.app.service;
 
-import com.alibaba.fastjson.JSONObject;
-import com.ydd.module.domain.DspWaimai;
-import com.ydd.module.dto.DeliveryConfigDto;
-import com.ydd.module.dto.WaimaiDto;
-import com.ydd.third.waimai.eleRetai.param.OrderGetResult;
-import com.ydd.third.waimai.vo.*;
-
-import java.util.List;
+import com.ydd.third.common.vo.waimai.ShanTangOrderCancelResultVo;
+import com.ydd.third.common.vo.waimai.ShanTangOrderResultVo;
 
 /**
  * Project：lb-server

lb-app/src/main/java/com/ydd/app/service/ApiShopService.java

@@ -5,7 +5,7 @@ import com.ydd.module.domain.DspDelivery;
 import com.ydd.module.domain.Shop;
 import com.ydd.module.dto.ShopDto;
 import com.ydd.module.dto.ShopSelectDto;
-import com.ydd.third.delivery.vo.callback.FengniaoV3CallbackStoreVo;
+import com.ydd.third.common.vo.callback.FengniaoV3CallbackStoreVo;
 
 import java.util.List;
 

lb-app/src/main/java/com/ydd/app/service/ApiWaimaiPlatformService.java

@@ -8,8 +8,8 @@ import com.ydd.module.dto.DeliveryConfigDto;
 import com.ydd.module.dto.WaimaiDto;
 import com.ydd.module.dto.WaimaiListDto;
 import com.ydd.module.dto.WaimaiResourceDto;
+import com.ydd.third.common.vo.waimai.*;
 import com.ydd.third.waimai.jdHome.vo.JdHomeCallBackVo;
-import com.ydd.third.waimai.vo.*;
 
 import java.util.List;
 import java.util.Map;

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackApt.java

@@ -5,8 +5,7 @@ import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.enums.OrderStatusEnum;
-import com.ydd.third.delivery.aipt.dto.AptCallbackOrderVo;
-import com.ydd.third.delivery.vo.callback.ShansongCallbackOrderVo;
+import com.ydd.third.common.dto.AptCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 
 import java.math.BigDecimal;

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackDaDa.java

@@ -1,11 +1,10 @@
 package com.ydd.app.service.impl;
 
 import com.ydd.app.service.ApiCallBack;
-import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.enums.OrderStatusEnum;
-import com.ydd.third.delivery.vo.callback.DadaCallbackOrderVo;
+import com.ydd.third.common.vo.callback.DadaCallbackOrderVo;
 
 /**
  * Project：lb-server

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackFengNiao.java

@@ -1,11 +1,9 @@
 package com.ydd.app.service.impl;
 
 import com.ydd.app.service.ApiCallBack;
-import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.enums.OrderStatusEnum;
-import com.ydd.third.delivery.vo.callback.FengniaoCallbackOrderVo;
-import com.ydd.third.delivery.vo.callback.FengniaoV3CallbackOrderVo;
+import com.ydd.third.common.vo.callback.FengniaoV3CallbackOrderVo;
 
 /**
  * Project：lb-server

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackHuoLaLa.java

@@ -1,14 +1,12 @@
 package com.ydd.app.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ydd.app.service.ApiCallBack;
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.enums.OrderStatusEnum;
-import com.ydd.third.delivery.huolala.HuolalaCallback;
-import com.ydd.third.delivery.vo.callback.HuolalaCallbackOrderVo;
+import com.ydd.third.common.vo.callback.HuolalaCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 
 /**

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackKF.java

@@ -5,8 +5,7 @@ import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.enums.OrderStatusEnum;
-import com.ydd.third.delivery.vo.callback.KfCallbackOrderVo;
-import com.ydd.third.delivery.vo.callback.UUPTCallbackOrderVo;
+import com.ydd.third.common.vo.callback.KfCallbackOrderVo;
 
 /**
  * Project：lb-server

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackMeiTuan.java

@@ -3,9 +3,8 @@ package com.ydd.app.service.impl;
 import com.ydd.app.service.ApiCallBack;
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.dto.CallBackOrderDto;
-import com.ydd.module.enums.DeliveryTypeEnum;
 import com.ydd.module.enums.OrderStatusEnum;
-import com.ydd.third.delivery.vo.callback.MeituanCallbackOrderVo;
+import com.ydd.third.common.vo.callback.MeituanCallbackOrderVo;
 
 /**
  * Project：lb-server

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackMeiTuanZb.java

@@ -4,8 +4,7 @@ import com.ydd.app.service.ApiCallBack;
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.enums.OrderStatusEnum;
-import com.ydd.third.delivery.vo.callback.MeituanCallbackOrderVo;
-import com.ydd.third.delivery.vo.callback.MeituanZbCallbackOrderVo;
+import com.ydd.third.common.vo.callback.MeituanZbCallbackOrderVo;
 
 import java.net.URLDecoder;
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackShanSong.java

@@ -4,9 +4,8 @@ import com.ydd.app.service.ApiCallBack;
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.dto.CallBackOrderDto;
-import com.ydd.module.enums.DeliveryTypeEnum;
 import com.ydd.module.enums.OrderStatusEnum;
-import com.ydd.third.delivery.vo.callback.ShansongCallbackOrderVo;
+import com.ydd.third.common.vo.callback.ShansongCallbackOrderVo;
 
 /**
  * Project：lb-server

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackShunFeng.java

@@ -5,7 +5,7 @@ import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.enums.OrderStatusEnum;
-import com.ydd.third.delivery.vo.callback.ShunfengCallbackOrderVo;
+import com.ydd.third.common.vo.callback.ShunfengCallbackOrderVo;
 
 /**
  * Project：lb-server

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackUUPT.java

@@ -5,8 +5,7 @@ import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.enums.OrderStatusEnum;
-import com.ydd.third.delivery.vo.callback.DadaCallbackOrderVo;
-import com.ydd.third.delivery.vo.callback.UUPTCallbackOrderVo;
+import com.ydd.third.common.vo.callback.UUPTCallbackOrderVo;
 
 /**
  * Project：lb-server

lb-app/src/main/java/com/ydd/app/service/impl/ApiCreateShopDaDa.java

@@ -1,5 +1,6 @@
 package com.ydd.app.service.impl;
 
+import com.ydd.api.DeliveryService;
 import com.ydd.app.dto.ShopReq;
 import com.ydd.app.service.ApiCreateShop;
 import com.ydd.common.enums.DeliveryTypeEnums;
@@ -10,9 +11,8 @@ import com.ydd.module.enums.BindStatusEnum;
 import com.ydd.module.service.IDspDeliveryService;
 import com.ydd.module.service.IShopDeliveryService;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.vo.shop.ShopResultVo;
-import com.ydd.third.delivery.vo.shop.ShopVo;
+import com.ydd.third.common.vo.shop.ShopResultVo;
+import com.ydd.third.common.vo.shop.ShopVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ import java.math.BigDecimal;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class ApiCreateShopDaDa implements ApiCreateShop {
 
-    private final Client deliveryClient;
+    private final DeliveryService deliveryClient;
 
     private final IShopDeliveryService iShopDeliveryService;
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiCreateShopMeiTuan.java

@@ -1,6 +1,6 @@
 package com.ydd.app.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.dto.ShopReq;
 import com.ydd.app.service.ApiCreateShop;
 import com.ydd.common.enums.DeliveryTypeEnums;
@@ -11,9 +11,8 @@ import com.ydd.module.enums.BindStatusEnum;
 import com.ydd.module.service.IDspDeliveryService;
 import com.ydd.module.service.IShopDeliveryService;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.vo.shop.ShopResultVo;
-import com.ydd.third.delivery.vo.shop.ShopVo;
+import com.ydd.third.common.vo.shop.ShopResultVo;
+import com.ydd.third.common.vo.shop.ShopVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +33,7 @@ import java.math.BigDecimal;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class ApiCreateShopMeiTuan implements ApiCreateShop {
 
-    private final Client deliveryClient;
+    private final DeliveryService deliveryClient;
 
     private final IShopDeliveryService iShopDeliveryService;
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiCreateShopShanSong.java

@@ -1,6 +1,6 @@
 package com.ydd.app.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.dto.ShopReq;
 import com.ydd.app.service.ApiCreateShop;
 import com.ydd.common.enums.DeliveryTypeEnums;
@@ -11,9 +11,8 @@ import com.ydd.module.enums.BindStatusEnum;
 import com.ydd.module.service.IDspDeliveryService;
 import com.ydd.module.service.IShopDeliveryService;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.vo.shop.ShopResultVo;
-import com.ydd.third.delivery.vo.shop.ShopVo;
+import com.ydd.third.common.vo.shop.ShopResultVo;
+import com.ydd.third.common.vo.shop.ShopVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +33,7 @@ import java.math.BigDecimal;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class ApiCreateShopShanSong implements ApiCreateShop {
 
-    private final Client deliveryClient;
+    private final DeliveryService deliveryClient;
 
     private final IShopDeliveryService iShopDeliveryService;
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiDadaValuationServiceImpl.java

@@ -2,6 +2,7 @@ package com.ydd.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.OrderEntityUtils;
 import com.ydd.app.QueryAmountEntityUtils;
 import com.ydd.app.dto.OrderReq;
@@ -23,18 +24,16 @@ import com.ydd.module.enums.StatusEnum;
 import com.ydd.module.expection.CustomWebException;
 import com.ydd.module.service.*;
 import com.ydd.module.utils.CommonUtils;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.AddressLngLatExchanger;
 import com.ydd.third.common.vo.GDMapTripResult;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
-import com.ydd.third.delivery.vo.order.OrderVo;
-import com.ydd.third.delivery.vo.shop.AmountResultVo;
-import com.ydd.third.delivery.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.shop.AmountResultVo;
+import com.ydd.third.common.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.vo.order.OrderResultVo;
+import com.ydd.third.common.vo.vo.order.OrderVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.elasticsearch.common.recycler.Recycler;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -63,7 +62,7 @@ public class ApiDadaValuationServiceImpl implements ApiDadaValuationService {
     private final IPackageFreightWeekService iPackageFreightWeekService;
     private final IPackageFreightWeightService iPackageFreightWeightService;
 
-    private final Client client;
+    private final DeliveryService client;
     private final IShopService iShopService;
     private final DeliveryConfig deliveryConfig;
     private final IShopDeliveryBindService iShopDeliveryBindService;

lb-app/src/main/java/com/ydd/app/service/impl/ApiDeliveryBindServiceImpl.java

@@ -2,6 +2,7 @@ package com.ydd.app.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.QueryAmountEntityUtils;
 import com.ydd.app.service.ApiDeliveryBindService;
 import com.ydd.common.enums.DeliveryTypeEnums;
@@ -25,25 +26,11 @@ import com.ydd.module.service.IMerchantService;
 import com.ydd.module.service.IShopDeliveryBindService;
 import com.ydd.module.service.IShopService;
 import com.ydd.system.service.ISysConfigService;
+import com.ydd.third.common.dto.*;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.aipt.AiptClient;
-import com.ydd.third.delivery.aipt.dto.AiptAuthDto;
-import com.ydd.third.delivery.aipt.dto.AiptUnBindDto;
-import com.ydd.third.delivery.dada.DadaClient;
-import com.ydd.third.delivery.fengniao.FengniaoClient;
-import com.ydd.third.delivery.huolala.HuolalaClient;
-import com.ydd.third.delivery.kuaifu.KfClient;
-import com.ydd.third.delivery.kuaifu.dto.KfAuthDto;
-import com.ydd.third.delivery.shansong.ShansongClient;
-import com.ydd.third.delivery.uupt.dto.BindUserApplyResponse;
-import com.ydd.third.delivery.uupt.dto.BindUserSubmitResponse;
-import com.ydd.third.delivery.uupt.dto.CancelBindResponse;
-import com.ydd.third.delivery.uupt.dto.GetBalanceDetailResponse;
-import com.ydd.third.delivery.uupt.service.UuptUserDeliveryService;
-import com.ydd.third.delivery.vo.callback.ShansongTokenVo;
-import com.ydd.third.delivery.vo.shop.AmountResultVo;
-import com.ydd.third.delivery.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.callback.ShansongTokenVo;
+import com.ydd.third.common.vo.shop.AmountResultVo;
+import com.ydd.third.common.vo.shop.QueryAmount;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -72,23 +59,11 @@ public class ApiDeliveryBindServiceImpl implements ApiDeliveryBindService {
 
     private final IShopDeliveryBindService iShopDeliveryBindService;
 
-    private final ShansongClient shansongClient;
-
-    private final FengniaoClient fengniaoClient;
-
-    private final AiptClient aiptClient;
-
     private final IMerchantService iMerchantService;
 
-    private final UuptUserDeliveryService uuptUserDeliveryService;
-
-    private final Client client;
+    private final DeliveryService client;
 
-    private final HuolalaClient huolalaClient;
 
-    private final KfClient kfClient;
-
-    private final DadaClient dadaClient;
 
     private final IShopService iShopService;
 
@@ -219,24 +194,25 @@ public class ApiDeliveryBindServiceImpl implements ApiDeliveryBindService {
             throw new CustomAppException("已绑定成功！");
         }
         String url = null;
-        if (DeliveryTypeEnums.SHAN_SONG.getType().equals(deliveryType)) {
-            url = shansongClient.getAuthUrl(merchant.getCode());
+        if (delivery.getType().equals(DeliveryTypeEnums.SHAN_SONG.getType())){
+            url = client.shansongAuthUrl(merchant.getCode());
         }
-        if (DeliveryTypeEnums.FENG_NIAO.getType().equals(deliveryType)) {
-            url = fengniaoClient.getAuthUrl();
+        if (delivery.getType().equals(DeliveryTypeEnums.FENG_NIAO.getType())){
+            url = client.fengniaoAuthUrl();
         }
-        if (DeliveryTypeEnums.FENG_NIAO_PT.getType().equals(deliveryType)) {
-            url = fengniaoClient.getAuthUrl();
+        if (delivery.getType().equals(DeliveryTypeEnums.FENG_NIAO_PT.getType())){
+            url = client.fengniaoAuthUrl();
         }
-        if (DeliveryTypeEnums.AIPT.getType().equals(deliveryType)) {
-            url = aiptClient.getAuthUrl(merchant.getCode());
+        if (delivery.getType().equals(DeliveryTypeEnums.AIPT.getType())){
+            url = client.aptAuthUrl(merchant.getCode());
         }
-        if (DeliveryTypeEnums.HUO_LA_LA.getType().equals(deliveryType)) {
-            url = huolalaClient.getAuthUrl();
+        if (delivery.getType().equals(DeliveryTypeEnums.HUO_LA_LA.getType())){
+            url = client.hllAuthUrl();
         }
-        if (DeliveryTypeEnums.KUAI_FU.getType().equals(deliveryType)) {
-            url = kfClient.getAuthUrlH5(merchant.getCode());
+        if (delivery.getType().equals(DeliveryTypeEnums.KUAI_FU.getType())){
+            url = client.kfAuthUrl(merchant.getCode());
         }
+
         if (DeliveryTypeEnums.MEI_TUAN_ZB.getType().equals(deliveryType)) {
             shopDeliveryBind = new ShopDeliveryBind();
             shopDeliveryBind.setAccount("sssss");
@@ -251,13 +227,13 @@ public class ApiDeliveryBindServiceImpl implements ApiDeliveryBindService {
             if (DeliveryTypeEnums.DADA_YZ.getType().equals(deliveryType)) {
                 type = 1;
             }
-            JSONObject jsonObject = dadaClient.partyTicket(type);
+            JSONObject jsonObject = client.partyTicket(type);
             if (jsonObject != null && jsonObject.getString("status").equals("success")) {
                 String state = merchant.getCode();
                 if (shopId != null) {
                     state = state + "_" + shopId;
                 }
-                url = dadaClient.getPartyOauth(jsonObject.getString("result"), type, state);
+                url = client.getPartyOauth(jsonObject.getString("result"), type, state);
             } else {
                 throw new CustomAppException(jsonObject == null ? "获取渠道授权码异常!" : jsonObject.getString("msg"));
             }
@@ -341,12 +317,14 @@ public class ApiDeliveryBindServiceImpl implements ApiDeliveryBindService {
     private void changeDadaBalance(ShopDeliveryBind shopDeliveryBind, Integer deliveryType){
         QueryAmount queryAmount = new QueryAmount();
         queryAmount.setIsDirectDelivery(0);
+        queryAmount.setLbClient(DeliveryTypeEnums.DADA.getName());
         if (DeliveryTypeEnums.DADA_YZ.getType().equals(deliveryType)) {
             queryAmount.setIsDirectDelivery(1);
+            queryAmount.setLbClient(DeliveryTypeEnums.DADA_YZ.getName());
         }
         // 查询余额
         queryAmount.setMerchantId(shopDeliveryBind.getThirdShopId());
-        ResObject<AmountResultVo> res = dadaClient.queryAmount(queryAmount);
+        ResObject<AmountResultVo> res = client.queryAmount(queryAmount);
         if(res.getCode() == 0) {
             BigDecimal balanceAmount = res.getData().getBalanceAmount();
             // 变更余额
@@ -420,7 +398,7 @@ public class ApiDeliveryBindServiceImpl implements ApiDeliveryBindService {
                 throw new CustomAppException("解除绑定失败, 请联系客服人员处理!");
             }
         } else if (DeliveryTypeEnums.SHAN_SONG.getType().equals(deliveryType)) {
-            ResObject res = shansongClient.cancelToken(shopDeliveryBind.getAuthToken());
+            ResObject res = client.cancelToken(shopDeliveryBind.getAuthToken());
             log.info("===闪送解除绑定返回: {}", JsonMapper.nonEmptyMapper().toJson(res));
             if (res.getCode() == 0) {
                 iShopDeliveryBindService.removeById(bindId);
@@ -439,7 +417,7 @@ public class ApiDeliveryBindServiceImpl implements ApiDeliveryBindService {
             return bindDto;
         }
         // 解除绑定
-        AiptUnBindDto bindDto = aiptClient.unBind(shopDeliveryBind.getAccount());
+        AiptUnBindDto bindDto = client.unBind(shopDeliveryBind.getAccount());
         log.info("===Aipt解除绑定返回: {}", JsonMapper.nonEmptyMapper().toJson(bindDto));
         if (bindDto != null && bindDto.getCode() != null && bindDto.getCode() == 1 && "Success".equals(bindDto.getState())) {
             iShopDeliveryBindService.removeById(bindId);
@@ -557,14 +535,14 @@ public class ApiDeliveryBindServiceImpl implements ApiDeliveryBindService {
 
     @Override
     public boolean getUuptVerifyCode(String mobile, String ip) {
-        ResObject<BindUserApplyResponse> resObject = uuptUserDeliveryService.bindUserApply(mobile, ip);
+        ResObject<BindUserApplyResponse> resObject = client.bindUserApply(mobile, ip);
         return resObject.getCode() == 0;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String bindUupt(Member member, String mobile, String validateCode, String cityName) {
-        ResObject<BindUserSubmitResponse> resObject = uuptUserDeliveryService.bindUserSubmit(mobile, validateCode, cityName);
+        ResObject<BindUserSubmitResponse> resObject = client.bindUserSubmit(mobile, validateCode, cityName);
         if (resObject.getCode() != 0) {
             return resObject.getMsg();
         }
@@ -572,7 +550,7 @@ public class ApiDeliveryBindServiceImpl implements ApiDeliveryBindService {
         DspDelivery delivery = iDspDeliveryService.findOne(DeliveryTypeEnums.UUPT.getType());
         ShopDeliveryBind shopDeliveryBind = new ShopDeliveryBind();
         shopDeliveryBind.setAccount(mobile);
-        ResObject<GetBalanceDetailResponse> res = uuptUserDeliveryService.getBalance(response.getOpenid());
+        ResObject<GetBalanceDetailResponse> res = client.getBalance(response.getOpenid());
         if(res.getCode() == 0) {
             shopDeliveryBind.setBalance(new BigDecimal(res.getData().getAccountMoney()));
         }
@@ -600,7 +578,7 @@ public class ApiDeliveryBindServiceImpl implements ApiDeliveryBindService {
         if (StringUtils.isBlank(shopDeliveryBind.getThirdShopId())) {
             throw new CustomAppException("UUPT解除绑定失败, 请联系客服人员处理!");
         }
-        ResObject<CancelBindResponse> resObject =  uuptUserDeliveryService.cancelBind(shopDeliveryBind.getThirdShopId());
+        ResObject<CancelBindResponse> resObject =  client.cancelBind(shopDeliveryBind.getThirdShopId());
         log.info("uupt 解除绑定返回: {}", JSONObject.toJSONString(resObject));
         if (resObject.getCode() == 0) {
             iShopDeliveryBindService.removeById(shopDeliveryBind.getId());

lb-app/src/main/java/com/ydd/app/service/impl/ApiDeliveryServiceImpl.java

@@ -1,9 +1,8 @@
 package com.ydd.app.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.QueryAmountEntityUtils;
 import com.ydd.app.service.ApiDeliveryService;
 import com.ydd.common.enums.DeliveryTypeEnums;
@@ -13,36 +12,21 @@ import com.ydd.module.domain.*;
 import com.ydd.module.dto.DeliveryDto;
 import com.ydd.module.dto.DeliveryInfo;
 import com.ydd.module.dto.MemberConfigDto;
-import com.ydd.module.dto.ShopDto;
 import com.ydd.module.enums.BindStatusEnum;
 import com.ydd.module.enums.IsDeleteEnum;
 import com.ydd.module.enums.StatusEnum;
 import com.ydd.module.expection.CustomAppException;
 import com.ydd.module.service.*;
 import com.ydd.system.service.ISysConfigService;
+import com.ydd.third.common.dto.*;
+import com.ydd.third.common.huolalaresponse.TokenResponse;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.aipt.AiptClient;
-import com.ydd.third.delivery.aipt.dto.AiptAuthDto;
-import com.ydd.third.delivery.aipt.dto.AiptUnBindDto;
-import com.ydd.third.delivery.dada.DadaClient;
-import com.ydd.third.delivery.fengniao.FengniaoClient;
-import com.ydd.third.delivery.huolala.HuolalaClient;
-import com.ydd.third.delivery.huolala.response.TokenResponse;
-import com.ydd.third.delivery.huolala.vo.HCityInfo;
-import com.ydd.third.delivery.huolala.vo.HPoiSearch;
-import com.ydd.third.delivery.huolala.vo.Haddress;
-import com.ydd.third.delivery.kuaifu.KfClient;
-import com.ydd.third.delivery.kuaifu.dto.KfAuthDto;
-import com.ydd.third.delivery.shansong.ShansongClient;
-import com.ydd.third.delivery.uupt.dto.BindUserApplyResponse;
-import com.ydd.third.delivery.uupt.dto.BindUserSubmitResponse;
-import com.ydd.third.delivery.uupt.dto.CancelBindResponse;
-import com.ydd.third.delivery.uupt.dto.GetBalanceDetailResponse;
-import com.ydd.third.delivery.uupt.service.UuptUserDeliveryService;
-import com.ydd.third.delivery.vo.callback.ShansongTokenVo;
-import com.ydd.third.delivery.vo.shop.AmountResultVo;
-import com.ydd.third.delivery.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.callback.ShansongTokenVo;
+import com.ydd.third.common.vo.huolalavo.HCityInfo;
+import com.ydd.third.common.vo.huolalavo.HPoiSearch;
+import com.ydd.third.common.vo.huolalavo.Haddress;
+import com.ydd.third.common.vo.shop.AmountResultVo;
+import com.ydd.third.common.vo.shop.QueryAmount;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,23 +59,15 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
 
     private final IMemberService iMemberService;
 
-    private final ShansongClient shansongClient;
 
-    private final FengniaoClient fengniaoClient;
-
-    private final AiptClient aiptClient;
 
     private final IMerchantService iMerchantService;
 
-    private final UuptUserDeliveryService uuptUserDeliveryService;
 
-    private final Client client;
 
-    private final HuolalaClient huolalaClient;
+    private final DeliveryService client;
 
-    private final KfClient kfClient;
 
-    private final DadaClient dadaClient;
 
     private final IShopService iShopService;
 
@@ -177,7 +153,7 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
             }
             if(DeliveryTypeEnums.SHAN_SONG.getType().equals(delivery.getType())){
                 //解除绑定
-                ResObject res = shansongClient.cancelToken(shopDelivery.getAuthToken());
+                ResObject res = client.cancelToken(shopDelivery.getAuthToken());
                 if (res.getCode() == 0){
                     iShopDeliveryService.removeById(id);
                 }
@@ -202,7 +178,7 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
         ShopDelivery shopDelivery = iShopDeliveryService.getById(id);
         if (shopDelivery != null){
             //解除绑定
-            AiptUnBindDto bindDto = aiptClient.unBind(shopDelivery.getAccount());
+            AiptUnBindDto bindDto = client.unBind(shopDelivery.getAccount());
             if (bindDto.getCode().equals(1) && bindDto.getState().equals("Success")){
                 iShopDeliveryService.removeById(id);
             }
@@ -300,19 +276,19 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
 //        }
         String url = null;
         if (delivery.getType().equals(DeliveryTypeEnums.SHAN_SONG.getType())){
-            url = shansongClient.getAuthUrl(merchant.getCode());
+            url = client.shansongAuthUrl(merchant.getCode());
         }
         if (delivery.getType().equals(DeliveryTypeEnums.FENG_NIAO.getType())){
-            url = fengniaoClient.getAuthUrl();
+            url = client.fengniaoAuthUrl();
         }
         if (delivery.getType().equals(DeliveryTypeEnums.AIPT.getType())){
-            url = aiptClient.getAuthUrl(merchant.getCode());
+            url = client.aptAuthUrl(merchant.getCode());
         }
         if (delivery.getType().equals(DeliveryTypeEnums.HUO_LA_LA.getType())){
-            url = huolalaClient.getAuthUrl();
+            url = client.hllAuthUrl();
         }
         if (delivery.getType().equals(DeliveryTypeEnums.KUAI_FU.getType())){
-            url = kfClient.getAuthUrlH5(merchant.getCode());
+            url = client.kfAuthUrl(merchant.getCode());
         }
         if (delivery.getType().equals(DeliveryTypeEnums.MEI_TUAN_ZB.getType())){
             shopDelivery = new ShopDelivery();
@@ -335,9 +311,9 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
             if (delivery.getType().equals(DeliveryTypeEnums.DADA_YZ.getType())){
                 type = 1;
             }
-            JSONObject jsonObject = dadaClient.partyTicket(type);
+            JSONObject jsonObject = client.partyTicket(type);
             if (jsonObject.getString("status").equals("success")){
-                url = dadaClient.getPartyOauth(jsonObject.getString("result"),type,merchant.getCode());
+                url = client.getPartyOauth(jsonObject.getString("result"),type,merchant.getCode());
             }else {
                 throw new CustomAppException(jsonObject.getString("msg"));
             }
@@ -396,13 +372,15 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
     public void getBalance(ShopDelivery shopDelivery,DspDelivery dspDelivery,Long merchantId,Long deliveryId,String shopNo){
         QueryAmount queryAmount = new QueryAmount();
         queryAmount.setIsDirectDelivery(0);
+        queryAmount.setLbClient(DeliveryTypeEnums.DADA.getName());
         if (DeliveryTypeEnums.DADA_YZ.getType().equals(dspDelivery.getType())){
             queryAmount.setIsDirectDelivery(1);
+            queryAmount.setLbClient(DeliveryTypeEnums.DADA_YZ.getName());
         }
         shopDelivery.setBindStatus(BindStatusEnum.BIND.status);
         // 查询余额
         queryAmount.setMerchantId(shopDelivery.getThirdShopId());
-        ResObject<AmountResultVo> res = dadaClient.queryAmount(queryAmount);
+        ResObject<AmountResultVo> res = client.queryAmount(queryAmount);
         if(res.getCode().intValue()==0){
             BigDecimal balanceAmount = res.getData().getBalanceAmount();
             shopDelivery.setBalance(balanceAmount);
@@ -551,7 +529,7 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
 
     @Override
     public boolean bindUserApply(String mobile, String ip) {
-        ResObject<BindUserApplyResponse> resObject =  uuptUserDeliveryService.bindUserApply(mobile,ip);
+        ResObject<BindUserApplyResponse> resObject =  client.bindUserApply(mobile,ip);
         if(resObject.getCode()!=0){
             return  false;
         }
@@ -561,7 +539,7 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
     @Override
     public String bindUserSubmit(Long memberId,String mobile, String validateCode, String cityName) {
         log.info("绑定用户请求：memberId:{}",memberId);
-        ResObject<BindUserSubmitResponse> resObject = uuptUserDeliveryService.bindUserSubmit(mobile,validateCode,cityName);
+        ResObject<BindUserSubmitResponse> resObject = client.bindUserSubmit(mobile,validateCode,cityName);
         if(resObject.getCode()==0){
             BindUserSubmitResponse response = resObject.getData();
             Member member = iMemberService.getById(memberId);
@@ -569,7 +547,7 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
             Merchant merchant = iMerchantService.getById(member.getMerchantId());
             ShopDelivery shopDelivery = new ShopDelivery();
             shopDelivery.setAccount(mobile);
-            ResObject<GetBalanceDetailResponse> res = uuptUserDeliveryService.getBalance(response.getOpenid());
+            ResObject<GetBalanceDetailResponse> res = client.getBalance(response.getOpenid());
             if(res.getCode().intValue()==0){
                 String accountMoney = res.getData().getAccountMoney();
                 shopDelivery.setBalance(new BigDecimal(accountMoney));
@@ -593,7 +571,7 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
         log.info("uupt 解除绑定开始:"+JSONObject.toJSONString(shopDelivery));
         if(shopDelivery!=null&&shopDelivery.getAccount().equals(mobile)&&StringUtils.isNotBlank(shopDelivery.getThirdShopId())){
             String openId = shopDelivery.getThirdShopId();
-            ResObject<CancelBindResponse> resObject =  uuptUserDeliveryService.cancelBind(openId);
+            ResObject<CancelBindResponse> resObject =  client.cancelBind(openId);
             if(resObject.getCode()==0){
                 CancelBindResponse response = resObject.getData();
                 log.info("uupt 解除绑定返回:"+JSONObject.toJSONString(response));
@@ -648,7 +626,7 @@ public class ApiDeliveryServiceImpl implements ApiDeliveryService {
 
     @Override
     public  List<Haddress>  poiSearch(HPoiSearch hPoiSearch) {
-      List<Haddress> list = huolalaClient.poiSearch(hPoiSearch);
+      List<Haddress> list = client.poiSearch(hPoiSearch);
         return list;
     }
 }

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderBackServiceImpl.java

@@ -4,8 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryService;
+import com.ydd.api.MeiTuanApi;
 import com.ydd.app.callback.controller.ShanTangSignUtils;
-import com.ydd.app.listener.DeliveryOrderEvent;
 import com.ydd.app.service.ApiCouponService;
 import com.ydd.app.service.ApiOrderBackService;
 import com.ydd.app.service.ApiOrderNewService;
@@ -25,17 +26,16 @@ import com.ydd.module.push.MessagePushService;
 import com.ydd.module.service.*;
 import com.ydd.module.service.impl.RedissonLockService;
 import com.ydd.system.service.ISysConfigService;
+import com.ydd.third.common.config.WaimaiConfig;
 import com.ydd.third.common.utils.AddressLngLatExchanger;
 import com.ydd.third.common.utils.CoordinateUtils;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.vo.order.CancelOrderResultVo;
-import com.ydd.third.delivery.vo.order.CancelOrderVo;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
-import com.ydd.third.waimai.config.WaimaiConfig;
-import com.ydd.third.waimai.eleme.api.enumeration.order.OSelfDeliveryStateEnum;
-import com.ydd.third.waimai.vo.SyncRiderPositionStatusVo;
+import com.ydd.third.common.vo.vo.order.CancelOrderResultVo;
+import com.ydd.third.common.vo.vo.order.CancelOrderVo;
+import com.ydd.third.common.vo.vo.order.OrderResultVo;
+import com.ydd.third.common.vo.waimai.SyncRiderPositionStatusVo;
+import com.ydd.third.common.vo.waimai.eleme.api.enumeration.order.OSelfDeliveryStateEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -70,7 +70,7 @@ public class ApiOrderBackServiceImpl implements ApiOrderBackService {
 
     private final IMemberService iMemberService;
 
-    private final Client client;
+    private final DeliveryService client;
 
     private final IDspDeliveryService iDspDeliveryService;
 
@@ -80,7 +80,7 @@ public class ApiOrderBackServiceImpl implements ApiOrderBackService {
 
     private final IDspWaimaiService iDspWaimaiService;
 
-    private final com.ydd.third.waimai.Client waimaiClient;
+    private final MeiTuanApi waimaiClient;
 
     private final IShopWaimaiService iShopWaimaiService;
 
@@ -411,8 +411,7 @@ public class ApiOrderBackServiceImpl implements ApiOrderBackService {
             }
             if (waimai.getType().equals(WaimaiTypeEnums.JD_HOME.getType())) {
                 // 获取京东到家相关配置
-                ShopJdHomeCode shopJdHome = iShopJdHomeCodeService.getOne(new QueryWrapper<ShopJdHomeCode>().eq("deleted", 0).eq("shop_waimai_id", shopWaimai.getId()));
-
+                ShopJdHomeCode shopJdHome = iShopJdHomeCodeService.getById(shopWaimai.getBusinessId());
                 vo.setAppAuthToken(shopJdHome.getToken());
                 vo.setJdAppKey(shopJdHome.getAppKey());
                 vo.setJdAppSecret(shopJdHome.getAppSecret());

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderCancelServiceImpl.java

@@ -3,65 +3,39 @@ package com.ydd.app.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.ijpay.core.enums.TradeType;
-import com.ydd.app.OrderEntityUtils;
-import com.ydd.app.QueryAmountEntityUtils;
-import com.ydd.app.dto.AddressReq;
-import com.ydd.app.dto.OrderMarkerDto;
-import com.ydd.app.dto.OrderReq;
-import com.ydd.app.dto.ValuationRes;
-import com.ydd.app.service.*;
-import com.ydd.app.task.TipsTask;
+import com.ydd.api.DeliveryService;
+import com.ydd.app.service.ApiCouponService;
+import com.ydd.app.service.ApiOrderCancelService;
+import com.ydd.app.service.ApiOrderNewService;
 import com.ydd.common.core.redis.RedisCache;
 import com.ydd.common.enums.DeliveryTypeEnums;
-import com.ydd.common.utils.DateUtils;
-import com.ydd.common.utils.SnCodeUtils;
-import com.ydd.common.utils.StringUtils;
 import com.ydd.ecloud.core.utils.BigDecimalUtils;
-import com.ydd.ecloud.core.utils.JsonMapper;
 import com.ydd.module.CancelOrderUtils;
 import com.ydd.module.domain.*;
 import com.ydd.module.dto.CancelOrderDto;
 import com.ydd.module.dto.CouponDto;
-import com.ydd.module.dto.DeliveryInfo;
-import com.ydd.module.dto.OrderDetailDto;
 import com.ydd.module.enums.*;
 import com.ydd.module.expection.CustomAppException;
-import com.ydd.module.pay.alipay.AliPayService;
-import com.ydd.module.pay.dto.OrderPaySignResponse;
-import com.ydd.module.pay.wechat.service.WechatPayService;
 import com.ydd.module.service.*;
 import com.ydd.module.service.impl.RedissonLockService;
-import com.ydd.module.utils.CommonUtils;
-import com.ydd.system.service.ISysConfigService;
-import com.ydd.third.common.utils.AddressLngLatExchanger;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.vo.order.CancelOrderResultVo;
-import com.ydd.third.delivery.vo.order.CancelOrderVo;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
-import com.ydd.third.delivery.vo.order.OrderVo;
-import com.ydd.third.delivery.vo.shop.AmountResultVo;
-import com.ydd.third.delivery.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.vo.order.CancelOrderResultVo;
+import com.ydd.third.common.vo.vo.order.CancelOrderVo;
+import com.ydd.third.common.vo.vo.order.OrderResultVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.redisson.api.RLock;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
-import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.Date;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * Project：lb-server
@@ -84,7 +58,7 @@ public class ApiOrderCancelServiceImpl implements ApiOrderCancelService {
     private final IOrderLogService iOrderLogService;
 
 
-    private final Client client;
+    private final DeliveryService client;
 
     private final IDspDeliveryService iDspDeliveryService;
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderDetailServiceImpl.java

@@ -13,7 +13,6 @@ import com.ydd.module.expection.CustomAppException;
 import com.ydd.module.service.*;
 import com.ydd.third.common.utils.AddressLngLatExchanger;
 import com.ydd.third.common.utils.StringUtils;
-import com.ydd.third.delivery.Client;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
@@ -42,7 +41,6 @@ public class ApiOrderDetailServiceImpl implements ApiOrderDetailService {
 
     private final IOrderService iOrderService;
 
-    private final Client client;
 
     private final IDspDeliveryService iDspDeliveryService;
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.ijpay.core.enums.TradeType;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.OrderEntityUtils;
 import com.ydd.app.QueryAmountEntityUtils;
 import com.ydd.app.dto.AddressReq;
@@ -44,20 +45,19 @@ import com.ydd.module.service.*;
 import com.ydd.module.utils.CommonUtils;
 import com.ydd.system.domain.SysConfig;
 import com.ydd.system.service.ISysConfigService;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.AddressLngLatExchanger;
 import com.ydd.third.common.vo.GDMapTripResult;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
-import com.ydd.third.delivery.vo.order.OrderVo;
-import com.ydd.third.delivery.vo.shop.AmountResultVo;
-import com.ydd.third.delivery.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.shop.AmountResultVo;
+import com.ydd.third.common.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.vo.order.OrderResultVo;
+import com.ydd.third.common.vo.vo.order.OrderVo;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.order.OActivity;
+import com.ydd.third.common.vo.waimai.meituan.MeituanOrderExtraVo;
 import com.ydd.third.print.request.PrintOrderActDto;
 import com.ydd.third.print.request.PrintOrderDto;
 import com.ydd.third.print.request.PrintOrderGoodsDto;
-import com.ydd.third.waimai.eleme.api.entity.order.OActivity;
-import com.ydd.third.waimai.meituan.vo.MeituanOrderExtraVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -103,7 +103,7 @@ public class ApiOrderServiceImpl implements ApiOrderService {
 
     private final IMemberService iMemberService;
 
-    private final Client client;
+    private final DeliveryService client;
 
     private final IDspDeliveryService iDspDeliveryService;
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderValuationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ydd.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.OrderEntityUtils;
 import com.ydd.app.QueryAmountEntityUtils;
 import com.ydd.app.dto.AddressReq;
@@ -25,14 +26,13 @@ import com.ydd.module.service.*;
 import com.ydd.module.utils.CommonUtils;
 import com.ydd.system.domain.SysConfig;
 import com.ydd.system.service.ISysConfigService;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.CoordinateUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
-import com.ydd.third.delivery.vo.order.OrderVo;
-import com.ydd.third.delivery.vo.shop.AmountResultVo;
-import com.ydd.third.delivery.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.shop.AmountResultVo;
+import com.ydd.third.common.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.vo.order.OrderResultVo;
+import com.ydd.third.common.vo.vo.order.OrderVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -61,7 +61,7 @@ public class ApiOrderValuationServiceImpl implements ApiOrderValuationService {
     private final IMerchantService iMerchantService;
     private final IDadaDspService iDadaDspService;
 
-    private final Client client;
+    private final DeliveryService client;
 
     private final IDspDeliveryService iDspDeliveryService;
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiPayServiceImpl.java

@@ -5,11 +5,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.ijpay.core.enums.TradeType;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.dto.OrderReq;
 import com.ydd.app.dto.ValuationRes;
 import com.ydd.app.listener.DeliveryOrderEvent;
 import com.ydd.app.service.*;
 import com.ydd.app.task.TipsTask;
+import com.ydd.common.exception.CustomException;
 import com.ydd.common.utils.DateUtils;
 import com.ydd.common.utils.SnCodeUtils;
 import com.ydd.module.domain.*;
@@ -20,8 +22,6 @@ import com.ydd.module.expection.CustomAppException;
 import com.ydd.module.pay.alipay.AliPayService;
 import com.ydd.module.pay.wechat.service.WechatPayService;
 import com.ydd.module.service.*;
-import com.ydd.third.common.exception.BusinessException;
-import com.ydd.third.delivery.Client;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -82,7 +82,8 @@ public class ApiPayServiceImpl implements ApiPayService {
     private final IOrderTipService iOrderTipService;
     private final IDspDeliveryService iDspDeliveryService;
     private final IOrderDeliveryService iOrderDeliveryService;
-    private final Client client;
+
+    private final DeliveryService client;
     private final IShopDeliveryService iShopDeliveryService;
     private final ApiOrderNewService apiOrderNewService;
     private final ApiOrderService apiOrderService;
@@ -152,7 +153,7 @@ public class ApiPayServiceImpl implements ApiPayService {
             return resp;
         } catch (WxPayException e) {
            // e.printStackTrace();
-            throw new BusinessException("支付失败, 请重试");
+            throw new CustomException("支付失败, 请重试");
         }
     }
 
@@ -350,7 +351,7 @@ public class ApiPayServiceImpl implements ApiPayService {
             return wechatPayService.wechatTradeQuery(orderSn);
         } else {
             log.warn("无效的付款类型! orderSn: {}, payType: {}", orderSn, payType);
-            throw new BusinessException("payType参数错误!");
+            throw new CustomException("payType参数错误!");
         }
     }
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiRiderLocationServiceImpl.java

@@ -1,38 +1,31 @@
 package com.ydd.app.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydd.app.service.ApiOrderDetailService;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.service.ApiRiderLocationService;
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.enums.WaimaiTypeEnums;
 import com.ydd.module.domain.*;
 import com.ydd.module.dto.OrderDto;
 import com.ydd.module.enums.DeliveryStatusEnum;
-import com.ydd.module.enums.IsDeleteEnum;
-import com.ydd.module.enums.MemberTypeEnum;
-import com.ydd.module.expection.CustomAppException;
-import com.ydd.module.service.*;
-import com.ydd.third.common.utils.AddressLngLatExchanger;
+import com.ydd.module.service.IDspWaimaiService;
+import com.ydd.module.service.IShopDeliveryBindService;
+import com.ydd.module.service.IShopDeliveryService;
+import com.ydd.module.service.IShopWaimaiService;
 import com.ydd.third.common.utils.CoordinateUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.huolala.HuolalaClient;
-import com.ydd.third.delivery.huolala.vo.HirtualPhoneInfo;
-import com.ydd.third.delivery.vo.order.OrderQueryResultVo;
-import com.ydd.third.delivery.vo.order.OrderQueryVo;
-import com.ydd.third.delivery.vo.order.RiderLocationResultVo;
-import com.ydd.third.delivery.vo.order.RiderLocationVo;
+import com.ydd.third.common.vo.huolalavo.HirtualPhoneInfo;
+import com.ydd.third.common.vo.vo.order.OrderQueryResultVo;
+import com.ydd.third.common.vo.vo.order.OrderQueryVo;
+import com.ydd.third.common.vo.vo.order.RiderLocationResultVo;
+import com.ydd.third.common.vo.vo.order.RiderLocationVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Project：lb-server
@@ -47,9 +40,8 @@ import java.util.Optional;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
 
-    private final Client client;
+    private final DeliveryService client;
 
-    private final HuolalaClient huolalaClient;
     private final IShopDeliveryService iShopDeliveryService;
     private final IShopDeliveryBindService iShopDeliveryBindService;
     private final IDspWaimaiService iDspWaimaiService;
@@ -261,7 +253,7 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                             }
                         }
                     }else{
-                        String phone = huolalaClient.bindVirtualPhone(delivery.getAuthToken(),orderDelivery.getOutTradeNo(),order.getSendPhone());
+                        String phone = client.bindVirtualPhone(delivery.getAuthToken(),orderDelivery.getOutTradeNo(),order.getSendPhone());
                         dto.setShipperPhone(phone);
                     }
                     dto.setShipperLat(orderInfo.getData().getRiderLat());

lb-app/src/main/java/com/ydd/app/service/impl/ApiShanTangServiceImpl.java

@@ -2,56 +2,35 @@ package com.ydd.app.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydd.app.service.*;
-import com.ydd.app.task.TriggerProcessTask;
-import com.ydd.common.core.redis.RedisCache;
+import com.ydd.app.service.ApiOrderCancelService;
+import com.ydd.app.service.ApiShanTangService;
+import com.ydd.app.service.ApiWaimaiPrintService;
+import com.ydd.app.service.ApiWaimaiService;
 import com.ydd.common.enums.WaimaiTypeEnums;
-import com.ydd.common.utils.DateUtils;
 import com.ydd.common.utils.SnCodeUtils;
-import com.ydd.ecloud.core.utils.JsonMapper;
 import com.ydd.module.domain.*;
-import com.ydd.module.dto.DeliveryConfigDto;
-import com.ydd.module.dto.OrderDetailDto;
-import com.ydd.module.dto.WaimaiDto;
-import com.ydd.module.enums.*;
-import com.ydd.module.expection.CustomAppException;
+import com.ydd.module.enums.DeliveryStatusEnum;
+import com.ydd.module.enums.OrderCancelTypeEnum;
+import com.ydd.module.enums.OrderStatusEnum;
+import com.ydd.module.enums.WaimaiOrderTypeEnum;
 import com.ydd.module.push.MessagePushService;
 import com.ydd.module.service.*;
-import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.print.request.PrintOrderDto;
-import com.ydd.third.print.service.UnifiedPrintService;
-import com.ydd.third.waimai.config.WaimaiConfig;
-import com.ydd.third.waimai.eleRetai.EleRetaiClient;
-import com.ydd.third.waimai.eleRetai.param.*;
-import com.ydd.third.waimai.eleme.ElemeAuthClient;
-import com.ydd.third.waimai.eleme.ElemeClient;
-import com.ydd.third.waimai.eleme.api.entity.order.OGoodsItem;
-import com.ydd.third.waimai.elemeretail.api.entity.user.BindShop;
-import com.ydd.third.waimai.meituan.MeituanClient;
-import com.ydd.third.waimai.meituan.vo.OrderDetailVo;
-import com.ydd.third.waimai.vo.*;
+import com.ydd.third.common.vo.waimai.ShanTangOrderCancelResultVo;
+import com.ydd.third.common.vo.waimai.ShanTangOrderDetailVo;
+import com.ydd.third.common.vo.waimai.ShanTangOrderResultVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Project：lb-server

lb-app/src/main/java/com/ydd/app/service/impl/ApiShopDeviceServiceImpl.java

@@ -2,6 +2,7 @@ package com.ydd.app.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.PrintApi;
 import com.ydd.app.dto.AddUsbPrintReq;
 import com.ydd.app.service.ApiShopDeviceService;
 import com.ydd.module.domain.Device;
@@ -17,8 +18,6 @@ import com.ydd.module.expection.CustomAppException;
 import com.ydd.module.service.IDeviceService;
 import com.ydd.module.service.IMemberService;
 import com.ydd.module.service.IShopDeviceService;
-import com.ydd.third.print.enums.PrintDeviceType;
-import com.ydd.third.print.service.UnifiedPrintService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -51,7 +50,7 @@ public class ApiShopDeviceServiceImpl implements ApiShopDeviceService {
     private final IMemberService iMemberService;
 
 
-    private final UnifiedPrintService unifiedPrintService;
+    private final PrintApi unifiedPrintService;
 
 
     @Override
@@ -159,7 +158,7 @@ public class ApiShopDeviceServiceImpl implements ApiShopDeviceService {
         Member member = iMemberService.getById(loginId);
         shopDevice.setShopId(member.getShopId());
         shopDevice.setMerchantId(member.getMerchantId());
-        shopDevice.setDeviceType(PrintDeviceType.usb.type);
+        shopDevice.setDeviceType(99);
         shopDevice.setDeviceSn("USB打印");
         shopDevice.setDeviceId(0L);
         boolean result = iShopDeviceService.saveOrUpdate(shopDevice);

lb-app/src/main/java/com/ydd/app/service/impl/ApiShopServiceImpl.java

@@ -2,6 +2,7 @@ package com.ydd.app.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.ShopEditUtils;
 import com.ydd.app.ShopEntityUtils;
 import com.ydd.app.dto.ShopReq;
@@ -10,7 +11,6 @@ import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.common.utils.SnCodeUtils;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.ecloud.core.utils.JsonMapper;
-import com.ydd.framework.web.domain.server.Mem;
 import com.ydd.module.domain.*;
 import com.ydd.module.dto.DeliveryDto;
 import com.ydd.module.dto.ShopDto;
@@ -22,15 +22,11 @@ import com.ydd.module.service.*;
 import com.ydd.system.domain.SysConfig;
 import com.ydd.system.service.ISysConfigService;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.vo.callback.FengniaoV3CallbackStoreVo;
-import com.ydd.third.delivery.vo.shop.ShopQueryResultVo;
-import com.ydd.third.delivery.vo.shop.ShopQueryVo;
-import com.ydd.third.delivery.vo.shop.ShopResultVo;
-import com.ydd.third.delivery.vo.shop.ShopVo;
+import com.ydd.third.common.vo.callback.FengniaoV3CallbackStoreVo;
+import com.ydd.third.common.vo.shop.ShopResultVo;
+import com.ydd.third.common.vo.shop.ShopVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -63,7 +59,7 @@ public class ApiShopServiceImpl implements ApiShopService {
 
     private final IDspDeliveryService iDspDeliveryService;
 
-    private final Client deliveryClient;
+    private final DeliveryService deliveryClient;
     private final IShopThirdService iShopThirdService;
 
     private final IMerchantCategoryService iMerchantCategoryService;

lb-app/src/main/java/com/ydd/app/service/impl/ApiWaimaiPlatformServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.sankuai.meituan.shangou.open.sdk.domain.OAuthAuthorizeParam;
+import com.ydd.api.*;
 import com.ydd.app.service.ApiWaimaiPlatformService;
 import com.ydd.common.enums.WaimaiTypeEnums;
 import com.ydd.common.utils.SnCodeUtils;
@@ -16,21 +17,15 @@ import com.ydd.module.enums.MemberTypeEnum;
 import com.ydd.module.enums.StatusEnum;
 import com.ydd.module.expection.CustomAppException;
 import com.ydd.module.service.*;
+import com.ydd.third.common.config.WaimaiConfig;
 import com.ydd.third.common.request.MtSgAuthRequest;
 import com.ydd.third.common.utils.Constants;
-import com.ydd.third.waimai.config.WaimaiConfig;
-import com.ydd.third.waimai.eleRetai.EleRetaiClient;
-import com.ydd.third.waimai.eleme.ElemeAuthClient;
-import com.ydd.third.waimai.eleme.ElemeClient;
-import com.ydd.third.waimai.elemeretail.api.entity.user.BindShop;
-import com.ydd.third.waimai.jdHome.JdHomeClient;
+import com.ydd.third.common.vo.waimai.*;
+import com.ydd.third.common.vo.waimai.elemeretail.api.entity.user.BindShop;
 import com.ydd.third.waimai.jdHome.dto.JdHomeCallBackDTO;
 import com.ydd.third.waimai.jdHome.dto.StoreInfo;
 import com.ydd.third.waimai.jdHome.vo.JdHomeCallBackVo;
 import com.ydd.third.waimai.jdHome.vo.JdHomeParamJsonVo;
-import com.ydd.third.waimai.meituan.MeituanClient;
-import com.ydd.third.waimai.meituanSg.MeituanSgClient;
-import com.ydd.third.waimai.vo.*;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -41,10 +36,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import springfox.documentation.spring.web.json.Json;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -69,19 +65,19 @@ public class ApiWaimaiPlatformServiceImpl implements ApiWaimaiPlatformService {
     private final IDspWaimaiService iDspWaimaiService;
 
 
-    private final MeituanClient meituanClient;
+    private final MeiTuanApi meituanClient;
 
-    private final MeituanSgClient meituanSgClient;
+    private final MeiTuanSgApi meituanSgClient;
 
-    private final ElemeAuthClient elemeAuthClient;
+    //private final ElemeAuthClient elemeAuthClient;
 
-    private final ElemeClient elemeClient;
+    private final ElemeApi elemeClient;
 
-    private final JdHomeClient jdHomeClient;
+    private final JdHomeApi jdHomeClient;
 
     private final WaimaiConfig waimaiConfig;
 
-    private final EleRetaiClient eleRetaiClient;
+    private final EleRetailApi eleRetaiClient;
     private final IMemberService iMemberService;
 
     private final IShopJdHomeService iShopJdHomeService;
@@ -229,7 +225,7 @@ public class ApiWaimaiPlatformServiceImpl implements ApiWaimaiPlatformService {
         if (waimai.getType().equals(WaimaiTypeEnums.MEI_TUAN.getType())) {
             url = meituanClient.storeMapUrl(code, shop.getName(), mtBindType);
         } else if (waimai.getType().equals(WaimaiTypeEnums.E_LE_ME.getType())) {
-            url = elemeAuthClient.getOAuthUrl(code);
+            url = elemeClient.getOAuthUrl(code);
         } else if (waimai.getType().equals(WaimaiTypeEnums.E_LE_ME_RETAIL.getType())) {
             url = waimaiConfig.getEleRetailUrl();
         } else if (waimai.getType().equals(WaimaiTypeEnums.MEI_TUAN_SG.getType())) {
@@ -427,11 +423,11 @@ public class ApiWaimaiPlatformServiceImpl implements ApiWaimaiPlatformService {
             iShopJdHomeCodeService.updateById(shopJdHome);
 
             // 重新发送更新token
-            ShopWaimai shopWaimai = iShopWaimaiService.getOne(new QueryWrapper<ShopWaimai>().eq("deleted", 0).eq("id", shopJdHome.getShopWaimaiId()));
-            if (Objects.nonNull(shopWaimai)) {
-                shopWaimai.setAuthToken(tokenDto.getToken());
-                iShopWaimaiService.updateById(shopWaimai);
-            }
+//            ShopWaimai shopWaimai = iShopWaimaiService.getOne(new QueryWrapper<ShopWaimai>().eq("deleted", 0).eq("id", shopJdHome.getShopWaimaiId()));
+//            if (Objects.nonNull(shopWaimai)) {
+//                shopWaimai.setAuthToken(tokenDto.getToken());
+//                iShopWaimaiService.updateById(shopWaimai);
+//            }
             return shopJdHome;
         }else{
             ShopJdHomeCode newJdHomeCode = new ShopJdHomeCode();
@@ -484,70 +480,7 @@ public class ApiWaimaiPlatformServiceImpl implements ApiWaimaiPlatformService {
         return shopJdHomeList;
     }
 
-//    @SneakyThrows
-//    @Override
-//    @Transactional(rollbackFor = Exception.class)
-//    @Async
-//    public void storeCrud(JdHomeShopMappingResultVo shopMappingVo, Integer type) {
-//        if (type == 0) {
-//          DspWaimai waimai = iDspWaimaiService.findOne(WaimaiTypeEnums.JD_HOME.getType());
-//          //  if (waimai != null) {
-//          // Shop shop = iShopService.getOne(new QueryWrapper<Shop>().eq("code", shopMappingVo.getPoiInfoData().getAppPoiCode()));
-//          //先取消所有的其他的绑定
-//          iShopWaimaiService.updateStatus(shopMappingVo.getBillId());
-//          ShopWaimai shopWaimai = iShopWaimaiService.getOne(new QueryWrapper<ShopWaimai>().eq("epoid", shopMappingVo.getBillId()).eq("waimai_id",waimai.getId()));
-//
-//          shopWaimai.setThirdShopId(shopMappingVo.getBillId());
-//
-//          // 添加门店应用信息
-//          ShopJdHome shopJdHome = new ShopJdHome();
-//          shopJdHome.setShopWaimaiId(shopWaimai.getId());
-//          shopJdHome.setAppKey(shopMappingVo.getAppKey());
-//          shopJdHome.setSign(shopMappingVo.getSign());
-//          SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//          shopJdHome.setTimestamp(sdf.parse(shopMappingVo.getTimestamp()));
-//          shopJdHome.setFormat(shopMappingVo.getFormat());
-//          shopJdHome.setV(shopMappingVo.getV());
-//          shopJdHome.setToken(shopMappingVo.getToken());
-//          shopJdHome.setSign(shopMappingVo.getSign());
-//          // shopJdHome.setAppSecret("df1bcb2103374425ad675f5d92f1893b");
-//          iShopJdHomeService.save(shopJdHome);
-//
-//
-//          // 获取门店信息
-//          JdHomeParamJsonVo jsonVo = new JdHomeParamJsonVo();
-//          jsonVo.setAppAuthToken(shopJdHome.getToken());
-//          jsonVo.setStoreNo(shopMappingVo.getBillId());
-//          StoreInfo storeInfo = jdHomeClient.selectJdHomeShop(jsonVo, shopJdHome.getAppKey(), shopJdHome.getAppSecret());
-//
-//          shopWaimai.setThirdShopName(storeInfo.getStationName());
-//          shopWaimai.setBindStatus(BindStatusEnum.BIND.status);
-//          shopWaimai.setDeleted(IsDeleteEnum.NORMAL.status);
-//  //            Integer businessId = 2;
-//  //            if (StringUtils.isNotBlank(shopMappingVo.getBusinessId())){
-//  //                businessId = Integer.valueOf(shopMappingVo.getBusinessId());
-//  //            }
-//  //            shopWaimai.setBusinessId(businessId);
-//          iShopWaimaiService.updateById(shopWaimai);
-//        }else if (type == 1) {
-//          DspWaimai waimai = iDspWaimaiService.findOne(WaimaiTypeEnums.JD_HOME.getType());
-//          if (waimai != null) {
-//              ShopWaimai shopWaimai = iShopWaimaiService.getOne(new QueryWrapper<ShopWaimai>()
-//                      .eq("epoid",  shopMappingVo.getBillId())
-//                      .eq("waimai_id",waimai.getId())
-//                      .eq("deleted",IsDeleteEnum.NORMAL.status));
-//  //            Shop shop = iShopService.getOne(new QueryWrapper<Shop>().eq("code", shopMappingVo.getPoiInfoData().getAppPoiCode()));
-//  //            ShopWaimai shopWaimai = iShopWaimaiService.findById(shop.getId(), waimai.getId());
-//              //  iShopWaimaiService.removeById(shopWaimai.getId());
-//              iShopWaimaiService.updateStatus(shopWaimai.getThirdShopId());
-//
-//              // 删除对应应用
-//              ShopJdHome shopJdHome = iShopJdHomeService.getOne(new QueryWrapper<ShopJdHome>().eq("deleted", 0).eq("shop_waimai_id", shopWaimai.getId()));
-//              iShopJdHomeService.removeById(shopJdHome.getId());
-//          }
-//        }
-//
-//    }
+
 
     @Override
     public boolean changeShop(Long id, Long shopId) {

lb-app/src/main/java/com/ydd/app/service/impl/ApiWaimaiPrintServiceImpl.java

@@ -4,8 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.PrintApi;
 import com.ydd.app.service.ApiWaimaiPrintService;
 import com.ydd.common.enums.WaimaiTypeEnums;
+import com.ydd.common.exception.CustomException;
 import com.ydd.common.utils.DateUtils;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.domain.DspWaimai;
@@ -14,14 +16,9 @@ import com.ydd.module.domain.WaimaiOrder;
 import com.ydd.module.domain.WaimaiOrderDetail;
 import com.ydd.module.enums.OrderStatusEnum;
 import com.ydd.module.service.*;
-import com.ydd.third.common.exception.BusinessException;
-import com.ydd.third.print.request.PrintDeviceDto;
-import com.ydd.third.print.request.PrintOrderActDto;
-import com.ydd.third.print.request.PrintOrderDto;
-import com.ydd.third.print.request.PrintOrderGoodsDto;
-import com.ydd.third.print.service.UnifiedPrintService;
-import com.ydd.third.waimai.eleme.api.entity.order.OActivity;
-import com.ydd.third.waimai.meituan.vo.MeituanOrderExtraVo;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.order.OActivity;
+import com.ydd.third.common.vo.waimai.meituan.MeituanOrderExtraVo;
+import com.ydd.third.print.request.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -64,7 +61,7 @@ public class ApiWaimaiPrintServiceImpl implements ApiWaimaiPrintService {
     private final IShopDeviceService iShopDeviceService;
 
 
-    private final UnifiedPrintService unifiedPrintService;
+    private final PrintApi unifiedPrintService;
 
 
 
@@ -79,10 +76,10 @@ public class ApiWaimaiPrintServiceImpl implements ApiWaimaiPrintService {
         WaimaiOrder waimaiOrder = iWaimaiOrderService.getById(waimaiId);
         List<ShopDevice> deviceDtos = iShopDeviceService.list(new QueryWrapper<ShopDevice>().eq("shop_id", waimaiOrder.getShopId()).eq("status", 1).eq("deleted", 0));
         if (CollectionUtils.isEmpty(deviceDtos)) {
-            throw new BusinessException("暂无可用的设备");
+            throw new CustomException("暂无可用的设备");
         }else{
            if(deviceDtos.get(0).getOpenOrderPrint()==0){
-               throw new BusinessException("请开启自动接单打印");
+               throw new CustomException("请开启自动接单打印");
            }
         }
         List<PrintDeviceDto> printDeviceDtos = new ArrayList<>();
@@ -200,7 +197,11 @@ public class ApiWaimaiPrintServiceImpl implements ApiWaimaiPrintService {
         printOrderDto.setOpenQrCode(iShopService.getOpenQrCode(waimaiOrder.getShopId()));
         printOrderDto.setQrCode(waimaiOrder.getOutOrderId());
         //手动打印, 强制
-        unifiedPrintService.printOrder(printOrderDto, printDeviceDtos, true);
+        PrintDto dto = new PrintDto();
+        dto.setPrintOrderDto(printOrderDto);
+        dto.setDeviceDtoList(printDeviceDtos);
+        dto.setIsforce(true);
+        unifiedPrintService.printOrder(dto);
     }
 
 
@@ -338,7 +339,12 @@ public class ApiWaimaiPrintServiceImpl implements ApiWaimaiPrintService {
         }
         printOrderDto.setOpenQrCode(iShopService.getOpenQrCode(waimaiOrder.getShopId()));
         //手动打印, 强制
-        unifiedPrintService.printTestOrder(printOrderDto, printDeviceDto, waimaiOrder.getShopId(), true);
+        PrintDto dto = new PrintDto();
+        dto.setPrintOrderDto(printOrderDto);
+        dto.setPrintDeviceDto(printDeviceDto);
+        dto.setShopId(waimaiOrder.getShopId());
+        dto.setIsforce(true);
+        unifiedPrintService.printTestOrder(dto);
         return true;
     }
 
@@ -380,7 +386,11 @@ public class ApiWaimaiPrintServiceImpl implements ApiWaimaiPrintService {
         printOrderDto.setOpenQrCode(iShopService.getOpenQrCode(waimaiOrder.getShopId()));
         printOrderDto.setQrCode(waimaiOrder.getOutOrderId());
         //手动打印, 强制
-        unifiedPrintService.printOrder(printOrderDto, printDeviceDtos, true);
+        PrintDto dto = new PrintDto();
+        dto.setPrintOrderDto(printOrderDto);
+        dto.setDeviceDtoList(printDeviceDtos);
+        dto.setIsforce(true);
+        unifiedPrintService.printOrder(dto);
     }
 
     @Override
@@ -435,7 +445,11 @@ public class ApiWaimaiPrintServiceImpl implements ApiWaimaiPrintService {
         printOrderDto.setOpenQrCode(iShopService.getOpenQrCode(waimaiOrder.getShopId()));
         printOrderDto.setQrCode(waimaiOrder.getOutOrderId());
         //手动打印, 强制
-        unifiedPrintService.printOrder(printOrderDto, printDeviceDtos, true);
+        PrintDto dto = new PrintDto();
+        dto.setPrintOrderDto(printOrderDto);
+        dto.setDeviceDtoList(printDeviceDtos);
+        dto.setIsforce(true);
+        unifiedPrintService.printOrder(dto);
     }
 
 }

lb-app/src/main/java/com/ydd/app/service/impl/ApiWaimaiServiceImpl.java

@@ -2,7 +2,7 @@ package com.ydd.app.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.sankuai.meituan.shangou.open.sdk.domain.OAuthAuthorizeParam;
+import com.ydd.api.*;
 import com.ydd.app.service.ApiOrderCancelService;
 import com.ydd.app.service.ApiWaimaiPrintService;
 import com.ydd.app.service.ApiWaimaiService;
@@ -14,16 +14,13 @@ import com.ydd.common.utils.SnCodeUtils;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.ecloud.core.utils.JsonMapper;
 import com.ydd.module.domain.*;
-import com.ydd.module.dto.DeliveryConfigDto;
 import com.ydd.module.dto.OrderDetailDto;
-import com.ydd.module.dto.WaimaiDto;
 import com.ydd.module.dto.WaimaiListDto;
 import com.ydd.module.enums.*;
 import com.ydd.module.expection.CustomAppException;
 import com.ydd.module.push.MessagePushService;
 import com.ydd.module.service.*;
-import com.ydd.third.common.request.MtSgAuthRequest;
-import com.ydd.third.common.utils.Constants;
+import com.ydd.third.common.config.WaimaiConfig;
 import com.ydd.third.common.vo.ResObject;
 import com.ydd.third.common.vo.waimai.*;
 import com.ydd.third.common.vo.waimai.eleme.api.entity.order.OGoodsItem;
@@ -31,30 +28,16 @@ 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.common.vo.waimai.jdHome.vo.JdHomeOrderResultVo;
 import com.ydd.third.common.vo.waimai.meituan.OrderDetailVo;
-import com.ydd.third.delivery.fengniao.entity.OrderInfo;
 import com.ydd.third.print.request.PrintOrderDto;
-import com.ydd.third.waimai.config.WaimaiConfig;
-import com.ydd.third.waimai.eleRetai.EleRetaiClient;
 import com.ydd.third.waimai.eleRetai.param.*;
 import com.ydd.third.waimai.eleRetai.vo.OrderEBaiInfo;
 import com.ydd.third.waimai.eleRetai.vo.OrderEBaiList;
-import com.ydd.third.waimai.eleme.ElemeAuthClient;
-import com.ydd.third.waimai.eleme.ElemeClient;
-import com.ydd.third.waimai.eleme.api.entity.order.OGoodsItem;
-import com.ydd.third.waimai.eleme.api.entity.order.OOrder;
-import com.ydd.third.waimai.eleme.api.entity.order.OrderList;
-import com.ydd.third.waimai.elemeretail.api.entity.user.BindShop;
-import com.ydd.third.waimai.jdHome.JdHomeClient;
 import com.ydd.third.waimai.jdHome.dto.OrderInfoDTO;
 import com.ydd.third.waimai.jdHome.dto.OrderInvoiceDTO;
 import com.ydd.third.waimai.jdHome.dto.OrderProductDTO;
 import com.ydd.third.waimai.jdHome.dto.StoreInfo;
 import com.ydd.third.waimai.jdHome.vo.JdHomeParamJsonVo;
-import com.ydd.third.waimai.meituan.MeituanClient;
-import com.ydd.third.waimai.meituan.vo.OrderDetailVo;
-import com.ydd.third.waimai.meituanSg.MeituanSgClient;
 import com.ydd.third.waimai.meituanSg.vo.SgOrderDetailVo;
-import com.ydd.third.waimai.vo.*;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -75,7 +58,6 @@ import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * Project：lb-server
@@ -100,13 +82,12 @@ public class ApiWaimaiServiceImpl implements ApiWaimaiService {
 
     private final IDspWaimaiService iDspWaimaiService;
 
-    private final MeituanClient meituanClient;
+    private final MeiTuanApi meituanClient;
 
-    private final MeituanSgClient meituanSgClient;
+    private final MeiTuanSgApi meituanSgClient;
 
-    private final ElemeAuthClient elemeAuthClient;
 
-    private final JdHomeClient jdHomeClient;
+    private final JdHomeApi jdHomeClient;
 
     private final IWaimaiOrderService iWaimaiOrderService;
 
@@ -127,7 +108,7 @@ public class ApiWaimaiServiceImpl implements ApiWaimaiService {
 
     private final MessagePushService messagePushService;
 
-    private final ElemeClient elemeClient;
+    private final ElemeApi elemeClient;
 
     private final ApplicationContext applicationContext;
 
@@ -141,7 +122,7 @@ public class ApiWaimaiServiceImpl implements ApiWaimaiService {
 
     private final ApiOrderCancelService apiOrderCancelService;
 
-    private final EleRetaiClient eleRetaiClient;
+    private final EleRetailApi eleRetaiClient;
 
     private final IAgentService iAgentService;
 
@@ -1488,15 +1469,14 @@ public class ApiWaimaiServiceImpl implements ApiWaimaiService {
     @Transactional
     @Async
     public void jdHomeNewOrder(JdHomeOrderResultVo orderResultVo) {
-       ShopJdHomeCode shopJdHomeCode = iShopJdHomeCodeService.getOne(new QueryWrapper<ShopJdHomeCode>().eq("deleted", 0).eq("app_key", orderResultVo.getAppKey()));
-       ShopWaimai shopWaimai = iShopWaimaiService.getById(shopJdHomeCode.getShopWaimaiId());
-
-//       DspWaimai waimai = iDspWaimaiService.findOne(WaimaiTypeEnums.JD_HOME.getType());
-//       ShopWaimai shopWaimai =iShopWaimaiService.getOne(new QueryWrapper<ShopWaimai>().eq("epoid",  shopWaimai.getThirdShopId())
-//                .eq("deleted",IsDeleteEnum.NORMAL.status)
-//                .eq("waimai_id",waimai.getId())
-//                .eq("bind_status",BindStatusEnum.BIND.status));
-       Long memberId = null;
+        ShopJdHomeCode shopJdHomeCode = iShopJdHomeCodeService.getOne(new QueryWrapper<ShopJdHomeCode>().eq("deleted", 0).eq("app_key", orderResultVo.getAppKey()));
+        List<ShopWaimai> shopWaimais = iShopWaimaiService.list(new QueryWrapper<ShopWaimai>().eq("bind_status", 1).eq("business_id", shopJdHomeCode.getId()));
+
+        Long memberId = null;
+        ShopWaimai shopWaimai = new ShopWaimai();
+        if (CollectionUtils.isNotEmpty(shopWaimais)) {
+            shopWaimai = shopWaimais.get(0);
+        }
         List<Long> memberIds = iMemberService.selectByShopId(shopWaimai.getShopId());
         if(CollectionUtils.isNotEmpty(memberIds)){
             memberId = memberIds.get(0);
@@ -1508,14 +1488,14 @@ public class ApiWaimaiServiceImpl implements ApiWaimaiService {
         //    DspWaimai waimai = iDspWaimaiService.findOne(WaimaiTypeEnums.MEI_TUAN_SG.getType());
         //   ShopWaimai shopWaimai = iShopWaimaiService.findById(shop.getId(), waimai.getId());
 
-      if (config != null && StatusEnum.SHOW.status.equals(config.getOpenAutoorder())) {
-        ConfirmOrderVo confirmOrderVo = new ConfirmOrderVo();
-        confirmOrderVo.setOrderId(orderResultVo.getBillId());
-        confirmOrderVo.setAppAuthToken(shopJdHomeCode.getToken());
-        ResObject resObject = jdHomeClient.confirmOrder(confirmOrderVo, shopJdHomeCode.getAppKey(), shopJdHomeCode.getAppSecret());
-        log.info("=======京东到家订单确认结果=====" + JsonMapper.nonEmptyMapper().toJson(resObject));
+        if (config != null && StatusEnum.SHOW.status.equals(config.getOpenAutoorder())) {
+            ConfirmOrderVo confirmOrderVo = new ConfirmOrderVo();
+            confirmOrderVo.setOrderId(orderResultVo.getBillId());
+            confirmOrderVo.setAppAuthToken(shopJdHomeCode.getToken());
+            ResObject resObject = jdHomeClient.confirmOrder(confirmOrderVo, shopJdHomeCode.getAppKey(), shopJdHomeCode.getAppSecret());
+            log.info("=======京东到家订单确认结果=====" + JsonMapper.nonEmptyMapper().toJson(resObject));
 
-      }
+        }
     }
 
     /**
@@ -1527,156 +1507,161 @@ public class ApiWaimaiServiceImpl implements ApiWaimaiService {
     @Async
     @Transactional
     public void jdHomeConfirmOrder(JdHomeOrderResultVo orderVo) {
-      DspWaimai waimai = iDspWaimaiService.findOne(WaimaiTypeEnums.JD_HOME.getType());
-
-      ShopJdHomeCode shopJdHomeCode = iShopJdHomeCodeService.getOne(new QueryWrapper<ShopJdHomeCode>().eq("deleted", 0).eq("app_key", orderVo.getAppKey()));
-      ShopWaimai shopWaimai = iShopWaimaiService.getOne(new QueryWrapper<ShopWaimai>()
-        .eq("id", shopJdHomeCode.getShopWaimaiId())
-        .eq("deleted", IsDeleteEnum.NORMAL.status)
-        .eq("waimai_id", waimai.getId())
-        .eq("bind_status", BindStatusEnum.BIND.status));
-      Shop shop = iShopService.getById(shopWaimai.getShopId());
-
-      WaimaiOrder waimaiOrder = iWaimaiOrderService.getOne(new QueryWrapper<WaimaiOrder>().eq("out_order_id", orderVo.getBillId()));
-
-      JdHomeParamJsonVo jsonVo = new JdHomeParamJsonVo();
-      jsonVo.setAppAuthToken(shopWaimai.getAuthToken());
-      jsonVo.setOrderId(orderVo.getBillId());
-      List<OrderInfoDTO> orderInfoDTOList = jdHomeClient.selectJdHomeOrder(jsonVo, shopJdHomeCode.getAppKey(), shopJdHomeCode.getAppSecret());
-      OrderInfoDTO orderInfoDTO = new OrderInfoDTO();
-      if (orderInfoDTOList != null && orderInfoDTOList.size() > 0) {
-        orderInfoDTO = orderInfoDTOList.get(0);
-      }
-
-      if (waimaiOrder == null) {
-        waimaiOrder = new WaimaiOrder();
-        BeanUtils.copyProperties(orderInfoDTO, waimaiOrder);
-        String recipientAddress = orderInfoDTO.getBuyerFullAddress();
-
-        waimaiOrder.setRecipientAddress(recipientAddress);
-        waimaiOrder.setRecipientAddressDesensitization(recipientAddress);
-        waimaiOrder.setLogisticsCode(orderInfoDTO.getDeliveryCarrierNo());
-        String remark = orderInfoDTO.getOrderBuyerRemark();
-
-        if (StringUtils.isNotBlank(remark) && remark.contains("\n")) {
-          remark = remark.replace("\n", "");
-        }
+        DspWaimai waimai = iDspWaimaiService.findOne(WaimaiTypeEnums.JD_HOME.getType());
 
-        if (StringUtils.isNotBlank(remark) && remark.contains("[预")) {
-          remark = remark.substring(remark.indexOf("[预"), remark.indexOf("[预") + 8) + "****" + remark.substring(remark.indexOf("[预") + 12, remark.length());
-        }
+        ShopJdHomeCode shopJdHomeCode = iShopJdHomeCodeService.getOne(new QueryWrapper<ShopJdHomeCode>().eq("deleted", 0).eq("app_key", orderVo.getAppKey()));
 
-        waimaiOrder.setCaution(remark);
-
-        waimaiOrder.setWaimaiId(waimai.getId());
-        waimaiOrder.setShopId(shop.getId());
-        waimaiOrder.setCityId(Long.valueOf(orderInfoDTO.getBuyerCity()));
-        waimaiOrder.setOutOrderId(orderInfoDTO.getOrderId().toString());
-        waimaiOrder.setOrderidView(orderInfoDTO.getOrderId().toString());
-        waimaiOrder.setOrderTime(orderInfoDTO.getOrderStartTime());
-        waimaiOrder.setRecipientName(orderInfoDTO.getBuyerFullName());
-        waimaiOrder.setRecipientPhone(orderInfoDTO.getBuyerMobile());
-        waimaiOrder.setDaySeq(orderInfoDTO.getOrderNum().toString());
-        Long deliveryTime = orderInfoDTO.getOrderPreStartDeliveryTime().getTime();
-        String businessTag = orderInfoDTO.getBusinessTag();
-        String[] reTag = businessTag.split(";");
-        List<String> tagList = Arrays.asList(reTag);
-        // 预计送达时间，如果立即达set 0
-        if (tagList.contains("one_dingshida") || tagList.contains("dj_aging_nextday")) {
-          waimaiOrder.setDeliveryTime(deliveryTime/1000);
-        }else if (tagList.contains("dj_aging_immediately")) {
-          waimaiOrder.setDeliveryTime(0L);
+        WaimaiOrder waimaiOrder = iWaimaiOrderService.getOne(new QueryWrapper<WaimaiOrder>().eq("out_order_id", orderVo.getBillId()));
+
+        JdHomeParamJsonVo jsonVo = new JdHomeParamJsonVo();
+        jsonVo.setAppAuthToken(shopJdHomeCode.getToken());
+        jsonVo.setOrderId(orderVo.getBillId());
+        List<OrderInfoDTO> orderInfoDTOList = jdHomeClient.selectJdHomeOrder(jsonVo, shopJdHomeCode.getAppKey(), shopJdHomeCode.getAppSecret());
+        OrderInfoDTO orderInfoDTO = new OrderInfoDTO();
+        if (orderInfoDTOList != null && orderInfoDTOList.size() > 0) {
+            orderInfoDTO = orderInfoDTOList.get(0);
         }
 
-        waimaiOrder.setHasInvoiced(orderInfoDTO.getOrderInvoiceOpenMark() == 1 ? 1 : 0);
+        ShopWaimai shopWaimai = iShopWaimaiService.getOne(new QueryWrapper<ShopWaimai>()
+                .eq("business_id", shopJdHomeCode.getId())
+                .eq("deleted", IsDeleteEnum.NORMAL.status)
+                .eq("waimai_id", waimai.getId())
+                .eq("bind_status", BindStatusEnum.BIND.status)
+                .eq("third_shop_id", orderInfoDTO.getDeliveryStationNo()));
+
+        Shop shop = iShopService.getById(shopWaimai.getShopId());
+
+
+        if (waimaiOrder == null && shopWaimai != null) {
+            waimaiOrder = new WaimaiOrder();
+            BeanUtils.copyProperties(orderInfoDTO, waimaiOrder);
+            String recipientAddress = orderInfoDTO.getBuyerFullAddress();
+
+            waimaiOrder.setRecipientAddress(recipientAddress);
+            waimaiOrder.setRecipientAddressDesensitization(recipientAddress);
+            waimaiOrder.setLogisticsCode(orderInfoDTO.getDeliveryCarrierNo());
+            String remark = orderInfoDTO.getOrderBuyerRemark();
+
+            if (StringUtils.isNotBlank(remark) && remark.contains("\n")) {
+                remark = remark.replace("\n", "");
+            }
+
+            if (StringUtils.isNotBlank(remark) && remark.contains("[预")) {
+                remark = remark.substring(remark.indexOf("[预"), remark.indexOf("[预") + 8) + "****" + remark.substring(remark.indexOf("[预") + 12, remark.length());
+            }
+
+            waimaiOrder.setCaution(remark);
+
+            waimaiOrder.setWaimaiId(waimai.getId());
+            waimaiOrder.setShopId(shop.getId());
+            waimaiOrder.setCityId(Long.valueOf(orderInfoDTO.getBuyerCity()));
+            waimaiOrder.setOutOrderId(orderInfoDTO.getOrderId().toString());
+            waimaiOrder.setOrderidView(orderInfoDTO.getOrderId().toString());
+            waimaiOrder.setOrderTime(orderInfoDTO.getOrderStartTime());
+            waimaiOrder.setRecipientName(orderInfoDTO.getBuyerFullName());
+            waimaiOrder.setRecipientPhone(orderInfoDTO.getBuyerMobile());
+            waimaiOrder.setDaySeq(orderInfoDTO.getOrderNum().toString());
+            Long deliveryTime = orderInfoDTO.getOrderPreStartDeliveryTime().getTime();
+            String businessTag = orderInfoDTO.getBusinessTag();
+            String[] reTag = businessTag.split(";");
+            List<String> tagList = Arrays.asList(reTag);
+            // 预计送达时间，如果立即达set 0
+            if (tagList.contains("one_dingshida") || tagList.contains("dj_aging_nextday")) {
+                waimaiOrder.setDeliveryTime(deliveryTime/1000);
+            }else if (tagList.contains("dj_aging_immediately")) {
+                waimaiOrder.setDeliveryTime(0L);
+            }
+
+            waimaiOrder.setHasInvoiced(orderInfoDTO.getOrderInvoiceOpenMark() == 1 ? 1 : 0);
 //        waimaiOrder.setLatitude(orderInfoDTO.getBuyerLng();
 //        waimaiOrder.setLongitude(orderInfoDTO.getBuyerLat());
-        // 发票具体信息
-        OrderInvoiceDTO orderInvoiceDTO = orderInfoDTO.getOrderInvoice();
-        if (orderInvoiceDTO != null) {
-          waimaiOrder.setInvoiceTitle(orderInvoiceDTO.getInvoiceTitle());
-          waimaiOrder.setTaxpayerId(orderInvoiceDTO.getInvoiceDutyNo());
-        }
+            // 发票具体信息
+            OrderInvoiceDTO orderInvoiceDTO = orderInfoDTO.getOrderInvoice();
+            if (orderInvoiceDTO != null) {
+                waimaiOrder.setInvoiceTitle(orderInvoiceDTO.getInvoiceTitle());
+                waimaiOrder.setTaxpayerId(orderInvoiceDTO.getInvoiceDutyNo());
+            }
 //        waimaiOrder.setExtras(orderInfoDTO.getDiscount().toString());
 //        waimaiOrder.setIsThirdShipping(orderVo.getIsThirdShipping());
-        waimaiOrder.setReceiptLat(orderInfoDTO.getBuyerLat().toString());
-        waimaiOrder.setReceiptLng(orderInfoDTO.getBuyerLng().toString());
-        BigDecimal originalPrice = new BigDecimal(String.valueOf(orderInfoDTO.getOrderTotalMoney()));
-        waimaiOrder.setOriginalPrice(originalPrice.divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP));
-        waimaiOrder.setPayType(orderInfoDTO.getOrderPayType());
+            waimaiOrder.setReceiptLat(orderInfoDTO.getBuyerLat().toString());
+            waimaiOrder.setReceiptLng(orderInfoDTO.getBuyerLng().toString());
+            BigDecimal originalPrice = new BigDecimal(String.valueOf(orderInfoDTO.getOrderTotalMoney()));
+            waimaiOrder.setOriginalPrice(originalPrice.divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP));
+            waimaiOrder.setPayType(orderInfoDTO.getOrderPayType());
 //      waimaiOrder.setPickType(Integer.valueOf(orderInfoDTO.getDeliveryCarrierNo()));
 //            orderVo.setWmPoiAddress(URLDecoder.decode(orderVo.getWmPoiAddress(), "utf-8"));
-        waimaiOrder.setPoiName(orderInfoDTO.getDeliveryStationName());
-        BigDecimal orderReceivableFreight = new BigDecimal(String.valueOf(orderInfoDTO.getOrderReceivableFreight()));
-        waimaiOrder.setShippingFee(orderReceivableFreight.divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP));
-
-        // 门店具体信息
-        jsonVo.setStoreNo(orderInfoDTO.getDeliveryStationNo());
-        StoreInfo storeInfo = jdHomeClient.selectJdHomeShop(jsonVo, shopJdHomeCode.getAppKey(), shopJdHomeCode.getAppSecret());
-        waimaiOrder.setPoiAddress(storeInfo.getStationAddress());
-        waimaiOrder.setPoiPhone(storeInfo.getPhone());
-
-        waimaiOrder.setPoiReceiveDetail(null);
-        waimaiOrder.setReceiptPrivacyPhone(null);
-        waimaiOrder.setStatus(DeliveryStatusEnum.ORDERS_TO_BE_BILLED.status);
-        waimaiOrder.setOrderType(WaimaiOrderTypeEnum.JD_HOME.getType());
-        BigDecimal totalPrice = new BigDecimal(String.valueOf(orderInfoDTO.getOrderBuyerPayableMoney()));
-        waimaiOrder.setTotalPrice(totalPrice.divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP));
-        waimaiOrder.setCreateTime(new Date());
-
-        BigDecimal boxFee = BigDecimal.ZERO;
-        List<OrderProductDTO> orderProductDTOS = orderInfoDTO.getProduct();
-        for (OrderProductDTO dto : orderProductDTOS) {
-          boxFee = boxFee.add(BigDecimal.valueOf(dto.getCanteenMoney()));
-        }
-        waimaiOrder.setBoxFee(boxFee);
-        waimaiOrder.setThirdShopId(shopWaimai.getThirdShopId());
-        iWaimaiOrderService.save(waimaiOrder);
-
-        //消息推送
-        //     messagePushService.waimaiMessage(shop.getId(), waimaiOrder);
-
-        //记录商品详情
-        List<WaimaiOrderDetail> detailList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(orderInfoDTO.getProduct())) {
-          for (OrderProductDTO vo : orderInfoDTO.getProduct()) {
-            WaimaiOrderDetail detail = new WaimaiOrderDetail();
-            BeanUtils.copyProperties(vo, detail);
-            detail.setAppFoodCode(vo.getSkuIdIsv());
-            detail.setSkuId(vo.getSkuId().toString());
-            detail.setQuantity(Long.valueOf(vo.getSkuCount()));
-            detail.setWaimaiOrderId(waimaiOrder.getId());
-            detail.setFoodName(vo.getSkuName());
-            detail.setPrice(new BigDecimal(String.valueOf(vo.getSkuStorePrice())).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP));
-            detail.setSpec(vo.getSkuCostumeProperty());
+            waimaiOrder.setPoiName(orderInfoDTO.getDeliveryStationName());
+            BigDecimal orderReceivableFreight = new BigDecimal(String.valueOf(orderInfoDTO.getOrderReceivableFreight()));
+            waimaiOrder.setShippingFee(orderReceivableFreight.divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP));
+
+            // 门店具体信息
+            jsonVo.setStoreNo(orderInfoDTO.getDeliveryStationNo());
+            StoreInfo storeInfo = jdHomeClient.selectJdHomeShop(jsonVo, shopJdHomeCode.getAppKey(), shopJdHomeCode.getAppSecret());
+            waimaiOrder.setPoiAddress(storeInfo.getStationAddress());
+            waimaiOrder.setPoiPhone(storeInfo.getPhone());
+
+            waimaiOrder.setPoiReceiveDetail(null);
+            waimaiOrder.setReceiptPrivacyPhone(null);
+            waimaiOrder.setStatus(DeliveryStatusEnum.ORDERS_TO_BE_BILLED.status);
+            waimaiOrder.setOrderType(WaimaiOrderTypeEnum.JD_HOME.getType());
+            BigDecimal totalPrice = new BigDecimal(String.valueOf(orderInfoDTO.getOrderBuyerPayableMoney()));
+            waimaiOrder.setTotalPrice(totalPrice.divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP));
+            waimaiOrder.setCreateTime(new Date());
+
+            BigDecimal boxFee = BigDecimal.ZERO;
+            List<OrderProductDTO> orderProductDTOS = orderInfoDTO.getProduct();
+            for (OrderProductDTO dto : orderProductDTOS) {
+                boxFee = boxFee.add(BigDecimal.valueOf(dto.getCanteenMoney()));
+            }
+            waimaiOrder.setBoxFee(boxFee);
+            waimaiOrder.setThirdShopId(shopWaimai.getThirdShopId());
+            iWaimaiOrderService.save(waimaiOrder);
+
+            //消息推送
+            //     messagePushService.waimaiMessage(shop.getId(), waimaiOrder);
+
+            //记录商品详情
+            List<WaimaiOrderDetail> detailList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(orderInfoDTO.getProduct())) {
+                for (OrderProductDTO vo : orderInfoDTO.getProduct()) {
+                    WaimaiOrderDetail detail = new WaimaiOrderDetail();
+                    BeanUtils.copyProperties(vo, detail);
+                    detail.setAppFoodCode(vo.getSkuIdIsv());
+                    detail.setSkuId(vo.getSkuId().toString());
+                    detail.setQuantity(Long.valueOf(vo.getSkuCount()));
+                    detail.setWaimaiOrderId(waimaiOrder.getId());
+                    detail.setFoodName(vo.getSkuName());
+                    detail.setPrice(new BigDecimal(String.valueOf(vo.getSkuStorePrice())).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP));
+                    detail.setSpec(vo.getSkuCostumeProperty());
 //                    detail.setBoxNum(vo.getBoxNum().toString());
-            detailList.add(detail);
-            //iWaimaiOrderDetailService.save(detail);
-          }
-          iWaimaiOrderDetailService.saveBatch(detailList);
-        }
-        //自动打印外卖单
-        redisCache.redisTemplate.opsForValue().set("jd-order:" + orderInfoDTO.getOrderId() + "", JSONObject.toJSONString(orderInfoDTO), 2, TimeUnit.DAYS);
-        try {
-          //     redisCache.setNumber(shop.getId(),Integer.parseInt(orderVo.getDaySeq()));
+                    detailList.add(detail);
+                    //iWaimaiOrderDetailService.save(detail);
+                }
+                iWaimaiOrderDetailService.saveBatch(detailList);
+            }
+            //自动打印外卖单
+            redisCache.redisTemplate.opsForValue().set("jd-order:" + orderInfoDTO.getOrderId() + "", JSONObject.toJSONString(orderInfoDTO), 2, TimeUnit.DAYS);
+            try {
+                //     redisCache.setNumber(shop.getId(),Integer.parseInt(orderVo.getDaySeq()));
 //                autoPrintWaimai(waimaiOrder, detailList);
-          PrintOrderDto printOrderDto = JdHomeConvertPrint.convert(orderInfoDTO);
-          apiWaimaiPrintService.autoPrintWaimaiNew(printOrderDto, detailList, shop.getId(), waimaiOrder);
-        } catch (Exception e) {
-          log.error("自动打印异常！", e);
-        }
-        try {
-          //推送外卖新消息
-          messagePushService.waimaiMessage(shop.getId(), waimaiOrder);
-        } catch (Exception e) {
-          log.error("推送外卖订单消息异常，订单号：" + waimaiOrder.getOutOrderId());
-        }
+                PrintOrderDto printOrderDto = JdHomeConvertPrint.convert(orderInfoDTO);
+                apiWaimaiPrintService.autoPrintWaimaiNew(printOrderDto, detailList, shop.getId(), waimaiOrder);
+            } catch (Exception e) {
+                log.error("自动打印异常！", e);
+            }
+            try {
+                //推送外卖新消息
+                messagePushService.waimaiMessage(shop.getId(), waimaiOrder);
+            } catch (Exception e) {
+                log.error("推送外卖订单消息异常，订单号：" + waimaiOrder.getOutOrderId());
+            }
 
-        //产生配送订单
-        addOrder(shop, waimaiOrder, waimai, SnCodeUtils.createSn());
-      }
+            //产生配送订单
+            addOrder(shop, waimaiOrder, waimai, SnCodeUtils.createSn());
+        }
     }
 
+
     @Override
     @Async
     public void jdHomeDoCancelOrder(JdHomeOrderResultVo orderCancelVo) {

lb-app/src/main/java/com/ydd/app/service/impl/EleConvertPrint.java

@@ -5,7 +5,6 @@ import com.ydd.third.common.vo.waimai.ElemeOrderResultVo;
 import com.ydd.third.common.vo.waimai.eleme.api.entity.order.OActivity;
 import com.ydd.third.print.request.PrintOrderActDto;
 import com.ydd.third.print.request.PrintOrderDto;
-import com.ydd.third.waimai.eleme.api.entity.order.OActivity;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.math.BigDecimal;

lb-app/src/main/java/com/ydd/app/service/impl/EleRetailConvertPrint.java

@@ -6,9 +6,6 @@ import com.ydd.third.print.request.PrintOrderActDto;
 import com.ydd.third.print.request.PrintOrderDto;
 import com.ydd.third.waimai.eleRetai.param.OrderGetDataResultDataDto;
 import com.ydd.third.waimai.eleRetai.param.OrderGetDiscount;
-import com.ydd.third.waimai.eleme.api.entity.order.OActivity;
-import com.ydd.third.waimai.vo.ElemeOrderResultVo;
-import org.apache.commons.collections4.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

lb-app/src/main/java/com/ydd/app/service/impl/JdHomeConvertPrint.java

@@ -4,18 +4,14 @@ import com.ydd.common.utils.StringUtils;
 import com.ydd.third.common.utils.DateUtils;
 import com.ydd.third.print.request.PrintOrderActDto;
 import com.ydd.third.print.request.PrintOrderDto;
-import com.ydd.third.waimai.jdHome.dto.OrderDiscountDTO;
 import com.ydd.third.waimai.jdHome.dto.OrderInfoDTO;
 import com.ydd.third.waimai.jdHome.dto.OrderProductDTO;
-import com.ydd.third.waimai.vo.JdHomeOrderResultVo;
-import org.apache.commons.collections4.CollectionUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 

lb-app/src/main/java/com/ydd/app/service/impl/ShanTangConvertPrint.java

@@ -1,13 +1,11 @@
 package com.ydd.app.service.impl;
 
 import com.ydd.third.common.utils.DateUtils;
+import com.ydd.third.common.vo.waimai.ShanTangOrderDetailVo;
+import com.ydd.third.common.vo.waimai.ShanTangOrderResultVo;
+import com.ydd.third.common.vo.waimai.meituan.MeituanOrderExtraVo;
 import com.ydd.third.print.request.PrintOrderActDto;
 import com.ydd.third.print.request.PrintOrderDto;
-import com.ydd.third.waimai.meituan.vo.MeituanOrderExtraVo;
-import com.ydd.third.waimai.meituan.vo.OrderDetailVo;
-import com.ydd.third.waimai.vo.MeituanOrderResultVo;
-import com.ydd.third.waimai.vo.ShanTangOrderDetailVo;
-import com.ydd.third.waimai.vo.ShanTangOrderResultVo;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.math.BigDecimal;

lb-app/src/main/java/com/ydd/app/task/ShopDeliveryTask.java

@@ -1,26 +1,8 @@
 package com.ydd.app.task;
 
-import com.ydd.module.domain.DspDelivery;
-import com.ydd.module.domain.ShopDelivery;
-import com.ydd.module.domain.ShopWaimai;
-import com.ydd.module.dto.ShopDto;
-import com.ydd.module.service.IDspDeliveryService;
-import com.ydd.module.service.IShopDeliveryService;
-import com.ydd.module.service.IShopService;
-import com.ydd.module.service.IShopWaimaiService;
-import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.fengniao.FengniaoClient;
-import com.ydd.third.delivery.fengniao.entity.FengniaoV3Token;
-import com.ydd.third.delivery.shansong.ShansongClient;
-import com.ydd.third.delivery.vo.callback.ShansongTokenVo;
-import com.ydd.third.waimai.eleme.ElemeAuthClient;
-import com.ydd.third.waimai.eleme.oauth.response.Token;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @author xsx
  * @version 1.0
@@ -30,21 +12,21 @@ import java.util.List;
 @Component
 public class ShopDeliveryTask {
 
-    private final IShopDeliveryService iShopDeliveryService;
-    private final ShansongClient shansongClient;
-    private final IDspDeliveryService iDspDeliveryService;
-    private final FengniaoClient fengniaoClient;
-    private final IShopWaimaiService iShopWaimaiService;
-    private final ElemeAuthClient elemeAuthClient;
-
-    public ShopDeliveryTask(IShopDeliveryService iShopDeliveryService, ShansongClient shansongClient, IDspDeliveryService iDspDeliveryService, FengniaoClient fengniaoClient, IShopWaimaiService iShopWaimaiService, ElemeAuthClient elemeAuthClient) {
-        this.iShopDeliveryService = iShopDeliveryService;
-        this.shansongClient = shansongClient;
-        this.iDspDeliveryService = iDspDeliveryService;
-        this.fengniaoClient = fengniaoClient;
-        this.iShopWaimaiService = iShopWaimaiService;
-        this.elemeAuthClient = elemeAuthClient;
-    }
+//    private final IShopDeliveryService iShopDeliveryService;
+//    private final ShansongClient shansongClient;
+//    private final IDspDeliveryService iDspDeliveryService;
+//    private final FengniaoClient fengniaoClient;
+//    private final IShopWaimaiService iShopWaimaiService;
+//    private final ElemeAuthClient elemeAuthClient;
+//
+//    public ShopDeliveryTask(IShopDeliveryService iShopDeliveryService, ShansongClient shansongClient, IDspDeliveryService iDspDeliveryService, FengniaoClient fengniaoClient, IShopWaimaiService iShopWaimaiService, ElemeAuthClient elemeAuthClient) {
+//        this.iShopDeliveryService = iShopDeliveryService;
+//        this.shansongClient = shansongClient;
+//        this.iDspDeliveryService = iDspDeliveryService;
+//        this.fengniaoClient = fengniaoClient;
+//        this.iShopWaimaiService = iShopWaimaiService;
+//        this.elemeAuthClient = elemeAuthClient;
+//    }
 
     /**
      * 闪送刷新token定时任务

lb-app/src/main/java/com/ydd/app/task/SyncRiderEvent.java

@@ -1,31 +1,13 @@
 package com.ydd.app.task;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydd.app.OrderTipUtils;
-import com.ydd.app.dto.ValuationRes;
-import com.ydd.common.enums.DeliveryTypeEnums;
-import com.ydd.module.domain.*;
-import com.ydd.module.dto.CouponDto;
-import com.ydd.module.dto.OrderTipDto;
-import com.ydd.module.enums.DeliveryAddTipEnum;
-import com.ydd.module.enums.DeliveryStatusEnum;
-import com.ydd.module.enums.IsDeleteEnum;
-import com.ydd.module.service.IDspDeliveryService;
-import com.ydd.module.service.IOrderDeliveryService;
-import com.ydd.module.service.IOrderService;
-import com.ydd.module.service.IShopDeliveryService;
-import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.vo.order.OrderTipsResultVo;
-import com.ydd.third.delivery.vo.order.OrderTipsVo;
-import com.ydd.third.waimai.vo.SyncRiderPositionStatusVo;
+import com.ydd.module.domain.DspDelivery;
+import com.ydd.module.domain.Order;
+import com.ydd.module.domain.OrderDelivery;
+import com.ydd.third.common.vo.waimai.SyncRiderPositionStatusVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.context.ApplicationEvent;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * @author Zoe
@@ -41,7 +23,7 @@ public class SyncRiderEvent extends ApplicationEvent implements Serializable {
     private  OrderDelivery orderDelivery;
     private  DspDelivery delivery;
 
-    public SyncRiderEvent(Order order, SyncRiderPositionStatusVo  vo,OrderDelivery orderDelivery,DspDelivery delivery) {
+    public SyncRiderEvent(Order order, SyncRiderPositionStatusVo vo, OrderDelivery orderDelivery, DspDelivery delivery) {
         super(vo);
         this.order = order;
         this.vo = vo;

lb-app/src/main/java/com/ydd/app/task/SyncRiderTask.java

@@ -1,6 +1,9 @@
 package com.ydd.app.task;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.api.EleRetailApi;
+import com.ydd.api.ElemeApi;
+import com.ydd.api.MeiTuanApi;
 import com.ydd.app.service.ApiRiderLocationService;
 import com.ydd.module.domain.DspDelivery;
 import com.ydd.module.domain.Order;
@@ -9,11 +12,8 @@ import com.ydd.module.dto.CallBackOrderDto;
 import com.ydd.module.dto.OrderDto;
 import com.ydd.module.enums.DeliveryStatusEnum;
 import com.ydd.module.service.IOrderService;
-import com.ydd.third.waimai.eleRetai.EleRetaiClient;
-import com.ydd.third.waimai.eleme.ElemeClient;
-import com.ydd.third.waimai.eleme.api.enumeration.order.OSelfDeliveryStateEnum;
-import com.ydd.third.waimai.meituan.MeituanClient;
-import com.ydd.third.waimai.vo.SyncRiderPositionStatusVo;
+import com.ydd.third.common.vo.waimai.SyncRiderPositionStatusVo;
+import com.ydd.third.common.vo.waimai.eleme.api.enumeration.order.OSelfDeliveryStateEnum;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -34,11 +34,11 @@ import java.util.concurrent.TimeUnit;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class SyncRiderTask {
 
-    private final ElemeClient elemeClient;
-    private final EleRetaiClient eleRetaiClient;
+    private final ElemeApi elemeClient;
+    private final EleRetailApi eleRetaiClient;
     private final IOrderService iOrderService;
 
-    private final  MeituanClient meituanClient;
+    private final MeiTuanApi meituanClient;
     private final ApiRiderLocationService apiRiderLocationService;
     @EventListener(SyncRiderEvent.class)
     @Async

lb-app/src/main/java/com/ydd/app/task/TipsTask.java

@@ -1,21 +1,20 @@
 package com.ydd.app.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.api.DeliveryService;
 import com.ydd.app.OrderTipUtils;
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.*;
 import com.ydd.module.dto.OrderTipDto;
-import com.ydd.module.enums.*;
-import com.ydd.module.expection.CustomAppException;
+import com.ydd.module.enums.DeliveryAddTipEnum;
+import com.ydd.module.enums.DeliveryStatusEnum;
+import com.ydd.module.enums.IsDeleteEnum;
 import com.ydd.module.service.*;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.Client;
-import com.ydd.third.delivery.vo.order.OrderResultVo;
-import com.ydd.third.delivery.vo.order.OrderTipsResultVo;
-import com.ydd.third.delivery.vo.order.OrderTipsVo;
+import com.ydd.third.common.vo.vo.order.OrderTipsResultVo;
+import com.ydd.third.common.vo.vo.order.OrderTipsVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.data.redis.core.RedisTemplate;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -35,7 +34,7 @@ public class TipsTask implements Runnable {
 
     private final IDspDeliveryService iDspDeliveryService;
 
-    private final Client client;
+    private final DeliveryService client;
 
     private BigDecimal orderTip;
     private  IOrderDeliveryService iOrderDeliveryService;
@@ -43,7 +42,7 @@ public class TipsTask implements Runnable {
     private  IShopDeliveryBindService iShopDeliveryBindService;
 
     public TipsTask(Order order, MemberConfig config, IOrderService iOrderService, IDspDeliveryService iDspDeliveryService,
-                    Client client,BigDecimal orderTip,IOrderDeliveryService iOrderDeliveryService,IShopDeliveryService iShopDeliveryService,
+                    DeliveryService client,BigDecimal orderTip,IOrderDeliveryService iOrderDeliveryService,IShopDeliveryService iShopDeliveryService,
                     IShopDeliveryBindService iShopDeliveryBindService) {
         this.order = order;
         this.config = config;

lb-feginclient/src/main/java/com/ydd/api/DeliveryCallbackApi.java

@@ -12,26 +12,26 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
-@FeignClient(name = "lb-delivery",url = "http://127.0.0.1:8083/delivery")
+@FeignClient(name = "lb-delivery", url = "http://127.0.0.1:8083/delivery")
 public interface DeliveryCallbackApi {
 
-    @PostMapping(value="/callBack/doOrder")
+    @PostMapping(value = "/callBack/doOrder")
     Object doOrder(@RequestBody CallBackOrderVo CallBackOrderVo);
 
-    @PostMapping(value="/callback/fengniaoToken")
-    ResObject<FengniaoV3Token> doToken(@RequestParam("code") String code,@RequestParam("merchantId") String merchantId);
+    @PostMapping(value = "/callback/fengniaoToken")
+    ResObject<FengniaoV3Token> doToken(@RequestParam("code") String code, @RequestParam("merchantId") String merchantId);
 
-    @PostMapping(value="/callback/fengniaoStore")
+    @PostMapping(value = "/callback/fengniaoStore")
     ResObject<FengniaoV3CallbackStoreVo> doStore(@RequestBody JSONObject params);
 
-    @PostMapping(value="/callback/huolalaAuth")
+    @PostMapping(value = "/callback/huolalaAuth")
     String huolalaAuth(@RequestParam("code") String code);
 
-    @PostMapping(value="/callback/shansongAuth")
-    ResObject<ShansongTokenVo> shansongAuth(@RequestParam("code")String code, @RequestParam("thirdStoreId")String thirdStoreId,@RequestParam("state") String state);
+    @PostMapping(value = "/callback/shansongAuth")
+    ResObject<ShansongTokenVo> shansongAuth(@RequestParam("code") String code, @RequestParam("thirdStoreId") String thirdStoreId, @RequestParam("state") String state);
 
-    @PostMapping(value="/callback/mtAuth")
-    ResObject<MeituanToken> mtAuth(@RequestParam("params")Map<String, String> params);
+    @PostMapping(value = "/callback/mtAuth")
+    ResObject<MeituanToken> mtAuth(@RequestParam("params") Map<String, String> params);
 
 
 }

lb-feginclient/src/main/java/com/ydd/api/DeliveryService.java

@@ -15,75 +15,91 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@FeignClient(name = "lb-delivery",url = "http://127.0.0.1:8083/delivery")
+@FeignClient(name = "lb-delivery", url = "http://127.0.0.1:8083/delivery")
 public interface DeliveryService {
 
-    @PostMapping(value="/queryOrderInfo")
+    @PostMapping(value = "/queryOrderInfo")
     ResObject<OrderQueryResultVo> queryOrderInfo(@RequestBody OrderQueryVo orderQueryVo);
 
-    @PostMapping(value="/getRiderLocation")
-    ResObject<RiderLocationResultVo> getRiderLocation(@RequestBody RiderLocationVo riderLocationVo );
+    @PostMapping(value = "/getRiderLocation")
+    ResObject<RiderLocationResultVo> getRiderLocation(@RequestBody RiderLocationVo riderLocationVo);
 
 
-    @PostMapping(value="/getCityList")
+    @PostMapping(value = "/getCityList")
     List<HCity> getCityList();
 
-    @PostMapping(value="/getCityInfo")
+    @PostMapping(value = "/getCityInfo")
     HCityInfo getCityInfo(@RequestParam("cityId") String cityId);
 
 
-    @RequestMapping(value="/poiSearch",method = RequestMethod.GET)
+    @RequestMapping(value = "/poiSearch", method = RequestMethod.GET)
     List<Haddress> poiSearch(@RequestBody HPoiSearch hPoiSearch);
 
-    @PostMapping(value="/queryAmount")
+    @PostMapping(value = "/queryAmount")
     ResObject<AmountResultVo> queryAmount(@RequestBody QueryAmount queryAmount);
-    @GetMapping(value="/bindVirtualPhone")
-    String bindVirtualPhone(@RequestParam("authToken")String authToken,@RequestParam("authToken")String outTradeNo,@RequestParam("authToken")String sendPhone);
-    @PostMapping(value="/orderAddTip")
+
+    @GetMapping(value = "/bindVirtualPhone")
+    String bindVirtualPhone(@RequestParam("authToken") String authToken, @RequestParam("authToken") String outTradeNo, @RequestParam("authToken") String sendPhone);
+
+    @PostMapping(value = "/orderAddTip")
     ResObject<OrderTipsResultVo> orderAddTip(@RequestBody OrderTipsVo orderVo);
-    @PostMapping(value="/queryOrderDeliverFee")
+
+    @PostMapping(value = "/queryOrderDeliverFee")
     ResObject<OrderResultVo> queryOrderDeliverFee(@RequestBody OrderVo orderVo);
-    @PostMapping(value="/createShop")
-    ResObject<ShopResultVo> createShop(@RequestBody ShopVo shopVo );
-    @PostMapping(value="/updateShop")
-    ResObject<ShopResultVo> updateShop(@RequestBody ShopVo shopVo );
 
-    @PostMapping(value="/cancelOrder")
+    @PostMapping(value = "/createShop")
+    ResObject<ShopResultVo> createShop(@RequestBody ShopVo shopVo);
+
+    @PostMapping(value = "/updateShop")
+    ResObject<ShopResultVo> updateShop(@RequestBody ShopVo shopVo);
+
+    @PostMapping(value = "/cancelOrder")
     ResObject<CancelOrderResultVo> cancelOrder(@RequestBody CancelOrderVo orderVo);
-    @PostMapping(value="/createOrder")
+
+    @PostMapping(value = "/createOrder")
     ResObject<OrderResultVo> createOrder(@RequestBody OrderVo orderVo);
 
-    @GetMapping(value="/uupt/cancelBind")
-    ResObject<CancelBindResponse> cancelBind(@RequestParam("openId")String openId);
-    @GetMapping(value="/uupt/bindUserApply")
-    ResObject<BindUserApplyResponse> bindUserApply(@RequestParam("mobile")String mobile,@RequestParam("ip") String ip);
-    @GetMapping(value="/uupt/bindUserSubmit")
-    ResObject<BindUserSubmitResponse> bindUserSubmit(@RequestParam("mobile")String mobile,@RequestParam("validateCode") String validateCode,@RequestParam("cityName") String cityName);
-    @GetMapping(value="/uupt/getBalance")
-    ResObject<GetBalanceDetailResponse> getBalance(@RequestParam("openId")String openId);
+    @GetMapping(value = "/uupt/cancelBind")
+    ResObject<CancelBindResponse> cancelBind(@RequestParam("openId") String openId);
+
+    @GetMapping(value = "/uupt/bindUserApply")
+    ResObject<BindUserApplyResponse> bindUserApply(@RequestParam("mobile") String mobile, @RequestParam("ip") String ip);
+
+    @GetMapping(value = "/uupt/bindUserSubmit")
+    ResObject<BindUserSubmitResponse> bindUserSubmit(@RequestParam("mobile") String mobile, @RequestParam("validateCode") String validateCode, @RequestParam("cityName") String cityName);
+
+    @GetMapping(value = "/uupt/getBalance")
+    ResObject<GetBalanceDetailResponse> getBalance(@RequestParam("openId") String openId);
+
     //auth url
-    @GetMapping(value="/shansongAuthUrl")
-    String shansongAuthUrl(@RequestParam("code")String code);
-    @GetMapping(value="/fengniaoAuthUrl")
+    @GetMapping(value = "/shansongAuthUrl")
+    String shansongAuthUrl(@RequestParam("code") String code);
+
+    @GetMapping(value = "/fengniaoAuthUrl")
     String fengniaoAuthUrl();
-    @GetMapping(value="/aptAuthUrl")
-    String aptAuthUrl(@RequestParam("code")String code);
-    @GetMapping(value="/hllAuthUrl")
+
+    @GetMapping(value = "/aptAuthUrl")
+    String aptAuthUrl(@RequestParam("code") String code);
+
+    @GetMapping(value = "/hllAuthUrl")
     String hllAuthUrl();
-    @GetMapping(value="/kfAuthUrl")
-    String kfAuthUrl(@RequestParam("code")String code);
 
-    @GetMapping(value="/dada/partyTicket")
-    JSONObject partyTicket(@RequestParam("type")Integer type);
-    @GetMapping(value="/dada/authUrl")
-    String dadaAuthUrl(@RequestParam("result")String result,@RequestParam("type")Integer type,@RequestParam("code")String code);
+    @GetMapping(value = "/kfAuthUrl")
+    String kfAuthUrl(@RequestParam("code") String code);
+
+    @GetMapping(value = "/dada/partyTicket")
+    JSONObject partyTicket(@RequestParam("type") Integer type);
+
+    @GetMapping(value = "/dada/authUrl")
+    String getPartyOauth(@RequestParam("result") String result, @RequestParam("type") Integer type, @RequestParam("code") String code);
+
+    @GetMapping(value = "/shansong/cancelToken")
+    ResObject cancelToken(@RequestParam("token") String token);
 
-    @GetMapping(value="/shansong/cancelToken")
-    ResObject cancelToken (@RequestParam("token")String token);
+    @GetMapping(value = "/apt/unBind")
+    AiptUnBindDto unBind(@RequestParam("account") String account);
 
-    @GetMapping(value="/apt/unBind")
-    AiptUnBindDto unBind (@RequestParam("account")String account);
+    @PostMapping(value = "/apt/queryShop")
+    ResObject<ShopQueryResultVo> queryShop(@RequestBody ShopQueryVo shopQueryVo);
 
-    @PostMapping(value="/apt/queryShop")
-    ResObject<ShopQueryResultVo> queryShop (@RequestBody ShopQueryVo shopQueryVo );
 }

lb-feginclient/src/main/java/com/ydd/api/EleRetailApi.java

@@ -13,19 +13,24 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
-@FeignClient(name = "lb-waimai",url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai", url = "http://127.0.0.1:8085/waimai")
 public interface EleRetailApi {
 
     @PostMapping(value = "/eleRetail/syncRiderPosition")
     ResObject syncRiderPosition(@RequestBody SyncRiderPositionStatusVo syncRiderPositionVo);
+
     @GetMapping(value = "/eleRetail/getOrderList")
     ResObject<OrderEBaiList> getOrderList(@RequestParam("thirdShopId") String thirdShopId, @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime, @RequestParam("status") String status);
+
     @GetMapping(value = "/eleRetail/getOrder")
     OrderGetResult getOrder(@RequestParam("orderId") String orderId);
+
     @GetMapping(value = "/eleRetail/confirm")
     Boolean confirm(@RequestParam("orderId") String orderId);
+
     @GetMapping(value = "/eleRetail/doStoreMap")
     ResObject<ElemeRetailMerchantResultVo> doStoreMap(@RequestParam Map<String, String> params);
-    @GetMapping(value="/queryFoodList")
-    ResObject queryFoodList(@RequestParam("code")String code, @RequestParam("pageNo") Integer pageNo,@RequestParam("pageSize")Integer pageSize);
+
+    @GetMapping(value = "/queryFoodList")
+    ResObject queryFoodList(@RequestParam("code") String code, @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize);
 }

lb-feginclient/src/main/java/com/ydd/api/ElemeApi.java

@@ -11,21 +11,27 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "lb-waimai",url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai", url = "http://127.0.0.1:8085/waimai")
 public interface ElemeApi {
 
-    @PostMapping(value="/eleme/selfDeliveryLocationSync")
+    @PostMapping(value = "/eleme/selfDeliveryLocationSync")
     ResObject selfDeliveryLocationSync(@RequestBody SyncRiderPositionStatusVo syncRiderPositionVo);
-    @GetMapping(value="/eleme/getOAuthUrl")
+
+    @GetMapping(value = "/eleme/getOAuthUrl")
     String getOAuthUrl(@RequestParam("shopCode") String shopCode);
-    @GetMapping(value="/eleme/getAllOrders")
+
+    @GetMapping(value = "/eleme/getAllOrders")
     ResObject<OrderList> getAllOrders(@RequestParam("shopCode") String token, @RequestParam("shopId") Long shopId, @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam("date") String date);
-    @PostMapping(value="/eleme/confirmOrder")
+
+    @PostMapping(value = "/eleme/confirmOrder")
     ResObject confirmOrder(@RequestBody ConfirmOrderVo confirmOrderVo);
-    @GetMapping(value="/eleme/doOAuthToken")
+
+    @GetMapping(value = "/eleme/doOAuthToken")
     ResObject doOAuthToken(@RequestParam("code") String code, @RequestParam("state") String state);
-    @PostMapping(value="/eleme/doOAuthToken")
+
+    @PostMapping(value = "/eleme/doOAuthToken")
     ResObject doOrder(@RequestBody(required = false) JSONObject jsonParams);
-    @GetMapping(value="/queryItem")
-    ResObject queryItem(@RequestParam("authToken")String authToken, @RequestParam("thirdShopId") Long thirdShopId);
+
+    @GetMapping(value = "/queryItem")
+    ResObject queryItem(@RequestParam("authToken") String authToken, @RequestParam("thirdShopId") Long thirdShopId);
 }

lb-feginclient/src/main/java/com/ydd/api/JdHomeApi.java

@@ -0,0 +1,48 @@
+package com.ydd.api;
+
+import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.waimai.ConfirmOrderVo;
+import com.ydd.third.common.vo.waimai.SyncRiderPositionStatusVo;
+import com.ydd.third.common.vo.waimai.jdHome.vo.JdHomeOrderResultVo;
+import com.ydd.third.waimai.jdHome.dto.OrderInfoDTO;
+import com.ydd.third.waimai.jdHome.dto.StoreInfo;
+import com.ydd.third.waimai.jdHome.vo.JdHomeCallBackVo;
+import com.ydd.third.waimai.jdHome.vo.JdHomeParamJsonVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "lb-waimai",url = "http://127.0.0.1:8085/waimai")
+public interface JdHomeApi {
+
+    @PostMapping(value="/jd/selectJdHomeOrder")
+    List<OrderInfoDTO> selectJdHomeOrder(@RequestBody JdHomeParamJsonVo jsonVo, @RequestParam("appKey")String appKey, @RequestParam("appSecret")String appSecret);
+
+    @PostMapping(value="/jd/confirmOrder")
+    ResObject confirmOrder(@RequestBody ConfirmOrderVo confirmOrderVo, @RequestParam("appKey")String appKey, @RequestParam("appSecret")String appSecret);
+
+    @PostMapping(value="/jd/selectJdHomeShop")
+    StoreInfo selectJdHomeShop(@RequestBody JdHomeParamJsonVo jsonVo, @RequestParam("appKey")String appKey, @RequestParam("appSecret")String appSecret);
+
+    @PostMapping(value="/jd/selectJdHomeNoList")
+    List<String> selectJdHomeNoList(@RequestParam("token")String token, @RequestParam("appKey")String appKey, @RequestParam("appSecret")String appSecret);
+
+    @PostMapping(value="/jd/getCallBack")
+    ResObject<JdHomeCallBackVo> getCallBack(@RequestParam("params") Map<String, String> params) ;
+
+    @PostMapping(value="/jd/doNewOrder")
+    ResObject<JdHomeOrderResultVo> doNewOrder(@RequestParam("params")Map<String, String> params) ;
+
+    @PostMapping(value="/jd/doFinishOrder")
+    ResObject<JdHomeOrderResultVo> doFinishOrder(@RequestParam("params")Map<String, String> params) ;
+
+    @PostMapping(value="/jd/doCancelOrder")
+    ResObject<JdHomeOrderResultVo> doCancelOrder(@RequestParam("params")Map<String, String> params) ;
+
+    @PostMapping(value="/jd/doMerchantCancelOrder")
+    ResObject<JdHomeOrderResultVo> doMerchantCancelOrder(@RequestParam("params")Map<String, String> params) ;
+}

lb-feginclient/src/main/java/com/ydd/api/MeiTuanApi.java

@@ -3,6 +3,7 @@ package com.ydd.api;
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.third.common.vo.ResObject;
 import com.ydd.third.common.vo.waimai.*;
+import com.ydd.third.print.request.MeituanWmDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,51 +12,75 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
-@FeignClient(name = "lb-waimai",url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai", url = "http://127.0.0.1:8085/waimai")
 public interface MeiTuanApi {
 
-    @PostMapping(value="/meituan/syncRiderPosition")
+    @PostMapping(value = "/meituan/syncRiderPosition")
     ResObject syncRiderPosition(@RequestBody SyncRiderPositionStatusVo syncRiderPositionVo);
-    @PostMapping(value="/meituan/shopReleaseBindUrl")
+
+    @PostMapping(value = "/meituan/shopReleaseBindUrl")
     String shopReleaseBindUrl(@RequestParam("token") String token, @RequestParam("shopCode") String shopCode, @RequestParam("businessId") String businessId);
-    @PostMapping(value="/meituan/storeMapUrl")
+
+    @PostMapping(value = "/meituan/storeMapUrl")
     String storeMapUrl(@RequestParam("shopCode") String shopCode, @RequestParam("shopName") String shopName, @RequestParam("mtBindType") Integer mtBindType);
-    @PostMapping(value="/meituan/confirmOrder")
+
+    @PostMapping(value = "/meituan/confirmOrder")
     ResObject confirmOrder(@RequestBody ConfirmOrderVo confirmOrderVo);
-    @PostMapping(value="/meituan/doStoreMap")
+
+    @PostMapping(value = "/meituan/doStoreMap")
     ResObject<MeituanShopMappingResultVo> doStoreMap(@RequestParam Map<String, String> params);
-    @PostMapping(value="/meituan/doShopReleaseBind")
+
+    @PostMapping(value = "/meituan/doShopReleaseBind")
     ResObject<MeituanShopReleaseBindResultVo> doShopReleaseBind(@RequestParam Map<String, String> params);
-    @PostMapping(value="/meituan/doPrivacyNoDecline")
+
+    @PostMapping(value = "/meituan/doPrivacyNoDecline")
     ResObject doPrivacyNoDecline(@RequestParam Map<String, String> params);
-    @PostMapping(value="/meituan/doRemindOrder")
+
+    @PostMapping(value = "/meituan/doRemindOrder")
     ResObject<MeituanRemindOrderResultVo> doRemindOrder(@RequestParam Map<String, String> params);
 
-    @PostMapping(value="/meituan/doOrderPartRefund")
+    @PostMapping(value = "/meituan/doOrderPartRefund")
     ResObject<MeituanOrderPartRefundResultVo> doOrderPartRefund(@RequestParam Map<String, String> params);
-    @PostMapping(value="/meituan/doFinishOrder")
+
+    @PostMapping(value = "/meituan/doFinishOrder")
     ResObject<MeituanOrderResultVo> doFinishOrder(@RequestParam Map<String, String> params);
-    @PostMapping(value="/meituan/doConfirmOrder")
+
+    @PostMapping(value = "/meituan/doConfirmOrder")
     ResObject<MeituanOrderResultVo> doConfirmOrder(@RequestParam Map<String, String> params);
 
-    @PostMapping(value="/meituan/doOrderRefund")
+    @PostMapping(value = "/meituan/doOrderRefund")
     ResObject<MeituanOrderRefundResultVo> doOrderRefund(@RequestParam Map<String, String> params);
-    @PostMapping(value="/meituan/doCancelOrder")
+
+    @PostMapping(value = "/meituan/doCancelOrder")
     ResObject<MeituanOrderCancelResultVo> doCancelOrder(@RequestParam Map<String, String> params);
-    @PostMapping(value="/meituan/doWmNewOrder")
+
+    @PostMapping(value = "/meituan/doWmNewOrder")
     ResObject<MeituanWmoperOrderResultVo> doWmNewOrder(@RequestBody JSONObject jsonObject);
-    @PostMapping(value="/meituan/doNewOrder")
+
+    @PostMapping(value = "/meituan/doNewOrder")
     ResObject<MeituanOrderResultVo> doNewOrder(@RequestParam Map<String, String> params);
 
-    @GetMapping(value="/meituan/queryOrderDetail")
-    ResObject<MeituanWmOrderResultVo> queryOrderDetail(@RequestParam("appAuthToken")String appAuthToken,@RequestParam("orderId")String orderId);
-
-    @GetMapping(value="/meituan/getRecipientInfo")
-    ResObject<MeituanWmRecipientInfoResultVo> getRecipientInfo(@RequestParam("appAuthToken")String appAuthToken,@RequestParam("orderId")String orderId);
-    @GetMapping(value="/syncRiderPositionStatus")
-    ResObject syncRiderPositionStatus(@RequestBody  SyncRiderPositionStatusVo vo );
-    @GetMapping(value="/queryFoodList")
-    ResObject  queryFoodList(@RequestParam("authToken")String authToken);
-    @GetMapping(value="/queryNgFoodList")
-    ResObject  queryNgFoodList(@RequestParam("authToken")String authToken);
+    @GetMapping(value = "/meituan/queryOrderDetail")
+    ResObject<MeituanWmOrderResultVo> queryOrderDetail(@RequestParam("appAuthToken") String appAuthToken, @RequestParam("orderId") String orderId);
+
+    @GetMapping(value = "/meituan/getRecipientInfo")
+    ResObject<MeituanWmRecipientInfoResultVo> getRecipientInfo(@RequestParam("appAuthToken") String appAuthToken, @RequestParam("orderId") String orderId);
+
+    @PostMapping(value = "/meituan/syncNgRiderPosition")
+    ResObject syncNgRiderPosition(@RequestBody SyncRiderPositionStatusVo syncRiderPositionVo);
+
+    @GetMapping(value = "/syncRiderPositionStatus")
+    ResObject syncRiderPositionStatus(@RequestBody SyncRiderPositionStatusVo vo);
+
+    @GetMapping(value = "/queryFoodList")
+    ResObject queryFoodList(@RequestParam("authToken") String authToken);
+
+    @GetMapping(value = "/queryNgFoodList")
+    ResObject queryNgFoodList(@RequestParam("authToken") String authToken);
+
+    @GetMapping(value = "/getRealRecipientAddress")
+    ResObject<String> getRealRecipientAddress(@RequestParam("authToken") String authToken, @RequestParam("orderId") String orderId);
+
+    @GetMapping(value = "/meituanwm/convert")
+    MeituanOrderResultVo convert(@RequestBody MeituanWmDto dto);
 }

lb-framework/src/main/java/com/ydd/framework/web/service/TokenService.java

@@ -249,4 +249,12 @@ public class TokenService
     {
          redisCache.setCacheObject(Constants.APP_LOGIN_TOKEN_KEY + token, memberId, appExpireTime, TimeUnit.DAYS);
     }
+
+    /**
+     * 保存运力优化标识
+     * @param deliveryOptFlag 标识: 0/null - 未更新   1 - 已更新
+     */
+    public void setDeliveryOptFlag(String deliveryOptFlag, Long memberId) {
+        redisCache.setCacheObject(Constants.DELIVERY_OPT_FLAG + memberId, deliveryOptFlag, 15, TimeUnit.DAYS);
+    }
 }

lb-module/src/main/java/com/ydd/module/push/impl/MessagePushServiceImpl.java

@@ -68,15 +68,17 @@ public class MessagePushServiceImpl implements MessagePushService {
             message.setType(MessageTypeEnum.SYSTEM_MSG.getType());
             message.setMemberId(id);
             messageList.add(message);
-            if (StringUtils.isNotBlank(member.getAliasId())&&member.getAliasId().contains(",")) {
-                String[] array = member.getAliasId().split(",");
-                for (int i = 0; i < array.length; i++) {
-                    if (StringUtils.isNotBlank(array[i])) {
-                        aliasIds.add(array[i]);
+            if (StringUtils.isNotBlank(member.getAliasId())) {
+                if (StringUtils.isNotBlank(member.getAliasId()) && member.getAliasId().contains(",")) {
+                    String[] array = member.getAliasId().split(",");
+                    for (int i = 0; i < array.length; i++) {
+                        if (StringUtils.isNotBlank(array[i])) {
+                            aliasIds.add(array[i]);
+                        }
                     }
+                } else {
+                    aliasIds.add(member.getAliasId());
                 }
-            } else {
-                aliasIds.add(member.getAliasId());
             }
             // pc声音提醒
             redisCache.lPush(id + RedisKeyConstant.MSG_SOUND, pushMsg, 30, TimeUnit.MINUTES);

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/config/WaimaiConfig.java

@@ -1,9 +1,8 @@
-package com.ydd.third.waimai.config;
+package com.ydd.third.common.config;
 
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
 
@@ -54,4 +53,10 @@ public class WaimaiConfig {
 
     @Value("${waimai.meituansg.appScert}")
     private String meituansgAppScert;
+
+    @Value("${waimai.shantang.appId}")
+    private String shantangAppId;
+
+    @Value("${waimai.shantang.appSecret}")
+    private String shantangAppSecret;
 }

lb-third/lb-third-common/src/main/java/com/ydd/third/print/request/MeituanWmDto.java

@@ -0,0 +1,21 @@
+package com.ydd.third.print.request;
+
+import com.ydd.third.common.vo.waimai.MeituanWmOrderResultVo;
+import com.ydd.third.common.vo.waimai.MeituanWmRecipientInfoResultVo;
+import com.ydd.third.common.vo.waimai.MeituanWmoperOrderResultVo;
+import lombok.Data;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 打印订单
+ */
+@Data
+public class MeituanWmDto implements Serializable {
+
+    MeituanWmOrderResultVo resultVo;
+    MeituanWmoperOrderResultVo orderResultVo;
+    MeituanWmRecipientInfoResultVo getInfo;
+}

lb-third/lb-third-delivery/src/main/java/com/ydd/third/controller/DeliveryController.java

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project：lb-server
@@ -163,7 +164,7 @@ public class DeliveryController  {
         return dadaClient.partyTicket(type);
     }
     @GetMapping(value="/dada/authUrl")
-    public String dadaAuthUrl(@RequestParam("result")String result,@RequestParam("type")Integer type,@RequestParam("code")String code){
+    public String getPartyOauth(@RequestParam("result")String result,@RequestParam("type")Integer type,@RequestParam("code")String code){
         return dadaClient.getPartyOauth(result, type, code);
     }
     @GetMapping(value="/aptAuthUrl")

lb-third/lb-third-waimai/src/main/java/com/ydd/third/controller/JdHomeController.java

@@ -0,0 +1,73 @@
+package com.ydd.third.controller;
+
+import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.waimai.ConfirmOrderVo;
+import com.ydd.third.common.vo.waimai.jdHome.vo.JdHomeOrderResultVo;
+import com.ydd.third.waimai.jdHome.JdHomeCallback;
+import com.ydd.third.waimai.jdHome.JdHomeClient;
+import com.ydd.third.waimai.jdHome.dto.OrderInfoDTO;
+import com.ydd.third.waimai.jdHome.vo.JdHomeCallBackVo;
+import com.ydd.third.waimai.jdHome.vo.JdHomeParamJsonVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 美团外卖相关api
+ *
+ * @author 叶君翔
+ * @date 2021/11/10 11:59
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class JdHomeController {
+
+    private final JdHomeClient jdHomeClient;
+    private final JdHomeCallback jdHomeCallback;
+
+    @PostMapping(value = "/jd/selectJdHomeOrder")
+    List<OrderInfoDTO> selectJdHomeOrder(@RequestBody JdHomeParamJsonVo jsonVo, @RequestParam("appKey") String appKey, @RequestParam("appSecret") String appSecret) {
+        return jdHomeClient.selectJdHomeOrder(jsonVo, appKey, appSecret);
+    }
+
+    @PostMapping(value = "/jd/confirmOrder")
+    ResObject confirmOrder(@RequestBody ConfirmOrderVo confirmOrderVo, @RequestParam("appKey") String appKey, @RequestParam("appSecret") String appSecret) {
+        return jdHomeClient.confirmOrder(confirmOrderVo, appKey, appSecret);
+    }
+
+    @PostMapping(value = "/jd/selectJdHomeNoList")
+    List<String> selectJdHomeNoList(@RequestParam("token") String token, @RequestParam("appKey") String appKey, @RequestParam("appSecret") String appSecret) {
+        return jdHomeClient.selectJdHomeNoList(token, appKey, appSecret);
+    }
+
+    @PostMapping(value = "/jd/getCallBack")
+    ResObject<JdHomeCallBackVo> getCallBack(@RequestParam("params") Map<String, String> params) {
+        return jdHomeCallback.getCallBack(params);
+    }
+
+    @PostMapping(value = "/jd/doNewOrder")
+    ResObject<JdHomeOrderResultVo> doNewOrder(@RequestParam("params") Map<String, String> params) {
+        return jdHomeCallback.doNewOrder(params);
+    }
+
+    @PostMapping(value = "/jd/doFinishOrder")
+    ResObject<JdHomeOrderResultVo> doFinishOrder(@RequestParam("params") Map<String, String> params) {
+        return jdHomeCallback.doFinishOrder(params);
+    }
+
+    @PostMapping(value = "/jd/doCancelOrder")
+    ResObject<JdHomeOrderResultVo> doCancelOrder(@RequestParam("params") Map<String, String> params) {
+        return jdHomeCallback.doCancelOrder(params);
+    }
+
+    @PostMapping(value = "/jd/doMerchantCancelOrder")
+    ResObject<JdHomeOrderResultVo> doMerchantCancelOrder(@RequestParam("params") Map<String, String> params) {
+        return jdHomeCallback.doMerchantCancelOrder(params);
+    }
+}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/controller/MeiTuanController.java

@@ -3,6 +3,7 @@ package com.ydd.third.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.third.common.vo.ResObject;
 import com.ydd.third.common.vo.waimai.*;
+import com.ydd.third.print.request.MeituanWmDto;
 import com.ydd.third.waimai.Client;
 import com.ydd.third.waimai.meituan.MeituanCallback;
 import com.ydd.third.waimai.meituan.MeituanClient;
@@ -184,4 +185,16 @@ public class MeiTuanController {
     ResObject queryNgFoodList(@RequestParam("authToken") String authToken) {
         return meituanClient.queryNgFoodList(authToken);
     }
+    @GetMapping(value="/meituanwm/convert")
+    MeituanOrderResultVo convert(@RequestBody MeituanWmDto dto){
+        MeituanWmOrderResultVo resultVo =dto.getResultVo();
+        MeituanWmoperOrderResultVo orderResultVo = dto.getOrderResultVo();
+        MeituanWmRecipientInfoResultVo getInfo = dto.getGetInfo();
+        return meituanCallback.convert(resultVo, orderResultVo, getInfo);
+    }
+
+    @PostMapping(value = "/meituan/syncNgRiderPosition")
+    ResObject syncNgRiderPosition(@RequestBody SyncRiderPositionStatusVo syncRiderPositionVo){
+        return  meituanClient.syncNgRiderPosition(syncRiderPositionVo);
+    }
 }

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/jdHome/JdHomeClient.java

@@ -6,10 +6,10 @@ import com.sankuai.meituan.shangou.open.sdk.exception.SgOpenException;
 import com.sankuai.meituan.shangou.open.sdk.util.PropertiesUtil;
 import com.ydd.common.core.redis.RedisCache;
 import com.ydd.common.exception.CustomException;
+import com.ydd.third.common.config.WaimaiConfig;
 import com.ydd.third.common.vo.ResObject;
 import com.ydd.third.common.vo.waimai.ConfirmOrderVo;
 import com.ydd.third.common.vo.waimai.SyncRiderPositionStatusVo;
-import com.ydd.third.waimai.config.WaimaiConfig;
 import com.ydd.third.waimai.jdHome.dto.JdResponseDTO;
 import com.ydd.third.waimai.jdHome.dto.OrderInfoDTO;
 import com.ydd.third.waimai.jdHome.dto.StoreInfo;
@@ -189,7 +189,7 @@ public class JdHomeClient {
     @Transactional(rollbackFor = Exception.class)
     public ResObject<JdResponseDTO> deliveryEndOrder(SyncRiderPositionStatusVo syncRiderPositionVo) {
       String orderId = syncRiderPositionVo.getOrderId();
-      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
       Date date = new Date();
 
       // 声明公共参数，orderId订单号，operPin操作人，operTime操作时间

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/meituanSg/utils/SgSignUtils.java

@@ -4,7 +4,7 @@ import com.sankuai.meituan.shangou.open.sdk.domain.SystemParam;
 import com.sankuai.meituan.shangou.open.sdk.exception.SgOpenException;
 import com.sankuai.meituan.shangou.open.sdk.request.SgOpenGeneralRequest;
 import com.sankuai.meituan.shangou.open.sdk.response.SgOpenResponse;
-import com.ydd.third.waimai.config.WaimaiConfig;
+import com.ydd.third.common.config.WaimaiConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -20,7 +20,7 @@ import java.io.IOException;
 public final class SgSignUtils {
 
     @Autowired
-    private  WaimaiConfig waimaiConfig;
+    private WaimaiConfig waimaiConfig;
 
     public static String  sgOpenGeneralRequestGetTest(String appId, String scert, String url) {
         SystemParam systemParam = new SystemParam(appId, scert);

lb-web/src/main/java/com/ydd/web/controller/AgentController.java

@@ -10,12 +10,13 @@ import com.ydd.common.enums.BusinessType;
 import com.ydd.common.enums.UserTypeEnums;
 import com.ydd.module.domain.Agent;
 import com.ydd.module.dto.BaseConfgMinDto;
-import com.ydd.module.producer.RabbitSender;
+import com.ydd.module.request.AgentBindRulePackageRequest;
 import com.ydd.module.service.IAgentService;
 import com.ydd.system.service.ISysConfigService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -206,4 +207,27 @@ public class AgentController extends BaseController {
         map.put("bindingThirdMin", baseConfgMinDtoTwo.getBindingThirdMin());
         return Result.success(map);
     }
+
+    /**
+     * 绑定优惠包
+     */
+    // @PreAuthorize("@ss.hasPermi('module:agent:bindDiscountPackage')" )
+    @Log(title = "绑定优惠包" , businessType = BusinessType.INSERT)
+    @PostMapping("/bindDiscountPackage")
+    public Result bindDiscountPackage(@RequestBody @Validated AgentBindRulePackageRequest request) {
+        iAgentService.bindValuationRulePackage(request);
+        return Result.success();
+    }
+
+    /**
+     * 绑定佣金包
+     */
+    // @PreAuthorize("@ss.hasPermi('module:agent:bindCommissionPackage')" )
+    @Log(title = "绑定佣金包" , businessType = BusinessType.INSERT)
+    @PostMapping("/bindCommissionPackage")
+    public Result bindCommissionPackage(@RequestBody @Validated AgentBindRulePackageRequest request) {
+        iAgentService.bindValuationRulePackage(request);
+        return Result.success();
+    }
+
 }

lb-web/src/main/java/com/ydd/web/controller/AppInfoController.java

@@ -0,0 +1,73 @@
+package com.ydd.web.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydd.common.annotation.Log;
+import com.ydd.common.core.controller.BaseController;
+import com.ydd.common.core.domain.Result;
+import com.ydd.common.core.page.PageResult;
+import com.ydd.common.enums.BusinessType;
+import com.ydd.module.domain.AppInfo;
+import com.ydd.module.service.IAppInfoService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Demo class
+ *
+ * @author 14027
+ * @date 2022/2/24 9:55
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequestMapping("/module/appInfo")
+public class AppInfoController extends BaseController {
+
+  private final IAppInfoService iAppInfoService;
+
+  /**
+     * 查询应用消息列表
+     */
+    @GetMapping("/list")
+    public Result list(Page page, AppInfo appInfo) {
+        PageResult pageResult = iAppInfoService.queryList(page, appInfo);
+        Map map = new HashMap();
+        map.put("page",pageResult);
+        Result result = Result.success();
+        result.put("data",map);
+        return result;
+    }
+
+    /**
+     * 新增应用
+     */
+    @PreAuthorize("@ss.hasPermi('system:appInfo:add')")
+    @Log(title = "应用消息新增" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public Result add(@RequestBody AppInfo appInfo) throws Exception {
+        return toAjax(iAppInfoService.createAppInfo(appInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除应用
+     */
+//    @Log(title = "应用消息删除" , businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}" )
+//    public Result remove(@PathVariable Long[] ids) {
+//        return toAjax(iAppInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+//    }
+
+    /**
+     * 获取应用详细信息
+     */
+//    @GetMapping(value = "/{id}" )
+//    public Result getInfo(@PathVariable("id" ) Long id) {
+//        return Result.success(iAppInfoService.getById(id));
+//    }
+}

lb-web/src/main/java/com/ydd/web/controller/DadaDspAccountController.java

@@ -0,0 +1,102 @@
+package com.ydd.web.controller;
+
+import com.ydd.common.annotation.Log;
+import com.ydd.common.annotation.RepeatSubmit;
+import com.ydd.common.core.controller.BaseController;
+import com.ydd.common.core.domain.Result;
+import com.ydd.common.core.domain.entity.SysUser;
+import com.ydd.common.core.page.TableDataInfo;
+import com.ydd.common.enums.BusinessType;
+import com.ydd.common.enums.UserTypeEnums;
+import com.ydd.module.domain.DadaDspWithdrawal;
+import com.ydd.module.dto.DadaDspAccountListDto;
+import com.ydd.module.dto.DadaDspWithdrawalDto;
+import com.ydd.module.service.IDadaDspWithdrawalService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 达达配送商-我的账户
+ *
+ * @author 叶君翔
+ * @date 2021-12-28
+ */
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/module/dadaDspAccount")
+public class DadaDspAccountController extends BaseController {
+
+    private final IDadaDspWithdrawalService iDadaDspWithdrawalService;
+
+    /**
+     * 收支明细
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(DadaDspAccountListDto accountDto) {
+        SysUser user = getSysUser();
+        startPage();
+        List<DadaDspWithdrawal> list = iDadaDspWithdrawalService.queryList(accountDto, user.getDadaDspId());
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取账户信息
+     */
+    @GetMapping(value = "/info" )
+    public Result getInfo() {
+        SysUser user = getSysUser();
+        return Result.success(iDadaDspWithdrawalService.getInfo(user.getDadaDspId()));
+    }
+
+    /**
+     * 提现申请
+     */
+    @Log(title = "配送商提现申请" , businessType = BusinessType.INSERT)
+    @PostMapping("/withdrawal")
+    @RepeatSubmit
+    public Result add(@RequestBody DadaDspWithdrawal withdrawal) {
+        SysUser user = getSysUser();
+        if (!UserTypeEnums.DADA_DELIVERY_RAP.getCode().equals(user.getType())
+                && !UserTypeEnums.DADA_DELIVERY.getCode().equals(user.getType())) {
+            return Result.error("异常操作!");
+        }
+        return toAjax(iDadaDspWithdrawalService.addWithdrawal(withdrawal, user) ? 1 : 0);
+    }
+
+    /**
+     * 达达提现申请列表
+     */
+    @GetMapping("/withdrawalList")
+    public TableDataInfo withdrawalList(DadaDspAccountListDto accountDto) {
+        startPage();
+        List<DadaDspWithdrawalDto> list = iDadaDspWithdrawalService.withdrawalList(accountDto);
+        return getDataTable(list);
+    }
+
+    /**
+     * 提现审核
+     */
+    @Log(title = "提现审核" , businessType = BusinessType.UPDATE)
+    @PostMapping("/verify")
+    @RepeatSubmit
+    public Result verify(@RequestBody DadaDspWithdrawal withdrawal) {
+        SysUser user = getSysUser();
+        if (!UserTypeEnums.DSP.getCode().equals(user.getType())
+            && !UserTypeEnums.PLATFORM.getCode().equals(user.getType())) {
+            return Result.error("异常操作!");
+        }
+        return toAjax(iDadaDspWithdrawalService.verify(withdrawal, user) ? 1 : 0);
+    }
+
+    /**
+     * 获取提现申请信息
+     */
+    @GetMapping(value = "/getDadaWithdrawal/{id}")
+    public Result getDadaWithdrawal(@PathVariable("id") Long id) {
+        return Result.success(iDadaDspWithdrawalService.getDadaWithdrawal(id));
+    }
+
+}

lb-web/src/main/java/com/ydd/web/controller/DadaDspBankCardController.java

@@ -0,0 +1,89 @@
+package com.ydd.web.controller;
+
+import com.ydd.common.annotation.Log;
+import com.ydd.common.core.controller.BaseController;
+import com.ydd.common.core.domain.Result;
+import com.ydd.common.core.domain.entity.SysUser;
+import com.ydd.common.enums.BusinessType;
+import com.ydd.common.enums.UserTypeEnums;
+import com.ydd.module.domain.DadaDspBankCard;
+import com.ydd.module.service.IDadaDspBankCardService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 达达配送商-银行卡管理
+ *
+ * @author 叶君翔
+ * @date 2021-12-28
+ */
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/module/dadaDspBankCard")
+public class DadaDspBankCardController extends BaseController {
+
+    private final IDadaDspBankCardService iDadaDspBankCardService;
+
+    /**
+     * 查询银行卡列表
+     */
+    @GetMapping("/list")
+    public Result list() {
+        SysUser user = getSysUser();
+        List<DadaDspBankCard> list = iDadaDspBankCardService.queryList(user.getDadaDspId());
+        return Result.success(list);
+    }
+
+    /**
+     * 获取银行卡信息
+     */
+    @GetMapping(value = "/info" )
+    public Result getInfo(Long id) {
+        if (id == null || id == 0) {
+            return Result.error("请求参数错误, id不可为空!");
+        }
+        return Result.success(iDadaDspBankCardService.getInfo(id));
+    }
+
+    /**
+     * 新增银行卡
+     */
+    @Log(title = "新增银行卡" , businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public Result add(@RequestBody DadaDspBankCard bankCard) {
+        SysUser user = getSysUser();
+        if (!UserTypeEnums.DADA_DELIVERY_RAP.getCode().equals(user.getType())
+                && !UserTypeEnums.DADA_DELIVERY.getCode().equals(user.getType())) {
+            return Result.error("异常操作!");
+        }
+        return toAjax(iDadaDspBankCardService.addBandCard(bankCard, user) ? 1 : 0);
+    }
+
+    /**
+     * 修改银行卡
+     */
+    @Log(title = "修改银行卡" , businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    public Result edit(@RequestBody DadaDspBankCard bankCard) {
+        SysUser user = getSysUser();
+        if (!UserTypeEnums.DADA_DELIVERY_RAP.getCode().equals(user.getType())
+                && !UserTypeEnums.DADA_DELIVERY.getCode().equals(user.getType())) {
+            return Result.error("异常操作!");
+        }
+        return toAjax(iDadaDspBankCardService.updateBankCard(bankCard) ? 1 : 0);
+    }
+
+    /**
+     * 删除银行卡
+     */
+//    @PreAuthorize("@ss.hasPermi('module:agent:remove')" )
+    @Log(title = "删除银行卡" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{id}" )
+    public Result remove(@PathVariable Long id) {
+        return toAjax(iDadaDspBankCardService.deleteBankCard(id) ? 1 : 0);
+    }
+
+}

lb-web/src/main/java/com/ydd/web/controller/DadaDspController.java

@@ -0,0 +1,79 @@
+package com.ydd.web.controller;
+
+import com.ydd.common.annotation.Log;
+import com.ydd.common.core.controller.BaseController;
+import com.ydd.common.core.domain.Result;
+import com.ydd.common.core.domain.entity.SysUser;
+import com.ydd.common.core.page.TableDataInfo;
+import com.ydd.common.enums.BusinessType;
+import com.ydd.common.enums.UserTypeEnums;
+import com.ydd.module.dto.DadaDspDto;
+import com.ydd.module.service.IDadaDspService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Demo class
+ *
+ * @author 14027
+ * @date 2021/12/16 14:49
+ */
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/module/dadaDsp" )
+public class DadaDspController extends BaseController {
+
+    private final IDadaDspService iDadaDspService;
+
+    /**
+     * 查询配送服务商列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(DadaDspDto dadaDspDto) {
+        SysUser user = getSysUser();
+        startPage();
+        List<DadaDspDto> list = iDadaDspService.queryList(dadaDspDto,user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增配送服务商
+     */
+    @Log(title = "配送服务商" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public Result add(@RequestBody DadaDspDto dadaDspDto) throws Exception {
+        SysUser user = getSysUser();
+        if (!UserTypeEnums.DADA.getCode().equals(user.getType())) {
+            return Result.error("风险操作!");
+        }
+        return toAjax(iDadaDspService.createDadaDsp(dadaDspDto,user) ? 1 : 0);
+    }
+
+    /**
+     * 配送服务商详情
+     */
+    @GetMapping(value = "/info" )
+    public Result getDspInfo(Long id) {
+        if (id == null || id == 0) {
+            return Result.error("配送商id必传!");
+        }
+        return Result.success(iDadaDspService.selectInfo(id));
+    }
+
+    /**
+     * 修改配送服务商
+     */
+    @Log(title = "配送服务商" , businessType = BusinessType.UPDATE)
+    @PutMapping
+    public Result edit(@RequestBody DadaDspDto dadaDspDto) {
+        SysUser user = getSysUser();
+        if (!UserTypeEnums.DADA.getCode().equals(user.getType())) {
+            return Result.error("风险操作!");
+        }
+        return toAjax(iDadaDspService.updateDadaDsp(dadaDspDto) ? 1 : 0);
+    }
+
+}

lb-web/src/main/java/com/ydd/web/controller/DadaDspMerchantController.java

@@ -0,0 +1,153 @@
+package com.ydd.web.controller;
+
+import com.ydd.common.annotation.ControllerLog;
+import com.ydd.common.annotation.Log;
+import com.ydd.common.annotation.RepeatSubmit;
+import com.ydd.common.core.controller.BaseController;
+import com.ydd.common.core.domain.Result;
+import com.ydd.common.core.domain.entity.SysUser;
+import com.ydd.common.core.page.PageResult;
+import com.ydd.common.core.page.TableDataInfo;
+import com.ydd.common.enums.BusinessType;
+import com.ydd.common.enums.UserTypeEnums;
+import com.ydd.module.domain.Merchant;
+import com.ydd.module.domain.PackageFreight;
+import com.ydd.module.dto.*;
+import com.ydd.module.enums.PackageFreightDimensionEnum;
+import com.ydd.module.expection.CustomWebException;
+import com.ydd.module.service.IMerchantService;
+import com.ydd.module.service.IPackageFreightService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Demo class
+ *
+ * @author 14027
+ * @date 2021/12/16 14:49
+ */
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/module/dadaDsp/merchant" )
+public class DadaDspMerchantController extends BaseController {
+
+    private final IMerchantService iMerchantService;
+
+    private final IPackageFreightService iPackageFreightService;
+
+    /**
+     * 查询客户商家列表
+     */
+    // @PreAuthorize("@ss.hasPermi('module:merchant:list')")
+    @GetMapping("/list")
+    public Result merchantList(DadaDspMerchantListQuery dadaDspMerchantListQuery) {
+        SysUser user = getSysUser();
+        PageResult pageResult = iMerchantService.queryListByDadaDspId(dadaDspMerchantListQuery, user);
+        return Result.success(pageResult);
+    }
+
+    /**
+     * 查询客户商家明细
+     */
+    // @PreAuthorize("@ss.hasPermi('module:merchant:list')")
+    @GetMapping("/info")
+    public Result dadaMerchant(@RequestParam("merchantId") Long merchantId) {
+        DadaDspMerchantInfoDto dadaDspMerchantInfoDto = iMerchantService.queryDadaMerchantInfo(merchantId);
+        return Result.success(dadaDspMerchantInfoDto);
+    }
+
+    /**
+     * 配送商修改客户商家
+     */
+    // @PreAuthorize("@ss.hasPermi('module:merchant:list')")
+    @Log(title = "配送商修改客户商家" , businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    @RepeatSubmit
+    public Result updateDadaMerchant(@RequestBody DadaDspMerchantInfoDto dadaDspMerchantInfoDto) {
+        SysUser user = getSysUser();
+        return toAjax(iMerchantService.updateDadaMerchant(dadaDspMerchantInfoDto, user) ? 1 : 0);
+    }
+
+    /**
+     * 配送商新增客户商家
+     */
+    // @PreAuthorize("@ss.hasPermi('module:merchant:add')" )
+    @Log(title = "配送商新增客户商家" , businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @RepeatSubmit
+    public Result add(@RequestBody DadaDspMerchantAddDto dadaDspMerchantAddDto) {
+        SysUser user = getSysUser();
+        // 身份校验
+        if (!user.getType().equals(UserTypeEnums.DADA_DELIVERY_RAP.getCode()) &&
+                !user.getType().equals(UserTypeEnums.DADA_DELIVERY.getCode())){
+            throw new CustomWebException("风险操作，已被系统拦截！");
+        }
+        return toAjax(iMerchantService.creteDadaMerchant(dadaDspMerchantAddDto, user.getDadaDspId()) ? 1 : 0);
+    }
+
+    /**
+     * 查询客户商家-门店列表
+     */
+    // @PreAuthorize("@ss.hasPermi('module:merchant:list')")
+    @GetMapping("/shop/list")
+    public TableDataInfo dadaDssShopList(@Valid DadaDspMerchantShopListQuery shopListQuery) {
+        startPage();
+        List<DadaDspMerchantShopInfoDto> list = iMerchantService.queryShopListByMerchantId(shopListQuery);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询运费包列表
+     */
+    @GetMapping("/freightPackageList")
+    public Result freightPackageList() {
+        SysUser user = getSysUser();
+        List<PackageFreight> list = iPackageFreightService.queryListNoPage(user.getDadaDspId(), PackageFreightDimensionEnum.MERCHANT.getType());
+        return Result.success(list);
+    }
+
+    /**
+     * 查询运费包列表
+     */
+    @GetMapping("/filter/freightPackageList")
+    public Result filterFreightPackageList() {
+        SysUser user = getSysUser();
+        List<PackageFreight> list = iPackageFreightService.queryFilterListNoPage(user.getDadaDspId(), PackageFreightDimensionEnum.MERCHANT.getType());
+        return Result.success(list);
+    }
+
+    @GetMapping("/getMerchantOption")
+    public Result getMerchantOption() {
+        SysUser user = getSysUser();
+        List<Merchant> list = iMerchantService.getDadaMerchantOption(user);
+        Map map = new HashMap();
+        map.put("list",getDataTable(list));
+        map.put("type",user.getType());
+        return Result.success(map);
+    }
+
+    /**
+     * 商户绑定运费包
+     */
+    @Log(title = "商户绑定运费包" , businessType = BusinessType.UPDATE)
+    @PostMapping("/bindFreightPackage")
+    @ControllerLog(value = "商户绑定运费包", isApp = false)
+    @RepeatSubmit
+    public Result bindFreightPackage(@RequestBody DadaDspBindFreightQuery bindFreightQuery) {
+        SysUser user = getSysUser();
+        if (!UserTypeEnums.DADA_DELIVERY_RAP.getCode().equals(user.getType())) {
+            return Result.error("非法操作!");
+        }
+        if (bindFreightQuery.getMerchantId() == null || bindFreightQuery.getMerchantId() == 0) {
+            return Result.error("merchantId不能为空!");
+        }
+        return toAjax(iMerchantService.bindFreightPackage(bindFreightQuery) ? 1 : 0);
+    }
+
+}