隐藏门店商品二维码，门店管理二维码，代号：req_hidden_20200610 ；补全一条sql

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

@@ -214,6 +214,8 @@
         a.id,a.sku,a.goods_sn,a.name,a.list_pic_url,a.prod_barcode,r.market_price storeMarketPrice,r.retail_price storeRetailPrice ,r.stock_num,s.store_name,r.product_id,s.id 'storeId'
         FROM
         mall_goods a
+        LEFT JOIN mall_product_store_rela r ON r.goods_id = a.id
+        inner join mall_store s on r.store_id=s.id
         where a.prod_barcode = #{prodBarcode} and a.is_delete = 0
         <if test="goodsId != null and goodsId != ''">
             AND a.id != #{goodsId}

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

@@ -27,19 +27,21 @@ $(function () {
                         return '禁用';
                     }
                     return '';
-                }},
+                }}
+                /*,req_hidden_20200610
             {
                 label: '操作', width: 150, align: 'center', sortable: false, formatter: function (value, col, row) {
                     let htmlStr = "-";
                     if (row.isValid == 0) {
                         htmlStr = "<button class='btn btn-outline btn-primary' " +
-                            "onclick='vm.qrcodeCanvas(" + row.id + ")'><i class='fa fa-qrcode'></i>二维码</button>";
+                            "onclick='vm.qrcodeCanvas(" + row.id + ")'><i class='fa fa-qrcode'></i>门店二维码</button>";
                     }else{
                         htmlStr = "<span style='color: red;font-weight: bolder'>门店禁用则没有生成二维码权限</span>";
                     }
                     return htmlStr;
                 }
-            }],
+            }*/
+            ],
         viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -215,7 +217,7 @@ let vm = new Vue({
                 $("#qrcodeCanvas").html($("#qrcImg").html());
 
                 openWindow({
-                    title: "二维码",
+                    title: "门店二维码",
                     area: ['450px', '450px'],
                     content: jQuery("#qrcode"),
                     btn: ["打印"],

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

@@ -60,7 +60,8 @@ $(function () {
                     //列排序事件
                     jQuery("#jqGrid").jqGrid('setGridParam', {page: $('#XtoPage').val()});
                 }
-            },
+            }
+            /*,req_hidden_20200610
             {
                 label: '操作', width: 220, align: 'center', sortable: false, formatter: function (value, col, row) {
                 let htmlStr = '';
@@ -76,7 +77,7 @@ $(function () {
                 }
                 return htmlStr;
             }
-            }
+            }*/
         ],
         viewrecords: true,
         height: 550,
@@ -621,7 +622,7 @@ var vm = new Vue({
                 alert("商品所属商户与门店商品所属商户不一致，请修改为一致后再生成二维码！");
                 return;
             }
-            $("#qrcodeCanvas").html("");
+            $("#qrcodeCanvas").html("<p>请使用电商小程序扫码 ！！</p><br/>");
             $("#qrcodeCanvas").qrcode({
                 render : "canvas",    //设置渲染方式，有table和canvas，使用canvas方式渲染性能相对来说比较好
                 text : "emato../goods/goods?id=" + id +"&storeId=" + storeId,    //扫描二维码后显示的内容,可以直接填一个网址，扫描二维码后自动跳向该链接