🎨 #2194 【小程序】交易组件生成订单接口请求增加缺失参数

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopAddOrderResult.java

@@ -7,10 +7,11 @@ import lombok.Data;
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopAddOrderResult implements Serializable {
+  private static final long serialVersionUID = -6574489801942310752L;
+
   /**
    * 交易组件平台订单ID
    */

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopAddSpuResult.java

@@ -1,19 +1,20 @@
 package cn.binarywang.wx.miniapp.bean.shop;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
-import lombok.Data;
 
 /**
  * @author leiin
  * @date 2021/3/23
- * @description: 添加商品参数返回
+ * 添加商品参数返回
  */
 @Data
 public class WxMaShopAddSpuResult implements Serializable {
-
   private static final long serialVersionUID = 2520459849240776617L;
+
   /**
    * 交易组件平台内部商品ID
    * <pre>

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopAddressInfo.java

@@ -7,10 +7,11 @@ import lombok.Data;
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopAddressInfo implements Serializable {
+  private static final long serialVersionUID = 1180506593111279857L;
+
   /**
    * 收件人姓名
    * <pre>

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopDeliveryDetail.java

@@ -8,11 +8,9 @@ import lombok.Data;
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopDeliveryDetail implements Serializable {
-
   private static final long serialVersionUID = 9074573142867543744L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopDeliveryItem.java

@@ -7,11 +7,9 @@ import lombok.Data;
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopDeliveryItem implements Serializable {
-
   private static final long serialVersionUID = -161617470937369136L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopGetSpuResult.java

@@ -1,17 +1,18 @@
 package cn.binarywang.wx.miniapp.bean.shop;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class WxMaShopGetSpuResult extends WxMaShopSpuInfo implements Serializable {
-
   private static final long serialVersionUID = -3859372286926181933L;
   /**
    * 商品审核信息

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopOrderDetail.java

@@ -1,17 +1,18 @@
 package cn.binarywang.wx.miniapp.bean.shop;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
-import lombok.Data;
 
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopOrderDetail implements Serializable {
+  private static final long serialVersionUID = 3325843289672341160L;
 
   /**
    * 下单商品信息

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopOrderInfo.java

@@ -4,9 +4,12 @@ import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import lombok.Data;
 
+/**
+ * @author Boris
+ * @date 2021/3/23
+ */
 @Data
 public class WxMaShopOrderInfo implements Serializable {
-
   private static final long serialVersionUID = -159624260640727372L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopOrderResult.java

@@ -7,11 +7,9 @@ import lombok.Data;
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopOrderResult implements Serializable {
-
   private static final long serialVersionUID = -2665426592693969921L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopPayInfo.java

@@ -7,11 +7,9 @@ import lombok.Data;
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopPayInfo implements Serializable {
-
   private static final long serialVersionUID = 687488209024968647L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopPriceInfo.java

@@ -1,18 +1,18 @@
 package cn.binarywang.wx.miniapp.bean.shop;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopPriceInfo implements Serializable {
-
   private static final long serialVersionUID = 1588840927992523263L;
+
   /**
    * 该订单最终的金额（单位：分）
    * <pre>

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopProductInfo.java

@@ -3,13 +3,16 @@ package cn.binarywang.wx.miniapp.bean.shop;
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
-public class WxMaShopProductInfo {
+public class WxMaShopProductInfo implements Serializable {
+  private static final long serialVersionUID = 8979181840150112093L;
+
   /**
    * 商家自定义商品ID
    * <pre>
@@ -79,5 +82,11 @@ public class WxMaShopProductInfo {
    */
   @SerializedName("sku_id")
   private Integer skuId;
+
+  /**
+   * 扣除优惠后单件sku的分摊价格（单位：分），如果没优惠则与sale_price一致
+   */
+  @SerializedName("real_price")
+  private Integer realPrice;
 }
 

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopSkuAttribute.java

@@ -8,9 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * <pre>
  * sku对象
- * </pre>
  *
  * @author <a href="https://github.com/borisbao">boris</a>
  * @since 2021-03-22
@@ -20,11 +18,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class WxMaShopSkuAttribute implements Serializable {
-
-
   private static final long serialVersionUID = -3617077838017818865L;
 
-
   /**
    * 销售属性key（自定义）
    * <pre>

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopSkuInfo.java

@@ -9,9 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * <pre>
  * sku对象
- * </pre>
  *
  * @author <a href="https://github.com/borisbao">boris</a>
  * @since 2021-03-22
@@ -21,8 +19,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class WxMaShopSkuInfo implements Serializable {
-
-
   private static final long serialVersionUID = -3617077838017818865L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopSkuResult.java

@@ -1,18 +1,18 @@
 package cn.binarywang.wx.miniapp.bean.shop;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopSkuResult implements Serializable {
-
   private static final long serialVersionUID = 7127892618805299305L;
+
   /**
    * 交易组件平台自定义skuID
    * <pre>

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopSkuWithoutAuditInfo.java

@@ -7,11 +7,9 @@ import lombok.Data;
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopSkuWithoutAuditInfo implements Serializable {
-
   private static final long serialVersionUID = 3354108922805323888L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopSpuAudit.java

@@ -1,18 +1,18 @@
 package cn.binarywang.wx.miniapp.bean.shop;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopSpuAudit implements Serializable {
-
   private static final long serialVersionUID = -3793445161382782265L;
+
   /**
    * 上一次审核时间, yyyy-MM-dd HH:mm:ss
    * <pre>

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopSpuDescInfo.java

@@ -1,6 +1,8 @@
 package cn.binarywang.wx.miniapp.bean.shop;
 
 import com.google.gson.annotations.SerializedName;
+
+import java.io.Serializable;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -8,9 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * <pre>
  * 交易组件-spu商品详情图文
- * </pre>
  * @author <a href="https://github.com/borisbao">boris</a>
  * @since 2021-03-22
  */
@@ -18,7 +18,8 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class WxMaShopSpuDescInfo {
+public class WxMaShopSpuDescInfo implements Serializable {
+  private static final long serialVersionUID = 9116393835880797275L;
 
   /**
    * 商品详情图文-描述

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopSpuInfo.java

@@ -5,9 +5,12 @@ import java.io.Serializable;
 import java.util.List;
 import lombok.Data;
 
+/**
+ * @author Boris
+ * @date 2021/3/23
+ */
 @Data
 public class WxMaShopSpuInfo implements Serializable {
-
   private static final long serialVersionUID = 7237829277693177420L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopSpuWithoutAuditInfo.java

@@ -1,16 +1,18 @@
 package cn.binarywang.wx.miniapp.bean.shop;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.List;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
-public class WxMaShopSpuWithoutAuditInfo {
+public class WxMaShopSpuWithoutAuditInfo implements Serializable {
+  private static final long serialVersionUID = 3878053072551733781L;
 
   /**
    * 交易组件平台内部商品ID，修改时与out_product_id二选一

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopOrderPayRequest.java

@@ -7,11 +7,9 @@ import lombok.Data;
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopOrderPayRequest implements Serializable {
-
   private static final long serialVersionUID = -954667936670521398L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopSpuPageRequest.java

@@ -1,17 +1,17 @@
 package cn.binarywang.wx.miniapp.bean.shop.request;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author leiin
  * @date 2021/3/23
- * @description: spu分页参数
+ * spu分页参数
  */
 @Data
 public class WxMaShopSpuPageRequest implements Serializable {
-
   private static final long serialVersionUID = -4927300283039328661L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopAddOrderResponse.java

@@ -4,15 +4,15 @@ import cn.binarywang.wx.miniapp.bean.shop.WxMaShopAddOrderResult;
 import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class WxMaShopAddOrderResponse extends WxMaShopBaseResponse implements Serializable {
-
   private static final long serialVersionUID = -8923439859095040010L;
 
   @SerializedName("data")

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopAddSpuResponse.java

@@ -4,18 +4,17 @@ import cn.binarywang.wx.miniapp.bean.shop.WxMaShopAddSpuResult;
 import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class WxMaShopAddSpuResponse extends WxMaShopBaseResponse implements Serializable {
-
   private static final long serialVersionUID = 4370719678135233135L;
 
-
   @SerializedName("data")
   private WxMaShopAddSpuResult data;
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopBaseResponse.java

@@ -1,17 +1,17 @@
 package cn.binarywang.wx.miniapp.bean.shop.response;
 
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
 public class WxMaShopBaseResponse implements Serializable {
-
   private static final long serialVersionUID = -4647161641538864187L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopGetOrderResponse.java

@@ -2,17 +2,18 @@ package cn.binarywang.wx.miniapp.bean.shop.response;
 
 import cn.binarywang.wx.miniapp.bean.shop.WxMaShopOrderResult;
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class WxMaShopGetOrderResponse extends WxMaShopBaseResponse implements Serializable {
-
   private static final long serialVersionUID = -5036075669789800464L;
 
   @SerializedName("order")

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopGetSpuListResponse.java

@@ -2,18 +2,19 @@ package cn.binarywang.wx.miniapp.bean.shop.response;
 
 import cn.binarywang.wx.miniapp.bean.shop.WxMaShopGetSpuResult;
 import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.io.Serializable;
 import java.util.List;
-import lombok.Data;
 
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class WxMaShopGetSpuListResponse extends WxMaShopBaseResponse implements Serializable {
-
   private static final long serialVersionUID = 1423766388278762123L;
 
   /**

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopGetSpuResponse.java

@@ -2,17 +2,18 @@ package cn.binarywang.wx.miniapp.bean.shop.response;
 
 import cn.binarywang.wx.miniapp.bean.shop.WxMaShopGetSpuResult;
 import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
 
 /**
  * @author leiin
  * @date 2021/3/23
- * @description:
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class WxMaShopGetSpuResponse extends WxMaShopBaseResponse implements Serializable {
-
   private static final long serialVersionUID = -3781992184787152637L;
 
   /**