商户修改

zzjs-service/src/main/java/com/miaxis/collection/vo/CollectionCustomerVo.java

@@ -48,6 +48,17 @@ public class CollectionCustomerVo {
     @ApiModelProperty(value = "小程序介绍")
     private String appletIntroduce;
 
+    @TableField("jump_url")
+    @ApiModelProperty(value = "跳转url")
+    private String jumpUrl;
+
+    @TableField("jump_url_type")
+    @ApiModelProperty(value = "跳转url类型  goMiniApp:小程序 、goPage：小程序页面、goWebView: h5")
+    private String jumpUrlType;
+
+    @ApiModelProperty(value = "权重（数值从大到小）")
+    private Integer weight;
+
     @TableField("status")
     @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
     private String status;

zzjs-service/src/main/java/com/miaxis/customer/domain/CustomerInfo.java

@@ -169,6 +169,17 @@ public class CustomerInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "上架状态  0：已上架、1：未上架")
     private Integer shelfStatus;
 
+    @TableField("jump_url")
+    @ApiModelProperty(value = "跳转url")
+    private String jumpUrl;
+
+    @TableField("jump_url_type")
+    @ApiModelProperty(value = "跳转url类型  goMiniApp:小程序 、goPage：小程序页面、goWebView: h5")
+    private String jumpUrlType;
+
+    @ApiModelProperty(value = "权重（数值从大到小）")
+    private Integer weight;
+
     /** 状态  0：有效(默认)、1：失效 （伪删除） */
     @Excel(name = "状态  0：有效(默认)、1：失效 （伪删除）", readConverterExp = "伪=删除")
     @TableField("status")

zzjs-service/src/main/java/com/miaxis/customer/vo/BrowseRecordCustomerInfoVo.java

@@ -46,6 +46,17 @@ public class BrowseRecordCustomerInfoVo implements Serializable {
     @ApiModelProperty(value = "小程序介绍")
     private String appletIntroduce;
 
+    @TableField("jump_url")
+    @ApiModelProperty(value = "跳转url")
+    private String jumpUrl;
+
+    @TableField("jump_url_type")
+    @ApiModelProperty(value = "跳转url类型  goMiniApp:小程序 、goPage：小程序页面、goWebView: h5")
+    private String jumpUrlType;
+
+    @ApiModelProperty(value = "权重（数值从大到小）")
+    private Integer weight;
+
     @TableField("status")
     @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
     private String status;

zzjs-service/src/main/java/com/miaxis/customer/vo/CustomerInfoVo.java

@@ -130,6 +130,17 @@ public class CustomerInfoVo extends BaseBusinessEntity{
     @ApiModelProperty(value = "收藏数量")
     private Integer collectionCount;
 
+    @TableField("jump_url")
+    @ApiModelProperty(value = "跳转url")
+    private String jumpUrl;
+
+    @TableField("jump_url_type")
+    @ApiModelProperty(value = "跳转url类型  goMiniApp:小程序 、goPage：小程序页面、goWebView: h5")
+    private String jumpUrlType;
+
+    @ApiModelProperty(value = "权重（数值从大到小）")
+    private Integer weight;
+
     @TableField("status")
     @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
     private String status;

zzjs-service/src/main/java/com/miaxis/customer/vo/ExhibitionCustomerInfoVo.java

@@ -42,6 +42,17 @@ public class ExhibitionCustomerInfoVo extends BaseBusinessEntity{
     @ApiModelProperty(value = "小程序介绍")
     private String appletIntroduce;
 
+    @TableField("jump_url")
+    @ApiModelProperty(value = "跳转url")
+    private String jumpUrl;
+
+    @TableField("jump_url_type")
+    @ApiModelProperty(value = "跳转url类型  goMiniApp:小程序 、goPage：小程序页面、goWebView: h5")
+    private String jumpUrlType;
+
+    @ApiModelProperty(value = "权重（数值从大到小）")
+    private Integer weight;
+
     @TableField("status")
     @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
     private String status;

zzjs-service/src/main/resources/mapper/customer/CustomerInfoMapper.xml

@@ -30,13 +30,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="appletQrCode"    column="applet_qr_code"    />
         <result property="appletIntroduce"    column="applet_introduce"    />
         <result property="shelfStatus"    column="shelf_status"    />
+        <result property="jumpUrl"    column="jump_url"    />
+        <result property="jumpUrlType"    column="jump_url_type"    />
+        <result property="weight"    column="weight"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectCustomerInfoVo">
-        select id, corporate_name, business_type, corporate_logo, customer_source, city_code,area_code, attributed_personnel, detailed_address, industry_type, corporate_phone, corporate_contacts, phone, customer_star, enterprise_tax_number, invoice_title, bank_of_deposit, bank_account, finance_phone, fax_number, applet_address, applet_logo, applet_qr_code, applet_introduce, shelf_status, create_time, update_time, status from customer_info
+        select id, corporate_name, business_type, corporate_logo, customer_source, city_code,area_code, attributed_personnel, detailed_address, industry_type, corporate_phone, corporate_contacts, phone, customer_star, enterprise_tax_number, invoice_title, bank_of_deposit, bank_account, finance_phone, fax_number, applet_address, applet_logo, applet_qr_code, applet_introduce, shelf_status,jump_url,jump_url_type,weight, create_time, update_time, status from customer_info
     </sql>
 
     <select id="selectCustomerInfoList" resultType="com.miaxis.customer.vo.CustomerInfoVo">
@@ -67,6 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         f2.file_url as appletLogoFileUrl,
         f3.file_url as appletQrCodeFileUrl,
         ci.applet_introduce,
+        ci.jump_url,
+        ci.jump_url_type,
+        ci.weight,
         ci.create_time,
         ci.update_time,
         (select COUNT(1) from collection_info coi where coi.customer_id = ci.id) as collectionCount,
@@ -96,6 +102,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="financePhone != null  and financePhone != ''"> and finance_phone = #{financePhone}</if>
             <if test="appletAddress != null  and appletAddress != ''"> and applet_address = #{appletAddress}</if>
             <if test="shelfStatus != null "> and shelf_status = #{shelfStatus}</if>
+            <if test="jumpUrl != null "> and jump_url = #{jumpUrl}</if>
+            <if test="jumpUrlType != null "> and jump_url_type = #{jumpUrlType}</if>
+            <if test="weight != null "> and weight = #{weight}</if>
             <if test="status != null and status != ''"> and status = #{status}</if>
         </where>
     </select>
@@ -131,6 +140,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (select COUNT(1) from collection_info coi where coi.customer_id = ci.id) as collectionCount,
         ci.applet_introduce,
         ci.shelf_status,
+        ci.jump_url,
+        ci.jump_url_type,
+        ci.weight,
         ci.create_time,
         ci.update_time,
         ci.status
@@ -151,6 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         f2.file_url as appletLogoFileUrl,
         f3.file_url as appletQrCodeFileUrl,
         ci.applet_introduce,
+        ci.jump_url,
+        ci.jump_url_type,
+        ci.weight,
         ci.create_time,
         ci.update_time,
         (select COUNT(1) from collection_info coi where coi.customer_id = ci.id) as collectionCount,
@@ -190,6 +205,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         f1.file_url as corporateLogoFileUrl,
         f2.file_url as appletLogoFileUrl,
         f3.file_url as appletQrCodeFileUrl,
+        ci.jump_url,
+        ci.jump_url_type,
+        ci.weight,
         ci.applet_introduce,
         coi.create_time,
         ci.status
@@ -214,6 +232,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         f2.file_url as appletLogoFileUrl,
         f3.file_url as appletQrCodeFileUrl,
         ci.applet_introduce,
+        ci.jump_url,
+        ci.jump_url_type,
+        ci.weight,
         ci.status
         FROM `customer_info` ci
         LEFT JOIN file_info f1 on f1.file_id = ci.corporate_logo