提交代码

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/java/com/kmall/admin/entity/CashierEntity.java

@@ -38,10 +38,12 @@ public class CashierEntity implements Serializable {
      * 门店编号
      */
     private String shopSn;
+    private String shopName;
     /**
      * 商户编号
      */
     private String merchSn;
+    private String merchName;
     /**
      * 第三方商户编号
      */
@@ -236,4 +238,20 @@ public class CashierEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getMerchName() {
+        return merchName;
+    }
+
+    public void setMerchName(String merchName) {
+        this.merchName = merchName;
+    }
 }

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

@@ -34,6 +34,7 @@ public class SaleRecordEntity implements Serializable {
      * 活动id
      */
     private String discountId;
+    private String discountName;
     /**
      * 销售时间
      */
@@ -202,4 +203,12 @@ public class SaleRecordEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+    public String getDiscountName() {
+        return discountName;
+    }
+
+    public void setDiscountName(String discountName) {
+        this.discountName = discountName;
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/entity/vip/Mall2MemberConsumptionRecordsEntity.java

@@ -22,6 +22,7 @@ public class Mall2MemberConsumptionRecordsEntity implements Serializable {
      * 用户id
      */
     private String userId;
+    private String userName;
     /**
      * 订单编号
      */
@@ -34,6 +35,7 @@ public class Mall2MemberConsumptionRecordsEntity implements Serializable {
      * 消费门店id
      */
     private String shopSn;
+    private String shopName;
     /**
      * 是否使用生日优惠
      */
@@ -202,4 +204,20 @@ public class Mall2MemberConsumptionRecordsEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/entity/vip/Mall2MemberPointsEntity.java

@@ -22,6 +22,7 @@ public class Mall2MemberPointsEntity implements Serializable {
      * 用户id
      */
     private String userId;
+    private String userName;
     /**
      * 积分数
      */
@@ -168,4 +169,12 @@ public class Mall2MemberPointsEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -148,6 +148,8 @@ public class OrderServiceImpl implements OrderService {
     private MkStorePromTypeDao storePromTypeDao; // 优惠类型
     @Autowired
     private Mk2MemberBirthdayDao memberBirthdayDao; // 生日优惠
+    @Autowired
+    private MerchUserDao merchUserDao;
 
     @Override
     public OrderEntity queryObject(Long id) {
@@ -1720,6 +1722,14 @@ public class OrderServiceImpl implements OrderService {
                 userEntity.setLastLoginTime(new Date());
                 userEntity.setIdNo((String) userInfo.get("customIDCard"));
                 userDao.save(userEntity);
+
+                MerchUserEntity merchUserEntity = new MerchUserEntity();
+                merchUserEntity.setMerchSn(user.getMerchSn());
+                merchUserEntity.setStoreId(storeId);
+                merchUserEntity.setUserId(userEntity.getId());
+                merchUserEntity.setCreateTime(new Date());
+                merchUserEntity.setIsLoadGoods("0");
+                merchUserDao.save(merchUserEntity);
             }
 
 
@@ -1745,6 +1755,7 @@ public class OrderServiceImpl implements OrderService {
                     }
                     goodsEntity.setStoreRetailPrice(goodsTopicPriceEntity.getTopicPrice());
                 }
+                topicId = storeTopic.getId();
 
             }else{
                 disCountAmount = getDisCountAmout(goodsEntities);

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

@@ -40,23 +40,27 @@
 
 	<select id="queryList" resultType="com.kmall.admin.entity.CashierEntity">
 		select
-    		mc_id,
-    		machine_code_type,
-    		machine_code,
-    		cashier_sn,
-    		station_code,
-    		shop_sn,
-    		merch_sn,
-    		third_merch_sn,
-    		creater_sn,
-    		create_time,
-    		moder_sn,
-    		mod_time,
-    		tstm
-		from mall2_cashier
+    		cashier.mc_id,
+    		cashier.machine_code_type,
+    		cashier.machine_code,
+    		cashier.cashier_sn,
+    		cashier.station_code,
+    		cashier.shop_sn,
+    		cashier.merch_sn,
+    		cashier.third_merch_sn,
+    		cashier.creater_sn,
+    		cashier.create_time,
+    		cashier.moder_sn,
+    		cashier.mod_time,
+    		cashier.tstm,
+    		store.store_name as shopName,
+			merch.merch_name as merchName
+		from mall2_cashier cashier
+		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() != ''">
@@ -74,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/GoodsDao.xml

@@ -253,12 +253,14 @@
         select
         mall_goods.*,
         case when mall_goods_group.id > 0 then 2 else 0 end as goodsType,
-        m.merch_name merchName, mb.is_stock_share isStockShare
+        m.merch_name merchName, mb.is_stock_share isStockShare,
+        catagory.keywords as categoryName
         from mall_goods
         left join mall_merch m on mall_goods.merch_sn = m.merch_sn
         left join mall_goods_group on mall_goods_group.goods_id = mall_goods.id and mall_goods_group.open_status != 3
         left join third_merchant_biz mb on mb.third_party_merch_code = mall_goods.third_party_merch_code and
         mb.merch_sn=mall_goods.merch_sn
+        left join mall_category catagory on catagory.id = mall_goods.category_id
         WHERE 1=1
         <!--  数据过滤  -->
         ${filterSql}

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

@@ -36,18 +36,20 @@
 
 	<select id="queryList" resultType="com.kmall.admin.entity.SaleRecordEntity">
 		select
-    		`msr_id`,
-    		`order_sn`,
-    		`cashier_sn`,
-    		`saller_id`,
-    		`discount_id`,
-    		`sales_time`,
-    		`creater_sn`,
-    		`create_time`,
-    		`moder_sn`,
-    		`mod_time`,
-    		`tstm`
-		from mall_sale_record
+    		record.msr_id,
+    		record.order_sn,
+    		record.cashier_sn,
+    		record.saller_id,
+    		record.discount_id,
+    		record.sales_time,
+    		record.creater_sn,
+    		record.create_time,
+    		record.moder_sn,
+    		record.mod_time,
+    		record.tstm,
+    		topic.title as discountName
+		from mall_sale_record record
+		left join mall_store_topic topic on topic.id = record.discount_id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')

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

@@ -36,21 +36,28 @@
 
 	<select id="queryList" resultType="com.kmall.admin.entity.vip.Mall2MemberConsumptionRecordsEntity">
 		select
-    		`mmcr_id`,
-    		`user_id`,
-    		`order_sn`,
-    		`consumption_time`,
-    		`shop_sn`,
-    		`is_use_birthday_offer`,
-    		`creater_sn`,
-    		`create_time`,
-    		`moder_sn`,
-    		`mod_time`,
-    		`tstm`
-		from mall2_member_consumption_records
+    		records.mmcr_id,
+    		records.user_id,
+    		records.order_sn,
+    		records.consumption_time,
+    		records.shop_sn,
+    		records.is_use_birthday_offer,
+    		records.creater_sn,
+    		records.create_time,
+    		records.moder_sn,
+    		records.mod_time,
+    		records.tstm,
+			mu.username as userName,
+			store.store_name as shopName
+		from mall2_member_consumption_records records
+		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() != ''">
@@ -68,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

@@ -32,19 +32,21 @@
 
 	<select id="queryList" resultType="com.kmall.admin.entity.vip.Mall2MemberPointsEntity">
 		select
-    		`mmp_id`,
-    		`user_id`,
-    		`points`,
-    		`points_expire_date`,
-    		`creater_sn`,
-    		`create_time`,
-    		`moder_sn`,
-    		`mod_time`,
-    		`tstm`
-		from mall2_member_points
+    		points.mmp_id,
+    		points.user_id,
+    		points.points,
+    		points.points_expire_date,
+    		points.creater_sn,
+    		points.create_time,
+    		points.moder_sn,
+    		points.mod_time,
+    		points.tstm,
+			mu.username as userName
+		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() != ''">
@@ -62,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,10 +10,11 @@
         <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>
+                <span>门店活动由“门店商品价格管理”导入</span>
 
             </div>
             <!--<div class="buttons-group">

kmall-admin/src/main/webapp/WEB-INF/page/sale/goodsPanorama.html

@@ -127,7 +127,7 @@
                 <i-col span="4">
                     <Form-item label="品类" prop="goodsSn">
 <!--                        <i-input v-model="goods.goodsSn" placeholder="品类"/>-->
-                        <i-input  readOnly="readonly" placeholder="品类"/>
+                        <i-input  readOnly="readonly" v-model="goods.categoryName" placeholder="品类"/>
                     </Form-item>
                 </i-col>
                 <i-col span="4">
@@ -142,9 +142,9 @@
                     </Form-item>
                 </i-col>
                 <i-col span="4">
-                    <Form-item label="进货单位" prop="goodsSn">
+                    <Form-item label="进货单位" prop="goodsUnit">
 <!--                        <i-input v-model="goods.goodsSn" placeholder="进货单位"/>-->
-                        <i-input  readOnly="readonly" placeholder="进货单位"/>
+                        <i-input  readOnly="readonly" v-model="goods.goodsUnit" placeholder="进货单位"/>
                     </Form-item>
                 </i-col>
             </Row>

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/shop/shopuser.html

@@ -21,21 +21,21 @@
                 #if($shiro.hasPermission("user:update"))
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
                 #end-->
-                #if($shiro.hasPermission("user:delete"))
-                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
-                #if($shiro.hasPermission("user:export"))
-                <i-button type="info" @click="exportUser"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>
-                #end
-                #if($shiro.hasPermission("shop:usercoupon"))
-                <i-button type="primary" @click="coupon"><i class="fa fa-cc-visa"></i>&nbsp;优惠券</i-button>
-                #end
-                #if($shiro.hasPermission("shop:cart"))
-                <i-button type="primary" @click="shopCart"><i class="fa fa-shopping-cart"></i>&nbsp;购物车</i-button>
-                #end
-                #if($shiro.hasPermission("shop:address"))
-                <i-button type="primary" @click="address"><i class="fa fa-map"></i>&nbsp;收货地址</i-button>
-                #end
+<!--                #if($shiro.hasPermission("user:delete"))-->
+<!--                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>-->
+<!--                #end-->
+<!--                #if($shiro.hasPermission("user:export"))-->
+<!--                <i-button type="info" @click="exportUser"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>-->
+<!--                #end-->
+<!--                #if($shiro.hasPermission("shop:usercoupon"))-->
+<!--                <i-button type="primary" @click="coupon"><i class="fa fa-cc-visa"></i>&nbsp;优惠券</i-button>-->
+<!--                #end-->
+<!--                #if($shiro.hasPermission("shop:cart"))-->
+<!--                <i-button type="primary" @click="shopCart"><i class="fa fa-shopping-cart"></i>&nbsp;购物车</i-button>-->
+<!--                #end-->
+<!--                #if($shiro.hasPermission("shop:address"))-->
+<!--                <i-button type="primary" @click="address"><i class="fa fa-map"></i>&nbsp;收货地址</i-button>-->
+<!--                #end-->
             </div>
         </Row>
         <table id="jqGrid"></table>
@@ -110,4 +110,4 @@
 
 <script src="${rc.contextPath}/js/shop/shopuser.js?_${date.systemTime}"></script>
 </body>
-</html>
+</html>

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/cashier/salerecord.js

@@ -12,7 +12,9 @@ $(function () {
 				if(value === '0'){
 					return '-';
 				}
+				return value;
 				}},
+			{label: '活动id', name: 'discountName', index: 'discountName', align: 'center', width: 80,},
 			{label: '销售时间', name: 'salesTime', index: 'sales_time',align: 'center', width: 80,formatter:function(value){
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}}

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

@@ -4,16 +4,16 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '活动主题', name: 'title', index: 'title', align: 'center',width: 80},
-			{label: '活动内容', name: 'content', index: 'content',align: 'center', width: 80},
+			{label: '活动主题', name: 'title', index: 'title', align: 'center',width: 200},
+			{label: '活动内容', name: 'content', index: 'content',align: 'center', width: 200},
 			// {label: '活动图片', name: 'itemPicUrl', index: 'item_pic_url', width: 80},
-			{label: '子标题', name: 'subtitle', index: 'subtitle', align: 'center',width: 80},
-			{label: '活动类别名称', name: 'promTypeName', index: 'prom_type_id',align: 'center', width: 80},
+			{label: '子标题', name: 'subtitle', index: 'subtitle', align: 'center',width: 200},
+			{label: '活动类别名称', name: 'promTypeName', index: 'prom_type_id',align: 'center', width: 200},
 			// {label: '活动价格', name: 'priceInfo', index: 'price_info', width: 80},
 			// {label: '场景图片链接', name: 'scenePicUrl', index: 'scene_pic_url', width: 80},
-			{label: '门店名称', name: 'storeName', index: 'store_id', align: 'center',width: 80},
-			{label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'third_merch_sn',align: 'center', width: 80},
-            {label: '是否有效', name: 'isValid', index: 'is_valid', width: 50, align: 'center',
+			{label: '门店名称', name: 'storeName', index: 'store_id', align: 'center',width: 200},
+			{label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'third_merch_sn',align: 'center', width: 200},
+            {label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '有效';
@@ -23,7 +23,7 @@ $(function () {
                     return '-';
                 }
             },
-			{label: '备注', name: 'note', index: 'note', width: 80},
+			{label: '备注', name: 'note', index: 'note', width: 200},
 			],
 		viewrecords: true,
         height: 550,
@@ -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/receipt/receiptCheck.js

@@ -21,6 +21,7 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+            {label: '小票号', name: 'orderSn', index: 'order_sn', align: 'center',width: 120},
             {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 120},
             {label: '操作店员', name: 'userName', index: 'user_name', align: 'center',width: 80},
             {
@@ -60,27 +61,8 @@ $(function () {
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
-            },
-            // {label: '快递公司', name: 'shippingName', index: 'shipping_name', width: 80},
-            // {label: '配送单号', name: 'shippingNo', index: 'shipping_No', width: 80},
-            // {label: '快递费用', name: 'shippingFee', index: 'shipping_fee', width: 80},
-            {
-                label: '操作', width: 180, sortable: false,align: 'center',
-                formatter: function (value, col, row) {
-                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
-                    if (row.orderStatus == 201 && (row.orderBizType == '11')) {
-                        htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.printDetail(' + row.id + ')"><i class="fa fa-print"></i>打印</button>&nbsp;';
-                    }
-                    if (row.orderStatus == 0) {
-                        htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.cancelUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;取消</button>&nbsp;';
-                    }
-                    if (row.orderStatus == 201) {
-                        htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.refundUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;退款</button>&nbsp;';
-                    }
-
-                    return htmlStr;
-                }
             }
+
         ],
         viewrecords: true,
         height: 675,
@@ -92,7 +74,6 @@ $(function () {
         shrinkToFit: false,
         autoScroll: true,   //开启水平滚动条
         width: 1500,
-        multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",

kmall-admin/src/main/webapp/js/sale/goodsPanorama.js

@@ -446,6 +446,7 @@ var vm = new Vue({
             $.post("../goods/infoByQuery",postData,function(r){
 
                 vm.goods = r.goods;
+                console.log(r.goods);
                 // vm.goodsBizType = r.goods.goodsBizType;
             });
             // $.get("../goods/info/" + id, function (r) {

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

@@ -3,7 +3,7 @@ $(function () {
         url: '../goodshistoryprice/list',
         datatype: "json",
         colModel: [
-			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+			{label: 'id', name: 'id', index: 'id', key: true, width: 50,hidden: true},
 			{label: '商品编码(sku)', name: 'sku', index: 'sku', width: 180},
 			{label: 'PLU', name: 'plu', index: 'plu', width: 180,align: 'center',formatter: function (value) {
 				if(!value){
@@ -26,7 +26,6 @@ $(function () {
         shrinkToFit: false,
         autoScroll: true,   //开启水平滚动条
         width: 1500,
-        multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",
@@ -57,7 +56,8 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            sku: '',
+            plu:''
 		}
 	},
 	methods: {
@@ -128,7 +128,8 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                sku: '',
+                plu:''
             }
             vm.reload();
 		},
@@ -153,4 +154,4 @@ let vm = new Vue({
             handleResetForm(this, name);
         }
 	}
-});
+});

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

@@ -5,11 +5,13 @@ $(function () {
         colModel: [
 			{label: 'mmcrId', name: 'mmcrId', index: 'mmcr_id', key: true, hidden: true},
 			{label: '用户id', name: 'userId', index: 'user_id',align:'center', width: 80},
+			{label: '用户名称', name: 'userName', index: 'userName',align:'center', width: 80},
 			{label: '订单编号', name: 'orderSn', index: 'order_sn',align:'center', width: 80},
 			{label: '消费时间', name: 'consumptionTime', index: 'consumption_time',align:'center', width: 80,formatter:function(value){
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}},
 			{label: '消费门店id', name: 'shopSn', index: 'shop_sn',align:'center', width: 80},
+			{label: '消费门店', name: 'shopName', index: 'shopName',align:'center', width: 80},
 			{label: '是否使用生日优惠', name: 'isUseBirthdayOffer', index: 'is_use_birthday_offer',align:'center', width: 80},
 			],
 		viewrecords: true,
@@ -50,7 +52,8 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            userId: '',
+            orderSn:''
 		}
 	},
 	methods: {
@@ -121,7 +124,8 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                userId: '',
+                orderSn:''
             }
             vm.reload();
 		},
@@ -129,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

@@ -5,6 +5,7 @@ $(function () {
         colModel: [
 			{label: 'mmpId', name: 'mmpId', index: 'mmp_id',align:'center', key: true, hidden: true},
 			{label: '用户id', name: 'userId', index: 'user_id',align:'center', width: 80},
+			{label: '用户名', name: 'userName', index: 'userName',align:'center', width: 80},
 			{label: '积分数', name: 'points', index: 'points',align:'center', width: 80},
 			{label: '积分到期时间', name: 'pointsExpireDate', index: 'points_expire_date',align:'center', width: 80,formatter:function(value){
 				return '-';
@@ -48,7 +49,7 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            userId: ''
 		}
 	},
 	methods: {
@@ -119,7 +120,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                userId: ''
             }
             vm.reload();
 		},
@@ -127,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');