门店短信配置界面优化

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

@@ -61,6 +61,11 @@ public class StoreSmsConfigEntity implements Serializable {
 
     private String isEnable;
 
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
     public String getIsEnable() {
         return isEnable;
     }
@@ -212,4 +217,12 @@ public class StoreSmsConfigEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
 }

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

@@ -38,19 +38,21 @@
 
 	<select id="queryList" resultType="com.kmall.admin.entity.StoreSmsConfigEntity">
 		select
-    		`id`,
-    		`store_id`,
-    		`merch_sn`,
-    		`send_start_time`,
-    		`send_end_time`,
-    		`is_valid`,
-		`is_enable`,
-    		`creater_sn`,
-    		`create_time`,
-    		`moder_sn`,
-    		`mod_time`,
-    		`tstm`
-		from mall_store_sms_config
+			config.`id`,
+			config.`store_id`,
+			config.`merch_sn`,
+			config.`send_start_time`,
+			config.`send_end_time`,
+			config.`is_valid`,
+			config.`is_enable`,
+			config.`creater_sn`,
+			config.`create_time`,
+			config.`moder_sn`,
+			config.`mod_time`,
+			config.`tstm`,
+		    store.`store_name`
+		from mall_store_sms_config config
+		left join mall_store store on config.store_id = store.id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')

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

@@ -5,7 +5,8 @@ $(function () {
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
 			{label: '商户编号', name: 'merchSn', index: 'merch_sn', align: 'center', width: 80},
-			{label: '门店id', name: 'storeId', index: 'store_id',  align: 'center',width: 80},
+			{label: '门店id', name: 'storeId', index: 'store_id',  align: 'center',width: 80, hidden: true},
+			{label: '门店名称', name: 'storeName', index: 'store_name',  align: 'center',width: 80},
 			{label: '发送开始时间', name: 'sendStartTime', index: 'send_start_time',  align: 'center',width: 80,formatter: function (value) {
 					return transDate(value,'yyyy-MM-dd hh:mm:ss');
 				}},