Merge branch 'feature/订单储值' into 'master'

Feature/订单储值

See merge request !1384

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

@@ -254,6 +254,10 @@ public class GicOrderController {
             if(!(orderDetailVO.getOrderStep().equals("2") || orderDetailVO.getOrderStep().equals("4"))) {
                 return RestResponse.failure("9999", "核销订单不存在");
             }
+            Date pickOverTime = detail.getOrderInfo().getPickUpOverTime() ;
+            if(null != pickOverTime && pickOverTime.before(new Date())) {
+                return RestResponse.failure("9999", "此订单自提时间已截止");
+            }
             return RestResponse.successResult(orderDetailVO);
         } else {
             return RestResponse.failure("9999", ret.getMessage());

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

@@ -151,12 +151,47 @@ public class OrderRefundDetailVO implements Serializable {
     private Integer usePoint ;
     private Integer goodsType;
     private String goodsReferId ;
+    /**
+     * 运费金额
+     */
+    private double refundFreightPrice;
 
     /**
      * 订单卡券状态（新增）
      */
     private OrderCouponDetailDTO orderCouponDetail;
+    /**
+     * 退的储值类型 800 储值卡  900 礼品卡
+     */
+    private String refundStoredType;
+    /**
+     * 退的储值金额
+     */
+    private Double refundStoredValue;
+
+    public double getRefundFreightPrice() {
+        return refundFreightPrice;
+    }
 
+    public void setRefundFreightPrice(double refundFreightPrice) {
+        this.refundFreightPrice = refundFreightPrice;
+    }
+
+    public String getRefundStoredType() {
+        return refundStoredType;
+    }
+
+    public Double getRefundStoredValue() {
+        return refundStoredValue;
+    }
+
+    public void setRefundStoredType(String refundStoredType) {
+        this.refundStoredType = refundStoredType;
+    }
+
+    public void setRefundStoredValue(Double refundStoredValue) {
+        this.refundStoredValue = refundStoredValue;
+    }
 
     public Integer getUsePoint() {
         return usePoint;