第三方商户新增地图是否显示配置，相关开发

kmall-admin/src/main/java/com/kmall/admin/entity/ThirdMerchantBizEntity.java

@@ -59,6 +59,16 @@ public class ThirdMerchantBizEntity implements Serializable {
      */
     private Date tstm;
 
+    private String isMapShow;
+
+    public String getIsMapShow() {
+        return isMapShow;
+    }
+
+    public void setIsMapShow(String isMapShow) {
+        this.isMapShow = isMapShow;
+    }
+
     public String getIsStoreUserShare() {
         return isStoreUserShare;
     }

kmall-admin/src/main/resources/logback.xml

@@ -6,7 +6,7 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
 -->
 <configuration scan="false" scanPeriod="60 seconds" debug="false">
 
-    <property name="LOG_HOME" value="/data/logs/kmall-pt/kmall-admin/"/>
+    <property name="LOG_HOME" value="/data/project/logs/kmall-pt/kmall-admin/"/>
     <!-- 定义日志的根目录 -->
     <property name="TRACE_DIR" value="trace" />
     <property name="DEBUG_DIR" value="debug" />

kmall-admin/src/main/resources/mybatis/mapper/ThirdMerchantBizDao.xml

@@ -16,6 +16,7 @@
         <result property="moderSn" column="moder_sn"/>
         <result property="modTime" column="mod_time"/>
         <result property="tstm" column="tstm"/>
+		<result property="isMapShow" column="is_map_show"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.kmall.admin.entity.ThirdMerchantBizEntity">
@@ -31,7 +32,8 @@
 			`create_time`,
 			`moder_sn`,
 			`mod_time`,
-			`tstm`
+			`tstm`,
+			is_map_show
 		from third_merchant_biz
 		where third_merch_sn = #{id}
 	</select>
@@ -49,7 +51,8 @@
 		`create_time`,
 		`moder_sn`,
 		`mod_time`,
-		`tstm`
+		`tstm`,
+		is_map_show
 		from third_merchant_biz
 		where merch_sn = #{value}
 	</select>
@@ -67,7 +70,8 @@
 		`create_time`,
 		`moder_sn`,
 		`mod_time`,
-		`tstm`
+		`tstm`,
+		is_map_show
 		from third_merchant_biz
 		where third_party_merch_code = #{thirdMerchantCode}
 	</select>
@@ -85,7 +89,7 @@
     		`create_time`,
     		`moder_sn`,
     		`mod_time`,
-    		`tstm`
+    		`tstm`,is_map_show
 		from third_merchant_biz
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
@@ -132,6 +136,7 @@
 			`is_valid`,
 			is_stock_share,
 			is_store_user_share,
+			is_map_show,
 			`creater_sn`,
 			`create_time`,
 			`moder_sn`,
@@ -144,6 +149,7 @@
 			#{isValid},
 			#{isStockShare},
 			#{isStoreUserShare},
+			#{isMapShow},
 			#{createrSn},
 			#{createTime},
 			#{moderSn},
@@ -160,6 +166,7 @@
 			<if test="isValid != null">`is_valid` = #{isValid}, </if>
 			<if test="isStockShare != null">`is_stock_share` = #{isStockShare}, </if>
 			<if test="isStoreUserShare != null">`is_store_user_share` = #{isStoreUserShare}, </if>
+			<if test="isStoreUserShare != null">`is_store_user_share` = #{isStoreUserShare}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>

kmall-admin/src/main/webapp/WEB-INF/page/shop/goods.html

@@ -150,11 +150,11 @@
         <i-form ref="formValidate" :model="goods" :rules="ruleValidate" :label-width="140">
         <Tabs value="name1">
             <Tab-Pane label="通用信息" name="name1">
-                <Row>
-                    <i-col span="16" style="margin-top: -10px;">
-                        <span style="margin-left: 140px;color: red;font-size: 12px;">* 修改商品二级分类将清空商品参数列表</span>
-                    </i-col>
-                </Row>
+                <!--<Row>-->
+                    <!--<i-col span="16" style="margin-top: -10px;">-->
+                        <!--<span style="margin-left: 140px;color: red;font-size: 12px;">* 修改商品二级分类将清空商品参数列表</span>-->
+                    <!--</i-col>-->
+                <!--</Row>-->
                 <!--<i-form ref="formValidate" :model="goods" :rules="ruleValidate" :label-width="80">-->
                 <Form-item label="商户" prop="merchSn">
                         <i-select v-model="goods.merchSn" filterable placeholder="商户" @on-change="showMerchInfo" label-in-value>

kmall-admin/src/main/webapp/WEB-INF/page/shop/thirdmerchantbiz.html

@@ -45,6 +45,11 @@
             <Form-item label="第三方商户名称" prop="thirdPartyMerchName">
                 <i-input v-model="thirdMerchantBiz.thirdPartyMerchName" placeholder="第三方商户名称"/>
             </Form-item>
+            <Row>
+                <i-col span="16" style="margin-top: -10px;">
+                    <span style="margin-left: 140px;color: red;font-size: 12px;">* 选择是，该商户下的所有门店商品库存将共享扣减</span>
+                </i-col>
+            </Row>
             <Form-item label="库存是否共享" prop="isStockShare" v-show="isOperate">
                 <Radio-group v-model="thirdMerchantBiz.isStockShare">
                     <Radio label="1">
@@ -55,8 +60,18 @@
                     </Radio>
                 </Radio-group>
             </Form-item>
-            <Form-item label="门店用户是否共享" prop="isStoreUserShare" v-show="isOperate">
-                <Radio-group v-model="thirdMerchantBiz.isStoreUserShare">
+            <!--<Form-item label="门店用户是否共享" prop="isStoreUserShare" v-show="isOperate">-->
+                <!--<Radio-group v-model="thirdMerchantBiz.isStoreUserShare">-->
+                    <!--<Radio label="1">-->
+                        <!--<span>是</span>-->
+                    <!--</Radio>-->
+                    <!--<Radio label="0">-->
+                        <!--<span>否</span>-->
+                    <!--</Radio>-->
+                <!--</Radio-group>-->
+            <!--</Form-item>-->
+            <Form-item label="商户地图是否显示" prop="isMapShow" v-show="isOperate">
+                <Radio-group v-model="thirdMerchantBiz.isMapShow">
                     <Radio label="1">
                         <span>是</span>
                     </Radio>
@@ -65,6 +80,7 @@
                     </Radio>
                 </Radio-group>
             </Form-item>
+
             <Form-item label="是否有效" prop="isValid">
                 <Radio-group v-model="thirdMerchantBiz.isValid">
                     <Radio label="1">

kmall-admin/src/main/webapp/js/shop/thirdmerchantbiz.js

@@ -25,7 +25,15 @@ $(function () {
             //         }
             //         return '';
             //     }},
-
+            {label: '商户地图是否显示', name: 'isMapShow', index: 'isMapShow', width: 80, align: 'center',
+                formatter: function (value) {
+                    if (value == '0') {
+                        return '否';
+                    } else if (value == '1') {
+                        return '是';
+                    }
+                    return '';
+                }},
 			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
@@ -74,7 +82,7 @@ let vm = new Vue({
 	data: {
         showList: true,
         title: null,
-		thirdMerchantBiz: {isValid: '', isStockShare:'',isStoreUserShare:''},
+		thirdMerchantBiz: {isValid: '', isStockShare:'',isStoreUserShare:'',isMapShow:''},
 		ruleValidate: {
 			name: [
 				{required: true, message: '名称不能为空', trigger: 'blur'}
@@ -94,7 +102,7 @@ let vm = new Vue({
 			vm.showList = false;
 			vm.title = "新增";
             vm.getMerchList();
-			vm.thirdMerchantBiz = {isValid: 0,isStockShare:0,isStoreUserShare:0};
+			vm.thirdMerchantBiz = {isValid: 0,isStockShare:0,isStoreUserShare:0,isMapShow:0};
 			vm.isOperate = true;
 		},
 		update: function (event) {
@@ -111,7 +119,25 @@ let vm = new Vue({
 		},
 		saveOrUpdate: function (event) {
             let url = vm.thirdMerchantBiz.thirdMerchSn == null ? "../thirdmerchantbiz/save" : "../thirdmerchantbiz/update";
-            confirm('库存是否共享添加成功后则不可修改！确定添加？', function () {
+            if(vm.isOperate){
+                confirm('库存是否共享，商户地图是否显示字段添加成功后则不可修改！请确认后添加？', function () {
+                    $.ajax({
+                        type: "POST",
+                        url: url,
+                        contentType: "application/json",
+                        data: JSON.stringify(vm.thirdMerchantBiz),
+                        success: function (r) {
+                            if (r.code === 0) {
+                                alert('操作成功', function (index) {
+                                    vm.reload();
+                                });
+                            } else {
+                                alert(r.msg);
+                            }
+                        }
+                    });
+                })
+            }else{
                 $.ajax({
                     type: "POST",
                     url: url,
@@ -127,7 +153,7 @@ let vm = new Vue({
                         }
                     }
                 });
-            })
+            }
 		},
 		del: function (event) {
             let thirdMerchSns = getSelectedRows();