订单

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -17,6 +17,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.business.order.dto.ordermanage.ListOrderDTO;
 import com.gic.business.order.dto.ordermanage.ListOrderItemDTO;
 import com.gic.business.order.dto.ordermanage.OrderDetailDTO;
+import com.gic.business.order.dto.ordermanage.OrderInfoDTO;
 import com.gic.business.order.enums.OrderEnum;
 import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
 import com.gic.business.order.qdto.ordermanage.OrderItemShipmentQDTO;
@@ -27,6 +28,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.manage.web.controller.marketing.MemberMarketingController;
+import com.gic.haoban.manage.web.vo.order.MemberInfoVO;
 import com.gic.haoban.manage.web.vo.order.OrderCountVO;
 import com.gic.haoban.manage.web.vo.order.OrderDetailItemVO;
 import com.gic.haoban.manage.web.vo.order.OrderDetailVO;
@@ -94,11 +96,20 @@ public class GicOrderController {
             return RestResponse.failure(ret.getCode(), ret.getMessage());
         }
         logger.info("订单信息={}", JSON.toJSONString(ret, true));
+        OrderInfoDTO orderInfo = ret.getResult().getOrderInfo();
         OrderDetailVO orderDetailVO = EntityUtil.changeEntityByJSON(OrderDetailVO.class,
                 ret.getResult().getOrderInfo());
         List<OrderDetailItemVO> orderItemList = EntityUtil.changeEntityListNew(OrderDetailItemVO.class,
                 ret.getResult().getOrderItemList());
         orderDetailVO.setOrderItemList(orderItemList);
+        MemberInfoVO member = new MemberInfoVO();
+        member.setMemberId("");
+        member.setMemberImage("");
+        member.setAddressPhone(orderInfo.getBuyerPhone());
+        member.setAddressName(orderInfo.getBuyerName());
+        member.setAddressDetail(orderInfo.getAddressInfo());
+        orderDetailVO.setMember(member);
+        
         return RestResponse.successResult(orderDetailVO);
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/MemberInfoVO.java

@@ -8,7 +8,8 @@ public class MemberInfoVO implements Serializable {
     * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
     */
     private static final long serialVersionUID = -2814959714712832104L;
-
+    
+    private String memberId ;
     // 会员信息
     private String memberName;
     private String memberImage;
@@ -21,6 +22,14 @@ public class MemberInfoVO implements Serializable {
     private String addressName;
     private String addressPhone;
     private String addressDetail;
+    
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
 
     public String getAddressName() {
         return addressName;

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderDetailVO.java

@@ -38,21 +38,6 @@ public class OrderDetailVO implements Serializable {
     private Integer orderType;
 
     /**
-     * 会员ID
-     */
-    private String memberId;
-
-    /**
-     * 会员姓名
-     */
-    private String memberRealName;
-
-    /**
-     * 会员卡号
-     */
-    private String memberCardNum;
-
-    /**
      * 发货渠道类型(0自提，1快递)
      */
     private String deliveryChannel;
@@ -83,9 +68,14 @@ public class OrderDetailVO implements Serializable {
     private MemberInfoVO member;
 
     /**
-     * 订单支付信息
+     * 订单运费
      */
-    private OrderPayInfoVO orderPayInfo;
+    private double freightAmount;
+
+    /**
+     * 订单优惠总金额
+     */
+    private double allDiscountAmount;
 
     public Date getPayTime() {
         return payTime;
@@ -95,10 +85,6 @@ public class OrderDetailVO implements Serializable {
         return buyerRemark;
     }
 
-    public OrderPayInfoVO getOrderPayInfo() {
-        return orderPayInfo;
-    }
-
     public void setPayTime(Date payTime) {
         this.payTime = payTime;
     }
@@ -107,10 +93,6 @@ public class OrderDetailVO implements Serializable {
         this.buyerRemark = buyerRemark;
     }
 
-    public void setOrderPayInfo(OrderPayInfoVO orderPayInfo) {
-        this.orderPayInfo = orderPayInfo;
-    }
-
     public MemberInfoVO getMember() {
         return member;
     }
@@ -151,30 +133,6 @@ public class OrderDetailVO implements Serializable {
         this.orderType = orderType;
     }
 
-    public String getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(String memberId) {
-        this.memberId = memberId;
-    }
-
-    public String getMemberRealName() {
-        return memberRealName;
-    }
-
-    public void setMemberRealName(String memberRealName) {
-        this.memberRealName = memberRealName;
-    }
-
-    public String getMemberCardNum() {
-        return memberCardNum;
-    }
-
-    public void setMemberCardNum(String memberCardNum) {
-        this.memberCardNum = memberCardNum;
-    }
-
     public String getDeliveryChannel() {
         return deliveryChannel;
     }
@@ -214,4 +172,20 @@ public class OrderDetailVO implements Serializable {
     public void setOrderItemList(List<OrderDetailItemVO> orderItemList) {
         this.orderItemList = orderItemList;
     }
+
+    public double getFreightAmount() {
+        return freightAmount;
+    }
+
+    public double getAllDiscountAmount() {
+        return allDiscountAmount;
+    }
+
+    public void setFreightAmount(double freightAmount) {
+        this.freightAmount = freightAmount;
+    }
+
+    public void setAllDiscountAmount(double allDiscountAmount) {
+        this.allDiscountAmount = allDiscountAmount;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderPayInfoVO.java

-package com.gic.haoban.manage.web.vo.order;
-
-import java.io.Serializable;
-
-public class OrderPayInfoVO implements Serializable{
-
-    /**
-    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
-    */
-    private static final long serialVersionUID = -4486463485561923799L;
-
-    /**
-     * 订单实付金额
-     */
-    private double payAmount;
-
-    /**
-     * 订单运费
-     */
-    private double freightAmount;
-
-    /**
-     * 订单优惠总金额
-     */
-    private double allDiscountAmount;
-
-    public double getPayAmount() {
-        return payAmount;
-    }
-
-    public double getFreightAmount() {
-        return freightAmount;
-    }
-
-    public double getAllDiscountAmount() {
-        return allDiscountAmount;
-    }
-
-    public void setPayAmount(double payAmount) {
-        this.payAmount = payAmount;
-    }
-
-    public void setFreightAmount(double freightAmount) {
-        this.freightAmount = freightAmount;
-    }
-
-    public void setAllDiscountAmount(double allDiscountAmount) {
-        this.allDiscountAmount = allDiscountAmount;
-    }
-}