修复订单生成

zsw-bxg/src/main/java/co/yixiang/modules/product/service/dto/Parameter.java

@@ -2,8 +2,11 @@ package co.yixiang.modules.product.service.dto;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class Parameter {
+public class Parameter implements Serializable {
+   private static final long serialVersionUID = 1L;////xxxx看自己喜欢
 //    商品参数名
    private  String name;
 //   参数详情

zsw-bxg/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java

@@ -30,7 +30,7 @@ import java.util.List;
 @Repository
 public interface YxStoreProductRelationMapper extends CoreMapper<YxStoreProductRelation> {
 
-    @Select("select B.id pid,A.type as category,B.store_name as storeName,B.price,B.is_integral as isIntegral,A.id id," +
+    @Select("select B.id pid,A.type as category,B.store_name as storeName,B.price,B.integral,B.is_integral as isIntegral,A.id id," +
             "B.ot_price as otPrice,B.sales,B.image,B.is_show as isShow" +
             " from yx_store_product_relation A left join yx_store_product B " +
             "on A.product_id = B.id where A.type=#{type} and A.uid=#{uid} and A.is_del = 0 and B.is_del = 0 order by A.create_time desc")

zsw-bxg/src/main/java/co/yixiang/modules/product/vo/YxStoreProductRelationQueryVo.java

@@ -62,6 +62,9 @@ public class YxStoreProductRelationQueryVo implements Serializable {
     @ApiModelProperty(value = "商品名称")
     private String storeName;
 
+    @ApiModelProperty(value = "兑换所需积分")
+    private String integral;
+
     @ApiModelProperty(value = "是否开启积分兑换")
     private Integer isIntegral;