diff --git a/agileboot-api/src/main/java/com/agileboot/api/controller/ShopController.java b/agileboot-api/src/main/java/com/agileboot/api/controller/ShopController.java index 17bde5c..77181da 100644 --- a/agileboot-api/src/main/java/com/agileboot/api/controller/ShopController.java +++ b/agileboot-api/src/main/java/com/agileboot/api/controller/ShopController.java @@ -20,6 +20,8 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import com.agileboot.domain.shop.shop.ShopApplicationService; +import com.agileboot.domain.shop.shop.db.ShopEntity; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; @@ -34,10 +36,21 @@ import org.springframework.web.util.UriComponentsBuilder; @Slf4j @RequiredArgsConstructor public class ShopController { - + private final ShopApplicationService shopApplicationService; private final GoodsApplicationService goodsApplicationService; private final CategoryApplicationService categoryApplicationService; + @GetMapping("/list") + public ResponseDTO> getShopList(@RequestParam(required = false) String corpid) { + List shopList; + if (StringUtils.isNotBlank(corpid)) { + shopList = shopApplicationService.getShopListByCorpid(corpid); + } else { + shopList = shopApplicationService.getShopListByCorpid(WeixinConstants.corpid); + } + return ResponseDTO.ok(shopList); + } + @GetMapping("/goods") public ResponseDTO getShopGoodsInfo(@RequestParam(required = false) Long shopId) { /*// 获取商品列表 diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/asset/command/PostAssetGoodsCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/asset/command/PostAssetGoodsCommand.java index 3acda64..238f20f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/asset/command/PostAssetGoodsCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/asset/command/PostAssetGoodsCommand.java @@ -51,6 +51,6 @@ public class PostAssetGoodsCommand { private Integer belongType; @ApiModelProperty("每人每月限购数量") - private String monthlyPurchaseLimit; + private Integer monthlyPurchaseLimit; } } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsEntity.java index 2d47992..2df90cd 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsEntity.java @@ -50,7 +50,7 @@ public class ShopGoodsEntity extends BaseEntity { @ApiModelProperty("每人每月限购数量") @TableField("monthly_purchase_limit") - private String monthlyPurchaseLimit; + private Integer monthlyPurchaseLimit; @ApiModelProperty("销售价格") @TableField("price") diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/dto/ShopGoodsDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/dto/ShopGoodsDTO.java index 66af8f4..0ea1dc2 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/dto/ShopGoodsDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/dto/ShopGoodsDTO.java @@ -103,5 +103,5 @@ public class ShopGoodsDTO { private String usageInstruction; @ExcelColumn(name = "每人每月限购数量") - private String monthlyPurchaseLimit; + private Integer monthlyPurchaseLimit; } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java index 859a0e2..4e9ea9b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/ShopApplicationService.java @@ -32,6 +32,10 @@ public class ShopApplicationService { return new PageDTO<>(dtoList, page.getTotal()); } + public List getShopListByCorpid(String corpid) { + return shopService.getShopListByCorpid(corpid); + } + public void addShop(AddShopCommand command) { ShopModel model = shopModelFactory.create(); model.loadAddCommand(command); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopService.java index 8ea9073..665af47 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopService.java @@ -27,4 +27,6 @@ public interface ShopService extends IService { ShopEntity selectByShopName(String shopName); Long countAllRecord(); + + List getShopListByCorpid(String corpid); } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopServiceImpl.java index 12c8a4c..3c1dddb 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/shop/db/ShopServiceImpl.java @@ -1,6 +1,7 @@ package com.agileboot.domain.shop.shop.db; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -47,4 +48,12 @@ public class ShopServiceImpl extends ServiceImpl impleme public Long countAllRecord() { return baseMapper.countAllRecord(); } + + @Override + public List getShopListByCorpid(String corpid) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("corpid", corpid) + .eq("deleted", 0); + return this.list(queryWrapper); + } } \ No newline at end of file