caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
lifenlong 2021-08-11 23:18:08 +08:00
commit d8155b2c15
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java
View File

@ -20,8 +20,7 @@ public interface CategorySpecificationMapper extends BaseMapper<CategorySpecific
* @param categoryId 分类id * @param categoryId 分类id
* @return 分类绑定规格列表 * @return 分类绑定规格列表
*/ */
@Select("select s.* from " + @Select("select s.* from li_specification s INNER join li_category_specification cs " +
"li_specification s INNER join li_category_specification cs on s.id = cs.specification_id and cs.category_id = #{categoryId} " + "on s.id = cs.specification_id and cs.category_id = #{categoryId} ")
"where s.delete_flag = 0")
List<Specification> getCategorySpecList(String categoryId); List<Specification> getCategorySpecList(String categoryId);
} }

2
seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java
View File

@ -36,7 +36,7 @@ public class DistributionOrderStoreController {
public ResultMessage<IPage<DistributionOrder>> distributionOrder(DistributionOrderSearchParams distributionOrderSearchParams) { public ResultMessage<IPage<DistributionOrder>> distributionOrder(DistributionOrderSearchParams distributionOrderSearchParams) {
//获取当前登录商家账号-查询当前店铺的分销订单 //获取当前登录商家账号-查询当前店铺的分销订单
distributionOrderSearchParams.setStoreId(UserContext.getCurrentUser().getId()); distributionOrderSearchParams.setStoreId(UserContext.getCurrentUser().getStoreId());
//查询分销订单列表 //查询分销订单列表
IPage<DistributionOrder> distributionOrderPage = distributionOrderService.getDistributionOrderPage(distributionOrderSearchParams); IPage<DistributionOrder> distributionOrderPage = distributionOrderService.getDistributionOrderPage(distributionOrderSearchParams);
return ResultUtil.data(distributionOrderPage); return ResultUtil.data(distributionOrderPage);