引入包冲突

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

@@ -13,7 +13,6 @@ import com.ydd.module.dto.SfShopDto;
 import com.ydd.module.enums.TakeTypeEnum;
 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.OpenApiGood;
 import com.ydd.third.common.vo.vo.order.OrderVo;
 import com.ydd.third.common.vo.vo.order.ProductVo;
 import org.apache.commons.collections4.CollectionUtils;

lb-third/lb-third-common/src/main/java/com/ydd/third/common/vo/vo/order/OpenApiGood.java

@@ -1,82 +0,0 @@
-package com.ydd.third.common.vo.vo.order;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.math.BigDecimal;
-
-/**
- * 订单商品信息
- */
-public class OpenApiGood {
-    /**
-     * 商品数量
-     */
-    private int goodCount;
-
-    /**
-     * 商品名称
-     */
-    private String goodName;
-
-    /**
-     * 商品价格，单位为元
-     */
-    private BigDecimal goodPrice;
-
-    /**
-     * 商品单位，如个
-     */
-    private String goodUnit;
-
-    public int getGoodCount() {
-        return goodCount;
-    }
-
-    public void setGoodCount(int goodCount) {
-        this.goodCount = goodCount;
-    }
-
-    public String getGoodName() {
-        return goodName;
-    }
-
-    public void setGoodName(String goodName) {
-        if (StringUtils.isEmpty(goodName)) {
-            this.goodName = "";
-        } else {
-            this.goodName = goodName;
-        }
-    }
-
-    public BigDecimal getGoodPrice() {
-        return goodPrice;
-    }
-
-    public void setGoodPrice(BigDecimal goodPrice) {
-        this.goodPrice = goodPrice;
-    }
-
-    public String getGoodUnit() {
-        return goodUnit;
-    }
-
-    public void setGoodUnit(String goodUnit) {
-        if (StringUtils.isEmpty(goodUnit)) {
-            this.goodUnit = "";
-        } else {
-            this.goodUnit = goodUnit;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "OpenApiGood {" +
-                "goodCount=" + goodCount +
-                ", goodPrice=" + goodPrice +
-                ", goodName=" + goodName +
-                ", goodUnit=" + goodUnit +
-                "}";
-    }
-}
-
-

lb-third/lb-third-common/src/main/java/com/ydd/third/common/vo/vo/order/OpenApiGoods.java

@@ -1,27 +0,0 @@
-package com.ydd.third.common.vo.vo.order;
-
-import java.util.List;
-
-/**
- * 订单商品信息列表
- */
-public class OpenApiGoods {
-    private List<OpenApiGood> goods;
-
-    public List<OpenApiGood> getGoods() {
-        return goods;
-    }
-
-    public void setGoods(List<OpenApiGood> goods) {
-        this.goods = goods;
-    }
-
-    @Override
-    public String toString() {
-        return "OpenApiGoods {" +
-                "goods=" + goods +
-                "}";
-    }
-}
-
-

lb-third/lb-third-common/src/main/java/com/ydd/third/common/vo/vo/order/OrderVo.java

@@ -1,7 +1,8 @@
 package com.ydd.third.common.vo.vo.order;
 
+import com.ydd.third.common.vo.dada.domain.BaseModel;
 import com.ydd.third.common.vo.dada.domain.order.GoodsInfo;
-
+import com.ydd.third.common.vo.waimai.meituan.OpenApiGood;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -14,7 +15,7 @@ import java.util.List;
  * @author: wan
  */
 @Data
-public class OrderVo {
+public class OrderVo  extends BaseModel {
 
     private String lbClient;
     /**

lb-third/lb-third-common/src/main/java/com/ydd/third/common/vo/waimai/elemeretail/ElemeretailCallback.java

@@ -1,50 +0,0 @@
-package com.ydd.third.common.vo.waimai.elemeretail;
-
-import com.alibaba.fastjson.JSONObject;
-import com.ydd.third.common.utils.StringUtils;
-import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.common.vo.waimai.ElemeRetailMerchantResultVo;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * Demo class
- *
- * @author 14027
- * @date 2021/5/19 0:52
- */
-@Service("waimaiElemeretailCallback")
-public class ElemeretailCallback {
-
-    /**
-     * 门店映射回调
-     *
-     * @param params
-     * @return
-     */
-    public ResObject<ElemeRetailMerchantResultVo> doStoreMap(Map<String, String> params) {
-        //开放平台回传token信息的方式是post，contentType是application/x-www-form-urlencoded，不是json
-        //@RequestParam Map<String, String> params
-        String cmd = params.get("cmd");
-        String version = params.get("version");
-        String ticket = params.get("ticket");
-        String timestamp = params.get("timestamp");
-        String source = params.get("source");
-        String sign = params.get("sign");
-        String body = params.get("body");
-        ResObject<ElemeRetailMerchantResultVo> resObject = new ResObject<>();
-        resObject.setCode(1);
-        if (StringUtils.isNotBlank(cmd) && StringUtils.isNotBlank(version) && StringUtils.isNotBlank(ticket) &&
-                StringUtils.isNotBlank(timestamp) && StringUtils.isNotBlank(source) && StringUtils.isNotBlank(sign) && StringUtils.isNotBlank(body)) {
-            ElemeRetailMerchantResultVo shopMappingVo = ((JSONObject) JSONObject.toJSON(params)).toJavaObject(ElemeRetailMerchantResultVo.class);
-            resObject.setCode(0);
-            resObject.setMsg("success");
-            resObject.setData(shopMappingVo);
-        } else {
-            resObject.setCode(1);
-            resObject.setMsg("参数值为空");
-        }
-        return resObject;
-    }
-}

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

@@ -1,13 +1,12 @@
 package com.ydd.third.controller;
 
 
-import com.ydd.common.core.controller.BaseController;
 import com.ydd.third.common.vo.ResObject;
+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 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 io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/Client.java

@@ -3,8 +3,8 @@ package com.ydd.third.delivery;
 import com.ydd.third.common.exception.BusinessException;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.common.vo.vo.order.OrderVo;
-import com.ydd.third.common.vo.waimai.OrderResultVo;
+import com.ydd.third.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.aipt.AiptClient;
 import com.ydd.third.delivery.dada.DadaClient;
 
@@ -17,8 +17,6 @@ import com.ydd.third.delivery.shansong.ShansongClient;
 import com.ydd.third.delivery.shansong.ShansongSHClient;
 import com.ydd.third.delivery.shunfeng.ShunfengClient;
 import com.ydd.third.delivery.uupt.UuptClient;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/aipt/AiptClient.java

@@ -5,19 +5,19 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.ecloud.core.utils.JsonMapper;
+import com.ydd.third.common.OrderPriceResponse;
+import com.ydd.third.common.config.DeliveryConfig;
+import com.ydd.third.common.dto.AiptUnBindDto;
+import com.ydd.third.common.dto.AptCallbackOrderVo;
 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.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.ClientHandler;
 import com.ydd.third.delivery.aipt.config.AiptConstant;
-import com.ydd.third.delivery.aipt.dto.AiptUnBindDto;
-import com.ydd.third.delivery.aipt.dto.AptCallbackOrderVo;
-import com.ydd.third.delivery.aipt.dto.OrderPriceResponse;
 import com.ydd.third.delivery.aipt.service.AiptDeliveryService;
 import com.ydd.third.delivery.aipt.utils.StringUtil;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/aipt/service/AiptDeliveryService.java

@@ -1,26 +1,8 @@
 package com.ydd.third.delivery.aipt.service;
 
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.ydd.common.utils.StringUtils;
-import com.ydd.ecloud.core.utils.JsonMapper;
-import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.ClientHandler;
-import com.ydd.third.delivery.aipt.config.AiptConstant;
-import com.ydd.third.delivery.aipt.dto.AiptCancelRequest;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.uupt.config.UuptConstant;
-import com.ydd.third.delivery.uupt.dto.CancelOrderRequest;
-import com.ydd.third.delivery.uupt.dto.CancelOrderResponse;
-import com.ydd.third.delivery.uupt.utils.StringUtil;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
-
 
 /**
  * @Description: 爱跑腿配送业务实现

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/aipt/utils/AIPTCallback.java

@@ -2,7 +2,7 @@ package com.ydd.third.delivery.aipt.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.vo.callback.UUPTCallbackOrderVo;
+import com.ydd.third.common.vo.callback.UUPTCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/DadaCallback.java

@@ -5,7 +5,7 @@ import com.ydd.third.common.utils.DateUtils;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
 import com.ydd.third.common.vo.callback.DadaCallbackOrderVo;
-import com.ydd.third.delivery.dada.utils.SignatureUtil;
+import com.ydd.third.common.vo.dada.utils.SignatureUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/CityCodeService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 
 /**
  * DATE: 18/9/4

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/merchant/MerchantAddService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.merchant;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/merchant/MerchantQueryBalanceService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.merchant;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/merchant/ShopAddService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.merchant;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/merchant/ShopDetailService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.merchant;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/merchant/ShopUpdateService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.merchant;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/order/OrderAddAfterQueryService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.order;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/order/OrderAddService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.order;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/order/OrderAddTipService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.order;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/order/OrderCancelReasonService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.order;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/order/OrderCancelService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.order;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/order/OrderQueryService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.order;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dada/service/order/OrderReAddService.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.dada.service.order;
 
-import com.ydd.third.delivery.dada.config.DadaConstant;
+import com.ydd.third.common.vo.dada.config.DadaConstant;
 import com.ydd.third.delivery.dada.service.BaseService;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dianwoda/DianwodaClient.java

@@ -7,13 +7,13 @@ import com.ydd.common.exception.CustomException;
 import com.ydd.ecloud.core.utils.HttpClientRuntimeException;
 import com.ydd.ecloud.core.utils.JsonMapper;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.shop.ShopResultVo;
+import com.ydd.third.common.vo.shop.ShopVo;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.dianwoda.config.AppConfig;
 import com.ydd.third.delivery.dianwoda.request.*;
 import com.ydd.third.delivery.dianwoda.response.*;
 import com.ydd.third.delivery.dianwoda.utils.DwdSignUtils;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.ShopResultVo;
-import com.ydd.third.delivery.vo.shop.ShopVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.Consts;
 import org.apache.http.HttpEntity;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/dianwoda/DwdCallback.java

@@ -1,19 +1,11 @@
 package com.ydd.third.delivery.dianwoda;
 
-import com.alibaba.fastjson.JSONObject;
-import com.ydd.third.common.utils.DateUtils;
-import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.dada.utils.SignatureUtil;
+import com.ydd.third.common.vo.callback.DadaCallbackOrderVo;
 import com.ydd.third.delivery.dianwoda.response.DwdCallbackOrderResponse;
-import com.ydd.third.delivery.vo.callback.DadaCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * 点我达回调
  */

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/fengniao/FengniaoCallback.java

@@ -1,15 +1,15 @@
 package com.ydd.third.delivery.fengniao;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.DateUtils;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.vo.callback.FengniaoV3CallbackOrderVo;
+import com.ydd.third.common.vo.callback.FengniaoV3CallbackStoreVo;
 import com.ydd.third.delivery.fengniao.entity.FengniaoV3Token;
 import com.ydd.third.delivery.fengniao.service.FengniaoTokenService;
 import com.ydd.third.delivery.fengniao.sign.OpenSignHelper;
-import com.ydd.third.delivery.vo.callback.FengniaoV3CallbackOrderVo;
-import com.ydd.third.delivery.vo.callback.FengniaoV3CallbackStoreVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/fengniao/FengniaoClient.java

@@ -4,18 +4,18 @@ package com.ydd.third.delivery.fengniao;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.common.enums.DeliveryTypeEnums;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.DateUtils;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.ClientHandler;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.fengniao.entity.FengniaoV3Token;
 import com.ydd.third.delivery.fengniao.service.FengniaoTokenService;
 import com.ydd.third.delivery.fengniao.service.OrderService;
 import com.ydd.third.delivery.fengniao.service.StoreService;
 import com.ydd.third.delivery.fengniao.util.ImageBinary;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/fengniao/service/FengniaoTokenService.java

@@ -3,7 +3,7 @@ package com.ydd.third.delivery.fengniao.service;
 
 import com.ydd.ecloud.core.utils.HttpClient;
 import com.ydd.ecloud.core.utils.HttpClientRuntimeException;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.delivery.fengniao.config.RequestConstant;
 import com.ydd.third.delivery.fengniao.sign.OpenSignHelper;
 import com.ydd.third.delivery.fengniao.util.JsonUtils;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/fengniao/service/OrderService.java

@@ -3,16 +3,17 @@ package com.ydd.third.delivery.fengniao.service;
 import com.ydd.common.utils.DateUtils;
 import com.ydd.ecloud.core.utils.HttpClient;
 import com.ydd.ecloud.core.utils.HttpClientRuntimeException;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.StringUtils;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.fengniao.config.RequestConstant;
 import com.ydd.third.delivery.fengniao.entity.GoodsItemInfo;
 import com.ydd.third.delivery.fengniao.entity.OrderInfo;
 import com.ydd.third.delivery.fengniao.sign.OpenSignHelper;
-import com.ydd.third.delivery.fengniao.util.*;
-import com.ydd.third.delivery.vo.order.*;
+import com.ydd.third.delivery.fengniao.util.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/fengniao/service/StoreService.java

@@ -3,18 +3,19 @@ package com.ydd.third.delivery.fengniao.service;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.ecloud.core.utils.HttpClient;
 import com.ydd.ecloud.core.utils.HttpClientRuntimeException;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.config.DeliveryConfig;
+import com.ydd.third.common.vo.shop.QueryAmount;
+import com.ydd.third.common.vo.shop.ShopQueryVo;
+import com.ydd.third.common.vo.shop.ShopVo;
 import com.ydd.third.delivery.fengniao.config.RequestConstant;
 import com.ydd.third.delivery.fengniao.sign.OpenSignHelper;
 import com.ydd.third.delivery.fengniao.util.JsonUtils;
-import com.ydd.third.delivery.vo.shop.QueryAmount;
-import com.ydd.third.delivery.vo.shop.ShopQueryVo;
-import com.ydd.third.delivery.vo.shop.ShopVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 @Slf4j
 @Service

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/HuolalaCallback.java

@@ -2,9 +2,9 @@ package com.ydd.third.delivery.huolala;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.vo.callback.HuolalaCallbackOrderVo;
-import com.ydd.third.delivery.vo.order.OrderQueryResultVo;
-import com.ydd.third.delivery.vo.order.OrderQueryVo;
+import com.ydd.third.common.vo.callback.HuolalaCallbackOrderVo;
+import com.ydd.third.common.vo.vo.order.OrderQueryResultVo;
+import com.ydd.third.common.vo.vo.order.OrderQueryVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,7 +23,7 @@ public class HuolalaCallback {
 
 
 
-    public ResObject<HuolalaCallbackOrderVo> doOrder(JSONObject jsonParam,String token) {
+    public ResObject<HuolalaCallbackOrderVo> doOrder(JSONObject jsonParam, String token) {
         ResObject<HuolalaCallbackOrderVo> resObject = new ResObject<>();
         try {
             HuolalaCallbackOrderVo callbackOrderVo = jsonParam.toJavaObject(HuolalaCallbackOrderVo.class);

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/HuolalaClient.java

@@ -3,38 +3,25 @@ package com.ydd.third.delivery.huolala;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.JavaType;
-import com.ydd.common.utils.ServletUtils;
-import com.ydd.common.utils.ip.IpUtils;
+import com.ydd.third.common.config.DeliveryConfig;
+import com.ydd.third.common.huolalaresponse.TokenResponse;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.huolalavo.*;
+import com.ydd.third.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.ClientHandler;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.huolala.config.BasicURL;
-import com.ydd.third.delivery.huolala.config.Config;
 import com.ydd.third.delivery.huolala.config.HllConfig;
-import com.ydd.third.delivery.huolala.impl.DefaultIOAuthClient;
-import com.ydd.third.delivery.huolala.request.ServerRefreshTokenRequest;
-import com.ydd.third.delivery.huolala.request.ServerTokenRequest;
-import com.ydd.third.delivery.huolala.response.TokenResponse;
 import com.ydd.third.delivery.huolala.utils.Constants;
-import com.ydd.third.delivery.huolala.utils.JacksonUtils;
 import com.ydd.third.delivery.huolala.utils.StringUtils;
 import com.ydd.third.delivery.huolala.utils.WebUtils;
-import com.ydd.third.delivery.huolala.vo.*;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.util.*;
 
 @Slf4j

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/HuolalaResult.java

@@ -1,7 +1,7 @@
 package com.ydd.third.delivery.huolala;
 
 
-import com.ydd.third.delivery.huolala.response.ErrorResponse;
+import com.ydd.third.common.huolalaresponse.ErrorResponse;
 
 import java.io.Serializable;
 

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/IOAuthClient.java

@@ -1,7 +1,7 @@
 package com.ydd.third.delivery.huolala;
 
 
-import com.ydd.third.delivery.huolala.response.ErrorResponse;
+import com.ydd.third.common.huolalaresponse.ErrorResponse;
 
 public interface IOAuthClient {
     /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/IOAuthRequest.java

@@ -2,7 +2,7 @@ package com.ydd.third.delivery.huolala;
 
 
 import com.fasterxml.jackson.databind.JavaType;
-import com.ydd.third.delivery.huolala.response.ErrorResponse;
+import com.ydd.third.common.huolalaresponse.ErrorResponse;
 
 import java.util.Map;
 

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/api/BaseService.java

@@ -1,11 +1,10 @@
 package com.ydd.third.delivery.huolala.api;
 
 
-
+import com.ydd.third.common.huolalaresponse.TokenResponse;
 import com.ydd.third.delivery.huolala.annotation.Service;
 import com.ydd.third.delivery.huolala.config.Config;
 import com.ydd.third.delivery.huolala.exception.ServiceException;
-import com.ydd.third.delivery.huolala.response.TokenResponse;
 import com.ydd.third.delivery.huolala.utils.WebUtils;
 
 import java.lang.reflect.Method;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/api/service/EPService.java

@@ -1,13 +1,12 @@
 package com.ydd.third.delivery.huolala.api.service;
 
 
-
+import com.ydd.third.common.huolalaresponse.TokenResponse;
 import com.ydd.third.delivery.huolala.HuolalaResult;
 import com.ydd.third.delivery.huolala.annotation.Service;
 import com.ydd.third.delivery.huolala.api.BaseService;
 import com.ydd.third.delivery.huolala.config.Config;
 import com.ydd.third.delivery.huolala.exception.ServiceException;
-import com.ydd.third.delivery.huolala.response.TokenResponse;
 
 import java.util.HashMap;
 import java.util.Map;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/api/service/UserService.java

@@ -1,9 +1,9 @@
 package com.ydd.third.delivery.huolala.api.service;
 
 
+import com.ydd.third.common.huolalaresponse.TokenResponse;
 import com.ydd.third.delivery.huolala.api.BaseService;
 import com.ydd.third.delivery.huolala.config.Config;
-import com.ydd.third.delivery.huolala.response.TokenResponse;
 
 /**
  * 用户服务

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/impl/DefaultIOAuthClient.java

@@ -1,11 +1,10 @@
 package com.ydd.third.delivery.huolala.impl;
 
 
-
+import com.ydd.third.common.huolalaresponse.ErrorResponse;
 import com.ydd.third.delivery.huolala.IOAuthClient;
 import com.ydd.third.delivery.huolala.IOAuthRequest;
 import com.ydd.third.delivery.huolala.config.Config;
-import com.ydd.third.delivery.huolala.response.ErrorResponse;
 import com.ydd.third.delivery.huolala.utils.Constants;
 import com.ydd.third.delivery.huolala.utils.JacksonUtils;
 import com.ydd.third.delivery.huolala.utils.WebUtils;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/request/ServerRefreshTokenRequest.java

@@ -2,10 +2,10 @@ package com.ydd.third.delivery.huolala.request;
 
 
 import com.fasterxml.jackson.databind.JavaType;
+import com.ydd.third.common.huolalaresponse.TokenResponse;
 import com.ydd.third.delivery.huolala.HuolalaResult;
 import com.ydd.third.delivery.huolala.IOAuthRequest;
 import com.ydd.third.delivery.huolala.config.Config;
-import com.ydd.third.delivery.huolala.response.TokenResponse;
 import com.ydd.third.delivery.huolala.utils.JacksonUtils;
 
 import java.util.HashMap;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/request/ServerTokenRequest.java

@@ -2,10 +2,10 @@ package com.ydd.third.delivery.huolala.request;
 
 
 import com.fasterxml.jackson.databind.JavaType;
+import com.ydd.third.common.huolalaresponse.TokenResponse;
 import com.ydd.third.delivery.huolala.HuolalaResult;
 import com.ydd.third.delivery.huolala.IOAuthRequest;
 import com.ydd.third.delivery.huolala.config.Config;
-import com.ydd.third.delivery.huolala.response.TokenResponse;
 import com.ydd.third.delivery.huolala.utils.JacksonUtils;
 
 import java.util.HashMap;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/huolala/utils/WebUtils.java

@@ -2,11 +2,11 @@ package com.ydd.third.delivery.huolala.utils;
 
 
 import com.fasterxml.jackson.databind.JavaType;
+import com.ydd.third.common.huolalaresponse.TokenResponse;
 import com.ydd.third.delivery.huolala.HuolalaResult;
 import com.ydd.third.delivery.huolala.annotation.Service;
 import com.ydd.third.delivery.huolala.config.Config;
 import com.ydd.third.delivery.huolala.exception.ServiceException;
-import com.ydd.third.delivery.huolala.response.TokenResponse;
 
 import javax.net.ssl.*;
 import java.io.*;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/kuaifu/KfClient.java

@@ -4,19 +4,19 @@ package com.ydd.third.delivery.kuaifu;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.ecloud.core.utils.JsonMapper;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.CoordinateUtils;
 import com.ydd.third.common.utils.DateUtils;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.ClientHandler;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.kuaifu.config.KuaiFuConstant;
 import com.ydd.third.delivery.kuaifu.dto.CreateOrderResponse;
 import com.ydd.third.delivery.kuaifu.dto.OrderCancelResponse;
 import com.ydd.third.delivery.kuaifu.dto.OrderPriceResponse;
 import com.ydd.third.delivery.kuaifu.util.StringUtil;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/kuaifu/dto/CreateOrderResponse.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.kuaifu.dto;
 
-import com.ydd.third.delivery.uupt.dto.BaseResponse;
+import com.ydd.third.common.dto.BaseResponse;
 import lombok.Data;
 
 import java.math.BigDecimal;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/kuaifu/dto/OrderCancelResponse.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.kuaifu.dto;
 
-import com.ydd.third.delivery.uupt.dto.BaseResponse;
+import com.ydd.third.common.dto.BaseResponse;
 import lombok.Data;
 
 import java.math.BigDecimal;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/kuaifu/dto/OrderPriceResponse.java

@@ -1,7 +1,6 @@
 package com.ydd.third.delivery.kuaifu.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydd.third.delivery.uupt.dto.BaseResponse;
+import com.ydd.third.common.dto.BaseResponse;
 import lombok.Data;
 
 import java.io.Serializable;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/kuaifu/util/KfCallback.java

@@ -2,8 +2,7 @@ package com.ydd.third.delivery.kuaifu.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.vo.callback.KfCallbackOrderVo;
-import com.ydd.third.delivery.vo.callback.UUPTCallbackOrderVo;
+import com.ydd.third.common.vo.callback.KfCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/MeituanAuthClient.java

@@ -1,9 +1,10 @@
 package com.ydd.third.delivery.meituan;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.vo.waimai.meituan.MeituanToken;
 import com.ydd.third.delivery.meituan.sign.SignHelper;
 import com.ydd.third.delivery.meituan.util.HttpClient;
 import lombok.extern.slf4j.Slf4j;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/MeituanCallback.java

@@ -1,9 +1,10 @@
 package com.ydd.third.delivery.meituan;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.StringUtils;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.vo.callback.MeituanCallbackOrderVo;
+import com.ydd.third.common.vo.callback.MeituanCallbackOrderVo;
+
 import com.ydd.third.delivery.meituan.sign.SignHelper;
 import com.ydd.third.common.vo.ResObject;
 import lombok.extern.slf4j.Slf4j;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/MeituanClient.java

@@ -9,8 +9,6 @@ import com.ydd.third.common.vo.shop.*;
 import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.ClientHandler;
 import com.ydd.third.delivery.meituan.service.*;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/request/CreateOrderByCoordinatesRequest.java

@@ -1,7 +1,7 @@
 package com.ydd.third.delivery.meituan.request;
 
 
-import com.ydd.third.delivery.meituan.vo.OpenApiGoods;
+import com.ydd.third.common.vo.waimai.meituan.OpenApiGoods;
 import com.ydd.third.delivery.meituan.constants.OrderType;
 
 import java.math.BigDecimal;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/request/CreateOrderByShopRequest.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.meituan.request;
 
-import com.ydd.third.delivery.meituan.vo.OpenApiGoods;
+import com.ydd.third.common.vo.waimai.meituan.OpenApiGoods;
 import com.ydd.third.delivery.meituan.constants.OrderType;
 
 import java.math.BigDecimal;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/request/PreCreateOrderByShopRequest.java

@@ -1,7 +1,7 @@
 package com.ydd.third.delivery.meituan.request;
 
+import com.ydd.third.common.vo.waimai.meituan.OpenApiGoods;
 import com.ydd.third.delivery.meituan.constants.OrderType;
-import com.ydd.third.delivery.meituan.vo.OpenApiGoods;
 
 import java.math.BigDecimal;
 

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/response/CancelOrderResponse.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.meituan.response;
 
-import com.ydd.third.delivery.meituan.vo.OrderIdInfo;
+import com.ydd.third.common.vo.vo.order.OrderIdInfo;
 
 /**
  * 取消订单响应类

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/response/CreateOrderByCoordinatesResponse.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.meituan.response;
 
-import com.ydd.third.delivery.meituan.vo.OrderIdInfo;
+import com.ydd.third.common.vo.vo.order.OrderIdInfo;
 
 /**
  * 订单创建(送货分拣方式)响应类

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/response/CreateOrderResponse.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.meituan.response;
 
-import com.ydd.third.delivery.meituan.vo.OrderIdInfo;
+import com.ydd.third.common.vo.vo.order.OrderIdInfo;
 
 /**
  * 创建订单响应类

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/response/EvaluateResponse.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.meituan.response;
 
-import com.ydd.third.delivery.meituan.vo.OrderIdInfo;
+import com.ydd.third.common.vo.vo.order.OrderIdInfo;
 
 /**
  * 评价骑手响应类

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/response/QueryOrderResponse.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery.meituan.response;
 
-import com.ydd.third.delivery.meituan.vo.OrderStatusInfo;
+import com.ydd.third.common.vo.vo.order.OrderStatusInfo;
 
 /**
  * 查询订单状态响应类

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/CancelOrder.java

@@ -1,8 +1,8 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.vo.vo.order.CancelOrderVo;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.meituan.constants.CancelOrderReasonId;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.CancelOrderRequest;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/CheckOrder.java

@@ -1,7 +1,7 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.CheckRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;
@@ -12,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/CreateOrderByShop.java

@@ -1,26 +1,26 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.DateUtils;
-import com.ydd.third.common.utils.StringUtils;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.vo.vo.order.OrderVo;
+import com.ydd.third.common.vo.waimai.meituan.OpenApiGood;
+import com.ydd.third.common.vo.waimai.meituan.OpenApiGoods;
 import com.ydd.third.delivery.meituan.constants.OrderType;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.CreateOrderByShopRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;
-import com.ydd.third.delivery.meituan.util.DateUtil;
 import com.ydd.third.delivery.meituan.util.HttpClient;
 import com.ydd.third.delivery.meituan.util.ParamBuilder;
-import com.ydd.third.delivery.meituan.vo.OpenApiGood;
-import com.ydd.third.delivery.meituan.vo.OpenApiGoods;
-import com.ydd.third.delivery.vo.order.OrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 创建订单 例子

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/CreateShop.java

@@ -1,8 +1,8 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.vo.shop.ShopVo;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.CreateShopRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/GetRiderLocation.java

@@ -1,8 +1,8 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.vo.vo.order.RiderLocationVo;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.QueryOrderRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/OrderAddTip.java

@@ -1,9 +1,9 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.exception.BusinessException;
 import com.ydd.third.common.vo.vo.order.OrderTipsVo;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.OrderAddTipRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/PreCreateByShop.java

@@ -1,16 +1,17 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.DateUtils;
 import com.ydd.third.common.vo.vo.order.OrderVo;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.vo.waimai.meituan.OpenApiGood;
+import com.ydd.third.common.vo.waimai.meituan.OpenApiGoods;
 import com.ydd.third.delivery.meituan.constants.OrderType;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.PreCreateOrderByShopRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;
 import com.ydd.third.delivery.meituan.util.HttpClient;
 import com.ydd.third.delivery.meituan.util.ParamBuilder;
-import com.ydd.third.delivery.meituan.vo.OpenApiGood;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/QueryOrderInfo.java

@@ -1,8 +1,8 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.vo.vo.order.OrderQueryVo;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.QueryOrderRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/QueryShop.java

@@ -1,8 +1,8 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.vo.shop.ShopQueryVo;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.QueryShopRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/QueryShopArea.java

@@ -1,7 +1,7 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.QueryShopAreaRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/UpdateShop.java

@@ -1,8 +1,8 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.vo.shop.ShopVo;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.UpdateShopRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/ZbCancelOrder.java

@@ -1,8 +1,8 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.vo.vo.order.CancelOrderVo;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.sign.SignHelper;
 import com.ydd.third.delivery.meituan.util.HttpClient;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/ZbCreateOrderByShop.java

@@ -1,11 +1,11 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.config.DeliveryConfig;
+import com.ydd.third.common.vo.vo.order.OrderVo;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.sign.SignHelper;
 import com.ydd.third.delivery.meituan.util.HttpClient;
-import com.ydd.third.delivery.vo.order.OrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/ZbPreCreateByShop.java

@@ -1,25 +1,16 @@
 package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.third.common.utils.DateUtils;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.meituan.constants.OrderType;
+import com.ydd.third.common.config.DeliveryConfig;
+import com.ydd.third.common.vo.vo.order.OrderVo;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
-import com.ydd.third.delivery.meituan.request.PreCreateOrderByShopRequest;
 import com.ydd.third.delivery.meituan.sign.SignHelper;
 import com.ydd.third.delivery.meituan.util.HttpClient;
-import com.ydd.third.delivery.meituan.util.ParamBuilder;
-import com.ydd.third.delivery.meituan.vo.OpenApiGood;
-import com.ydd.third.delivery.meituan.vo.OpenApiGoods;
-import com.ydd.third.delivery.vo.order.OrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/vo/OpenApiGood.java

@@ -1,82 +0,0 @@
-package com.ydd.third.delivery.meituan.vo;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.math.BigDecimal;
-
-/**
- * 订单商品信息
- */
-public class OpenApiGood {
-    /**
-     * 商品数量
-     */
-    private int goodCount;
-
-    /**
-     * 商品名称
-     */
-    private String goodName;
-
-    /**
-     * 商品价格，单位为元
-     */
-    private BigDecimal goodPrice;
-
-    /**
-     * 商品单位，如个
-     */
-    private String goodUnit;
-
-    public int getGoodCount() {
-        return goodCount;
-    }
-
-    public void setGoodCount(int goodCount) {
-        this.goodCount = goodCount;
-    }
-
-    public String getGoodName() {
-        return goodName;
-    }
-
-    public void setGoodName(String goodName) {
-        if (StringUtils.isEmpty(goodName)) {
-            this.goodName = "";
-        } else {
-            this.goodName = goodName;
-        }
-    }
-
-    public BigDecimal getGoodPrice() {
-        return goodPrice;
-    }
-
-    public void setGoodPrice(BigDecimal goodPrice) {
-        this.goodPrice = goodPrice;
-    }
-
-    public String getGoodUnit() {
-        return goodUnit;
-    }
-
-    public void setGoodUnit(String goodUnit) {
-        if (StringUtils.isEmpty(goodUnit)) {
-            this.goodUnit = "";
-        } else {
-            this.goodUnit = goodUnit;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "OpenApiGood {" +
-                "goodCount=" + goodCount +
-                ", goodPrice=" + goodPrice +
-                ", goodName=" + goodName +
-                ", goodUnit=" + goodUnit +
-                "}";
-    }
-}
-
-

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/vo/OpenApiGoods.java

@@ -1,27 +0,0 @@
-package com.ydd.third.delivery.meituan.vo;
-
-import java.util.List;
-
-/**
- * 订单商品信息列表
- */
-public class OpenApiGoods {
-    private List<OpenApiGood> goods;
-
-    public List<OpenApiGood> getGoods() {
-        return goods;
-    }
-
-    public void setGoods(List<OpenApiGood> goods) {
-        this.goods = goods;
-    }
-
-    @Override
-    public String toString() {
-        return "OpenApiGoods {" +
-                "goods=" + goods +
-                "}";
-    }
-}
-
-

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/vo/OrderIdInfo.java

@@ -1,104 +0,0 @@
-package com.ydd.third.delivery.meituan.vo;
-
-/**
- * 订单id信息
- */
-public class OrderIdInfo {
-	/**
-     * 配送唯一标识
-     */
-    private String mt_peisong_id;
-	/**
-     * 订单ID
-     */
-    private String order_id;
-	/**
-     * 配送活动标识
-     */
-    private long delivery_id;
-	/**
-     * 目的地id
-     */
-    private String destination_id;
-	/**
-     * 订单配送距离
-     */
-    private Integer delivery_distance;
-	/**
-     * 订单配送价格（面向商家）
-     */
-    private Double delivery_fee;
-	/**
-     * 路区信息
-     */
-    private String road_area;
-
-    public long getDelivery_id() {
-        return delivery_id;
-    }
-
-    public void setDelivery_id(long delivery_id) {
-        this.delivery_id = delivery_id;
-    }
-
-    public String getMt_peisong_id() {
-        return mt_peisong_id;
-    }
-
-    public void setMt_peisong_id(String mt_peisong_id) {
-        this.mt_peisong_id = mt_peisong_id;
-    }
-
-    public String getOrder_id() {
-        return order_id;
-    }
-
-    public void setOrder_id(String order_id) {
-        this.order_id = order_id;
-    }
-
-    public String getDestination_id() {
-        return destination_id;
-    }
-
-    public void setDestination_id(String destination_id) {
-        this.destination_id = destination_id;
-    }
-
-    public Integer getDelivery_distance() {
-        return delivery_distance;
-    }
-
-    public void setDelivery_distance(Integer delivery_distance) {
-        this.delivery_distance = delivery_distance;
-    }
-
-    public Double getDelivery_fee() {
-        return delivery_fee;
-    }
-
-    public void setDelivery_fee(Double delivery_fee) {
-        this.delivery_fee = delivery_fee;
-    }
-
-    public String getRoad_area() {
-        return road_area;
-    }
-
-    public void setRoad_area(String road_area) {
-        this.road_area = road_area;
-    }
-
-    @Override
-    public String toString() {
-        return "OrderIdInfo{" +
-                "mt_peisong_id='" + mt_peisong_id + '\'' +
-                ", order_id='" + order_id + '\'' +
-                ", delivery_id=" + delivery_id +
-                ", destination_id='" + destination_id + '\'' +
-                ", delivery_distance=" + delivery_distance +
-                ", delivery_fee=" + delivery_fee +
-                ", road_area='" + road_area + '\'' +
-                '}';
-    }
-}

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/vo/OrderStatusInfo.java

@@ -1,126 +0,0 @@
-package com.ydd.third.delivery.meituan.vo;
-
-import com.ydd.third.delivery.meituan.constants.OrderStatus;
-
-/**
- * 订单状态信息
- */
-public class OrderStatusInfo {
-    /**
-     * 配送活动标识
-     */
-    private String delivery_id;
-
-    /**
-     * 美团配送内部订单id，最长不超过32个字符
-     */
-    private String mt_peisong_id;
-
-    /**
-     * 外部订单号，最长不超过32个字符
-     */
-    private String order_id;
-
-    /**
-     * 订单状态代码
-     */
-    private OrderStatus status;
-
-    /**
-     * 配送员姓名（订单已被骑手接单后会返回骑手信息）
-     */
-    private String courier_name;
-
-    /**
-     * 配送员电话（订单已被骑手接单后会返回骑手信息）
-     */
-    private String courier_phone;
-
-    /**
-     * 取消原因id
-     */
-    private int cancel_reason_id;
-
-    /**
-     * 取消原因详情，最长不超过256个字符
-     */
-    private String cancel_reason;
-
-    public String getDelivery_id() {
-        return delivery_id;
-    }
-
-    public void setDelivery_id(String delivery_id) {
-        this.delivery_id = delivery_id;
-    }
-
-    public String getMt_peisong_id() {
-        return mt_peisong_id;
-    }
-
-    public void setMt_peisong_id(String mt_peisong_id) {
-        this.mt_peisong_id = mt_peisong_id;
-    }
-
-    public String getOrder_id() {
-        return order_id;
-    }
-
-    public void setOrder_id(String order_id) {
-        this.order_id = order_id;
-    }
-
-    public OrderStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(OrderStatus status) {
-        this.status = status;
-    }
-
-    public String getCourier_name() {
-        return courier_name;
-    }
-
-    public void setCourier_name(String courier_name) {
-        this.courier_name = courier_name;
-    }
-
-    public String getCourier_phone() {
-        return courier_phone;
-    }
-
-    public void setCourier_phone(String courier_phone) {
-        this.courier_phone = courier_phone;
-    }
-
-    public int getCancel_reason_id() {
-        return cancel_reason_id;
-    }
-
-    public void setCancel_reason_id(int cancel_reason_id) {
-        this.cancel_reason_id = cancel_reason_id;
-    }
-
-    public String getCancel_reason() {
-        return cancel_reason;
-    }
-
-    public void setCancel_reason(String cancel_reason) {
-        this.cancel_reason = cancel_reason;
-    }
-
-    @Override
-    public String toString() {
-        return "OrderStatusInfo {" +
-                "delivery_id=" + delivery_id +
-                ", mt_peisong_id=" + mt_peisong_id +
-                ", order_id=" + order_id +
-                ", status=" + status +
-                ", courier_name=" + courier_name +
-                ", courier_phone=" + courier_phone +
-                ", cancel_reason_id=" + cancel_reason_id +
-                ", cancel_reason=" + cancel_reason +
-                '}';
-    }
-}

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/shansong/ShansongCallback.java

@@ -1,9 +1,9 @@
 package com.ydd.third.delivery.shansong;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.third.common.utils.*;
-import com.ydd.third.delivery.vo.callback.ShansongCallbackOrderVo;
+import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.callback.ShansongCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/shansong/ShansongClient.java

@@ -4,15 +4,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.common.core.redis.RedisCache;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.*;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.callback.ShansongTokenVo;
+import com.ydd.third.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.ClientHandler;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.shansong.sign.SignHelper;
 import com.ydd.third.delivery.shansong.utils.HttpClient;
-import com.ydd.third.delivery.vo.callback.ShansongTokenVo;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/shansong/ShansongSHClient.java

@@ -4,21 +4,26 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.common.core.redis.RedisCache;
-import com.ydd.third.common.utils.*;
+import com.ydd.third.common.config.DeliveryConfig;
+import com.ydd.third.common.utils.CoordinateUtils;
+import com.ydd.third.common.utils.DateUtils;
+import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.ClientHandler;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.shansong.constants.RequestConstant;
 import com.ydd.third.delivery.shansong.sign.SignHelper;
 import com.ydd.third.delivery.shansong.utils.HttpClient;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static com.ydd.third.delivery.shansong.constants.RequestConstant.*;
 
@@ -49,30 +54,6 @@ public class ShansongSHClient implements ClientHandler {
     public ResObject<OrderResultVo> queryOrderDeliverFee(OrderVo order) {
         String url = RequestConstant.getApiUrl(appConfig.isTest()) + SH_ORDER_CALCULATE_URL;
         ResObject<OrderResultVo> resObject = new ResObject<>();
-        /**
-         String token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         if (StringUtils.isBlank(token)) {
-         try {
-         ResObject resObjectToken = refreshToken();
-         if (resObjectToken.getCode() == 0) {
-         token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         } else  {
-         return resObjectToken;
-         }
-
-         } catch (Exception ex) {
-         log.error(ex.getMessage());
-         resObject.setCode(1);
-         resObject.setMsg("token 无效，重新获取token时发生异常，"+ex.getMessage());
-         return resObject;
-         }
-         }
-         if (StringUtils.isBlank(token)) {
-         resObject.setCode(2);
-         resObject.setMsg("token 无效，重新授权");
-         return resObject;
-         }
-         **/
         resObject.setCode(1);
         resObject.setMsg("非法访问");
         //  JSONObject jsonParams = JSONObject.parseObject(jsonParamsStr);
@@ -131,6 +112,7 @@ public class ShansongSHClient implements ClientHandler {
         List<Map<String, String>> receiverList = new ArrayList<>();
         receiverList.add(receiverMap);
         dataMap.put("receiverList", receiverList);
+        dataMap.put("storeId",order.getShopNo());
         dataMap.put("appointType", order.getIsAppoint()); //预约类型	int/YES	0立即单，1预约单
         dataMap.put("appointmentDate", DateUtils.format(order.getExpectedPickupTime(), "yyyy-MM-dd HH:mm")); //预约时间	String/NO	2020-02-02 22:00,指的是预约取件时间
 
@@ -211,51 +193,9 @@ public class ShansongSHClient implements ClientHandler {
     public ResObject<OrderResultVo> createOrder(OrderVo order) {
         String url = RequestConstant.getApiUrl(appConfig.isTest()) + SH_CREATE_ORDER_URL;
         ResObject<OrderResultVo> resObject = new ResObject<>();
-        /**
-         String token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         //
-         if (StringUtils.isBlank(token)) {
-         try {
-         ResObject resObjectToken = refreshToken();
-         if (resObjectToken.getCode() == 0) {
-         token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         } else  {
-         return resObjectToken;
-         // return tokenJson.toJSONString();
-         }
-
-         } catch (Exception ex) {
-         log.error(ex.getMessage());
-         resObject.setCode(1);
-         resObject.setMsg("token 无效，重新获取token时发生异常，"+ex.getMessage());
-         return resObject;
-         //return JSONUtil.toJson(resObject);
-         }
-         }
-         if (StringUtils.isBlank(token)) {
-         resObject.setCode(2);
-         resObject.setMsg("token 无效，重新授权");
-         return resObject;
-         //return JSONUtil.toJson(resObject);
-         }
-         **/
         resObject.setCode(1);
         resObject.setMsg("非法访问");
 
-
-//        ResObject<OrderResultVo> orderRes = queryOrderDeliverFee(order);
-//        // JSONObject orderResJson = JSONObject.parseObject(orderResStr);
-//        if (orderRes.getCode() != 0) {
-//            resObject.setCode(1);
-//            String errMsg = orderRes.getMsg();
-//            if (StringUtils.isBlank(errMsg)) {
-//                errMsg = "操作失败";
-//            }
-//            resObject.setMsg(errMsg);
-//            return resObject;
-//            // return orderResStr;
-//        }
-     //   String orderNumber = (orderRes.getData()).getDeliveryOrderNo();
         String orderNumber = order.getOrderNumber();
         // orderResJson.getString("orderNumber");
         Map<String, Object> dataMap = new HashMap<String, Object>();
@@ -329,30 +269,6 @@ public class ShansongSHClient implements ClientHandler {
         String url = RequestConstant.getApiUrl(appConfig.isTest()) + SH_ABORT_ORDER_URL;
 
         ResObject<CancelOrderResultVo> resObject = new ResObject<>();
-        /**
-         String token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         if (StringUtils.isBlank(token)) {
-         try {
-         ResObject resObjectToken = refreshToken();
-         if (resObjectToken.getCode() == 0) {
-         token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         } else  {
-         return resObjectToken;
-         }
-
-         } catch (Exception ex) {
-         log.error(ex.getMessage());
-         resObject.setCode(1);
-         resObject.setMsg("token 无效，重新获取token时发生异常，"+ex.getMessage());
-         return resObject;
-         }
-         }
-         if (StringUtils.isBlank(token)) {
-         resObject.setCode(2);
-         resObject.setMsg("token 无效，重新授权");
-         return resObject;
-         }
-         **/
         resObject.setCode(1);
         resObject.setMsg("非法访问");
         //JSONObject jsonParams = JSONObject.parseObject(jsonParamsStr);
@@ -413,30 +329,7 @@ public class ShansongSHClient implements ClientHandler {
     public ResObject<OrderQueryResultVo> queryOrderInfo(OrderQueryVo orderQueryVo) {
         String url = RequestConstant.getApiUrl(appConfig.isTest()) + SH_ORDER_INFO_URL;
         ResObject<OrderQueryResultVo> resObject = new ResObject<>();
-        /**
-         String token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         if (StringUtils.isBlank(token)) {
-         try {
-         ResObject resObjectToken = refreshToken();
-         if (resObjectToken.getCode() == 0) {
-         token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         } else  {
-         return resObjectToken;
-         }
 
-         } catch (Exception ex) {
-         log.error(ex.getMessage());
-         resObject.setCode(1);
-         resObject.setMsg("token 无效，重新获取token时发生异常，"+ex.getMessage());
-         return resObject;
-         }
-         }
-         if (StringUtils.isBlank(token)) {
-         resObject.setCode(2);
-         resObject.setMsg("token 无效，重新授权");
-         return resObject;
-         }
-         **/
         resObject.setCode(1);
         resObject.setMsg("非法访问");
 
@@ -514,30 +407,7 @@ public class ShansongSHClient implements ClientHandler {
     public ResObject<OrderTipsResultVo> orderAddTip(OrderTipsVo orderTipsVo) {
         String url = RequestConstant.getApiUrl(appConfig.isTest()) + SH_ADDITION_URL;
         ResObject<OrderTipsResultVo> resObject = new ResObject<>();
-        /**
-         String token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         if (StringUtils.isBlank(token)) {
-         try {
-         ResObject resObjectToken = refreshToken();
-         if (resObjectToken.getCode() == 0) {
-         token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         } else  {
-         return resObjectToken;
-         }
 
-         } catch (Exception ex) {
-         log.error(ex.getMessage());
-         resObject.setCode(1);
-         resObject.setMsg("token 无效，重新获取token时发生异常，"+ex.getMessage());
-         return resObject;
-         }
-         }
-         if (StringUtils.isBlank(token)) {
-         resObject.setCode(2);
-         resObject.setMsg("token 无效，重新授权");
-         return resObject;
-         }
-         **/
         resObject.setCode(1);
         resObject.setMsg("非法访问");
         //JSONObject jsonParams = JSONObject.parseObject(jsonParamsStr);
@@ -838,30 +708,6 @@ public class ShansongSHClient implements ClientHandler {
     public ResObject<AmountResultVo> queryAmount(QueryAmount queryAmount) {
         String url = RequestConstant.getApiUrl(appConfig.isTest()) + SH_GET_USER_ACCOUNT_URL;
         ResObject resObject = new ResObject();
-        /**
-         String token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         if (StringUtils.isBlank(token)) {
-         try {
-         ResObject resObjectToken = refreshToken();
-         if (resObjectToken.getCode() == 0) {
-         token = redisCache.getCacheObject("DELIVERY_SHANSONG_TOKEN");
-         } else  {
-         return resObjectToken;
-         }
-
-         } catch (Exception ex) {
-         log.error(ex.getMessage());
-         resObject.setCode(1);
-         resObject.setMsg("token 无效，重新获取token时发生异常，"+ex.getMessage());
-         return resObject;
-         }
-         }
-         if (StringUtils.isBlank(token)) {
-         resObject.setCode(2);
-         resObject.setMsg("token 无效，重新授权");
-         return resObject;
-         }
-         **/
         resObject.setCode(1);
         resObject.setMsg("非法访问");
         //  JSONObject jsonParams = JSONObject.parseObject(jsonParamsStr);

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/shunfeng/ShunfengCallback.java

@@ -1,11 +1,11 @@
 package com.ydd.third.delivery.shunfeng;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.DateUtils;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.config.DeliveryConfig;
+import com.ydd.third.common.vo.callback.ShunfengCallbackOrderVo;
 import com.ydd.third.delivery.shunfeng.util.SignUtil;
-import com.ydd.third.delivery.vo.callback.ShunfengCallbackOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/shunfeng/ShunfengClient.java

@@ -1,13 +1,14 @@
 package com.ydd.third.delivery.shunfeng;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.common.enums.DeliveryTypeEnums;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.common.utils.DateUtils;
 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.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.ClientHandler;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.shunfeng.constant.RequestConstant;
 import com.ydd.third.delivery.shunfeng.request.*;
 import com.ydd.third.delivery.shunfeng.response.Response;
@@ -16,8 +17,6 @@ import com.ydd.third.delivery.shunfeng.vo.OrderDetail;
 import com.ydd.third.delivery.shunfeng.vo.ProductDetail;
 import com.ydd.third.delivery.shunfeng.vo.Receive;
 import com.ydd.third.delivery.shunfeng.vo.Shop;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/shunfeng/request/Request.java

@@ -1,7 +1,6 @@
 package com.ydd.third.delivery.shunfeng.request;
 
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.shunfeng.constant.RequestConstant;
+import com.ydd.third.common.config.DeliveryConfig;
 import com.ydd.third.delivery.shunfeng.response.Response;
 import com.ydd.third.delivery.shunfeng.util.HttpUtil;
 
@@ -13,7 +12,7 @@ public abstract class Request {
 
     abstract void initDevId(Integer devId);
 
-    public Response doRequest(DeliveryConfig appConfig,String requestUrl) {
+    public Response doRequest(DeliveryConfig appConfig, String requestUrl) {
         initDevId(Integer.valueOf(appConfig.getSfDeveloperId()));
         Response response = HttpUtil.post(
                 Integer.valueOf(appConfig.getSfDeveloperId()),

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/uupt/UuptClient.java

@@ -2,12 +2,14 @@ package com.ydd.third.delivery.uupt;
 
 
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.ClientHandler;
-import com.ydd.third.delivery.uupt.dto.GetBalanceDetailResponse;
 import com.ydd.third.delivery.uupt.service.UuptDeliveryService;
 import com.ydd.third.delivery.uupt.service.UuptUserDeliveryService;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
+import com.ydd.third.common.config.DeliveryConfig;
+import com.ydd.third.common.dto.*;
+import com.ydd.third.common.vo.ResObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/uupt/service/UuptDeliveryService.java

@@ -5,16 +5,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.ydd.common.utils.DateUtils;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.ecloud.core.utils.JsonMapper;
+import com.ydd.third.common.config.DeliveryConfig;
+import com.ydd.third.common.dto.*;
 import com.ydd.third.common.utils.CoordinateUtils;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.ClientHandler;
-import com.ydd.third.delivery.config.DeliveryConfig;
 import com.ydd.third.delivery.uupt.Enum.OrderStatusEnum;
 import com.ydd.third.delivery.uupt.config.UuptConstant;
-import com.ydd.third.delivery.uupt.dto.*;
 import com.ydd.third.delivery.uupt.utils.StringUtil;
-import com.ydd.third.delivery.vo.order.*;
-import com.ydd.third.delivery.vo.shop.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -259,9 +259,8 @@ public class UuptDeliveryService implements ClientHandler {
             queryResultVo.setDistance(response.getDistance());
             if (StringUtils.isNotBlank(response.getDriverLastloc())) {
                 String[] array = response.getDriverLastloc().split(",");
-                double[] gps = CoordinateUtils.gcj02_To_Bd09(new BigDecimal(array[1]).doubleValue(), new BigDecimal(array[0]).doubleValue());
-                queryResultVo.setRiderLng(new BigDecimal(gps[1]));
-                queryResultVo.setRiderLat(new BigDecimal(gps[0]));
+                queryResultVo.setRiderLng(new BigDecimal(array[0]));
+                queryResultVo.setRiderLat(new BigDecimal(array[1]));
             }
 
             return new ResObject<>(queryResultVo);

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/uupt/service/UuptUserDeliveryService.java

@@ -2,25 +2,16 @@ package com.ydd.third.delivery.uupt.service;
 
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.common.utils.StringUtils;
 import com.ydd.ecloud.core.utils.JsonMapper;
+import com.ydd.third.common.config.DeliveryConfig;
+import com.ydd.third.common.dto.*;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.delivery.ClientHandler;
-import com.ydd.third.delivery.config.DeliveryConfig;
-import com.ydd.third.delivery.uupt.Enum.OrderStatusEnum;
 import com.ydd.third.delivery.uupt.config.UuptConstant;
-import com.ydd.third.delivery.uupt.dto.*;
 import com.ydd.third.delivery.uupt.utils.StringUtil;
-import com.ydd.third.delivery.vo.order.*;
-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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.Map;
 
 
@@ -37,7 +28,7 @@ public class UuptUserDeliveryService   {
     private DeliveryConfig deliveryConfig;
 
 
-    public ResObject<BindUserApplyResponse> bindUserApply(String mobile,String ip) {
+    public ResObject<BindUserApplyResponse> bindUserApply(String mobile, String ip) {
         BindUserApplyRequest request = new BindUserApplyRequest(deliveryConfig.getUuptAppId());
         request.setUserMobile(mobile);
         request.setUserIp(ip);
@@ -60,7 +51,7 @@ public class UuptUserDeliveryService   {
     }
 
 
-    public ResObject<BindUserSubmitResponse> bindUserSubmit(String mobile,String validateCode,String cityName) {
+    public ResObject<BindUserSubmitResponse> bindUserSubmit(String mobile, String validateCode, String cityName) {
         BindUserSubmitRequest request = new BindUserSubmitRequest(deliveryConfig.getUuptAppId());
         request.setCityName(cityName);
         request.setUserMobile(mobile);

lb-third/lb-third-waimai/pom.xml

@@ -22,13 +22,18 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.0</version>
+            <version>2.12.3</version>
         </dependency>
         <dependency>
             <groupId>com.ydd</groupId>
             <artifactId>lb-third-common</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.ydd</groupId>
+            <artifactId>lb-third-print</artifactId>
+            <version>1.0</version>
+        </dependency>
     </dependencies>
 
 

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/Client.java

@@ -2,12 +2,13 @@ package com.ydd.third.waimai;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.third.common.exception.BusinessException;
-import com.ydd.third.common.utils.*;
+import com.ydd.third.common.utils.HttpUtils;
+import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.waimai.meituan.RefundFoodItemVo;
 import com.ydd.third.waimai.eleRetai.EleRetaiClient;
 import com.ydd.third.waimai.eleme.ElemeClient;
 import com.ydd.third.waimai.meituan.MeituanClient;
-import com.ydd.third.waimai.meituan.vo.RefundFoodItemVo;
 import com.ydd.third.waimai.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/utils/JacksonUtils.java

@@ -78,37 +78,37 @@ public class JacksonUtils {
         }
     }
 
-    public static <T> Map<String, T> json2map(String jsonStr, Class<T> clazz) {
-        Map<String, Map<String, Object>> map;
-        try {
-            map = objectMapper.readValue(jsonStr,
-                    new TypeReference<Map<String, T>>() {
-                    });
-        } catch (IOException e) {
-            throw new JsonParseException();
-        }
-        Map<String, T> result = new HashMap<String, T>();
-        for (Map.Entry<String, Map<String, Object>> entry : map.entrySet()) {
-            result.put(entry.getKey(), map2pojo(entry.getValue(), clazz));
-        }
-        return result;
-    }
-
-    public static <T> List<T> json2list(String jsonArrayStr, Class<T> clazz) {
-        List<Map<String, Object>> list = null;
-        try {
-            list = objectMapper.readValue(jsonArrayStr,
-                    new TypeReference<List<T>>() {
-                    });
-        } catch (IOException e) {
-            throw new JsonParseException();
-        }
-        List<T> result = new ArrayList<T>();
-        for (Map<String, Object> map : list) {
-            result.add(map2pojo(map, clazz));
-        }
-        return result;
-    }
+//    public static <T> Map<String, T> json2map(String jsonStr, Class<T> clazz) {
+//        Map<String, Map<String, Object>> map;
+//        try {
+//            map = objectMapper.readValue(jsonStr,
+//                    new TypeReference<Map<String, T>>() {
+//                    });
+//        } catch (IOException e) {
+//            throw new JsonParseException();
+//        }
+//        Map<String, T> result = new HashMap<String, T>();
+//        for (Map.Entry<String, Map<String, Object>> entry : map.entrySet()) {
+//            result.put(entry.getKey(), map2pojo(entry.getValue(), clazz));
+//        }
+//        return result;
+//    }
+//
+//    public static <T> List<T> json2list(String jsonArrayStr, Class<T> clazz) {
+//        List<Map<String, Object>> list = null;
+//        try {
+//            list = objectMapper.readValue(jsonArrayStr,
+//                    new TypeReference<List<T>>() {
+//                    });
+//        } catch (IOException e) {
+//            throw new JsonParseException();
+//        }
+//        List<T> result = new ArrayList<T>();
+//        for (Map<String, Object> map : list) {
+//            result.add(map2pojo(map, clazz));
+//        }
+//        return result;
+//    }
 
     public static <T> T map2pojo(Map map, Class<T> clazz) {
         return objectMapper.convertValue(map, clazz);

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/vo/MeituanWmRecipientInfoResultVo.java

@@ -1,14 +1,8 @@
 package com.ydd.third.waimai.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.ydd.third.waimai.meituan.vo.MeituanOrderExtraVo;
-import com.ydd.third.waimai.meituan.vo.OrderDetailVo;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
-import java.util.List;
 
 @Data
 public class MeituanWmRecipientInfoResultVo extends OrderResultVo {

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/vo/MeituanWmoperOrderResultVo.java

@@ -1,16 +1,9 @@
 package com.ydd.third.waimai.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.ydd.third.waimai.meituan.vo.MeituanOrderExtraVo;
-import com.ydd.third.waimai.meituan.vo.MeituanPoiReceiveDetailVo;
-import com.ydd.third.waimai.meituan.vo.OrderDetailVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
  * 美团外卖非接单DTO
  * @author lh

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/vo/ShanTangOrderDetailVo.java

@@ -1,7 +1,6 @@
 package com.ydd.third.waimai.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.ydd.third.waimai.meituan.vo.OrderDetailExtraVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/vo/ShanTangOrderResultVo.java

@@ -1,9 +1,6 @@
 package com.ydd.third.waimai.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.ydd.third.waimai.meituan.vo.MeituanOrderExtraVo;
-import com.ydd.third.waimai.meituan.vo.MeituanPoiReceiveDetailVo;
-import com.ydd.third.waimai.meituan.vo.OrderDetailVo;
+import com.ydd.third.common.vo.waimai.meituan.MeituanOrderExtraVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;