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

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

@@ -151,7 +151,6 @@
 			LEFT JOIN mall_product_store_rela r ON m.store_rela_id = r.id
 			LEFT JOIN mall_store s ON r.store_id = s.id
 			LEFT JOIN mall_goods g ON r.goods_id = g.id
-			AND s.third_party_merch_code = g.third_party_merch_code
 		WHERE 1=1
 		<if test="goodsName != null and goodsName.trim() != ''">
 			AND g.NAME LIKE concat('%',#{goodsName},'%')
@@ -171,7 +170,6 @@
 		LEFT JOIN mall_product_store_rela r ON m.store_rela_id = r.id
 		LEFT JOIN mall_store s ON r.store_id = s.id
 		LEFT JOIN mall_goods g ON r.goods_id = g.id
-		AND s.third_party_merch_code = g.third_party_merch_code
 		WHERE 1=1
 		<if test="goodsName != null and goodsName.trim() != ''">
 			AND g.NAME LIKE concat('%',#{goodsName},'%')

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

@@ -589,7 +589,7 @@ let vm = new Vue({
                 return;
             }
             $.get("../productstorerela/queryGoodsRealListByTopicId?storeId=" + storeId +"&goodsName="+vm.s.goodsName+"&applyType="+vm.applyType+"&goodsBizType="+goodsBizType
-                +"&storeTopicId="+vm.storeTopicId+"&page="+1+"&limit="+vm.limit, function (r) {
+                +"&storeTopicId="+vm.storeTopicId+"&page="+vm.currentPage+"&limit="+vm.limit, function (r) {
                 if(r.code == 0){
                     vm.goodsList = r.page.list;
                     vm.totalPage = r.page.totalPage;

kmall-api/src/main/java/com/kmall/api/service/mk/ApiMkStoreCampMinusService.java

@@ -446,7 +446,7 @@ public class ApiMkStoreCampMinusService {
             CartVo cartVo = cartBizList.get(i);
             if(bizType.equalsIgnoreCase(cartVo.getGoodsBizType())) {
                 Integer goodsId = Integer.parseInt(String.valueOf(cartVo.getGoods_id()));
-                mkStoreCampMinusList = queryStoreCampMinusByGoodsId(storeId, userId, goodsId);
+                mkStoreCampMinusList.addAll(queryStoreCampMinusByGoodsId(storeId, userId, goodsId));
                 goodsIds[i] = goodsId;
             }
         }