Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/controller/FootprintController.java

@@ -32,7 +32,7 @@ public class FootprintController {
     @RequiresPermissions("footprint:list")
     public R list(@RequestParam Map<String, Object> params) {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
-        ParamUtils.setName(params, "name");
+        //ParamUtils.setName(params, "name");
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/java/com/kmall/admin/controller/mk/dist/MkDistController.java

@@ -35,8 +35,10 @@ public class MkDistController {
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
-        ParamUtils.setName(params, "distName");
+        //ParamUtils.setName(params, "distName");
         //查询列表数据
+        String distName = (String) params.get("distName");
+        System.out.println(distName);
         Query query = new Query(params);
         List<MkDistEntity> mkDistList = mkDistService.queryList(query);
         int total = mkDistService.queryTotal(query);

kmall-admin/src/main/java/com/kmall/admin/controller/mk/store/StoreTopicController.java

@@ -35,7 +35,7 @@ public class StoreTopicController {
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
-        ParamUtils.setName(params, "name");
+//        ParamUtils.setName(params, "storeName");
         //查询列表数据
         Query query = new Query(params);
 

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

@@ -104,10 +104,10 @@
             AND a.user_id = #{userId}
         </if>
         <if test="userName != null and userName != ''">
-            AND mall_address.user_name LIKE concat('%', #{userName},'%')
+            AND a.user_name LIKE concat('%', #{userName},'%')
         </if>
         <if test="telNumber != null and telNumber != ''">
-            AND mall_address.tel_number LIKE concat('%', #{telNumber},'%')
+            AND a.tel_number LIKE concat('%', #{telNumber},'%')
         </if>
     </select>
 

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

@@ -41,6 +41,9 @@
         LEFT JOIN mall_merch_user d ON a.user_id = d.user_id and a.store_id = d.store_id
         left join mall_store s on d.store_id = s.id
         where 1=1
+        <if test="userName != null and userName.trim() != ''">
+            and b.username LIKE CONCAT('%',#{userName},'%')
+        </if>
         <if test="storeId != null">
             and d.store_id = #{storeId}
         </if>
@@ -75,6 +78,7 @@
     <select id="queryTotal" resultType="int">
 		select count(distinct a.id)
         from mall_cart a
+        left join mall_user b on a.user_id = b.id
         LEFT JOIN mall_merch_user d ON a.user_id=d.user_id
         left join mall_store s on d.store_id = s.id
         where 1=1
@@ -93,6 +97,9 @@
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
+        <if test="userName != null and userName.trim() != ''">
+            and b.username LIKE CONCAT('%',#{userName},'%')
+        </if>
 	</select>
 
     <insert id="save" parameterType="com.kmall.admin.entity.CartEntity" useGeneratedKeys="true" keyProperty="id">

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

@@ -59,8 +59,8 @@
 		left join mall_store store on cashier.shop_sn = store.store_number
 		left join mall_merch merch on cashier.merch_sn = merch.merch_sn
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+		<if test="machineCode != null and machineCode.trim() != ''">
+			AND cashier.machine_code LIKE concat('%',#{machineCode},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -78,9 +78,9 @@
  	<select id="queryTotal" resultType="int">
 		select count(*) from mall2_cashier
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test="machineCode != null and machineCode.trim() != ''">
+			AND machine_code LIKE concat('%',#{machineCode},'%')
+		</if>
 	</select>
 
 	<insert id="save" parameterType="com.kmall.admin.entity.CashierEntity" useGeneratedKeys="true" keyProperty="mcId">

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

@@ -37,7 +37,7 @@
             AND c.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
         <if test="name != null and name != ''">
-            AND b.username LIKE concat('%',#{name},'%')
+            AND b.nickname LIKE concat('%',#{name},'%')
         </if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">

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

@@ -41,8 +41,8 @@
         <if test="merchSn != null and merchSn.trim() != ''">
             and c.merch_sn = #{merchSn}
         </if>
-        <if test="name != null and name != ''">
-            AND b.username LIKE concat('%',#{name},'%')
+        <if test="userName != null and userName != ''">
+            AND b.username LIKE concat('%',#{userName},'%')
         </if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">

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

@@ -33,6 +33,9 @@
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
+        <if test="keyword != null and keyword.trim() != ''">
+            AND a.keyword LIKE CONCAT('%',#{keyword},'%')
+        </if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}

kmall-admin/src/main/resources/mybatis/mapper/mk/Mk2GoodsTopicHistoryPriceDao.xml

@@ -58,8 +58,8 @@
     		`tstm`
 		from mk2_goods_topic_history_price
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+		<if test="topicName != null and topicName.trim() != ''">
+			AND topic_name LIKE concat('%',#{topicName},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -77,9 +77,9 @@
  	<select id="queryTotal" resultType="int">
 		select count(*) from mk2_goods_topic_history_price
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test="topicName != null and topicName.trim() != ''">
+			AND topic_name LIKE concat('%',#{topicName},'%')
+		</if>
 	</select>
 
 	<insert id="save" parameterType="com.kmall.admin.entity.mk.Mk2GoodsTopicHistoryPriceEntity" useGeneratedKeys="true" keyProperty="id">

kmall-admin/src/main/resources/mybatis/mapper/mk/Mk2GoodsTopicPriceDao.xml

@@ -63,8 +63,8 @@
 		from mk2_goods_topic_price mk2
 		left join mall_goods goods on mk2.topic_goods_sku = goods.sku
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+		<if test=" topicName != null and topicName.trim() != ''">
+			AND mk2.topic_name LIKE concat('%',#{topicName},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -82,9 +82,9 @@
  	<select id="queryTotal" resultType="int">
 		select count(*) from mk2_goods_topic_price
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test=" topicName != null and topicName.trim() != ''">
+			AND topic_name LIKE concat('%',#{topicName},'%')
+		</if>
 	</select>
 
 	<insert id="save" parameterType="com.kmall.admin.entity.mk.Mk2GoodsTopicPriceEntity" useGeneratedKeys="true" keyProperty="id">

kmall-admin/src/main/resources/mybatis/mapper/mk/Mk2MemberBirthdayDao.xml

@@ -49,8 +49,8 @@
     		`tstm`
 		from mk2_member_birthday
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+		<if test="topicName != null and topicName.trim() != ''">
+			AND topic_name LIKE concat('%',#{topicName},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -68,9 +68,9 @@
  	<select id="queryTotal" resultType="int">
 		select count(*) from mk2_member_birthday
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test="topicName != null and topicName.trim() != ''">
+			AND topic_name LIKE concat('%',#{topicName},'%')
+		</if>
 	</select>
 
 	<insert id="save" parameterType="com.kmall.admin.entity.mk.Mk2MemberBirthdayEntity" useGeneratedKeys="true" keyProperty="id">

kmall-admin/src/main/resources/mybatis/mapper/mk/store/StoreTopicDao.xml

@@ -71,8 +71,8 @@
 		LEFT JOIN mk_store_prom_type pt ON d.prom_type_id = pt.prom_type_id
 		left join mall_store s on d.store_id = s.id
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND title LIKE concat('%',#{name},'%')
+		<if test="storeName != null and storeName.trim() != ''">
+			AND s.store_name LIKE concat('%',#{storeName},'%')
 		</if>
 		<if test="storeId != null and storeId != ''">
 			and d.store_id = #{storeId}
@@ -101,10 +101,12 @@
 
  	<select id="queryTotal" resultType="int">
 		select count(*)
-		from mall_store_topic d left join third_merchant_biz t on d.third_merch_sn = t.third_merch_sn
+		from mall_store_topic d
+		left join third_merchant_biz t on d.third_merch_sn = t.third_merch_sn
+		left join mall_store s on d.store_id = s.id
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND title LIKE concat('%',#{name},'%')
+		<if test="storeName != null and storeName.trim() != ''">
+			AND s.store_name LIKE concat('%',#{storeName},'%')
 		</if>
 		<if test="storeId != null and storeId != ''">
 			and d.store_id = #{storeId}

kmall-admin/src/main/resources/mybatis/mapper/vip/Mall2MemberConsumptionRecordsDao.xml

@@ -53,8 +53,11 @@
 		left join mall_user mu on mu.id = records.user_id
 		left join mall_store store on store.id = records.shop_sn
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+		<if test="userId != null and userId.trim() != ''">
+			AND records.user_id LIKE concat('%',#{userId},'%')
+		</if>
+		<if test="orderSn != null and orderSn.trim() != ''">
+			AND records.order_sn LIKE concat('%',#{orderSn},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -72,9 +75,12 @@
  	<select id="queryTotal" resultType="int">
 		select count(*) from mall2_member_consumption_records
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test="userId != null and userId.trim() != ''">
+			AND user_id LIKE concat('%',#{userId},'%')
+		</if>
+		<if test="orderSn != null and orderSn.trim() != ''">
+			AND order_sn LIKE concat('%',#{orderSn},'%')
+		</if>
 	</select>
 
 	<insert id="save" parameterType="com.kmall.admin.entity.vip.Mall2MemberConsumptionRecordsEntity" useGeneratedKeys="true" keyProperty="id">

kmall-admin/src/main/resources/mybatis/mapper/vip/Mall2MemberPointsDao.xml

@@ -45,8 +45,8 @@
 		from mall2_member_points points
 		left join mall_user mu  on points.user_id = mu.id
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+		<if test="userId != null and userId.trim() != ''">
+			AND points.user_id LIKE concat('%',#{userId},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -64,9 +64,9 @@
  	<select id="queryTotal" resultType="int">
 		select count(*) from mall2_member_points
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test="userId != null and userId.trim() != ''">
+			AND user_id LIKE concat('%',#{userId},'%')
+		</if>
 	</select>
 
 	<insert id="save" parameterType="com.kmall.admin.entity.vip.Mall2MemberPointsEntity" useGeneratedKeys="true" keyProperty="id">

kmall-admin/src/main/webapp/WEB-INF/page/cashier/cashierManager.html

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.machineCode" @on-enter="query" placeholder="机器码"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mk2goodstopichistoryprice.html

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.topicName" @on-enter="query" placeholder="活动名称"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mk2goodstopicprice.html

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.topicName" @on-enter="query" placeholder="活动名称"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mk2memberbirthday.html

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.topicName" @on-enter="query" placeholder="活动名称"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
@@ -35,7 +35,7 @@
                 <i-input v-model="mk2MemberBirthday.topicType" placeholder="优惠类型"/>
             </Form-item>
             <Form-item label="优惠金额" prop="topicPrice">
-                <i-input v-model="mk2MemberBirthday.topicPrice" placeholder="优惠金额"/>
+                <i-input v-model="mk2MemberBirthday.topicPrice" type="number" placeholder="优惠金额"/>
             </Form-item>
             <Form-item label="优惠比例" prop="topicProportion">
                 <i-input v-model="mk2MemberBirthday.topicProportion" placeholder="优惠比例"/>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkdist.html

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.distName" @on-enter="query" placeholder="供货商名称"/>
+                    <i-input v-model="q.distName" @on-enter="query" placeholder="分销商名称"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/mk/storetopic.html

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.storeName" @on-enter="query" placeholder="门店名称"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

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

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.userName" @on-enter="query" placeholder="联系人"/>
+                    <i-input v-model="q.userName" @on-enter="query" placeholder="收货人姓名"/>
                 </i-col>
                 <i-col span="4">
                     <i-input v-model="q.telNumber" @on-enter="query" placeholder="联系电话"/>

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

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.userName" @on-enter="query" placeholder="会员名"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
             </div>

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

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="用户名"/>
+                    <i-input v-model="q.userName" @on-enter="query" placeholder="会员名"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
             </div>

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

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.keyword" @on-enter="query" placeholder="关键字"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
             </div>

kmall-admin/src/main/webapp/WEB-INF/page/sys/thirdmerchswitch.html

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.merchSn" @on-enter="query" placeholder="商户编号"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/js/cashier/cashierManager.js

@@ -47,12 +47,24 @@ let vm = new Vue({
         title: null,
 		cashier: {},
 		ruleValidate: {
-			name: [
-				{required: true, message: '名称不能为空', trigger: 'blur'}
-			]
+            machineCodeType: [
+				{required: true, message: '机器码类型不能为空', trigger: 'blur'}
+			],
+            machineCode: [
+                {required: true, message: '机器码不能为空', trigger: 'blur'}
+            ],
+            cashierSn: [
+                {required: true, message: '收银机编号不能为空', trigger: 'blur'}
+            ],
+            shopSn: [
+                {required: true, message: '门店编号不能为空', trigger: 'blur'}
+            ],
+            merchSn: [
+                {required: true, message: '商户编号不能为空', trigger: 'blur'}
+            ]
 		},
 		q: {
-		    name: ''
+            machineCode: ''
 		}
 	},
 	methods: {
@@ -123,7 +135,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                machineCode: ''
             }
             vm.reload();
 		},
@@ -131,7 +143,7 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'machineCode': vm.q.machineCode},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');

kmall-admin/src/main/webapp/js/mk/mk2goodstopichistoryprice.js

@@ -46,7 +46,7 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            topicName: ''
 		}
 	},
 	methods: {
@@ -117,7 +117,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                topicName: ''
             }
             vm.reload();
 		},
@@ -125,7 +125,7 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'topicName': vm.q.topicName},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');

kmall-admin/src/main/webapp/js/mk/mk2goodstopicprice.js

@@ -57,7 +57,7 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            topicName: ''
 		}
 	},
 	methods: {
@@ -128,7 +128,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                topicName: ''
             }
             vm.reload();
 		},
@@ -136,7 +136,7 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'topicName': vm.q.topicName},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');

kmall-admin/src/main/webapp/js/mk/mk2memberbirthday.js

@@ -67,12 +67,12 @@ let vm = new Vue({
         title: null,
 		mk2MemberBirthday: {},
 		ruleValidate: {
-			name: [
-				{required: true, message: '名称不能为空', trigger: 'blur'}
-			]
+            topicName:[{required: true, message: '活动名称不能为空', trigger: 'blur'}],
+            topicType:[{required: true, message: '优惠类型不能为空', trigger: 'blur'}],
+            topicProportion:[{required: true, message: '优惠比例不能为空', trigger: 'blur'}]
 		},
 		q: {
-		    name: ''
+            topicName: ''
 		}
 	},
 	methods: {
@@ -143,7 +143,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                topicName: ''
             }
             vm.reload();
 		},
@@ -151,7 +151,7 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'topicName': vm.q.topicName},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');

kmall-admin/src/main/webapp/js/mk/storetopic.js

@@ -65,7 +65,7 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            storeName: ''
 		}
 	},
 	methods: {
@@ -136,7 +136,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                storeName: ''
             }
             vm.reload();
 		},
@@ -144,7 +144,7 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'storeName': vm.q.storeName},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');

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

@@ -9,7 +9,7 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '会员', name: 'userName', index: 'user_name', width: 180},
+            {label: '会员名', name: 'userName', index: 'user_name', width: 180},
             // {label: 'sessionId', name: 'sessionId', index: 'session_id', width: 80 },
             {label: '商品', name: 'goodsName', index: 'goods_name', width: 400},
             {label: '商品序列号', name: 'goodsSn', index: 'goods_sn', width: 120},
@@ -59,7 +59,7 @@ var vm = new Vue({
         title: null,
         cart: {},
         q: {
-            name: ''
+            userName: ''
         }
     },
     methods: {
@@ -132,7 +132,7 @@ var vm = new Vue({
             vm.showList = true;
             var page = $("#jqGrid").jqGrid('getGridParam', 'page');
             $("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'userName': vm.q.userName},
                 page: page
             }).trigger("reloadGrid");
         }

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

@@ -4,7 +4,7 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '会员', name: 'userName', index: 'user_name', width: 180},
+            {label: '会员名', name: 'userName', index: 'user_name', width: 180},
             {label: '商品', name: 'goodsName', index: 'goods_name', width: 670},
             {label: '记录时间', name: 'addTime', index: 'add_time', align:'center',width: 160}],
         viewrecords: true,
@@ -43,7 +43,7 @@ var vm = new Vue({
         title: null,
         footprint: {},
         q: {
-            name: ''
+            userName: ''
         }
     },
     methods: {
@@ -116,7 +116,7 @@ var vm = new Vue({
             vm.showList = true;
             var page = $("#jqGrid").jqGrid('getGridParam', 'page');
             $("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'userName': vm.q.userName},
                 page: page
             }).trigger("reloadGrid");
         }

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

@@ -51,12 +51,16 @@ let vm = new Vue({
         title: null,
 		goodsBatch: {},
 		ruleValidate: {
-			name: [
-				{required: true, message: '名称不能为空', trigger: 'blur'}
-			]
+            batchSn: [
+				{required: true, message: '批次编号不能为空', trigger: 'blur'}
+			],
+            sku: [
+                {required: true, message: 'sku不能为空', trigger: 'blur'}
+            ]
 		},
 		q: {
-		    name: ''
+            batchSn: '',
+            sku:''
 		}
 	},
 	methods: {
@@ -122,12 +126,15 @@ let vm = new Vue({
 		},
 		getInfo: function(id){
 			$.get("../goodsbatch/info/"+id, function (r) {
+                var newDate= transDate(r.goodsBatch.batchExpireDate,'yyyy-MM-dd')
                 vm.goodsBatch = r.goodsBatch;
+                vm.goodsBatch.batchExpireDate=newDate;
             });
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                batchSn: '',
+                sku:''
             }
             vm.reload();
 		},

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

@@ -56,7 +56,8 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            sku: '',
+            plu:''
 		}
 	},
 	methods: {
@@ -127,7 +128,8 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                sku: '',
+                plu:''
             }
             vm.reload();
 		},

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

@@ -44,7 +44,7 @@ var vm = new Vue({
         title: null,
 		searchHistory: {},
 		q: {
-		    name: ''
+            keyword: ''
 		}
 	},
 	methods: {
@@ -117,7 +117,7 @@ var vm = new Vue({
 			vm.showList = true;
 			var page = $("#jqGrid").jqGrid('getGridParam','page');
 			$("#jqGrid").jqGrid('setGridParam',{
-                postData: {'name': vm.q.name},
+                postData: {'keyword': vm.q.keyword},
                 page:page
             }).trigger("reloadGrid");
         }

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

@@ -53,9 +53,18 @@ let vm = new Vue({
         title: null,
 		thirdMerchExpress: {},
 		ruleValidate: {
-			name: [
-				{required: true, message: '名称不能为空', trigger: 'blur'}
-			]
+            expressAccount: [
+                {required: true, message: '商户快递账号不能为空', trigger: 'blur'}
+            ],
+            expressPwd: [
+                {required: true, message: '商户快递密码不能为空', trigger: 'blur'}
+            ],
+            expressCusId: [
+                {required: true, message: '商户快递月结账号不能为空', trigger: 'blur'}
+            ],
+            thirdPartyMerchName: [
+                {required: true, message: '第三方商户代码不能为空', trigger: 'blur'}
+            ]
 		},
 		q: {
             thirdPartyMerchCode: ''

kmall-admin/src/main/webapp/js/sys/thirdmerchswitch.js

@@ -111,7 +111,7 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            merchSn: ''
 		},
         merchList: [],
         isOperate: false
@@ -197,7 +197,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                merchSn: ''
             }
             vm.reload();
 		},
@@ -205,7 +205,7 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'merchSn': vm.q.merchSn},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');

kmall-admin/src/main/webapp/js/vip/mall2memberconsumptionrecords.js

@@ -52,7 +52,8 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            userId: '',
+            orderSn:''
 		}
 	},
 	methods: {
@@ -123,7 +124,8 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                userId: '',
+                orderSn:''
             }
             vm.reload();
 		},
@@ -131,7 +133,7 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'userId': vm.q.userId,'orderSn':vm.q.orderSn},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');

kmall-admin/src/main/webapp/js/vip/mall2memberpoints.js

@@ -49,7 +49,7 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            userId: ''
 		}
 	},
 	methods: {
@@ -120,7 +120,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                userId: ''
             }
             vm.reload();
 		},
@@ -128,7 +128,7 @@ let vm = new Vue({
 			vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'userId': vm.q.userId},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');