C端查询订单详情 新增字段用于展示 userPhone/sendWord

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1340,9 +1340,25 @@ public class OrderSdkAdapter {
         // 买一赠一寄件信息
         data.setOrderSendCouponRespList(orderInfoReqs.getOrderSendCouponRespList());
 
+        // 设置 额外拓展字段信息
+        OrderExtended orderExtended =  this.getOrderExtendedObj(orderInfoReqs.getOrderExtended());
+        data.setOrderExtended(orderExtended);
         return data;
     }
 
+    private OrderExtended getOrderExtendedObj(OrderExtendedReq orderExtended){
+        if (Objects.isNull(orderExtended)) {
+            return null;
+        }
+        return OrderExtended.builder().orderClientGroup(orderExtended.getOrderClientGroup())
+                .orderClientGroupCode(orderExtended.getOrderClientGroupCode())
+                .storeNameEn(orderExtended.getStoreNameEn())
+                .spellGroupCode(orderExtended.getSpellGroupCode())
+                .userPhone(orderExtended.getUserPhone())
+                .sendWord(orderExtended.getSendWord())
+                .build();
+    }
+
     /**
      * 混合支付转换
      *
@@ -1382,6 +1398,7 @@ public class OrderSdkAdapter {
         dataBean.setCount(queryOrderForUserResp.getTotal());
         List<QueryOrdersResponse.DataBean.OrderBean> orders = new ArrayList<>();
         for (OrderInfoReqs orderInfoReqs : queryOrderForUserResp.getItemList()) {
+            // fisherman 需要开放 private OrderExtendedReq orderExtended 用于订单页面数据展示
             QueryOrdersResponse.DataBean.OrderBean data = convent2NEWOrderInfo(orderInfoReqs);
             orders.add(data);
         }

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

+package com.freemud.sdk.api.assortment.order.response.order;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/8/2 下午2:26
+ * @description : OrderBean 反馈 拓展字段信息
+ *
+ */
+@Data
+@Builder
+public class OrderExtended {
+    /**
+     * 渠道分组
+     */
+    private String orderClientGroup;
+
+    /**
+     * 渠道分组编号
+     */
+    private String orderClientGroupCode;
+
+    /**
+     * 订单门店英文名称
+     */
+    private String storeNameEn;
+
+    /**
+     * 团号
+     */
+    private String spellGroupCode;
+
+    /**
+     * 预定单的 您的电话
+     */
+    private String userPhone;
+    /**
+     *  预定单 蛋糕寄语(额外祝福语)
+     */
+    private String sendWord;
+}

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

@@ -14,8 +14,6 @@ package com.freemud.sdk.api.assortment.order.response.order;
 
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
-import io.swagger.annotations.ApiModelProperty;
-import com.rabbitmq.tools.json.JSONUtil;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -446,6 +444,8 @@ public class QueryOrdersResponse {
              */
             private String spellGroupActivityCode;
 
+            private OrderExtended orderExtended;
+
             @NoArgsConstructor
             @Data
             public static class AddDeliveryInfo {

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -75,6 +75,7 @@ import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
 import com.freemud.sdk.api.assortment.order.request.payment.PayPlatformVO;
 import com.freemud.sdk.api.assortment.order.request.payment.ProductVO;
 import com.freemud.sdk.api.assortment.order.response.order.CreateOrderFlowResponse;
+import com.freemud.sdk.api.assortment.order.response.order.OrderExtended;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
@@ -1527,9 +1528,15 @@ public class OrderAdapter {
             responseVo.setExpressNo(ordersBean.getExpressNo());
             responseVo.setAutoReviceTime(null == orderExtInfoDto ? null : orderExtInfoDto.getAutoReceiveTime());
             responseVo.setAfterSalesOrderResp(ordersBean.getAfterSalesOrderResp());
+
+            // bizType = 7 预定单的 额外信息返回
+            OrderExtended orderExtended = ordersBean.getOrderExtended();
+            if (Objects.nonNull(orderExtended)) {
+                responseVo.setUserPhone(orderExtended.getUserPhone());
+                responseVo.setSendWord(orderExtended.getSendWord());
+            }
             list.add(responseVo);
         });
-        AppLogUtil.infoLog("fisherman orderBean:", JSON.toJSONString(ordersBeans), JSON.toJSONString(list));
         return list;
     }
 

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

@@ -625,6 +625,15 @@ public class QueryOrderResponseVo {
 
     private AfterSalesOrderResp afterSalesOrderResp;
 
+    /**
+     * 预定单的 您的电话
+     */
+    private String userPhone;
+    /**
+     *  预定单 蛋糕寄语(额外祝福语)
+     */
+    private String sendWord;
+
 
     /**
      * 用户申请退款原因 1=退款退货 2=只退款不退货