diff --git a/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/enums/PayTypeEnum.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/PayTypeEnum.java similarity index 87% rename from mall-oms/oms-api/src/main/java/com/youlai/mall/oms/enums/PayTypeEnum.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/PayTypeEnum.java index 0e874dfb3..b4f1b163f 100644 --- a/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/enums/PayTypeEnum.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/PayTypeEnum.java @@ -1,12 +1,13 @@ -package com.youlai.mall.oms.enums; +package com.youlai.mall.oms.common.enums; import com.youlai.common.base.IBaseEnum; import lombok.Getter; /** + * 订单支付类型枚举 + * * @author huawei - * @desc 订单支付类型枚举 * @email huawei_code@163.com * @date 2021/1/16 */ diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/CartController.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/CartController.java index 8d435809d..9f30109dc 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/CartController.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/CartController.java @@ -3,7 +3,7 @@ package com.youlai.mall.oms.controller.app; import com.youlai.common.result.Result; import com.youlai.common.security.util.SecurityUtils; import com.youlai.mall.oms.pojo.dto.CartItemDTO; -import com.youlai.mall.oms.service.ICartService; +import com.youlai.mall.oms.service.CartService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -13,18 +13,20 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** + * 「移动端」购物车接口 + * * @author huawei * @email huawei_code@163.com * @date 2020-12-30 22:31:10 */ -@Api(tags = "「移动端」购物车管理") +@Api(tags = "「移动端」购物车接口") @RestController @RequestMapping("/app-api/v1/carts") @RequiredArgsConstructor public class CartController { - private final ICartService cartService; + private final CartService cartService; @ApiOperation(value = "查询购物车") @GetMapping diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/OrderItemDTO.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/OrderItemDTO.java index 0b3700fc1..274eb3575 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/OrderItemDTO.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/OrderItemDTO.java @@ -3,7 +3,10 @@ package com.youlai.mall.oms.pojo.dto; import lombok.*; /** - * 订单商品明细 + * 订单商品 + * + * @author haoxr + * @date 2022/12/21 */ @Data public class OrderItemDTO { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/form/OrderSubmitForm.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/form/OrderSubmitForm.java index 916b0a4fb..0fcb4d468 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/form/OrderSubmitForm.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/form/OrderSubmitForm.java @@ -1,8 +1,11 @@ package com.youlai.mall.oms.pojo.form; +import com.youlai.mall.oms.common.enums.OrderSourceTypeEnum; import com.youlai.mall.oms.pojo.dto.OrderItemDTO; import com.youlai.mall.ums.dto.MemberAddressDTO; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.ToString; import javax.validation.constraints.Size; import java.util.List; @@ -15,42 +18,38 @@ import java.util.List; * @date 2021/1/16 */ @Data +@ToString public class OrderSubmitForm { + /** - * 提交订单确认页面签发的令牌 + * 订单来源 + * + * @see OrderSourceTypeEnum */ + @ApiModelProperty("订单来源") + private Integer sourceType; + + @ApiModelProperty("提交订单确认页面签发的令牌(防止订单重复提交，订单提交成功转为订单编号)") private String orderToken; - /** - * 订单总金额-用于验价(单位：分) - */ + @ApiModelProperty("订单总金额-用于验价(单位：分)") private Long totalAmount; - /** - * 支付金额(单位：分) - */ + @ApiModelProperty("支付金额(单位：分)") private Long payAmount; - /** - * 订单的商品明细 - */ + @ApiModelProperty("订单的商品明细") private List orderItems; - /** - * 订单备注 - */ + @ApiModelProperty("订单备注") @Size(max = 500, message = "订单备注长度不能超过500") private String remark; - /** - * 优惠券ID - */ + @ApiModelProperty("优惠券ID") private String couponId; - /** - * 收获地址 - */ + @ApiModelProperty("收获地址") private MemberAddressDTO deliveryAddress; } diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/util/BloomFilterUtils.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/util/BloomFilterUtils.java similarity index 93% rename from mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/util/BloomFilterUtils.java rename to mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/util/BloomFilterUtils.java index 8786b60c9..02a269e37 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/util/BloomFilterUtils.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/util/BloomFilterUtils.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.util; +package com.youlai.mall.pms.common.util; import com.google.common.hash.Funnel; import com.google.common.hash.Hashing; @@ -6,10 +6,10 @@ import com.google.common.hash.Hashing; import static com.google.common.base.Preconditions.checkArgument; /** + * 布隆过滤器，摘录自Google-guava包 + * * @author DaniR - * @version 1.0 - * @description 布隆过滤器，摘录自Google-guava包 - * @createDate 2021/6/23 20:30 + * @date 2021/6/23 20:30 */ public class BloomFilterUtils { private final int numHashFunctions; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/CategoryController.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/CategoryController.java index 72eeab1ec..66cb2ba1e 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/CategoryController.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/CategoryController.java @@ -2,7 +2,7 @@ package com.youlai.mall.pms.controller.app; import com.youlai.common.result.Result; import com.youlai.mall.pms.pojo.vo.CategoryVO; -import com.youlai.mall.pms.service.IPmsCategoryService; +import com.youlai.mall.pms.service.CategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -16,7 +16,7 @@ import java.util.List; /** * 商品分类控制器 * - * @author haoxr + * @author haoxr * @date 2022/2/5 */ @Api(tags = "「移动端」商品分类") @@ -25,13 +25,13 @@ import java.util.List; @RequiredArgsConstructor public class CategoryController { - private final IPmsCategoryService iPmsCategoryService; + private final CategoryService categoryService; @ApiOperation(value = "分类列表") @GetMapping public Result list( @ApiParam("上级分类ID") Long parentId) { - List list = iPmsCategoryService.listCategory(parentId); + List list = categoryService.listCategory(parentId); return Result.success(list); } } diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/PmsCategoryAttributeMapper.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/PmsCategoryAttributeMapper.java index 228e1787d..1842fe986 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/PmsCategoryAttributeMapper.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/PmsCategoryAttributeMapper.java @@ -4,13 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.youlai.mall.pms.pojo.entity.PmsCategoryAttribute; import org.apache.ibatis.annotations.Mapper; -/** - * @author haoxr - * @date 2020-11-06 - */ @Mapper public interface PmsCategoryAttributeMapper extends BaseMapper { - - } diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/PmsSpuMapper.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/PmsSpuMapper.java index a28a1c87a..5acba09e3 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/PmsSpuMapper.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/PmsSpuMapper.java @@ -10,12 +10,6 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; -/** - * 商品持久层 - * - * @author haoxr - * @date 2022/2/5 - */ @Mapper public interface PmsSpuMapper extends BaseMapper {