From 5f259398a24ca82ad9c9ab4c5ba206336463ef44 Mon Sep 17 00:00:00 2001 From: sj <1304317391@qq.com> Date: Sat, 29 Oct 2022 10:42:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-local.yaml | 2 +- .../co/yixiang/modules/product/service/dto/Parameter.java | 5 ++++- .../product/service/mapper/YxStoreProductRelationMapper.java | 2 +- .../modules/product/vo/YxStoreProductRelationQueryVo.java | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 7097d95e..8c1f119d 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -244,7 +244,7 @@ dubbo: bxg: shop: # API_URL: http://192.168.10.113:48080/bxgApp - API_URL: https://eeca-27-19-79-51.jp.ngrok.io + API_URL: https://912e-27-19-79-51.jp.ngrok.io SITE_URL: http://192.168.10.113:48080/bxgApp UNI_SITE_URL: http://192.168.10.113:48080/bxgApp ADMIN_API_URL: http://192.168.10.113:48080/bxg diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/dto/Parameter.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/dto/Parameter.java index c816cb26..f0506885 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/dto/Parameter.java +++ b/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; // 参数详情 diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java index 69f079dc..403efc98 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/mapper/YxStoreProductRelationMapper.java +++ b/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 { - @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") diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/vo/YxStoreProductRelationQueryVo.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/vo/YxStoreProductRelationQueryVo.java index 97991425..833633bf 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/vo/YxStoreProductRelationQueryVo.java +++ b/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;