diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ExpressDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ExpressDO.java new file mode 100644 index 000000000..4af9bbc38 --- /dev/null +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ExpressDO.java @@ -0,0 +1,70 @@ +package cn.iocoder.yudao.module.shop.dal.dataobject.express; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 快递公司表 + * +---------------------------------------------------------------------- + * | CRMEB [ CRMEB赋能开发者,助力企业发展 ] + * +---------------------------------------------------------------------- + * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权 + * +---------------------------------------------------------------------- + * | Author: CRMEB Team + * +---------------------------------------------------------------------- + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("eb_express") +@Schema( description="快递公司表") +public class ExpressDO implements Serializable { + + private static final long serialVersionUID=1L; + + @Schema( description= "快递公司id") + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Integer id; + + @Schema( description= "快递公司简称") + private String code; + + @Schema( description= "快递公司全称") + private String name; + + @Schema( description= "是否需要月结账号") + private Boolean partnerId; + + @Schema( description= "是否需要月结密码") + private Boolean partnerKey; + + @Schema( description= "是否需要取件网店") + private Boolean net; + + @Schema( description= "账号") + private String account; + + @Schema( description= "密码") + private String password; + + @Schema( description= "网点名称") + private String netName; + + @Schema( description= "排序") + private Integer sort; + + @Schema( description= "是否显示") + private Boolean isShow; + + @Schema( description= "是否可用") + private Boolean status; +} diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index fa46ed6af..6af19f45a 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -34,7 +34,6 @@ import cn.iocoder.yudao.module.shop.request.order.StoreOrderUpdatePriceRequest; import cn.iocoder.yudao.module.shop.response.member.InitOrderResponse; import cn.iocoder.yudao.module.shop.response.order.*; import cn.iocoder.yudao.module.shop.service.express.ExpressService; -import cn.iocoder.yudao.module.shop.service.onepass.OnePassService; import cn.iocoder.yudao.module.shop.service.order.StoreOrderInfoService; import cn.iocoder.yudao.module.shop.service.order.StoreOrderRefundService; import cn.iocoder.yudao.module.shop.service.order.StoreOrderService;