From d32cb572e033ebdd83677df19f2a598242c96677 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 17 Jun 2025 13:42:46 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=93=E7=B3=BB=E5=AD=97=E6=AE=B5=EF=BC=9B?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5=E6=B3=A8=E9=87=8A=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manager/SaOrderController.java | 64 +++++++++---------- .../order/mapper/SaOrderRemarksMapper.java | 3 - .../hzs/sale/order/param/WaresOrderParam.java | 6 +- .../order/service/ISaOrderItemsService.java | 5 +- .../order/service/ISaOrderRemarksService.java | 3 - .../service/impl/SaOrderItemsServiceImpl.java | 3 - .../impl/SaOrderRemarksServiceImpl.java | 3 - .../hzs/sale/order/vo/WaresOrderInfoVo.java | 16 ++--- .../com/hzs/sale/order/vo/WaresOrderVo.java | 10 --- .../com/hzs/common/core/enums/EDelivery.java | 7 +- .../hzs/common/core/enums/EPresaleStatus.java | 15 +---- .../com/hzs/common/core/enums/ESaleType.java | 6 +- .../hzs/common/core/enums/ETransportType.java | 10 +-- .../domain/sale/order/SaOrderRemarks.java | 5 -- 14 files changed, 46 insertions(+), 110 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java index 985ad8b3..76e260e3 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java @@ -41,12 +41,6 @@ import java.util.stream.Collectors; /** * 订单控制类 - * - * @author: sui q - * @time: 2022/8/27 16:20 - * @description: - * @classname: OrderController - * @package_name: com.hzs.sale.order.controller */ @RestController @RequestMapping("/manage/order") @@ -56,14 +50,14 @@ public class SaOrderController extends ParentOrderController { @Autowired private ITransactionCommonService iTransactionCommonService; @Autowired - private ISaOrderService orderService; + private ISaOrderService iSaOrderService; @Autowired - private ISaOrderItemsService orderItemsService; + private ISaOrderItemsService iSaOrderItemsService; @Autowired - private ISaOrderRemarksService orderRemarksService; + private ISaOrderRemarksService iSaOrderRemarksService; @DubboReference - IAreaServiceApi areaServiceApi; + IAreaServiceApi iAreaServiceApi; @DubboReference IUserServiceApi iUserServiceApi; @DubboReference @@ -90,7 +84,7 @@ public class SaOrderController extends ParentOrderController { if (waresOrderParam.getEndPayDate() != null) { waresOrderParam.setEndPayDate(DateUtils.getEndTime(waresOrderParam.getEndPayDate())); } - Map areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); + Map areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); waresOrderParam.setPkCountry(SecurityUtils.getPkCountry()); // 获取管理员权限（角色地区范围、体系列表、团队列表） @@ -100,7 +94,7 @@ public class SaOrderController extends ParentOrderController { waresOrderParam.setTeamList(userAuthorityDTO.getUserTeamList()); startPage(); - List resultList = orderService.selectByOrderInfoList(waresOrderParam); + List resultList = iSaOrderService.selectByOrderInfoList(waresOrderParam); for (WaresOrderVo waresOrderVo : resultList) { // 省 @@ -183,7 +177,7 @@ public class SaOrderController extends ParentOrderController { if (waresOrderParam.getEndPayDate() != null) { waresOrderParam.setEndPayDate(DateUtils.getEndTime(waresOrderParam.getEndPayDate())); } - Map areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); + Map areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); waresOrderParam.setPkCountry(SecurityUtils.getPkCountry()); // 获取管理员权限（角色地区范围、体系列表、团队列表） @@ -191,10 +185,10 @@ public class SaOrderController extends ParentOrderController { waresOrderParam.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); waresOrderParam.setVertexIdList(userAuthorityDTO.getVertexIdList()); waresOrderParam.setTeamList(userAuthorityDTO.getUserTeamList()); - // startPage(); - List resultList = orderService.selectByOrderInfoList(waresOrderParam); + + List resultList = iSaOrderService.selectByOrderInfoList(waresOrderParam); // 获取需要翻译的枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values(), ETransportType.values(), EPresaleStatus.values(), EOrderType.values(), EOrderStatus.values(), EOrderPayType.values(), ESaleType.values(), EShippingChannel.values()); + Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderType.values(), EShippingChannel.values()); for (WaresOrderVo waresOrderVo : resultList) { // 省 if (waresOrderVo.getRecProvince() != null) { @@ -242,7 +236,7 @@ public class SaOrderController extends ParentOrderController { waresOrderVo.setLogisticsCode(waresOrderVo.getLogisticsCode()); waresOrderVo.setLogisticsCompany(waresOrderVo.getLogisticsCompany()); } - ExcelUtil util = new ExcelUtil(WaresOrderVo.class, iMenuColumnServiceApi.queryMenuColumn("Commodity", SecurityUtils.getUserId()).getData()); + ExcelUtil util = new ExcelUtil<>(WaresOrderVo.class, iMenuColumnServiceApi.queryMenuColumn("Commodity", SecurityUtils.getUserId()).getData()); util.exportExcel(response, resultList, "商品订单导出"); } @@ -269,10 +263,10 @@ public class SaOrderController extends ParentOrderController { // 获取需要翻译的枚举翻译 Map transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values()); - Map areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); + Map areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); startPage(); - List resultList = orderItemsService.selectByInvestmentList(waresOrderParam); + List resultList = iSaOrderItemsService.selectByInvestmentList(waresOrderParam); for (WaresOrderVo waresOrderVo : resultList) { // 省 if (waresOrderVo.getRecProvince() != null) { @@ -353,11 +347,11 @@ public class SaOrderController extends ParentOrderController { waresOrderParam.setEndCreateDate(DateUtils.getEndTime(waresOrderParam.getEndCreateDate())); } - Map areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); + Map areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); // 获取需要翻译的枚举翻译 Map transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values()); - List resultList = orderItemsService.selectByInvestmentList(waresOrderParam); + List resultList = iSaOrderItemsService.selectByInvestmentList(waresOrderParam); for (WaresOrderVo waresOrderVo : resultList) { // 省 if (waresOrderVo.getRecProvince() != null) { @@ -493,11 +487,11 @@ public class SaOrderController extends ParentOrderController { * @param param */ private void handleOrderSelect(List resultList, OrderSelectParam param) { - List saOrderItemsExtList = orderService.queryOrderSelect(param, SecurityUtils.getPkCountry()); + List saOrderItemsExtList = iSaOrderService.queryOrderSelect(param, SecurityUtils.getPkCountry()); if (CollectionUtil.isNotEmpty(saOrderItemsExtList)) { // 调用system服务，获取地址 - Map areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); + Map areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); for (SaOrderItemsExt saOrderItemsExt : saOrderItemsExtList) { OrderSelectVO orderSelectVO = BeanUtil.copyProperties(saOrderItemsExt, OrderSelectVO.class); @@ -511,20 +505,20 @@ public class SaOrderController extends ParentOrderController { /** * 添加订单备注 */ - @PostMapping("update-order-remarks") + @PostMapping("/update-order-remarks") public AjaxResult updateOrderRemarks(@RequestBody SaOrderRemarks saOrderRemarks) { - SaOrderRemarks orderRemarks = orderRemarksService.getOne(new LambdaQueryWrapper().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder())); + SaOrderRemarks orderRemarks = iSaOrderRemarksService.getOne(new LambdaQueryWrapper().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder())); if (orderRemarks == null) { saOrderRemarks.setCreationTime(DateUtils.currentDateTime()); saOrderRemarks.setPkCountry(SecurityUtils.getPkCountry()); saOrderRemarks.setPkCreator(SecurityUtils.getUserId()); saOrderRemarks.setStatus(EYesNo.NO.getIntValue()); - orderRemarksService.save(saOrderRemarks); + iSaOrderRemarksService.save(saOrderRemarks); } else { orderRemarks.setModifiedTime(DateUtils.currentDateTime()); orderRemarks.setPkModified(SecurityUtils.getUserId()); orderRemarks.setRemarks(saOrderRemarks.getRemarks()); - orderRemarksService.update(orderRemarks, new LambdaQueryWrapper().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder())); + iSaOrderRemarksService.update(orderRemarks, new LambdaQueryWrapper().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder())); } return AjaxResult.success(); } @@ -532,7 +526,7 @@ public class SaOrderController extends ParentOrderController { /** * 单品销量列表 */ - @GetMapping("single-item-stat") + @GetMapping("/single-item-stat") public TableDataInfo singleItemStat(SingleItemStatParam singleItemStatParam) { if (StringUtils.isBlank(singleItemStatParam.getSkuCode()) && StringUtils.isBlank(singleItemStatParam.getProductName()) @@ -560,7 +554,7 @@ public class SaOrderController extends ParentOrderController { singleItemStatParam.setEndPayDateStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.getEndTime(DateUtils.addDate(nowDate, 1)))); } startPage(); - List singleItemStatList = orderService.singleItemStat(singleItemStatParam); + List singleItemStatList = iSaOrderService.singleItemStat(singleItemStatParam); for (SingleItemStatVo singleItemStat : singleItemStatList) { singleItemStat.setTotal(singleItemStat.getGiftQuantity() + singleItemStat.getProductQuantity()); } @@ -573,7 +567,7 @@ public class SaOrderController extends ParentOrderController { * @param singleItemStatParam * @param */ - @GetMapping("get-single-item-stat-total") + @GetMapping("/get-single-item-stat-total") public AjaxResult getSingleItemStatTotal(SingleItemStatParam singleItemStatParam) { if (StringUtils.isBlank(singleItemStatParam.getSkuCode()) && StringUtils.isBlank(singleItemStatParam.getProductName()) @@ -609,7 +603,7 @@ public class SaOrderController extends ParentOrderController { // 总计 Integer total = 0; // 查询计算总计 - List siList = orderService.singleItemStat(singleItemStatParam); + List siList = iSaOrderService.singleItemStat(singleItemStatParam); for (SingleItemStatVo singleItemStatVo : siList) { singleItemStatVo.setTotal(singleItemStatVo.getGiftQuantity() + singleItemStatVo.getProductQuantity()); waresQuantity += singleItemStatVo.getWaresQuantity(); @@ -631,7 +625,7 @@ public class SaOrderController extends ParentOrderController { /** * 订单单品统计导出 */ - @PostMapping("single-item-stat-export") + @PostMapping("/single-item-stat-export") public void singleItemStatExport(SingleItemStatParam singleItemStatParam, HttpServletResponse response) { if (StringUtils.isBlank(singleItemStatParam.getSkuCode()) @@ -661,7 +655,7 @@ public class SaOrderController extends ParentOrderController { singleItemStatParam.setEndPayDateStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.getEndTime(DateUtils.addDate(nowDate, 1)))); } - List singleItemStatList = orderService.singleItemStat(singleItemStatParam); + List singleItemStatList = iSaOrderService.singleItemStat(singleItemStatParam); int waresQuantity = 0; // 产品数量 @@ -723,9 +717,9 @@ public class SaOrderController extends ParentOrderController { param.setTeamList(userAuthorityDTO.getUserTeamList()); startPage(); - List resultList = orderService.listOrderInvoicing(param); + List resultList = iSaOrderService.listOrderInvoicing(param); - Map areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); + Map areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); for (OrderInvoicingVO vo : resultList) { // 地区处理 if (vo.getRecProvince() != null) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRemarksMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRemarksMapper.java index 402d2af5..e0aa5c31 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRemarksMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRemarksMapper.java @@ -5,9 +5,6 @@ import com.hzs.common.domain.sale.order.SaOrderRemarks; /** * 订单备注信息（订单表一对一） Mapper 接口 - * - * @author hzs - * @since 2023-09-18 */ public interface SaOrderRemarksMapper extends BaseMapper { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresOrderParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresOrderParam.java index fd5fde46..cecbf6c5 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresOrderParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresOrderParam.java @@ -7,11 +7,7 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * @Description: 商品订单的查询条件 - * @Author: yuhui - * @Time: 2023/1/31 14:10 - * @Classname: WaresOrderParam - * @PackageName: com.hzs.sale.order.param + * 商品订单的查询条件 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java index f8eca0f3..e4877764 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java @@ -19,9 +19,6 @@ import java.util.List; /** * 销售订单-明细表 服务类 - * - * @author hzs - * @since 2022-08-31 */ public interface ISaOrderItemsService extends IService { @@ -104,7 +101,7 @@ public interface ISaOrderItemsService extends IService { /** * 根据订单ID查询订单明细列表 * - * @param orderIdList 订单ID列表 + * @param orderIdList 订单ID列表 * @return */ List queryListByOrderId(List orderIdList); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRemarksService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRemarksService.java index 11426d82..cd235215 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRemarksService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRemarksService.java @@ -5,9 +5,6 @@ import com.hzs.common.domain.sale.order.SaOrderRemarks; /** * 订单备注信息（订单表一对一） 服务类 - * - * @author hzs - * @since 2023-09-18 */ public interface ISaOrderRemarksService extends IService { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java index 779b1e72..d09f5ce7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java @@ -25,9 +25,6 @@ import java.util.*; /** * 销售订单-明细表 服务实现类 - * - * @author hzs - * @since 2022-08-31 */ @Service public class SaOrderItemsServiceImpl extends ServiceImpl implements ISaOrderItemsService { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRemarksServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRemarksServiceImpl.java index 29c20e8a..a85836d6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRemarksServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRemarksServiceImpl.java @@ -8,9 +8,6 @@ import org.springframework.stereotype.Service; /** * 订单备注信息（订单表一对一） 服务实现类 - * - * @author hzs - * @since 2023-09-18 */ @Service public class SaOrderRemarksServiceImpl extends ServiceImpl implements ISaOrderRemarksService { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java index 1cb988c3..10538ce3 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java @@ -9,14 +9,6 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.sale.order.vo - * @Author: yh - * @CreateTime: 2023-08-02 16:32 - * @Description: TODO - * @Version: 1.0 - */ @Data public class WaresOrderInfoVo implements Serializable { @@ -106,9 +98,15 @@ public class WaresOrderInfoVo implements Serializable { /** * 会员名称 */ - @Excel(name = "会员名称") + @Excel(name = "会员姓名") private String memberName; + /** + * 隶属体系 + */ + @Excel(name = "隶属体系") + private String vertexName; + /** * 联系方式 */ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java index 6d935413..73e1f3f0 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java @@ -10,29 +10,19 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/1/31 14:09 - * @Classname: WaresOrderVo - * @PackageName: com.hzs.sale.order.vo - */ @Data public class WaresOrderVo implements Serializable { /** * 产品主图 */ - // @Excel(name = "产品主图") private String cover1; /** * 产品名称 */ - // @Excel(name = "产品名称") private String waresName; - /** * 产品单价 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelivery.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelivery.java index 27b56a9f..408e267d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelivery.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelivery.java @@ -4,13 +4,8 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; - /** - * @Description: 发货方式 - * @Author: sui q - * @Time: 2022/8/31 9:07 - * @Classname: EDelivery - * @PackageName: com.hzs.common.core.enums + * 发货方式 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPresaleStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPresaleStatus.java index 0ea153e9..b1eae20e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPresaleStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPresaleStatus.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 预售状态 - * @Author: jiang chao - * @Time: 2022/11/4 14:05 - * @Classname: EPresaleStatus - * @PackageName: com.hzs.common.core.enums + * 预售状态 */ @AllArgsConstructor @Getter @@ -25,11 +21,6 @@ public enum EPresaleStatus { */ PRESALE(1, "预售", 0, EnumsPrefixConstants.PRESALE_STATUS + "1"), - /** - * 已售罄 2.0删除该项 已对接过设计 - */ -// SOLD_OUT(2, "已售罄", 0, EnumsPrefixConstants.PRESALE_STATUS + "2"), - /** * 缺货 */ @@ -54,9 +45,9 @@ public enum EPresaleStatus { */ private final String key; - public static EPresaleStatus getEPresaleStatus(int value ){ + public static EPresaleStatus getEPresaleStatus(int value) { for (EPresaleStatus ePresaleStatus : EPresaleStatus.values()) { - if (ePresaleStatus.getValue() == value){ + if (ePresaleStatus.getValue() == value) { return ePresaleStatus; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java index ac36549c..8923592c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 销售类型枚举 - * @Author: jiang chao - * @Time: 2023/3/21 14:46 - * @Classname: ESaleType - * @PackageName: com.hzs.common.core.enums + * 销售类型枚举 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransportType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransportType.java index aa57e394..33176d62 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransportType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransportType.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 运输类型 - * @Author: sui q - * @Time: 2022/9/15 14:30 - * @Classname: ETransportType - * @PackageName: com.hzs.common.core.enums + * 运输类型 */ @AllArgsConstructor @Getter @@ -48,9 +44,9 @@ public enum ETransportType { private final String key; - public static ETransportType getETransportType(int value){ + public static ETransportType getETransportType(int value) { for (ETransportType eTransportType : ETransportType.values()) { - if (eTransportType.getValue() == value){ + if (eTransportType.getValue() == value) { return eTransportType; } } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRemarks.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRemarks.java index 7a8a73b5..91dc2b2f 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRemarks.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRemarks.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 订单备注信息（订单表一对一） - *

- * - * @author hzs - * @since 2023-09-18 */ @Data @EqualsAndHashCode(callSuper = true)