Browse Source

代码优化

叶君翔 3 years atrás
parent
commit
5bb6f87d2b

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

@@ -26,7 +26,7 @@ import javax.validation.Valid;
  */
 @Api(value = "开放接口-订单模块", tags = {"开放接口-订单模块"})
 @RestController
-@RequestMapping("/order")
+@RequestMapping("/api/order")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class OrderOpenApi {
 

+ 0 - 1
lb-app/src/main/java/com/ydd/app/dto/OrderCreateReq.java

@@ -21,7 +21,6 @@ public class OrderCreateReq extends BaseDto implements Serializable {
      * 接入方订单编号
      */
     @NotBlank(message = "接入方订单编号不能为空")
-    @Size(max = 32, message = "接入方订单编号最长不能超过32个字符")
     private String outOrderSn;
 
     /**

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

@@ -19,7 +19,7 @@ import java.util.Map;
 public interface DeliveryCallbackApi {
 
     @PostMapping(value = "/callBack/doOrder")
-    <T> T doOrder(@RequestBody CallBackOrderVo CallBackOrderVo);
+    Object doOrder(@RequestBody CallBackOrderVo CallBackOrderVo);
 
     @PostMapping(value = "/callback/fengniaoToken")
     ResObject<FengniaoV3Token> doToken(@RequestParam("code") String code, @RequestParam("merchantId") String merchantId);

+ 1 - 1
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")
+@FeignClient(name = "lb-delivery", url = "http://127.0.0.1:8083/delivery")
 public interface DeliveryService {
 
     @PostMapping(value = "/queryOrderInfo")

+ 0 - 15
lb-feginclient/src/main/java/com/ydd/config/CustomizedConfiguration.java

@@ -1,15 +0,0 @@
-package com.ydd.config;
-
-import feign.codec.Decoder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class CustomizedConfiguration {
-
-    @Bean
-    public Decoder feignDecoder() {
-        return new GenericsFeignResultDecoder();
-    }
-
-}

+ 0 - 35
lb-feginclient/src/main/java/com/ydd/config/GenericsFeignResultDecoder.java

@@ -1,35 +0,0 @@
-package com.ydd.config;
-
-import com.alibaba.fastjson.JSON;
-import feign.FeignException;
-import feign.Response;
-import feign.Util;
-import feign.codec.DecodeException;
-import feign.codec.Decoder;
-import lombok.extern.slf4j.Slf4j;
-import sun.reflect.generics.reflectiveObjects.TypeVariableImpl;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-
-/**
- * @author 叶君翔
- * @date 2022/04/19 15:44
- */
-@Slf4j
-public class GenericsFeignResultDecoder implements Decoder {
-
-    @Override
-    public Object decode(Response response, Type type) throws IOException, DecodeException, FeignException {
-        if (response.body() == null) {
-            throw new DecodeException(response.status(), "no data response", response.request());
-        }
-        Class returnType = ((Method)((TypeVariableImpl)type).getGenericDeclaration()).getReturnType();
-        String bodyStr = Util.toString(response.body().asReader(Util.UTF_8));
-        log.info("bodyStr==================={}", bodyStr);
-        //对结果进行转换
-        return JSON.parseObject(bodyStr,returnType);
-    }
-
-}

+ 5 - 1
lb-third/lb-third-common/src/main/java/com/ydd/third/common/vo/vo/order/OrderResultVo.java

@@ -2,10 +2,14 @@ package com.ydd.third.common.vo.vo.order;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 @Data
-public class OrderResultVo {
+public class OrderResultVo implements Serializable {
+
+    private static final long serialVersionUID = 898640368816765804L;
+
     /**
      * 达达:配送距离(单位:米)
      * 闪送:totalDistance(单位:米)