修改收银端页面取货码显示

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

@@ -109,8 +109,8 @@ public class GoodsController {
     }
 
     @RequestMapping("/queryGoodsName")
-    public R queryGoodsName(@RequestParam String goodsName) {
-        List<GoodsEntity> goodsList = goodsService.queryByName(goodsName);
+    public R queryGoodsName(@RequestParam String storeId, @RequestParam String goodsName) {
+        List<GoodsEntity> goodsList = goodsService.queryByName(storeId, goodsName);
         return R.ok().put("goodsList", goodsList);
     }
 

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsDao.java

@@ -61,7 +61,7 @@ public interface GoodsDao extends BaseDao<GoodsEntity> {
      */
     List<GoodsEntity> queryListByBarcode(@Param("prodBarcode")String prodBarcode, @Param("storeId")Integer storeId);
 
-    List<GoodsEntity> queryByName(@Param("goodsName")String goodsName);
+    List<GoodsEntity> queryByName(@Param("storeId")String storeId, @Param("goodsName")String goodsName);
 
 
     List<String> queryNonSyncOmsHsCodeSkuList();

kmall-admin/src/main/java/com/kmall/admin/service/GoodsService.java

@@ -190,7 +190,7 @@ public interface GoodsService {
      * @param goodsName
      * @return
      */
-    List<GoodsEntity> queryByName(String goodsName);
+    List<GoodsEntity> queryByName(String storeId, String goodsName);
 
     void syncOmsHsCode();
 

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

@@ -620,8 +620,8 @@ public class GoodsServiceImpl implements GoodsService {
     }
 
     @Override
-    public List<GoodsEntity> queryByName(String goodsName) {
-        return goodsDao.queryByName(goodsName);
+    public List<GoodsEntity> queryByName(String storeId, String goodsName) {
+        return goodsDao.queryByName(storeId, goodsName);
     }
 
 

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

@@ -783,11 +783,18 @@
     </select>
 
     <select id="queryByName" resultType="com.kmall.admin.entity.GoodsEntity">
-        select id,name,sku,prod_barcode
-        from mall_goods
-        where 1=1
+        SELECT DISTINCT
+            g.id,
+            g.NAME,
+            g.sku,
+            g.prod_barcode
+        FROM
+            mall_product_store_rela r
+        LEFT JOIN mall_goods g ON g.id = r.goods_id
+        WHERE
+            r.store_id = #{storeId}
         <if test="goodsName != null and goodsName != ''">
-            and name like concat('%',#{goodsName},'%');
+            AND g.NAME LIKE concat('%',#{goodsName},'%');
         </if>
     </select>
     <select id="queryNonSyncOmsHsCodeSkuList" resultType="java.lang.String">

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

@@ -71,7 +71,7 @@
                 order by ${sidx} ${order}
             </when>
 			<otherwise>
-                order by FIELD(pick_up_code_status,0,2,3,1), pick_up_code_createtime desc
+                order by FIELD(pick_up_code_status,0,2,3,1,5), pick_up_code_createtime desc
 			</otherwise>
         </choose>
 		<if test="offset != null and limit != null">

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

@@ -73,7 +73,7 @@
                 order by ${sidx} ${order}
             </when>
 			<otherwise>
-                order by file_id desc
+                order by bill_time DESC, file_id desc
 			</otherwise>
         </choose>
 		<if test="offset != null and limit != null">

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

@@ -612,7 +612,8 @@ let vm = new Vue({
         },2000),
 
         queryGoods: function(){
-            $.get("../goods/queryGoodsName?goodsName=", function (r) {
+            vm.storeId = sessionStorage.getItem("storeId");
+            $.get("../goods/queryGoodsName?storeId="+vm.storeId+"&goodsName=", function (r) {
                 if (r.code == 0) {
                     vm.searchGoods = r.goodsList;
                 } else {