sdk 热数据

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

@@ -1137,6 +1137,7 @@ public class OrderSdkAdapter {
                     data.setReceiveProvince(orderInfoReqs.getDeliveryContactInfoList().get(0).getProvince());
                     data.setReceiveCity(orderInfoReqs.getDeliveryContactInfoList().get(0).getCity());
                     data.setReceiveRegion(orderInfoReqs.getDeliveryContactInfoList().get(0).getRegion());
+                    data.setContactsName(orderInfoReqs.getDeliveryContactInfoList().get(0).getContactsName());
                     data.setAddress(orderInfoReqs.getDeliveryContactInfoList().get(0).getAddressDetail());
                     data.setPhone(orderInfoReqs.getDeliveryContactInfoList().get(0).getMobile());
                     addInfo.setExtInfo(deliveryContactInfoResp.getExtInfo());

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

@@ -103,6 +103,11 @@ public class QueryOrdersResponse {
              */
             private String address;
             /**
+             * 收货地址
+             */
+            private String contactsName;
+
+            /**
              * 门店电话
              */
             private String shopPhone;

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

@@ -694,6 +694,7 @@ public class OrderAdapter {
         createOrderDto.setShopNameEn(createOrderVo.getStoreNameEn());
         createOrderDto.setUserId(createOrderVo.getUserId());
         createOrderDto.setUserName(createOrderVo.getUserName());
+        createOrderDto.setContactsName(createOrderVo.getContactsName());
         createOrderDto.setPhone(createOrderVo.getMobile());
         createOrderDto.setAddress(receiveAddress);
         createOrderDto.setLatitude(latitude);
@@ -1153,7 +1154,12 @@ public class OrderAdapter {
             responseVo.setShopAddress(ordersBean.getShopAddress());
             responseVo.setShopPhone(ordersBean.getShopPhone());
             responseVo.setReceiveAddress(ordersBean.getAddress());
-            responseVo.setReceiveUsername(ordersBean.getUserName());
+            if(OrderClientType.SAASMALL.getIndex().toString() == ordersBean.getOrderClient()){
+                responseVo.setReceiveUsername(ordersBean.getContactsName());
+            }else{
+                responseVo.setReceiveUsername(ordersBean.getUserName());
+            }
+
             responseVo.setReceiveProvince(ordersBean.getReceiveProvince());
             responseVo.setReceiveCity(ordersBean.getReceiveCity());
             responseVo.setReceiveRegion(ordersBean.getReceiveRegion());
@@ -4401,7 +4407,7 @@ public class OrderAdapter {
         //校验有没有售后单,一笔订单只会存在一笔售后单,售后单展示为取消展示申请退款按钮
         AfterSalesOrderResp afterSalesOrderResp = orderBean.getAfterSalesOrderResp();
         List<Integer> orderStatusList = Arrays.asList(OrderStatus.WAIT_PAY.getCode(),OrderStatus.RECEIPT.getCode(),OrderStatus.DISTRIBUTION.getCode(),OrderStatus.COMPLETE.getCode());
-        List<Integer> afterSaleStatusList = Arrays.asList(AfterSalesStatus.PENDING.getIndex(),AfterSalesStatus.COMPLETE.getIndex(),AfterSalesStatus.REJECTED.getIndex());
+        List<Integer> afterSaleStatusList = Arrays.asList(AfterSalesStatus.PENDING.getIndex(),AfterSalesStatus.RETURNING.getIndex(),AfterSalesStatus.COMPLETE.getIndex(),AfterSalesStatus.REJECTED.getIndex());
         //已发货
         if(null !=  orderBean.getGmtDelivery()){
             if(orderStatusList.contains(orderBean.getStatus()) && (null == afterSalesOrderResp || (null !=afterSalesOrderResp &&  AfterSalesStatus.CANCEL.getIndex() == afterSalesOrderResp.getAfterSalesStatus()))){