积分商城

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

@@ -57,4 +57,10 @@ public class ScoreRecordVo {
      */
     private String expressChannelCode;
 
+    private String userName;
+
+    private String mobile;
+
+    private String addressDetail;
+
 }

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

@@ -38,6 +38,7 @@ import com.freemud.application.sdk.api.ordercenter.request.create.DeliveryContac
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderItemCreateReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderSettlementCreateReq;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.DeliveryContactInfoResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
@@ -280,7 +281,8 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             if (order.getCreateTime() != null) {
                 responseVo.setCreateTime(Long.parseLong(order.getCreateTime()));
             }
-            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(order.getOrderItemList())) {
+            boolean entityProduct = false;
+            if (CollectionUtils.isNotEmpty(order.getOrderItemList())) {
                 OrderItemResp orderItemResp = order.getOrderItemList().get(0);
                 responseVo.setProductName(orderItemResp.getProductName());
                 responseVo.setProductQuantity(orderItemResp.getProductQuantity());
@@ -288,6 +290,15 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
                 responseVo.setIntegralPrice(orderItemResp.getProductPrice().intValue());
                 responseVo.setCashPrice(orderItemResp.getSalePrice().intValue());
                 responseVo.setProductPicUrl(orderItemResp.getProductPicUrl());
+                if(orderItemResp.getProductType() == 2){
+                    entityProduct = true;
+                }
+            }
+            if (entityProduct && CollectionUtils.isNotEmpty(order.getDeliveryContactInfoList())) {
+                DeliveryContactInfoResp deliveryContactInfoResp = order.getDeliveryContactInfoList().get(0);
+                responseVo.setUserName(deliveryContactInfoResp.getContactsName());
+                responseVo.setMobile(deliveryContactInfoResp.getMobile());
+                responseVo.setAddressDetail(deliveryContactInfoResp.getAddressDetail());
             }
             result.add(responseVo);
         });