积分商城

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

@@ -472,6 +472,7 @@ public class GicOrderController {
     private OrderDetailVO getOrderDetail(String enterpriseId, OrderInfoDTO orderInfo,
             List<ListOrderItemDTO> orderItemDTOList, String storeId) {
         OrderDetailVO orderDetailVO = EntityUtil.changeEntityByJSON(OrderDetailVO.class, orderInfo);
+        orderDetailVO.setUsePoint(orderInfo.getUsePoints());
         orderDetailVO.setBuyerRemark(orderInfo.getRemarks());
         List<OrderDetailItemVO> orderItemList = EntityUtil.changeEntityListNew(OrderDetailItemVO.class,
                 orderItemDTOList);
@@ -535,6 +536,7 @@ public class GicOrderController {
                     List<OrderListItemVO> voItemList = EntityUtil.changeEntityListNew(OrderListItemVO.class, itemList);
                     vo.setOrderItemList(voItemList);
                     vo.setPickUpTime(order.getWriteOffTime());
+                    vo.setUsePoint(order.getUsePoints());
                     // 核销导购
                     String verificationClerkName = order.getWriteOffClerkName();
                     vo.setVerificationClerkName(verificationClerkName);

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

 package com.gic.haoban.manage.web.vo.order.refund;
 
+import com.gic.business.order.dto.ordermanage.OrderCouponDetailDTO;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -145,7 +147,49 @@ public class OrderRefundDetailVO implements Serializable {
     private Integer deliveryChannel ;
     // 申请积分
     private Integer applyRefundPoints ;
-    
+
+    private Integer usePoints ;
+    private Integer goodsType;
+    private String goodsReferId ;
+
+    /**
+     * 订单卡券状态（新增）
+     */
+    private OrderCouponDetailDTO orderCouponDetail;
+
+
+    public Integer getUsePoints() {
+        return usePoints;
+    }
+
+    public void setUsePoints(Integer usePoints) {
+        this.usePoints = usePoints;
+    }
+
+    public Integer getGoodsType() {
+        return goodsType;
+    }
+
+    public void setGoodsType(Integer goodsType) {
+        this.goodsType = goodsType;
+    }
+
+    public String getGoodsReferId() {
+        return goodsReferId;
+    }
+
+    public void setGoodsReferId(String goodsReferId) {
+        this.goodsReferId = goodsReferId;
+    }
+
+    public OrderCouponDetailDTO getOrderCouponDetail() {
+        return orderCouponDetail;
+    }
+
+    public void setOrderCouponDetail(OrderCouponDetailDTO orderCouponDetail) {
+        this.orderCouponDetail = orderCouponDetail;
+    }
+
     public String getBelongClerkId() {
         return belongClerkId;
     }