拼单订单详情查询修改返回值的判断

order-application-service/src/main/java/cn/freemud/entities/vo/QueryCollageOrderResponseVo.java

@@ -378,7 +378,6 @@ public class QueryCollageOrderResponseVo {
     }
 
     @Data
-    @Builder
     public static class TakeMealFlow {
 
         /**

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1069,7 +1069,7 @@ public class OrderServiceImpl implements Orderservice {
 
         BaseResponse orderInfoRes = this.queryOrderById(operation,sessionId, oid,partnerId,channel);
 
-        if (!RESPONSE_SUCCESS_CODE.equals(orderInfoRes.getCode()) || orderInfoRes.getResult() == null) {
+        if(null == orderInfoRes.getResult() || !String.valueOf(RESPONSE_SUCCESS_CODE).equals(orderInfoRes.getCode())){
             return orderInfoRes;
         }
 
@@ -1091,7 +1091,7 @@ public class OrderServiceImpl implements Orderservice {
             userProducts.add(userProductVo);
         }
 
-        JSONObject.parseObject(JSONObject.toJSONString(queryOrderResponseVo),QueryCollageOrderResponseVo.class);
+        queryCollageOrderResponseVo = JSONObject.parseObject(JSONObject.toJSONString(queryOrderResponseVo),QueryCollageOrderResponseVo.class);
         queryCollageOrderResponseVo.setUserProducts(userProducts);
 
         return ResponseUtil.success(queryCollageOrderResponseVo);