bug修复

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

@@ -32,6 +32,15 @@ public class FootprintController {
     @RequiresPermissions("footprint:list")
     public R list(@RequestParam Map<String, Object> params) {
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
+        String name = (String) params.get("name");
+        if(org.apache.commons.lang3.StringUtils.isNotEmpty(name)){
+            try{
+                name = new String(name.getBytes("iso-8859-1"),"utf-8");
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+            params.put("name", name);
+        }
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/java/com/kmall/admin/dao/mk/MkCenterMenuStoreRealDao.java

@@ -14,5 +14,5 @@ import java.util.List;
  */
 public interface MkCenterMenuStoreRealDao extends BaseDao<MkCenterMenuStoreRealEntity> {
     Integer deleteByStoreId(Integer storeId);
-    List<MkCenterMenuStoreRealEntity> queryMenuByStoreId(Integer storeId);
+    List<MkCenterMenuStoreRealEntity> queryMenuByThirdMerchSn(Integer thirdMerchSn);
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkCenterMenuStoreRealServiceImpl.java

@@ -29,7 +29,7 @@ public class MkCenterMenuStoreRealServiceImpl implements MkCenterMenuStoreRealSe
     public MkCenterMenuStoreRealEntity queryObject(Integer id) {
         MkCenterMenuStoreRealEntity entity = mkCenterMenuStoreRealDao.queryObject(id);
         List<Integer> centerIdList = new ArrayList<>();
-        List<MkCenterMenuStoreRealEntity> storeRealEntityList = mkCenterMenuStoreRealDao.queryMenuByStoreId(entity.getStoreId());
+        List<MkCenterMenuStoreRealEntity> storeRealEntityList = mkCenterMenuStoreRealDao.queryMenuByThirdMerchSn(entity.getThirdMerchSn());
         for(MkCenterMenuStoreRealEntity realEntity : storeRealEntityList){
             centerIdList.add(realEntity.getCenterMenuId());
         }

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

@@ -38,7 +38,7 @@
         select distinct a.* ,b.nickname as user_name
         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_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="storeId != null">

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

@@ -18,22 +18,28 @@
 	</select>
 
     <select id="queryList" resultMap="footprintMap">
-        select distinct
-          a.* ,b.nickname as user_name,c.name as goods_name
-        from mall_footprint a
-        left join mall_user b on a.user_id = b.id
-        left join mall_goods c on a.goods_id = c.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
+        SELECT DISTINCT
+        a.*,
+        b.nickname AS user_name,
+        c.NAME AS goods_name
+        FROM
+        mall_product_store_rela r
+        INNER JOIN mall_footprint a ON r.goods_id = a.goods_id
+        INNER JOIN mall_store s ON r.store_id = s.id
+        INNER JOIN mall_goods c ON r.goods_id = c.id
+        INNER JOIN mall_merch_user d ON r.store_id = d.store_id
+        AND r.merch_sn = d.merch_sn
+        INNER JOIN mall_user b ON a.user_id = b.id
+        AND d.user_id = b.id
         WHERE 1=1
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
         <if test="storeId != null">
-            and d.store_id = #{storeId}
+            and r.store_id = #{storeId}
         </if>
         <if test="merchSn != null and merchSn.trim() != ''">
-            and d.merch_sn = #{merchSn}
+            and c.merch_sn = #{merchSn}
         </if>
         <if test="name != null and name != ''">
             AND b.username LIKE concat('%',#{name},'%')
@@ -52,19 +58,24 @@
     </select>
 
     <select id="queryTotal" resultType="int">
-		select count(distinct a.id) from mall_footprint 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
+		select count(distinct a.id) FROM
+        mall_product_store_rela r
+        INNER JOIN mall_footprint a ON r.goods_id = a.goods_id
+        INNER JOIN mall_store s ON r.store_id = s.id
+        INNER JOIN mall_goods c ON r.goods_id = c.id
+        INNER JOIN mall_merch_user d ON r.store_id = d.store_id
+        AND r.merch_sn = d.merch_sn
+        INNER JOIN mall_user b ON a.user_id = b.id
+        AND d.user_id = b.id
         WHERE 1=1
         <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
             AND s.third_party_merch_code = #{thirdPartyMerchCode}
         </if>
         <if test="storeId != null">
-            and d.store_id = #{storeId}
+            and r.store_id = #{storeId}
         </if>
         <if test="merchSn != null and merchSn.trim() != ''">
-            and d.merch_sn = #{merchSn}
+            and c.merch_sn = #{merchSn}
         </if>
         <if test="name != null and name != ''">
             AND b.username LIKE concat('%',#{name},'%')

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

@@ -546,7 +546,7 @@
         mall_product_store_rela s
         LEFT JOIN mk_store_ticket_goods_temp g ON s.id = g.store_rela_id AND g.guid = #{guid} and g.is_valid = '0' and g.is_button_cannel = '0'
         LEFT JOIN mall_goods gs ON s.goods_id = gs.id
-        LEFT JOIN mall_store st ON s.store_id = s.id
+        LEFT JOIN mall_store st ON st.id =  s.store_id
         WHERE  1=1 and gs.is_delete = 0
         <if test="storeId != null and storeId != '' ">
             AND s.store_id = #{storeId}
@@ -575,7 +575,7 @@
         mall_product_store_rela s
         LEFT JOIN mk_store_ticket_goods_temp g ON s.id = g.store_rela_id AND g.guid = #{guid} and g.is_valid = '0' and g.is_button_cannel = '0'
         LEFT JOIN mall_goods gs ON s.goods_id = gs.id
-        LEFT JOIN mall_store st ON s.store_id = s.id
+        LEFT JOIN mall_store st ON st.id =  s.store_id
         WHERE  1=1 and gs.is_delete = 0
         <if test="storeId != null and storeId != '' ">
             AND s.store_id = #{storeId}

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

@@ -28,13 +28,14 @@
 	</select>
 
     <select id="queryList" resultType="com.kmall.admin.entity.UserEntity">
-        select distinct
+        SELECT DISTINCT
         mall_user.*,
-        mall_user_level.name levelName
-        from mall_user
-        LEFT JOIN mall_merch_user mu ON mall_user.id=mu.user_id
-        LEFT JOIN mall_user_level ON mall_user.user_level_id=mall_user_level.id
-        left join mall_store s on mu.store_id = s.id
+        mall_user_level.NAME levelName
+        FROM
+        mall_store s
+        LEFT JOIN mall_merch_user mu ON mu.store_id = s.id
+        left join mall_user on mall_user.id = mu.user_id
+        LEFT JOIN mall_user_level ON mall_user.user_level_id = mall_user_level.id
         WHERE 1=1
         <if test="storeId != null and storeId != ''">
             and mu.store_id = #{storeId}
@@ -65,10 +66,12 @@
     </select>
 
     <select id="queryTotal" resultType="int">
-        select count(distinct mall_user.id) from mall_user
-        LEFT JOIN mall_merch_user mu ON mall_user.id=mu.user_id
-        LEFT JOIN mall_user_level ON mall_user.user_level_id=mall_user_level.id
-        left join mall_store s on mu.store_id = s.id
+        select count(distinct mall_user.id)
+        FROM
+        mall_store s
+        LEFT JOIN mall_merch_user mu ON mu.store_id = s.id
+        left join mall_user on mall_user.id = mu.user_id
+        LEFT JOIN mall_user_level ON mall_user.user_level_id = mall_user_level.id
         WHERE 1=1
         <if test="storeId != null and storeId != ''">
             and mu.store_id = #{storeId}

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

@@ -34,7 +34,7 @@
 		where id = #{id}
 	</select>
 
-	<select id="queryMenuByStoreId" resultType="com.kmall.admin.entity.mk.MkCenterMenuStoreRealEntity">
+	<select id="queryMenuByThirdMerchSn" resultType="com.kmall.admin.entity.mk.MkCenterMenuStoreRealEntity">
 		select
 		`id`,
 		`center_menu_id`,
@@ -48,7 +48,7 @@
 		`mod_time`,
 		`tstm`
 		from mk_center_menu_store_real
-		where store_id = #{storeId}
+		where third_merch_sn = #{thirdMerchSn}
 	</select>
 
 	<select id="queryList" resultType="com.kmall.admin.entity.mk.MkCenterMenuStoreRealEntity">