From 19e7bbc520b9227b53d86b9bf947f6de7661f27f Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期五, 20 十月 2023 09:47:56 +0800 Subject: [PATCH] 修改商家服务 --- springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml | 40 ------------------- springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java | 24 +----------- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java | 28 +------------- 3 files changed, 5 insertions(+), 87 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java index e5aaf22..fa801e4 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java @@ -24,8 +24,7 @@ public class JinhuiConvenientMerchantVO { @ApiModelProperty("商家ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; @ApiModelProperty("商家名称") private String name; @@ -78,27 +77,11 @@ @ApiModelProperty("所属社区名称") private String communityName; - - @ApiModelProperty("服务类型id列表") - private List<String> serviceIds; - - @ApiModelProperty("该商家存有商品,最多返回两条") - private List<ConvenientProductVO> productVOList; - - - - @ApiModelProperty("店铺销量") - private Integer sale; - - @ApiModelProperty("店铺销售额") - private BigDecimal saleVolume; - @ApiModelProperty("详细地址") private String detailedAddress; @ApiModelProperty("商家评分") - private BigDecimal score; - + private String score; @ApiModelProperty("审核状态 (1待审核 2已通过 3未通过 )") private String auditType; @@ -106,11 +89,4 @@ @ApiModelProperty("审核意见") private String auditOpinion; - public void setPeriod(String period) { - this.period = MerchantBusinessPeriod.valueOf(period); - } - - public void setBusinessStatus(Boolean businessStatus) { - this.businessStatus = businessStatus ? 1 : 0; - } } diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java index ef515b6..01c968c 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java @@ -23,8 +23,8 @@ /** * 主键id */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; + @TableId(type = IdType.AUTO) + private String id; /** * 商家名称 */ @@ -91,14 +91,6 @@ */ private Long userId; /** - * 咨询量 - */ - private Integer consultationVolume; - /** - * 浏览量 - */ - private Integer viewNum; - /** * 是否删除 */ private Boolean isDel; @@ -121,18 +113,6 @@ * 更新人 */ private Long updatedBy; - - - /** - * 店铺销量 - */ - private Integer sale; - - /** - * 店铺销售额 - */ - private BigDecimal saleVolume; - private String auditType; diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml index b9fbbb7..7512468 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml +++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml @@ -22,8 +22,6 @@ <id column="introduction" property="introduction" /> <id column="business_status" property="businessStatus" /> <id column="user_id" property="userId" /> - <id column="consultation_volume" property="consultationVolume" /> - <id column="view_num" property="viewNum" /> <id column="is_del" property="isDel" /> <id column="created_at" property="createdAt" /> <id column="created_by" property="createdBy" /> @@ -36,7 +34,7 @@ <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id,`name`,community_id,community_name,logo,contacts,phone,address,lat,lon,begin_at,end_at, - period,introduction,business_status,user_id,consultation_volume,is_del,created_at,created_by,updated_at, + period,introduction,business_status,user_id,is_del,created_at,created_by,updated_at, updated_by,detailed_address </sql> <select id="pageMerchant" resultType="com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO"> @@ -129,12 +127,6 @@ <if test="item.userId != null and item.userId != '' "> user_id, </if> - <if test="item.consultationVolume != null and item.consultationVolume != '' "> - consultation_volume, - </if> - <if test="item.viewNum != null and item.viewNum != '' "> - view_num, - </if> <if test="item.isDel != null and item.isDel != '' "> is_del, </if> @@ -143,12 +135,6 @@ </if> <if test="item.updatedBy != null and item.updatedBy != '' "> updated_by, - </if> - <if test="item.sale != null and item.sale != '' "> - sale, - </if> - <if test="item.saleVolume != null and item.saleVolume != '' "> - sale_volume, </if> <if test="item.convenientType != null and item.convenientType != '' "> convenient_type, @@ -211,12 +197,6 @@ <if test="item.userId != null and item.userId != '' "> #{item.userId}, </if> - <if test="item.consultationVolume != null and item.consultationVolume != '' "> - #{item.consultationVolume}, - </if> - <if test="item.viewNum != null and item.viewNum != '' "> - #{item.viewNum}, - </if> <if test="item.isDel != null and item.isDel != '' "> #{item.isDel}, </if> @@ -225,12 +205,6 @@ </if> <if test="item.updatedBy != null and item.updatedBy != '' "> #{item.updatedBy}, - </if> - <if test="item.sale != null and item.sale != '' "> - #{item.sale}, - </if> - <if test="item.saleVolume != null and item.saleVolume != '' "> - #{item.saleVolume}, </if> <if test="item.convenientType != null and item.convenientType != '' "> #{item.convenientType}, @@ -296,12 +270,6 @@ <if test="item.userId != null and item.userId != '' "> user_id=#{item.userId}, </if> - <if test="item.consultationVolume != null and item.consultationVolume != '' "> - consultation_volume=#{item.consultationVolume}, - </if> - <if test="item.viewNum != null and item.viewNum != '' "> - view_num=#{item.viewNum}, - </if> <if test="item.isDel != null and item.isDel != '' "> is_del=#{item.isDel}, </if> @@ -310,12 +278,6 @@ </if> <if test="item.updatedBy != null and item.updatedBy != '' "> updated_by=#{item.updatedBy}, - </if> - <if test="item.sale != null and item.sale != '' "> - sale=#{item.sale}, - </if> - <if test="item.saleVolume != null and item.saleVolume != '' "> - sale_volume=#{item.saleVolume}, </if> <if test="item.convenientType != null and item.convenientType != '' "> convenient_type=#{item.convenientType}, -- Gitblit v1.7.1