From 1195349ebf7a27080968126c2a5aeeb63cfc3543 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 11 Aug 2021 21:18:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E7=B1=BB=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=AF=BB=E5=8F=96=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/goods/mapper/CategorySpecificationMapper.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java
index 8667be9d..de3c4967 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java
@@ -20,8 +20,7 @@ public interface CategorySpecificationMapper extends BaseMapper<CategorySpecific
      * @param categoryId 分类id
      * @return 分类绑定规格列表
      */
-    @Select("select s.* from " +
-            "li_specification s INNER join li_category_specification cs on s.id = cs.specification_id and cs.category_id = #{categoryId} " +
-            "where s.delete_flag = 0")
+    @Select("select s.* from  li_specification s INNER join li_category_specification cs " +
+            "on s.id = cs.specification_id and cs.category_id = #{categoryId} ")
     List<Specification> getCategorySpecList(String categoryId);
 }
\ No newline at end of file

From d5b6ba5d000c17bf3dc4ff1c9db6ade4e3a5d040 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 11 Aug 2021 23:02:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../other/distribution/DistributionOrderStoreController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java
index b5b9f0e9..cab0ffcd 100644
--- a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java
@@ -36,7 +36,7 @@ public class DistributionOrderStoreController {
     public ResultMessage<IPage<DistributionOrder>> distributionOrder(DistributionOrderSearchParams distributionOrderSearchParams) {
 
         //获取当前登录商家账号-查询当前店铺的分销订单
-        distributionOrderSearchParams.setStoreId(UserContext.getCurrentUser().getId());
+        distributionOrderSearchParams.setStoreId(UserContext.getCurrentUser().getStoreId());
         //查询分销订单列表
         IPage<DistributionOrder> distributionOrderPage = distributionOrderService.getDistributionOrderPage(distributionOrderSearchParams);
         return ResultUtil.data(distributionOrderPage);