From 08aabed0ff5b032ba3c34ae6b0f1f662c3675065 Mon Sep 17 00:00:00 2001 From: SUCH HAVE YOU <2207141659@qq.com> Date: Mon, 23 Sep 2024 20:10:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat.=E5=BF=AB=E9=80=92=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeliveryController.java | 59 +++++++++++++++++++ .../com/skyeye/delivery/dao/DeliveryDao.java | 8 +++ .../com/skyeye/delivery/entity/Delivery.java | 50 ++++++++++++++++ .../delivery/service/DeliveryService.java | 12 ++++ .../service/impl/DeliveryServiceImpl.java | 31 ++++++++++ .../impl/ShopMemberLevelServiceImpl.java | 1 - 6 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/controller/DeliveryController.java create mode 100644 skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/dao/DeliveryDao.java create mode 100644 skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/entity/Delivery.java create mode 100644 skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/service/DeliveryService.java create mode 100644 skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/service/impl/DeliveryServiceImpl.java diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/controller/DeliveryController.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/controller/DeliveryController.java new file mode 100644 index 00000000..d90a6f1c --- /dev/null +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/controller/DeliveryController.java @@ -0,0 +1,59 @@ +package com.skyeye.delivery.controller; + +import com.skyeye.annotation.api.Api; +import com.skyeye.annotation.api.ApiImplicitParam; +import com.skyeye.annotation.api.ApiImplicitParams; +import com.skyeye.annotation.api.ApiOperation; +import com.skyeye.common.entity.search.CommonPageInfo; +import com.skyeye.common.object.InputObject; +import com.skyeye.common.object.OutputObject; +import com.skyeye.delivery.entity.Delivery; +import com.skyeye.delivery.service.DeliveryService; +import com.skyeye.level.entity.ShopMemberLevel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Api(value = "快递公司管理", tags = "快递公司管理", modelName = "快递公司管理") +public class DeliveryController { + + @Autowired + private DeliveryService deliveryService; + + @ApiOperation(id = "queryDeliveryList", value = "获取快递公司信息", method = "POST", allUse = "2") + @ApiImplicitParams(classBean = CommonPageInfo.class) + @RequestMapping("/post/DeliveryController/queryDeliveryList") + public void queryMemberLevelList(InputObject inputObject, OutputObject outputObject) { + deliveryService.queryPageList(inputObject, outputObject); + } + + @ApiOperation(id = "writeDelivery", value = "添加/编辑快递公司", method = "POST", allUse = "2") + @ApiImplicitParams(classBean = Delivery.class) + @RequestMapping("/post/DeliveryController/writeDelivery") + public void writeDelivery(InputObject inputObject, OutputObject outputObject) { + deliveryService.saveOrUpdateEntity(inputObject, outputObject); + } + + @ApiOperation(id = "deleteDeliveryById", value = "根据id删除快递公司信息", method = "DELETE", allUse = "2") + @ApiImplicitParams({@ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")}) + @RequestMapping("/post/DeliveryController/deleteDeliveryById") + public void deleteDeliveryById(InputObject inputObject, OutputObject outputObject) { + deliveryService.deleteById(inputObject, outputObject); + } + + @ApiOperation(id = "getDelivery", value = "根据ID获取快递公司", method = "GET", allUse = "2") + @ApiImplicitParams({@ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")}) + @RequestMapping("/post/DeliveryController/getDelivery") + public void queryDeliveryByIds(InputObject inputObject, OutputObject outputObject) { + deliveryService.selectById(inputObject, outputObject); + } + + + @ApiOperation(id = "deliveryListAllSimple",value = "获取精简的快递公司信息，主要用于下拉列表",method = "GET",allUse = "2") + @RequestMapping("/post/ShopDeliveryController/deliveryListAllSimple") + public void streamlineDeliveryList(InputObject inputObject, OutputObject outputObject) { + deliveryService.streamlineDeliveryList(inputObject,outputObject); + } + +} diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/dao/DeliveryDao.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/dao/DeliveryDao.java new file mode 100644 index 00000000..1cb1de35 --- /dev/null +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/dao/DeliveryDao.java @@ -0,0 +1,8 @@ +package com.skyeye.delivery.dao; + + +import com.skyeye.delivery.entity.Delivery; +import com.skyeye.eve.dao.SkyeyeBaseMapper; + +public interface DeliveryDao extends SkyeyeBaseMapper { +} diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/entity/Delivery.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/entity/Delivery.java new file mode 100644 index 00000000..b3cdc0b2 --- /dev/null +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/entity/Delivery.java @@ -0,0 +1,50 @@ +package com.skyeye.delivery.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.skyeye.annotation.api.ApiModel; +import com.skyeye.annotation.api.ApiModelProperty; +import com.skyeye.annotation.unique.UniqueField; +import com.skyeye.common.entity.features.OperatorUserInfo; +import lombok.Data; + +@Data +@UniqueField +//@RedisCacheField(name = CacheConstants.SHOP_STORE_CACHE_KEY) //开启缓存 +@TableName(value = "shop_delivery_company") +@ApiModel("快递公司管理") +public class Delivery extends OperatorUserInfo { + + @TableId("id") + @ApiModelProperty(value = "主键id。为空时新增，不为空时编辑") + private String id; + + @TableField(value = "`code_num`") + @ApiModelProperty(value = "快递公司 code",required = "required") + private String codeNum; + + @TableField(value = "`name`") + @ApiModelProperty(value = "快递公司名称", required = "required") + private String name; + + @TableField(value = "`logo`") + @ApiModelProperty(value = "快递公司 logo",required = "required") + private String logo; + + @TableField(value = "`remark`") + @ApiModelProperty(value = "快递公司 code") + private String remark; + + @TableField(value = "`enabled`") + @ApiModelProperty(value = "状态",required = "required") + private String enabled; + + @TableField(value = "`order_by`") + @ApiModelProperty(value = "排序",required = "required") + private String orderBy; + + @TableField(value = "`store_id`") + @ApiModelProperty(value = "门店id",required = "required") + private String storeId; +} diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/service/DeliveryService.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/service/DeliveryService.java new file mode 100644 index 00000000..4ceefd8d --- /dev/null +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/service/DeliveryService.java @@ -0,0 +1,12 @@ +package com.skyeye.delivery.service; + +import com.skyeye.base.business.service.SkyeyeBusinessService; +import com.skyeye.common.object.InputObject; +import com.skyeye.common.object.OutputObject; +import com.skyeye.delivery.entity.Delivery; + + +public interface DeliveryService extends SkyeyeBusinessService { + + void streamlineDeliveryList(InputObject inputObject, OutputObject outputObject); +} diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/service/impl/DeliveryServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/service/impl/DeliveryServiceImpl.java new file mode 100644 index 00000000..4a074f6b --- /dev/null +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/delivery/service/impl/DeliveryServiceImpl.java @@ -0,0 +1,31 @@ +package com.skyeye.delivery.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.skyeye.annotation.service.SkyeyeService; +import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; +import com.skyeye.common.object.InputObject; +import com.skyeye.common.object.OutputObject; +import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; +import com.skyeye.delivery.dao.DeliveryDao; +import com.skyeye.delivery.entity.Delivery; +import com.skyeye.delivery.service.DeliveryService; +import com.skyeye.level.entity.ShopMemberLevel; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@SkyeyeService(name = "快递公司管理", groupName = "快递公司管理") +public class DeliveryServiceImpl extends SkyeyeBusinessServiceImpl implements DeliveryService { + + + @Override + public void streamlineDeliveryList(InputObject inputObject, OutputObject outputObject) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + // 添加查询条件 enabled = "2" + queryWrapper.eq(MybatisPlusUtil.toColumns(Delivery::getEnabled), "2"); + List list = list(queryWrapper); + outputObject.setBeans(list); + outputObject.settotal(list.size()); + } +} diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java index db835574..a8caf8ea 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/level/service/impl/ShopMemberLevelServiceImpl.java @@ -32,7 +32,6 @@ public class ShopMemberLevelServiceImpl extends SkyeyeBusinessServiceImpl queryWrapper = new QueryWrapper<>(); // 添加查询条件 enabled = "2" queryWrapper.eq(MybatisPlusUtil.toColumns(ShopMemberLevel::getEnabled), "2"); From 9a517065677d0c36f54854c3fb6956c3f14d7d1c Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Wed, 25 Sep 2024 11:18:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=95=86=E5=93=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=93=81=E7=89=8C=E7=9A=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/skyeye/brand/controller/BrandController.java | 12 +++++------- .../java/com/skyeye/brand/service/BrandService.java | 2 +- .../skyeye/brand/service/impl/BrandServiceImpl.java | 6 +++--- .../java/com/skyeye/material/entity/Material.java | 5 +++++ .../material/service/impl/MaterialServiceImpl.java | 8 ++++++++ 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/controller/BrandController.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/controller/BrandController.java index 141ea334..831ea293 100644 --- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/controller/BrandController.java +++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/controller/BrandController.java @@ -46,17 +46,15 @@ public class BrandController { } /** - * 根据启用状态获取品牌列表 + * 根据已启用的品牌列表 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ - @ApiOperation(id = "queryBrandListByEnabled", value = "根据启用状态获取品牌列表", method = "POST", allUse = "1") - @ApiImplicitParams({ - @ApiImplicitParam(id = "enabled", name = "enabled", value = "商品状态", required = "required")}) - @RequestMapping("/post/BrandController/queryBrandListByEnabled") - public void queryBrandListByEnabled(InputObject inputObject, OutputObject outputObject) { - brandService.queryBrandListByEnabled(inputObject, outputObject); + @ApiOperation(id = "queryEnabledBrandList", value = "根据已启用的品牌列表", method = "POST", allUse = "0") + @RequestMapping("/post/BrandController/queryEnabledBrandList") + public void queryEnabledBrandList(InputObject inputObject, OutputObject outputObject) { + brandService.queryEnabledBrandList(inputObject, outputObject); } /** diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/service/BrandService.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/service/BrandService.java index 4a9cdb2c..af8a6dce 100644 --- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/service/BrandService.java +++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/service/BrandService.java @@ -18,5 +18,5 @@ import com.skyeye.common.object.OutputObject; * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ public interface BrandService extends SkyeyeBusinessService { - void queryBrandListByEnabled(InputObject inputObject, OutputObject outputObject); + void queryEnabledBrandList(InputObject inputObject, OutputObject outputObject); } diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/service/impl/BrandServiceImpl.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/service/impl/BrandServiceImpl.java index 1e3d1ca6..b8e7212f 100644 --- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/service/impl/BrandServiceImpl.java +++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/brand/service/impl/BrandServiceImpl.java @@ -10,6 +10,7 @@ import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; import com.skyeye.brand.dao.BrandDao; import com.skyeye.brand.entity.Brand; import com.skyeye.brand.service.BrandService; +import com.skyeye.common.enumeration.EnableEnum; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; @@ -30,10 +31,9 @@ import java.util.List; public class BrandServiceImpl extends SkyeyeBusinessServiceImpl implements BrandService { @Override - public void queryBrandListByEnabled(InputObject inputObject, OutputObject outputObject) { - String enable = inputObject.getParams().get("enabled").toString(); + public void queryEnabledBrandList(InputObject inputObject, OutputObject outputObject) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(MybatisPlusUtil.toColumns(Brand::getEnabled), enable); + queryWrapper.eq(MybatisPlusUtil.toColumns(Brand::getEnabled), EnableEnum.ENABLE_USING.getKey()); List brandList = list(queryWrapper); outputObject.setBeans(brandList); outputObject.settotal(brandList.size()); diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/material/entity/Material.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/material/entity/Material.java index 514b9c1a..1ecde335 100644 --- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/material/entity/Material.java +++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/material/entity/Material.java @@ -13,6 +13,7 @@ import com.skyeye.annotation.api.ApiModelProperty; import com.skyeye.annotation.api.Property; import com.skyeye.annotation.cache.RedisCacheField; import com.skyeye.annotation.unique.UniqueField; +import com.skyeye.brand.entity.Brand; import com.skyeye.common.constans.CacheConstants; import com.skyeye.common.entity.features.BaseGeneralInfo; import com.skyeye.material.entity.unit.MaterialUnit; @@ -120,4 +121,8 @@ public class Material extends BaseGeneralInfo { @ApiModelProperty(value = "品牌id") private String brandId; + @TableField(exist = false) + @ApiModelProperty(value = "品牌信息") + private Brand brandMation; + } diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/material/service/impl/MaterialServiceImpl.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/material/service/impl/MaterialServiceImpl.java index 8aaa02cf..c90e99e2 100644 --- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/material/service/impl/MaterialServiceImpl.java +++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/material/service/impl/MaterialServiceImpl.java @@ -13,6 +13,7 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.skyeye.annotation.service.SkyeyeService; import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; +import com.skyeye.brand.service.BrandService; import com.skyeye.common.constans.CommonCharConstants; import com.skyeye.common.constans.CommonConstants; import com.skyeye.common.entity.search.CommonPageInfo; @@ -74,6 +75,9 @@ public class MaterialServiceImpl extends SkyeyeBusinessServiceImpl queryWrapper = new QueryWrapper<>(); @@ -167,6 +171,8 @@ public class MaterialServiceImpl extends SkyeyeBusinessServiceImpl Date: Wed, 25 Sep 2024 18:09:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=90=8D=E7=A7=B0=E5=9C=A8=E3=80=90=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=AE=A1=E7=90=86=E3=80=91=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skyeye/server/service/impl/ServiceBeanServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/server/service/impl/ServiceBeanServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/server/service/impl/ServiceBeanServiceImpl.java index b127e64b..19d86cf0 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/server/service/impl/ServiceBeanServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/server/service/impl/ServiceBeanServiceImpl.java @@ -108,8 +108,8 @@ public class ServiceBeanServiceImpl extends SkyeyeBusinessServiceImpl classNameList) {