Merge branch 'master' of hyq/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/controller/mk/MkCenterMenuController.java

@@ -120,7 +120,7 @@ public class MkCenterMenuController {
         if(Dict.roleType.item_1.getItem().equals(user.getRoleType())){
             list = mkCenterMenuService.queryList(params);
         }else{
-            list = mkCenterMenuService.queryListByStore(params);
+            list = mkCenterMenuService.queryCenterByList(params);
         }
         if(list != null && list.size() > 0) {
             for (MkCenterMenuEntity mkCenterMenuEntity : list) {

kmall-admin/src/main/java/com/kmall/admin/controller/mk/MkCenterMenuStoreRealController.java

@@ -67,7 +67,7 @@ public class MkCenterMenuStoreRealController {
         Map<String, Object> valideDate = MapBeanUtil.fromObject(mkCenterMenuStoreReal);
         ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
         builder.put("thirdMerchSn", "所属三方商户");
-        builder.put("storeId", "所属门店");
+//        builder.put("storeId", "所属门店");
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
             throw new RRException(r.get("msg").toString());
@@ -84,6 +84,14 @@ public class MkCenterMenuStoreRealController {
     @RequiresPermissions("mkcentermenustorereal:update")
     @ResponseBody
     public R update(@RequestBody MkCenterMenuStoreRealEntity mkCenterMenuStoreReal) {
+        Map<String, Object> valideDate = MapBeanUtil.fromObject(mkCenterMenuStoreReal);
+        ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+        builder.put("thirdMerchSn", "所属三方商户");
+//        builder.put("storeId", "所属门店");
+        R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+        if (Integer.valueOf(r.get("code").toString()) != 0) {
+            throw new RRException(r.get("msg").toString());
+        }
         mkCenterMenuStoreRealService.update(mkCenterMenuStoreReal);
 
         return R.ok();

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

@@ -15,4 +15,6 @@ import java.util.Map;
  */
 public interface MkCenterMenuDao extends BaseDao<MkCenterMenuEntity> {
     List<MkCenterMenuEntity> queryListByStore(Map<String, Object> map);
+
+    List<MkCenterMenuEntity> queryCenterByList(Map<String, Object> map);
 }

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

@@ -34,10 +34,14 @@ public class MkCenterMenuServiceImpl implements MkCenterMenuService {
     }
 
     @Override
+    public List<MkCenterMenuEntity> queryCenterByList(Map<String, Object> map) {
+        return mkCenterMenuDao.queryCenterByList(map);
+    }
+
+    @Override
     public List<MkCenterMenuEntity> queryListByStore(Map<String, Object> map) {
         return mkCenterMenuDao.queryListByStore(map);
     }
-
     @Override
     public int queryTotal(Map<String, Object> map) {
         return mkCenterMenuDao.queryTotal(map);

kmall-admin/src/main/java/com/kmall/admin/service/mk/MkCenterMenuService.java

@@ -47,6 +47,13 @@ public interface MkCenterMenuService {
     int queryTotal(Map<String, Object> map);
 
     /**
+     * 营销中心菜单查询
+     * @param map
+     * @return
+     */
+    List<MkCenterMenuEntity> queryCenterByList(Map<String, Object> map);
+
+    /**
      * 保存实体
      *
      * @param mkCenterMenu 实体

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

@@ -53,6 +53,38 @@
 		FROM
 		mk_center_menu a
 	</select>
+	<select id="queryCenterByList" resultType="com.kmall.admin.entity.mk.MkCenterMenuEntity">
+		SELECT
+			a.`id`,
+			a.`menu_name`,
+			a.`menu_detail`,
+			a.`pic_url`,
+			a.`menu_url`,
+			a.`is_valid`
+		FROM
+			mk_center_menu a
+		WHERE
+			1 = 1
+		<if test="(thirdPartyMerchCode != null and thirdPartyMerchCode != '') or (storeId != null and storeId != '') or (thirdMerchSn != null and thirdMerchSn != '') ">
+			AND id IN (
+			SELECT
+			r.center_menu_id
+			FROM
+			mk_center_menu_store_real r
+			LEFT JOIN mall_store s ON r.store_id = s.id
+			LEFT JOIN third_merchant_biz t ON r.third_merch_sn = t.third_merch_sn
+			WHERE 1=1
+			<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+				AND t.third_party_merch_code = #{thirdPartyMerchCode}
+			</if>
+			<if test="thirdMerchSn != null and thirdMerchSn != ''">
+				AND r.third_merch_sn = #{thirdMerchSn}
+			</if>
+			)
+		</if>
+		ORDER BY
+			a.id DESC
+	</select>
 
 	<select id="queryListByStore" resultType="com.kmall.admin.entity.mk.MkCenterMenuEntity">
 		SELECT
@@ -82,12 +114,12 @@
 		<if test="menuName != null and menuName.trim() != ''">
 			AND menu_name LIKE concat('%',#{menuName},'%')
 		</if>
-		<if test="storeId != null and storeId != ''">
-			AND r.store_id = #{storeId}
-		</if>
 		<if test="thirdMerchSn != null and thirdMerchSn != ''">
 			AND r.third_merch_sn = #{thirdMerchSn}
 		</if>
+		<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+			AND t.third_party_merch_code = #{thirdPartyMerchCode}
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -111,12 +143,12 @@
 		<if test="menuName != null and menuName.trim() != ''">
 			AND menu_name LIKE concat('%',#{menuName},'%')
 		</if>
-		<if test="storeId != null and storeId != ''">
-			AND r.store_id = #{storeId}
-		</if>
 		<if test="thirdMerchSn != null and thirdMerchSn != ''">
 			AND r.third_merch_sn = #{thirdMerchSn}
 		</if>
+		<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+			AND t.third_party_merch_code = #{thirdPartyMerchCode}
+		</if>
 	</select>
 	 
 	<insert id="save" parameterType="com.kmall.admin.entity.mk.MkCenterMenuEntity" useGeneratedKeys="true" keyProperty="id">

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

@@ -111,6 +111,7 @@
 		left join mall_user u on t.referrer = u.id
 		left join mall_store s on t.store_id = s.id
 		left join mk_store_prom p on p.prom_id = t.prom_id
+		LEFT JOIN third_merchant_biz tb ON s.third_party_merch_code = tb.third_party_merch_code
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')
@@ -121,6 +122,9 @@
 		<if test="thirdMerchSn != null and thirdMerchSn != ''">
 			AND s.third_merch_sn = #{thirdMerchSn}
 		</if>
+		<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+			AND tb.third_party_merch_code = #{thirdPartyMerchCode}
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -140,6 +144,7 @@
 		left join mall_user u on t.referrer = u.id
 		left join mall_store s on t.store_id = s.id
 		left join mk_store_prom p on p.prom_id = t.prom_id
+		LEFT JOIN third_merchant_biz tb ON s.third_party_merch_code = tb.third_party_merch_code
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
             AND name LIKE concat('%',#{name},'%')
@@ -150,6 +155,9 @@
 		<if test="thirdMerchSn != null and thirdMerchSn != ''">
 			AND s.third_merch_sn = #{thirdMerchSn}
 		</if>
+		<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+			AND tb.third_party_merch_code = #{thirdPartyMerchCode}
+		</if>
 	</select>
 	 
 	<insert id="save" parameterType="com.kmall.admin.entity.mk.store.MkStorePromStatEntity">

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

@@ -144,6 +144,7 @@
 			d.`tstm`,
 			d.`send_type`,d.guid
 		from mk_store_ticket_discount d
+		LEFT JOIN third_merchant_biz b ON d.third_merch_sn = b.third_merch_sn
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND d.name LIKE concat('%',#{name},'%')
@@ -154,6 +155,9 @@
 		<if test="thirdMerchSn != null and thirdMerchSn != ''">
 			AND d.third_merch_sn = #{thirdMerchSn}
 		</if>
+		<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+			AND b.third_party_merch_code = #{thirdPartyMerchCode}
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -169,6 +173,7 @@
 	
  	<select id="queryTotal" resultType="int">
 		select count(*) from mk_store_ticket_discount d
+		LEFT JOIN third_merchant_biz b ON d.third_merch_sn = b.third_merch_sn
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
             AND d.name LIKE concat('%',#{name},'%')
@@ -179,6 +184,9 @@
 		<if test="thirdMerchSn != null and thirdMerchSn != ''">
 			AND d.third_merch_sn = #{thirdMerchSn}
 		</if>
+		<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+			AND b.third_party_merch_code = #{thirdPartyMerchCode}
+		</if>
 	</select>
 
 	<insert id="save" parameterType="com.kmall.admin.entity.mk.store.MkStoreTicketDiscountEntity" useGeneratedKeys="true" keyProperty="tickDiscId">

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

@@ -105,6 +105,7 @@
 		LEFT JOIN mall_store s ON t.store_id = s.id
 		LEFT JOIN mall_store_topic p ON p.id = t.store_topic_id
 		LEFT JOIN mk_store_prom_type pt ON p.prom_type_id = pt.prom_type_id
+		LEFT JOIN third_merchant_biz tb ON s.third_party_merch_code = tb.third_party_merch_code
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')
@@ -115,6 +116,9 @@
 		<if test="thirdMerchSn != null and thirdMerchSn != ''">
 			AND s.third_merch_sn = #{thirdMerchSn}
 		</if>
+		<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+			AND tb.third_party_merch_code = #{thirdPartyMerchCode}
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -133,6 +137,7 @@
 		LEFT JOIN mall_store s ON t.store_id = s.id
 		LEFT JOIN mall_store_topic p ON p.id = t.store_topic_id
 		LEFT JOIN mk_store_prom_type pt ON p.prom_type_id = pt.prom_type_id
+		LEFT JOIN third_merchant_biz tb ON s.third_party_merch_code = tb.third_party_merch_code
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
             AND name LIKE concat('%',#{name},'%')
@@ -143,6 +148,9 @@
 		<if test="thirdMerchSn != null and thirdMerchSn != ''">
 			AND s.third_merch_sn = #{thirdMerchSn}
 		</if>
+		<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+			AND tb.third_party_merch_code = #{thirdPartyMerchCode}
+		</if>
 	</select>
 
 	<insert id="save" parameterType="com.kmall.admin.entity.mk.store.MkStoreTopicStatEntity" useGeneratedKeys="true" keyProperty="storeTopicStatId">

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

@@ -76,6 +76,9 @@
 		<if test="merchSn != null and merchSn != ''">
 			and t.merch_sn = #{merchSn}
 		</if>
+		<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+			AND t.third_party_merch_code = #{thirdPartyMerchCode}
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -105,6 +108,9 @@
 		<if test="merchSn != null and merchSn != ''">
 			and t.merch_sn = #{merchSn}
 		</if>
+		<if test="thirdPartyMerchCode != null and thirdPartyMerchCode != ''">
+			AND t.third_party_merch_code = #{thirdPartyMerchCode}
+		</if>
 	</select>
 	 
 	<insert id="save" parameterType="com.kmall.admin.entity.mk.store.StoreTopicEntity" useGeneratedKeys="true" keyProperty="id">

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

@@ -78,12 +78,12 @@
                     <i-option v-for="thirdMerchant in thirdMerchantBizList" :value="thirdMerchant.thirdMerchSn" :key="thirdMerchant.thirdMerchSn">{{thirdMerchant.thirdPartyMerchName}}</i-option>
                 </i-select>
             </Form-item>
-            <Form-item label="所属门店" prop="storeId">
-                <i-select v-model="mkCenterMenuStoreReal.storeId" placeholder="所属门店" style="width: 268px;">
-                    <i-option v-for="store in storeList" :value="store.id" :key="store.id">{{store.storeName}}
-                    </i-option>
-                </i-select>
-            </Form-item>
+            <!--<Form-item label="所属门店" prop="storeId">-->
+                <!--<i-select v-model="mkCenterMenuStoreReal.storeId" placeholder="所属门店" style="width: 268px;">-->
+                    <!--<i-option v-for="store in storeList" :value="store.id" :key="store.id">{{store.storeName}}-->
+                    <!--</i-option>-->
+                <!--</i-select>-->
+            <!--</Form-item>-->
             <Form-item label="营销菜单">
                 <div style="overflow-y: auto; max-height: 250px; border: 1px solid #cccccc;">
                     <ul id="menuTree" class="ztree"></ul>