商品店铺信息查询展示

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -379,6 +379,9 @@ public interface FsStoreProductScrmMapper
             "\tCOUNT(*) OVER ( PARTITION BY p.product_name ) AS storeCount,\n" +
             "\tp1.storeIds,\n" +
             "\tp.* \n" +
+            "<if test=\"maps.isStores != null and maps.isStores == 1\">\n" +
+            ",fs.store_name \n" +
+            "</if>" +
             "FROM\n" +
             "\tfs_store_product_scrm p\n" +
             "\tLEFT JOIN ( SELECT GROUP_CONCAT( DISTINCT fsp1.store_id SEPARATOR ',' ) AS storeIds, fsp1.product_name FROM fs_store_product_scrm fsp1 GROUP BY fsp1.product_name ) p1 ON p1.product_name = p.product_name\n" +
@@ -393,9 +396,9 @@ public interface FsStoreProductScrmMapper
             "<if test = 'maps.isDisplay != null and maps.isDisplay == 1   '> " +
             "and p.is_display =#{maps.isDisplay}  " +
             "</if>" +
-            "<if test = 'maps.companyId != null'> " +
-            "and find_in_set(#{maps.companyId}, p.company_ids) " +
-            "</if>" +
+//            "<if test = 'maps.companyId != null'> " +
+//            "and find_in_set(#{maps.companyId}, p.company_ids) " +
+//            "</if>" +
             "<if test = 'maps.cateId != null    '> " +
             "and p.cate_id =#{maps.cateId}  " +
             "</if>" +

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreProductListQueryVO.java

@@ -70,4 +70,9 @@ public class FsStoreProductListQueryVO implements Serializable
      * 批号
      * **/
     private String prescribeCode;
+
+    /**
+     * 店铺名称
+     * **/
+    private String storeName;
 }

fs-user-app/src/main/java/com/fs/app/redis/OrderExpireHandler.java

@@ -53,7 +53,7 @@ public class OrderExpireHandler {
     private static final String LOCK_KEY_PREFIX = "order-expire-product-lock:";
 
     private static final int LOCK_WAIT_TIME = 3; // 锁等待时间
-    private static final int LOCK_LEASE_TIME = 30; // 锁持有时间
+    private static final int LOCK_LEASE_TIME = 66; // 锁持有时间秒
 
     @Autowired
     private IFsStoreOrderScrmService fsStoreOrderService;