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");