代码合并冲突丢失补全与createTime字段类型统一成Long,聚合订单sdk升级

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -725,7 +725,7 @@ public class QueryOrdersResponse {
             @NoArgsConstructor
             @Data
             public static class OperationHistory {
-                private String createTime;
+                private Long createTime;
                 private String operationDesc;
                 private String operationMethod;
                 private String orderCode;

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.11-SNAPSHOT</version>
+            <version>2.2.12-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -34,7 +34,7 @@ public class OrderRiderResponseVo {
     private List<Operation> operationList;
     @Data
     public static class Operation{
-        private String createTime;
+        private Long createTime;
         private String operationDesc;
         private String operationMethod;
         private String operator;

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -132,5 +132,15 @@ public interface Orderservice {
 
     BaseResponse mcCafePollingPickUpCode(MaCafeQueryOrderVo vo );
 
+    /**
+     * 通过订单号查询订单详情
+     *
+     * @param sessionId 用户会话ID
+     * @param oid       订单ID
+     * @return
+     */
+    BaseResponse queryCollageOrderById(Integer operation,String sessionId, String oid, String partnerId,String channel);
+
+
     BaseResponse<OrderRiderResponseVo> queryOrderRider(OrderRiderRequestVo requestVo);
 }

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

@@ -3429,4 +3429,40 @@ public class OrderServiceImpl implements Orderservice {
     //    // TODO: 2019/9/10 hubowen mq推送变更
     //    backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
     //}
+
+
+    @Override
+    public BaseResponse queryCollageOrderById(Integer operation, String sessionId, String oid, String partnerId, String channel) {
+
+        BaseResponse orderInfoRes = this.queryOrderById(operation,sessionId, oid,partnerId,channel);
+
+        if(null == orderInfoRes.getResult() || !String.valueOf(RESPONSE_SUCCESS_CODE).equals(orderInfoRes.getCode())){
+            return orderInfoRes;
+        }
+
+        // 根据用户聚合商品信息
+        QueryCollageOrderResponseVo queryCollageOrderResponseVo = new QueryCollageOrderResponseVo();
+        QueryOrderResponseVo queryOrderResponseVo  = (QueryOrderResponseVo)orderInfoRes.getResult();
+        List<ProductVo> productVo = queryOrderResponseVo.getProducts();
+        // 根据用户id分类商品
+        Map<String,List<ProductVo>> orderItemMap = productVo.stream().collect(Collectors.groupingBy(ProductVo::getUserId));
+        List<UserProductVo> userProducts = new ArrayList<>();
+        for(Map.Entry<String,List<ProductVo>> m : orderItemMap.entrySet()){
+            List<ProductVo> products = m.getValue();
+
+            UserProductVo userProductVo = new UserProductVo();
+            userProductVo.setUserId(products.get(0).getUserId());
+            userProductVo.setOpenId(products.get(0).getOpenId());
+            userProductVo.setNickName(products.get(0).getNickName());
+            userProductVo.setPhotoUrl(products.get(0).getPhotoUrl());
+            userProductVo.setProducts(products);
+            userProducts.add(userProductVo);
+        }
+
+        queryCollageOrderResponseVo = JSONObject.parseObject(JSONObject.toJSONString(queryOrderResponseVo),QueryCollageOrderResponseVo.class);
+        queryCollageOrderResponseVo.setUserProducts(userProducts);
+
+        return ResponseUtil.success(queryCollageOrderResponseVo);
+    }
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderOperationHistoryResp.java

@@ -17,7 +17,7 @@ import lombok.Data;
 @Data
 public class OrderOperationHistoryResp {
 
-    private String createTime;
+    private Long createTime;
     //操作描述
     private String operationDesc;
     //操作方法