Merge remote-tracking branch 'origin/master'

lb-app/pom.xml

@@ -28,7 +28,6 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
-
         <!-- swagger2-->
         <dependency>
             <groupId>io.springfox</groupId>
@@ -133,6 +132,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
     </dependencies>
 
     <build>

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

@@ -264,6 +264,9 @@ public class OrderEntityUtils {
                 }else if (orderReq.getOrderSource().equals("102")||orderReq.getOrderSource().equals("103")){
                     orderVo.setOriginMark("elm");
                     orderVo.setOriginMarkNo(orderReq.getPoiSeq());
+                } else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOriginMark("jdhome");
+                    orderVo.setOriginMarkNo(orderReq.getPoiSeq());
                 }
             }
             /**
@@ -357,6 +360,9 @@ public class OrderEntityUtils {
                 }else if (orderReq.getOrderSource().equals("102")||orderReq.getOrderSource().equals("103")){
                     orderVo.setOriginMark("elm");
                     orderVo.setOriginMarkNo(orderReq.getPoiSeq());
+                }   else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOriginMark("jdhome");
+                    orderVo.setOriginMarkNo(orderReq.getPoiSeq());
                 }
             }
             /**
@@ -435,6 +441,9 @@ public class OrderEntityUtils {
                 }else if (orderReq.getOrderSource().equals("102")||orderReq.getOrderSource().equals("103")){
                     orderVo.setOrderingSourceType(3);
                     orderVo.setOrderingSourceNo(orderReq.getPoiSeq());
+                } else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderingSourceType(6);
+                    orderVo.setOrderingSourceNo(orderReq.getPoiSeq());
                 }
             }
             /**
@@ -568,6 +577,10 @@ public class OrderEntityUtils {
                     orderVo.setOrderSource("2");
                     orderVo.setOrderSequence(orderReq.getPoiSeq());
                 }
+                else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("京东到家");
+                    orderVo.setOrderSequence(orderReq.getPoiSeq());
+                }
             }else {
                 orderVo.setOrderSource("商家APP");
             }
@@ -621,25 +634,7 @@ public class OrderEntityUtils {
              * 是否是预约单	0：非预约单；1：预约单
              */
             orderVo.setIsAppoint(0);
-//            if (TakeTypeEnum.APPOINTMENT.type.equals(orderReq.getTakeType())) {
-//                orderVo.setIsAppoint(1);
-//                /**
-//                 * 用户期望上门时间
-//                 * 顺丰
-//                 * expect_pickup_time 不必传
-//                 * 预约单，期望取货时间
-//                 */
-//                orderVo.setExpectedPickupTime(DateUtils.parseDate(orderReq.getTakeTime()));
-//
-//                /**
-//                 * 预约单类型
-//                 * 顺丰
-//                 * appoint_type 不必传
-//                 * 预约单类型
-//                 * 顺丰：预约单的时候传入,1：预约单送达单；2：预约单上门单
-//                 */
-//                orderVo.setAppointType(2);
-//            }
+
 
             /**
              * 预约单，期望送达时间
@@ -879,6 +874,9 @@ public class OrderEntityUtils {
                 }else if (orderReq.getOrderSource().equals("102")||orderReq.getOrderSource().equals("103")){
                     orderVo.setOrderSource("2");
                     orderVo.setOrderingSourceNo(orderReq.getPoiSeq());
+                } else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("3");
+                    orderVo.setOrderingSourceNo(orderReq.getPoiSeq());
                 }
             }else {
                 orderVo.setOrderSource("3");
@@ -1010,6 +1008,8 @@ public class OrderEntityUtils {
                     orderVo.setOrderSource("6");
                 }else if (orderReq.getOrderSource().equals("103")){
                     orderVo.setOrderSource("8");
+                }else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("0");
                 }
             } else {
                 orderVo.setOrderSource("0");
@@ -1085,6 +1085,8 @@ public class OrderEntityUtils {
             } else {
                 if(orderReq.getOrderSource().equals("103")){
                     orderReq.setOrderSource("102");
+                }else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("103");
                 }
                 orderVo.setOrderSource(orderReq.getOrderSource());
             }
@@ -1137,23 +1139,6 @@ public class OrderEntityUtils {
              */
             orderVo.setIsAppoint(0);
 
-//            if (TakeTypeEnum.APPOINTMENT.type.equals(orderReq.getTakeType())) {
-//                /**
-//                 * 美团
-//                 * 是否是预约单
-//                 * 美团：order_type，不必传，订单类型，默认为0 0: 即时单(尽快送达，限当日订单) 1: 预约单
-//                 */
-//                orderVo.setIsAppoint(1);
-//
-//                /**
-//                 * 美团
-//                 * 预约单，期望取货时间
-//                 * 美团：expected_pickup_time, 不必传，期望取货时间
-//                 */
-//                orderVo.setExpectedDeliveryTime(DateUtils.parseDate(orderReq.getTakeTime()));
-//                // 普通订单是取件时间，外卖是送达时间
-//                orderVo.setExpectedPickupTime(DateUtils.parseDate(orderReq.getTakeTime()));
-//            }
 
             /**
              * 美团
@@ -1221,6 +1206,8 @@ public class OrderEntityUtils {
                     orderVo.setOrderSource("饿了么");
                 }else if (orderReq.getOrderSource().equals("103")){
                     orderVo.setOrderSource("饿百");
+                }else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("京东到家");
                 }
             }
             if (orderReq.getTotalMoney() != null) {
@@ -1366,6 +1353,8 @@ public class OrderEntityUtils {
                     orderVo.setOrderSource("6");
                 }else if (orderReq.getOrderSource().equals("103")){
                     orderVo.setOrderSource("8");
+                }else if (orderReq.getOrderSource().equals("104")){
+                    orderVo.setOrderSource("0");
                 }
             } else {
                 orderVo.setOrderSource("0");

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

@@ -57,7 +57,7 @@ public class MeituanWaiMaiSgCallback {
     public String doStoreMap(@RequestParam Map<String, String> params) throws UnsupportedEncodingException {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
         res.put("data", "ok");
@@ -93,10 +93,10 @@ public class MeituanWaiMaiSgCallback {
     public String doNewOrder(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购推送新订单回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgOrderResultVo> callbackRes = callback.doNewOrder(params);
         // JSONObject json = callBack.doNewOrder(params);
@@ -104,8 +104,8 @@ public class MeituanWaiMaiSgCallback {
             MeituanSgOrderResultVo orderVo = callbackRes.getData();
 
             apiWaimaiService.sgDoNewOrder(orderVo);
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         } else {
             log.error(callbackRes.getMsg());
@@ -123,17 +123,17 @@ public class MeituanWaiMaiSgCallback {
     public String doConfirmOrder(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购商家已确认订单的回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgOrderResultVo> callbackRes = callback.doNewOrder(params);
         if (callbackRes.getCode() == 0) {
             MeituanSgOrderResultVo orderVo = callbackRes.getData();
             apiWaimaiService.sgConfirmOrder(orderVo);
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         } else {
             log.error(callbackRes.getMsg());
@@ -151,10 +151,10 @@ public class MeituanWaiMaiSgCallback {
     public String doFinishOrder(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购订单完成后的回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgOrderResultVo> callbackRes = callback.doFinishOrder(params);
         if (callbackRes.getCode() == 0) {
@@ -163,8 +163,8 @@ public class MeituanWaiMaiSgCallback {
             /**
              * 此时对返回的订单完成数据作处理
              */
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         } else {
             log.error(callbackRes.getMsg());
@@ -182,7 +182,7 @@ public class MeituanWaiMaiSgCallback {
     public String doCancelOrder(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
         res.put("data", "ok");
@@ -192,7 +192,7 @@ public class MeituanWaiMaiSgCallback {
             MeituanSgOrderCancelResultVo orderVo = callbackRes.getData();
 
             apiWaimaiService.sgDoCancelOrder(orderVo);
-            // res.put("data", "OK");
+            // res.put("data", "ok");
             return res.toJSONString();
         } else {
             log.error(callbackRes.getMsg());
@@ -210,10 +210,10 @@ public class MeituanWaiMaiSgCallback {
     public String doOrderRefund(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购订单退款回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgOrderRefundResultVo> callbackRes = callback.doOrderRefund(params);
         // JSONObject json = callBack.doNewOrder(params);
@@ -241,8 +241,8 @@ public class MeituanWaiMaiSgCallback {
                     //取消退款申诉，对返回的数据作处理
                 }
             }
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         }
         return res.toJSONString();
@@ -258,10 +258,10 @@ public class MeituanWaiMaiSgCallback {
     public String doOrderPartRefund(@RequestParam Map<String, String> params) throws UnsupportedEncodingException {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购订单部分退款的回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgOrderPartRefundResultVo> callbackRes = callback.doOrderPartRefund(params);
         // JSONObject json = callBack.doNewOrder(params);
@@ -282,8 +282,8 @@ public class MeituanWaiMaiSgCallback {
                     //商家拒绝部分退款，对返回的数据作处理
                 }
             }
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         }
         return res.toJSONString();
@@ -299,10 +299,10 @@ public class MeituanWaiMaiSgCallback {
     public String doPrivacyNoDecline(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购隐私号-降级回调："+JSONUtil.toJson(params));
         ResObject callbackRes = callback.doPrivacyNoDecline(params);
         // JSONObject json = callBack.doPrivacyNoDecline(params);
@@ -310,8 +310,8 @@ public class MeituanWaiMaiSgCallback {
             /**
              * 此时异步调用拉取订单并通知客户
              */
-            //{“data”.“OK”}
-            // res.put("data", "OK");
+            //{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         } else {
             log.error(callbackRes.getMsg());
@@ -329,11 +329,11 @@ public class MeituanWaiMaiSgCallback {
     public String doRemindOrder(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
 
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购用户催单后的回调："+JSONUtil.toJson(params));
         ResObject<MeituanSgRemindOrderResultVo> callbackRes = callback.doRemindOrder(params);
         // JSONObject json = callBack.doNewOrder(params);
@@ -342,8 +342,8 @@ public class MeituanWaiMaiSgCallback {
             /**
              * 此时对催单的处理
              */
-            //服务商接收后需立即返回{“data”.“OK”}
-            // res.put("data", "OK");
+            //服务商接收后需立即返回{“data”.“ok”}
+            // res.put("data", "ok");
             return res.toJSONString();
         }
         return res.toJSONString();
@@ -359,10 +359,10 @@ public class MeituanWaiMaiSgCallback {
     public String doWmOrderStatus(@RequestParam Map<String, String> params) {
         JSONObject res = new JSONObject();
         if (null == params||params.size()==0) {
-            res.put("data", "OK");
+            res.put("data", "ok");
             return res.toJSONString();
         }
-        res.put("data", "OK");
+        res.put("data", "ok");
         log.info("美团闪购外卖非接单推送订单配送状态通知："+JSONUtil.toJson(params));
         return res.toJSONString();
     }

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

@@ -52,19 +52,19 @@ public class OrderOpenApi {
 
     @ApiOperation("开放接口-推送订单")
     @RequestMapping(value = "/push", method = RequestMethod.POST)
-    public ResponseResult pushOrder(@Valid @RequestBody OrderPushReq pushReq) {
+    public ResponseResult pushOrder(@RequestBody @Valid OrderPushReq pushReq) {
         return openApiOrderService.pushOrder(pushReq);
     }
 
     @ApiOperation("开放接口-取消订单")
     @RequestMapping(value = "/cancel", method = RequestMethod.POST)
-    public ResponseResult cancelOrder(@Valid @RequestBody OrderCancelReq cancelReq) {
+    public ResponseResult cancelOrder(@RequestBody @Valid OrderCancelReq cancelReq) {
         return openApiOrderService.cancelOrder(cancelReq);
     }
 
     @ApiOperation("开放接口-骑手位置")
     @RequestMapping(value = "/rider/location", method = RequestMethod.POST)
-    public ResponseResult location(@Valid @RequestBody OrderLocationReq locationReq) {
+    public ResponseResult location(@RequestBody @Valid OrderLocationReq locationReq) {
         return openApiOrderService.riderLocation(locationReq);
     }
 

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

@@ -47,8 +47,10 @@ public class StoreApi extends BaseController {
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     @AccessToken
     public ResponseResult saveShop(@RequestBody @Validated StoreDto storeDto) {
+        logger.info("新增门店请求"+JSONObject.toJSONString(storeDto));
         JSONObject resp = apiStoreService.saveShop(getLoginId(), storeDto, false);
-        if (resp.get("code") != null) {
+        logger.info("新增门店返回"+resp);
+        if (resp.get("code") != null&&resp.getIntValue("code")!=0) {
             return ResponseResult.error((ResponseResultCodeEnum) resp.get("code"));
         } else {
             return ResponseResult.success(resp.getString("shopCode"));
@@ -64,7 +66,7 @@ public class StoreApi extends BaseController {
     @AccessToken
     public ResponseResult modify(@RequestBody @Validated StoreDto shopReq) {
         JSONObject resp = apiStoreService.modify(getLoginId(), shopReq);
-        if (resp.get("code") != null) {
+        if (resp.get("code") != null&&resp.getIntValue("code")!=0) {
             return ResponseResult.error((ResponseResultCodeEnum) resp.get("code"));
         } else {
             return ResponseResult.success(resp.getString("shopCode"));

lb-app/src/main/java/com/ydd/app/dto/OrderPushReq.java

@@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -34,14 +35,14 @@ public class OrderPushReq extends BaseDto implements Serializable {
     /**
      * 物品ID
      */
-    @NotEmpty(message = "物品ID不能为空")
+    @NotNull(message = "物品ID不能为空")
     @ApiModelProperty(required = true, value = "物品ID")
     private Integer categoryId;
 
     /**
      * 物品重量，单位KG
      */
-    @NotEmpty(message = "物品重量不能为空")
+    @NotNull(message = "物品重量不能为空")
     @ApiModelProperty(required = true, value = "物品重量")
     private Integer weight;
 
@@ -120,6 +121,14 @@ public class OrderPushReq extends BaseDto implements Serializable {
     private String receiverLat;
 
     /**
+     * 收件人城市code，最长不超过30个字符
+     */
+    @NotBlank(message = "收件人城市code不能为空")
+    @Size(max = 30, message = "收件人城市code最长不能超过30个字符")
+    @ApiModelProperty(required = true, value = "收件人城市code")
+    private String receiverCityCode;
+
+    /**
      * 猎豹AI门店编号，最长不超过45个字符
      */
     @ApiModelProperty(value = "猎豹AI门店编号")
@@ -189,6 +198,13 @@ public class OrderPushReq extends BaseDto implements Serializable {
     private String sendLat;
 
     /**
+     * 发件人城市code，最长不超过30个字符
+     */
+    @Size(max = 30, message = "发件人城市code最长不能超过30个字符")
+    @ApiModelProperty(required = true, value = "发件人城市code")
+    private String sendCityCode;
+
+    /**
      * 流水号，最长不超过5个字符
      */
     @NotBlank(message = "流水号不能为空")

lb-app/src/main/java/com/ydd/app/dto/OrderReq.java

@@ -200,7 +200,7 @@ public class OrderReq implements Serializable {
     private String shopName;
 
     /**
-     * 平台类型(0-猎豹 1-美团 2-饿了么 3-饿百零售 5-美团闪购)
+     * 平台类型(0-猎豹 1-美团 2-饿了么 3-饿百零售 5-美团闪购 6-京东到家)
      */
     private Integer platformType;
 

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

@@ -84,7 +84,7 @@ public class ApiCallBackDaDa extends ApiCallBack {
                 dto.setOrderStatus(OrderStatusEnum.TO_BE_DELIVERED.status);
                 dto.setOrderMtStatus(15);
                 dto.setOrderEleStatus("DELIVERY_KNIGHT_REACH_SHOP");
-
+                dto.setOrderEleRetaiStatus("7");
                 break;
             case 1000:
                 dto.setOrderStatus(OrderStatusEnum.CANCEL.status);

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

@@ -456,6 +456,10 @@ public class ApiOrderNewServiceImpl implements ApiOrderNewService {
                 // 饿百零售
                 order.setOrderSource("103");
             }
+            else if (platformType == 6) {
+                // 京东到家
+                order.setOrderSource("104");
+            }
         }
     }
 

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

@@ -211,6 +211,9 @@ public class ApiOrderValuationServiceImpl implements ApiOrderValuationService {
             } else if (platformType == 3) {
                 // 饿百零售
                 orderReq.setOrderSource("103");
+            }else if (platformType == 6) {
+            // 京东到家
+            orderReq.setOrderSource("104");
             }
         }
     }
@@ -521,6 +524,8 @@ public class ApiOrderValuationServiceImpl implements ApiOrderValuationService {
             orderReq.setOrderSource("103");
         }else if (waimaiOrder.getOrderType().equals(WaimaiOrderTypeEnum.MEI_TUAN_SG.getType())) {
             orderReq.setOrderSource("101");
+        }else if (waimaiOrder.getOrderType().equals(WaimaiOrderTypeEnum.JD_HOME.getType())) {
+            orderReq.setOrderSource("104");
         }
         orderReq.setTakeRemark(takeRemark);
         orderReq.setWaiMaiRemark(waimaiOrder.getCaution());

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

@@ -69,6 +69,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                 if (resObject.getCode().intValue() == 0) {
                     dto.setShipperLat(resObject.getData().getRiderLat());
                     dto.setShipperLng(resObject.getData().getRiderLng());
+                    dto.setShipperName(resObject.getData().getRiderName());
+                    dto.setShipperPhone(resObject.getData().getRiderPhone());
                 }
             } else if (DeliveryTypeEnums.DADA_YZ.getType().equals(delivery.getType())&&orderDelivery!=null) {
                 OrderQueryVo orderQueryVo = new OrderQueryVo();
@@ -86,6 +88,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                 if (resObject.getCode().intValue() == 0) {
                     dto.setShipperLat(resObject.getData().getRiderLat());
                     dto.setShipperLng(resObject.getData().getRiderLng());
+                    dto.setShipperName(resObject.getData().getRiderName());
+                    dto.setShipperPhone(resObject.getData().getRiderPhone());
                 }
             } else if (DeliveryTypeEnums.UUPT.getType().equals(delivery.getType())) {
                 OrderQueryVo orderQueryVo = new OrderQueryVo();
@@ -98,6 +102,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                         double[] receiverGps = CoordinateUtils.bd09_To_Gcj02(resObject.getData().getRiderLat().doubleValue(), resObject.getData().getRiderLng().doubleValue());
                         dto.setShipperLat(new BigDecimal(receiverGps[0] + ""));
                         dto.setShipperLng(new BigDecimal(receiverGps[1] + ""));
+                        dto.setShipperName(resObject.getData().getRiderName());
+                        dto.setShipperPhone(resObject.getData().getRiderPhone());
                         dto.setEstimateArriveTimeStr(resObject.getData().getEstimateArriveTimeStr());
                     }
                     //订单距离
@@ -115,6 +121,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                             double[] receiverGps = CoordinateUtils.bd09_To_Gcj02(resObject.getData().getRiderLat().doubleValue(), resObject.getData().getRiderLng().doubleValue());
                             dto.setShipperLat(new BigDecimal(receiverGps[0] + ""));
                             dto.setShipperLng(new BigDecimal(receiverGps[1] + ""));
+                            dto.setShipperName(resObject.getData().getRiderName());
+                            dto.setShipperPhone(resObject.getData().getRiderPhone());
                             dto.setEstimateArriveTimeStr(resObject.getData().getEstimateArriveTimeStr());
                         }
 //                        dto.setShipperLat(resObject.getData().getRiderLat());
@@ -143,6 +151,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                     if (res.getCode().intValue() == 0) {
                         dto.setShipperLat(res.getData().getLat());
                         dto.setShipperLng(res.getData().getLng());
+                        dto.setShipperName(resObject.getData().getRiderName());
+                        dto.setShipperPhone(resObject.getData().getRiderPhone());
                       //  dto.setEstimateArriveTimeStr(resObject.getData().getEstimateArriveTimeStr());
                     }
                 }
@@ -167,6 +177,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                     orderQuery.setDeliveryId(order.getId());
                     ResObject<OrderQueryResultVo> resObject1 = client.queryOrderInfo(orderQuery);
                     if (resObject1.getCode().intValue() == 0) {
+                        dto.setShipperName(resObject1.getData().getRiderName());
+                        dto.setShipperPhone(resObject1.getData().getRiderPhone());
                         dto.setEstimateArriveTimeStr(resObject1.getData().getEstimateArriveTimeStr());
                     }
                 }
@@ -205,6 +217,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                             double[] receiverGps = CoordinateUtils.bd09_To_Gcj02(resObject.getData().getRiderLat().doubleValue(), resObject.getData().getRiderLng().doubleValue());
                             dto.setShipperLat(new BigDecimal(receiverGps[0] + ""));
                             dto.setShipperLng(new BigDecimal(receiverGps[1] + ""));
+                            dto.setShipperName(resObject.getData().getRiderName());
+                            dto.setShipperPhone(resObject.getData().getRiderPhone());
                         }
 //                        dto.setShipperLat(resObject.getData().getRiderLat());
 //                        dto.setShipperLng(resObject.getData().getRiderLng());
@@ -229,6 +243,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                             double[] receiverGps = CoordinateUtils.bd09_To_Gcj02(resObject.getData().getRiderLat().doubleValue(), resObject.getData().getRiderLng().doubleValue());
                             dto.setShipperLat(new BigDecimal(receiverGps[0] + ""));
                             dto.setShipperLng(new BigDecimal(receiverGps[1] + ""));
+                            dto.setShipperName(resObject.getData().getRiderName());
+                            dto.setShipperPhone(resObject.getData().getRiderPhone());
                             dto.setEstimateArriveTimeStr(resObject.getData().getEstimateArriveTimeStr());
                         }
 //                        dto.setShipperLat(resObject.getData().getRiderLat());
@@ -269,8 +285,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
                     if(resObject.getData().getLat()!=null){
                         dto.setShipperLat(new BigDecimal(resObject.getData().getLat() + ""));
                         dto.setShipperLng(new BigDecimal(resObject.getData().getLng()+ ""));
-//                        dto.setShipperName(resObject.getData().getName());
-//                        dto.setShipperPhone(resObject.getData().getPhone());
+                        dto.setShipperName(resObject.getData().getName());
+                        dto.setShipperPhone(resObject.getData().getPhone());
                     }
                     //订单距离
 //                    dto.setOrderDistance(new BigDecimal(resObject.getData().getDistance()));
@@ -304,6 +320,8 @@ public class ApiRiderLocationServiceImpl  implements ApiRiderLocationService {
 //                        dto.setShipperLat(resObject.getData().getRiderLat());
 //                        dto.setShipperLng(resObject.getData().getRiderLng());
                         dto.setEstimateArriveTimeStr(resObject.getData().getEstimateArriveTimeStr());
+                        dto.setShipperName(resObject.getData().getRiderName());
+                        dto.setShipperPhone(resObject.getData().getRiderPhone());
                     }
                     RiderLocationVo riderLocationVo = new RiderLocationVo();
                     riderLocationVo.setLbClient(DeliveryTypeEnums.FENG_NIAO_PT.getName());

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

@@ -834,7 +834,7 @@ public class ApiWaimaiServiceImpl implements ApiWaimaiService {
             UserExtraInfo userExtraInfo = orderVo.getUserExtraInfo();
             waimaiOrder.setCaution(orderVo.getDescription());
             if(userExtraInfo!=null&&StringUtils.isNotBlank(userExtraInfo.getGreeting())){
-                waimaiOrder.setCaution("[祝福语]："+userExtraInfo.getGreeting()+orderVo.getDescription());
+                waimaiOrder.setCaution("[祝福语]："+userExtraInfo.getGreeting()+" "+orderVo.getDescription());
             }
             waimaiOrder.setOrderTime(orderVo.getCreatedAt());
             waimaiOrder.setDaySeq(String.valueOf(orderVo.getDaySn()));

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

@@ -47,7 +47,7 @@ public class EleConvertPrint {
         UserExtraInfo userExtraInfo = ele.getUserExtraInfo();
         dto.setCaution(ele.getDescription());
         if(userExtraInfo!=null&& StringUtils.isNotBlank(userExtraInfo.getGreeting())){
-            dto.setCaution("[祝福语]："+userExtraInfo.getGreeting()+ele.getDescription());
+            dto.setCaution("[祝福语]："+userExtraInfo.getGreeting()+" "+ele.getDescription());
         }
         dto.setRecipientAddress(ele.getDeliveryPoiAddress());
         dto.setRecipientName(ele.getConsignee());

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

@@ -28,10 +28,7 @@ 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.enums.DeliveryStatusEnum;
-import com.ydd.module.enums.MemberCouponStatusEnum;
-import com.ydd.module.enums.OrderCancelTypeEnum;
-import com.ydd.module.enums.PayStatusEnum;
+import com.ydd.module.enums.*;
 import com.ydd.module.service.*;
 import com.ydd.third.common.utils.CoordinateUtils;
 import com.ydd.third.common.vo.ResObject;
@@ -88,6 +85,9 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
     private final IShopWaimaiService iShopWaimaiService;
     private final IDspWaimaiService iDspWaimaiService;
 
+    private final IMerchantService iMerchantService;
+    private final IMemberService iMemberService;
+
     @Override
     public ResponseResult pushOrder(OrderPushReq pushReq) {
         // 特殊必填处理
@@ -96,12 +96,21 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
             return result;
         }
 
+        Merchant merchant = iMerchantService.getOne(new QueryWrapper<Merchant>().eq("deleted", 0).eq("app_id", pushReq.getAppId()));
+        if (Objects.isNull(merchant)) {
+            return ResponseResult.error(ResponseResultCodeEnum.APP_ID_ERR);
+        }
+        Member member = iMemberService.getOne(new QueryWrapper<Member>().eq("deleted", 0)
+                .eq("merchant_id", merchant.getId()).eq("member_type", MemberTypeEnum.MERCHANT.getType()));
+
         Order order = iOrderService.getOne(new QueryWrapper<Order>().eq("deleted", 0).eq("out_trade_no", pushReq.getOutOrderSn()));
         if (order == null) {
             order = new Order();
         }
 
         // 添加订单其它属性
+        order.setMemberId(member.getId());
+        order.setMerchantId(merchant.getId());
         order.setOutTradeNo(pushReq.getOutOrderSn());
         order.setProductId(pushReq.getCategoryId().longValue());
         Product product = iProductService.getById(order.getProductId());
@@ -123,14 +132,30 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
         }
         order.setReceiptLng(pushReq.getReceiverLng());
         order.setReceiptLat(pushReq.getReceiverLat());
+        order.setReceiptCityCode(pushReq.getReceiverCityCode());
+        order.setDeliveryStatus(DeliveryStatusEnum.ORDERS_TO_BE_BILLED.getStatus());
         if (StringUtils.isNotBlank(pushReq.getShopCode())) {
             Shop shop = iShopService.getOne(new QueryWrapper<Shop>().eq("deleted", 0).eq("code", pushReq.getShopCode()));
             if (shop != null) {
-                order.setMerchantId(shop.getMerchantId());
                 order.setShopId(shop.getId());
                 order.setShopName(shop.getName());
+                order.setSendProvinceName(shop.getProvinceName());
+                order.setSendCityName(shop.getCityName());
+                order.setSendDistrictName(shop.getDistrictName());
+                order.setSendAddress(shop.getAddress());
+                order.setSendContactName(shop.getContactName());
+                order.setSendPhone(shop.getMobile());
+                order.setSendLng(shop.getLng());
+                order.setSendLat(shop.getLat());
+                order.setSendStreet(shop.getStreet());
+                order.setSendCityCode(shop.getCityCode());
+            }else {
+                return ResponseResult.error(ResponseResultCodeEnum.SHOP_NOT_EXIST);
             }
         } else {
+            order.setShopId(member.getShopId());
+            Shop shop = iShopService.getById(order.getShopId());
+            order.setShopName(shop.getName());
             order.setSendContactName(pushReq.getSendName());
             order.setSendPhone(pushReq.getSendPhone());
             order.setSendProvinceName(pushReq.getSendProvinceName());
@@ -144,6 +169,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
             }
             order.setSendLng(pushReq.getSendLng());
             order.setSendLat(pushReq.getSendLat());
+            order.setSendCityCode(pushReq.getSendCityCode());
         }
         order.setLbDaySeq(pushReq.getDaySeq());
         order.setOrderSn(SnCodeUtils.createSn());
@@ -185,6 +211,9 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
             if (StringUtils.isBlank(orderDto.getSendLat())) {
                 return ResponseResult.error(ResponseResultCodeEnum.FIELD_EMPTY, "发件人经度", null);
             }
+            if (StringUtils.isBlank(orderDto.getSendCityCode())) {
+                return ResponseResult.error(ResponseResultCodeEnum.FIELD_EMPTY, "发件人测试code", null);
+            }
         }
         return result;
     }

lb-core/src/main/java/com/ydd/ecloud/core/config/CorsConfig.java

@@ -9,8 +9,7 @@ public class CorsConfig implements WebMvcConfigurer {
 
 //    @Override
 //    public void addCorsMappings(CorsRegistry registry) {
-//        registry.addMapping("/**")
-//            .allowedOrigins("*")
+//        registry.addMapping("/**")//            .ok("*")
 //            .allowCredentials(true)
 //            .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
 //            .maxAge(3600);

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

@@ -16,7 +16,7 @@ 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")
 public interface DeliveryService {
 
     @PostMapping(value = "/queryOrderInfo")

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

@@ -13,7 +13,7 @@ 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" )
 public interface EleRetailApi {
 
     @PostMapping(value = "/eleRetail/syncRiderPosition")

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

@@ -12,7 +12,7 @@ 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" )
 public interface ElemeApi {
 
     @PostMapping(value = "/eleme/selfDeliveryLocationSync")

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

@@ -16,7 +16,7 @@ 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")
+@FeignClient(name = "lb-waimai" )
 public interface JdHomeApi {
 
     @PostMapping(value="/jd/selectJdHomeOrder")

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

@@ -12,7 +12,7 @@ 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" )
 public interface MeiTuanApi {
 
     @PostMapping(value = "/meituan/syncRiderPosition")

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

@@ -11,7 +11,7 @@ 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" )
 public interface MeiTuanSgApi {
 
 

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name = "lb-waimai",url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai" )
 public interface PrintApi {
 
     @PostMapping(value="/print/printOrder")

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @date 2021/11/10 11:59
  */
 
-@FeignClient(name = "lb-waimai", url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai")
 public interface WaimaiApi {
 
     /**

lb-framework/src/main/java/com/ydd/framework/config/ResourcesConfig.java

@@ -13,6 +13,9 @@ import com.ydd.common.config.ProjectConfig;
 import com.ydd.common.constant.Constants;
 import com.ydd.framework.interceptor.RepeatSubmitInterceptor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 通用配置
  * 
@@ -50,11 +53,20 @@ public class ResourcesConfig implements WebMvcConfigurer
     @Bean
     public CorsFilter corsFilter()
     {
+
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = new CorsConfiguration();
+        // 是否允许请求带有验证信息
         config.setAllowCredentials(true);
+
+        // 允许访问的客户端域名
+        // (springboot2.4以上的加入这一段可解决 allowedOrigins cannot contain the special value "*"问题)
+        List<String> allowedOriginPatterns = new ArrayList<>();
+        allowedOriginPatterns.add("*");
+        config.setAllowedOriginPatterns(allowedOriginPatterns);
+
         // 设置访问源地址
-        config.addAllowedOrigin("*");
+        // config.addAllowedOrigin("*");
         // 设置访问源请求头
         config.addAllowedHeader("*");
         // 设置访问源请求方法

lb-framework/src/main/java/com/ydd/framework/web/exception/GlobalExceptionHandler.java

@@ -2,6 +2,7 @@ package com.ydd.framework.web.exception;
 
 import com.ydd.common.constant.HttpStatus;
 import com.ydd.common.core.domain.Result;
+import com.ydd.common.enums.ResponseResultCodeEnum;
 import com.ydd.common.exception.BaseException;
 import com.ydd.common.exception.BusinessException;
 import com.ydd.common.exception.CustomException;
@@ -98,7 +99,7 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(BindException.class)
     public Result validatedBindException(BindException e) {
-        log.error(e.getMessage(), e);
+      //  log.error(e.getMessage(), e);
         String message = e.getAllErrors().get(0).getDefaultMessage();
         return Result.error(message);
     }
@@ -118,9 +119,9 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public Object validExceptionHandler(MethodArgumentNotValidException e) {
-        log.error(e.getMessage(), e);
+      //  log.error(e.getMessage(), e);
         String message = e.getBindingResult().getFieldError().getDefaultMessage();
-        return Result.error(message);
+        return Result.error(ResponseResultCodeEnum.FIELD_EMPTY.getCode(),message);
     }
 
     /**

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

@@ -194,7 +194,7 @@ public class ShopWaimaiServiceImpl extends ServiceImpl<ShopWaimaiMapper, ShopWai
          */
         if(CollectionUtils.isNotEmpty(list)){
             for(ShopWaimai shopWaimai :list){
-                if(shopWaimai.getUpdateTime().getTime()/1000-shopWaimai.getExpiresIn()<86400){
+                if((System.currentTimeMillis()-shopWaimai.getUpdateTime().getTime())/1000-86400>=shopWaimai.getExpiresIn()){
                     OAuthTokenParam tokenParam = MtSgAuthRequest.refreshOauthToken(waimaiConfig.getMeituansgAppid(), waimaiConfig.getMeituansgAppScert(), shopWaimai.getRefreshToken());
                     shopWaimai.setAuthToken(tokenParam.getAccess_token());
                     shopWaimai.setRefreshToken(tokenParam.getRefresh_token());

lb-third/lb-third-common/pom.xml

@@ -136,8 +136,17 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.netflix.ribbon</groupId>
+                    <artifactId>ribbon</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>

lb-third/lb-third-delivery/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
   port: 8083
   servlet:
     # 应用的访问路径
-    context-path: /delivery
+    context-path: /
   # undertow 配置
   undertow:
     # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的

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

@@ -51,6 +51,62 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>dev</profiles.active>
+                <logging.level>debug</logging.level>
+            </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profiles.active>prod</profiles.active>
+                <logging.level>info</logging.level>
+            </properties>
+        </profile>
+    </profiles>
 
 </project>

lb-third/lb-third-waimai/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
   port: 8085
   servlet:
     # 应用的访问路径
-    context-path: /waimai
+    context-path: /
   # undertow 配置
   undertow:
     # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的