From 86f29b3278ddf0747b28d00613cfe57cfb236243 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 19 Aug 2025 11:00:11 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/CuMemberBonusController.java | 2 +- .../impl/CuMemberBonusServiceImpl.java | 37 ++------ .../impl/CuMemberAssessServiceImpl.java | 3 - .../api/ApiCuMemberAchieveDisController.java | 2 - .../api/ApiCuMemberAssessController.java | 24 ++--- .../WaresSalesVolumeController.java | 38 +++----- .../report/report/vo/WaresSalesVolume.java | 2 +- .../controller/api/ApiOrderController.java | 8 +- .../api/ApiOthSaOrderController.java | 3 +- .../manager/SaOrderChargeLogController.java | 8 +- .../order/service/impl/SaOrderHandle.java | 3 +- .../service/impl/SaOrderServiceImpl.java | 19 +--- .../controller/api/ApiBdWaresController.java | 18 +--- .../controller/manage/BdWaresController.java | 4 +- .../impl/BdWaresSpecsSkuServiceImpl.java | 6 +- .../BdMemberSpecialCurrencyController.java | 10 +- .../enums/controller/EnumsController.java | 14 --- .../enums/controller/EnumsInitController.java | 10 -- .../common/core/constant/SysConstants.java | 8 +- .../com/hzs/common/core/enums/EOrderType.java | 93 +++++-------------- .../hzs/common/core/enums/ESpecialArea.java | 72 ++++---------- .../com/hzs/common/core/enums/ETradeType.java | 22 ++--- 22 files changed, 102 insertions(+), 304 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java index 7694c77c..0b5f95a3 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java @@ -220,7 +220,7 @@ public class CuMemberBonusController extends BaseController { // 获取需要翻译的枚举翻译 Map transactionLongMap = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); for (MemberBonusDetailSerVO memberBonusDetailSerVO : memberBonusDetailSerVOList) { - memberBonusDetailSerVO.setOrderTypeVal(EOrderType.getEnumLabelByValue(memberBonusDetailSerVO.getOrderType())); + memberBonusDetailSerVO.setOrderTypeVal(EOrderType.getLabelByValue(memberBonusDetailSerVO.getOrderType())); memberBonusDetailSerVO.setIncomeStatusVal(EBonusIncomeStatus.getEnumLabelByValue(memberBonusDetailSerVO.getIncomeStatus())); if (transactionLongMap.containsKey(memberBonusDetailSerVO.getPkSettleGrade())) { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java index 71bfba83..72212199 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java @@ -34,6 +34,7 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -58,14 +59,15 @@ public class CuMemberBonusServiceImpl extends ServiceImpl batchQueryCuMemberBonusSeq(Integer rowNum) { return baseMapper.batchQueryCuMemberBonusSeq(rowNum); @@ -515,7 +492,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl transactionMap = transactionCommonService.exportEnumTransaction(EOrderType.values()); + public TableDataInfo list(String waresCode, String waresName, Date startDate, Date endDate) { startPage(); - List waresSalesVolumeList = waresSalesVolumeService.queryList(waresCode,waresName,startDate,endDate); + List waresSalesVolumeList = waresSalesVolumeService.queryList(waresCode, waresName, startDate, endDate); for (WaresSalesVolume waresSalesVolume : waresSalesVolumeList) { - List waresSalesVolumeProductList = waresSalesVolumeService.queryProductList(waresSalesVolume.getPkWares()); + List waresSalesVolumeProductList = waresSalesVolumeService.queryProductList(waresSalesVolume.getPkWares()); waresSalesVolume.setProductInfo(waresSalesVolumeProductList); - waresSalesVolume.setOrderTypeVal(transactionMap.get(EOrderType.getEnumByValue(waresSalesVolume.getOrderType()).getKey())); + waresSalesVolume.setOrderTypeVal(EOrderType.getLabelByValue(waresSalesVolume.getOrderType())); } return getDataTable(waresSalesVolumeList); } /** * 导出 + * * @param waresCode * @param waresName * @param startDate * @param endDate */ @PostMapping("export") - public void export(String waresCode, String waresName, Date startDate , Date endDate, HttpServletResponse response){ - List waresSalesVolumeList = waresSalesVolumeService.queryList(waresCode,waresName,startDate,endDate); + public void export(String waresCode, String waresName, Date startDate, Date endDate, HttpServletResponse response) { + List waresSalesVolumeList = waresSalesVolumeService.queryList(waresCode, waresName, startDate, endDate); for (WaresSalesVolume waresSalesVolume : waresSalesVolumeList) { List waresSalesVolumeProductList = waresSalesVolumeService.queryProductList(waresSalesVolume.getPkWares()); waresSalesVolume.setProductInfo(waresSalesVolumeProductList); diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/vo/WaresSalesVolume.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/vo/WaresSalesVolume.java index 23e783f6..5f1d623f 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/vo/WaresSalesVolume.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/vo/WaresSalesVolume.java @@ -49,12 +49,12 @@ public class WaresSalesVolume { /** * 订单类型 */ - @Excel(name = "订单类型") private Integer orderType; /** * 订单类型 */ + @Excel(name = "订单类型") private String orderTypeVal; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java index cdddfe6d..d0f0eedd 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java @@ -46,11 +46,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 我的订单控制器 - * @Author: jiang chao - * @Time: 2023/1/13 15:53 - * @Classname: ApiOrderController - * @PackageName: com.hzs.sale.order.controller.api + * 我的订单控制器 */ @Slf4j @RestController @@ -683,7 +679,7 @@ public class ApiOrderController extends BaseController { myOrder.setRecCounty(recCounty); } myOrder.setAddress(saOrder.getRecAddress()); - myOrder.setOrderTypeVal(EOrderType.getEnumLabelByValue(myOrder.getOrderType())); + myOrder.setOrderTypeVal(EOrderType.getLabelByValue(myOrder.getOrderType())); // 处理订单明细 myOrderItemsList = new ArrayList<>(); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java index c29ae7a9..462f43b4 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java @@ -52,8 +52,7 @@ public class ApiOthSaOrderController extends ParentOrderController { if (orderParam.getSpecialArea() != EOrderType.REGISTER_ORDER.getValue()) { convertShoppingCarToSku(orderParam); if (EOrderType.UPGRADE_ORDER.getValue() == orderParam.getSpecialArea() - || EOrderType.REPURCHASE_ORDER.getValue() == orderParam.getSpecialArea() - || EOrderType.WELFARE_ORDER.getValue() == orderParam.getSpecialArea()) { + || EOrderType.REPURCHASE_ORDER.getValue() == orderParam.getSpecialArea()) { if (StringUtils.isEmpty(orderParam.getUpgradeMemberCode())) { orderParam.setUpgradeMemberCode(SecurityUtils.getMemberCode()); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderChargeLogController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderChargeLogController.java index bf31667d..8eb0e63f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderChargeLogController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderChargeLogController.java @@ -100,11 +100,11 @@ public class SaOrderChargeLogController extends BaseController { Map transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveRechargeStatus.values(), EOrderStatus.values(), EPlaceDept.values(), ECustomerType.values(), EApprovalBusiness.values(), - EOrderType.values(), ETransportType.values(), EYesNo.values(), EShippingChannel.values(), EUnit.values(), ESignSource.values(), EOrderSource.values()); + ETransportType.values(), EYesNo.values(), EShippingChannel.values(), EUnit.values(), ESignSource.values(), EOrderSource.values()); for (SaOrderChargeLogExt orderChargeLogExt : list) { // 订单类型 - orderChargeLogExt.setOrderTypeStr(transactionMap.get(EOrderType.getEnumByValue(orderChargeLogExt.getOrderType()).getKey())); + orderChargeLogExt.setOrderTypeStr(EOrderType.getLabelByValue(orderChargeLogExt.getOrderType())); // 撤单类型 if (orderChargeLogExt.getChargeType() != null) { orderChargeLogExt.setChargeTypeStr(transactionMap.get(EApprovalBusiness.getEnumByValue(orderChargeLogExt.getChargeType()).getKey())); @@ -274,11 +274,11 @@ public class SaOrderChargeLogController extends BaseController { Map transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveRechargeStatus.values(), EOrderStatus.values(), EPlaceDept.values(), ECustomerType.values(), EApprovalBusiness.values(), - EOrderType.values(), ETransportType.values(), EYesNo.values(), EShippingChannel.values(), EUnit.values(), ESignSource.values(), EOrderSource.values()); + ETransportType.values(), EYesNo.values(), EShippingChannel.values(), EUnit.values(), ESignSource.values(), EOrderSource.values()); for (SaOrderChargeLogExt orderChargeLogExt : list) { // 订单类型 - orderChargeLogExt.setOrderTypeStr(transactionMap.get(EOrderType.getEnumByValue(orderChargeLogExt.getOrderType()).getKey())); + orderChargeLogExt.setOrderTypeStr(EOrderType.getLabelByValue(orderChargeLogExt.getOrderType())); // 撤单类型 if (orderChargeLogExt.getChargeType() != null) { orderChargeLogExt.setChargeTypeStr(transactionMap.get(EApprovalBusiness.getEnumByValue(orderChargeLogExt.getChargeType()).getKey())); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java index 9c223be3..6469d6ba 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java @@ -480,8 +480,7 @@ public class SaOrderHandle { private void setWaresRange(Integer specialArea, List bdWaresDetailExtList, CuMember cuMember) { // 复购订单商品跟业绩需要单独处理 if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea - || EOrderType.MALL_ORDER.getValue() == specialArea - || EOrderType.COOPERATE_ORDER.getValue() == specialArea) { + || EOrderType.MALL_ORDER.getValue() == specialArea) { Map> waresDetailExtMap = new HashMap<>(); List specsSkuList = new ArrayList<>(); bdWaresDetailExtList.forEach(bdWaresDetailExt -> { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index a61166b8..8294b07b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.activity.pick.service.IAcRetailPickService; -import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants; @@ -87,7 +86,6 @@ import java.math.RoundingMode; import java.time.temporal.ChronoUnit; import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -652,10 +650,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl confirmPay = querySystemConfigByKey(pkCountry, ESystemConfig.REPURCHASE_ORDER_CONFIRM_PAY.getKey()); } else if (EOrderType.CONSUME_ORDER.getValue() == specialArea) { confirmPay = querySystemConfigByKey(pkCountry, ESystemConfig.CONSUME_ORDER_CONFIRM_PAY.getKey()); - } else if (EOrderType.EXCHANGE_ORDER.getValue() == specialArea) { - confirmPay = querySystemConfigByKey(pkCountry, ESystemConfig.EXCHANGE_ORDER_CONFIRM_PAY.getKey()); - } else if (EOrderType.WELFARE_ORDER.getValue() == specialArea) { - confirmPay = querySystemConfigByKey(pkCountry, ESystemConfig.WELFARE_ORDER_CONFIRM_PAY.getKey()); } else if (EOrderType.MALL_ORDER.getValue() == specialArea) { confirmPay = querySystemConfigByKey(pkCountry, ESystemConfig.REPURCHASE_ORDER_CONFIRM_PAY.getKey()); } else { @@ -683,10 +677,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl timeType = querySystemConfigByKey(pkCountry, ESystemConfig.REPURCHASE_ORDER_TIME.getKey()); } else if (EOrderType.CONSUME_ORDER.getValue() == specialArea) { timeType = querySystemConfigByKey(pkCountry, ESystemConfig.CONSUME_ORDER_TIME.getKey()); - } else if (EOrderType.EXCHANGE_ORDER.getValue() == specialArea) { - timeType = querySystemConfigByKey(pkCountry, ESystemConfig.EXCHANGE_ORDER_TIME.getKey()); - } else if (EOrderType.WELFARE_ORDER.getValue() == specialArea) { - timeType = querySystemConfigByKey(pkCountry, ESystemConfig.WELFARE_ORDER_TIME.getKey()); } else if (EOrderType.MALL_ORDER.getValue() == specialArea) { timeType = querySystemConfigByKey(pkCountry, ESystemConfig.REGISTER_ORDER_TIME.getKey()); } else { @@ -899,8 +889,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl boolean isToBePay = getIsToBePayByOrderType(orderParam.getPkSettleCountry(), orderParam.getSpecialArea()); CuMember cuMember; if (EOrderType.UPGRADE_ORDER.getValue() == orderParam.getSpecialArea() - || EOrderType.REPURCHASE_ORDER.getValue() == orderParam.getSpecialArea() - || EOrderType.WELFARE_ORDER.getValue() == orderParam.getSpecialArea()) { + || EOrderType.REPURCHASE_ORDER.getValue() == orderParam.getSpecialArea()) { cuMember = getCuMemberByCode(orderParam.getUpgradeMemberCode()); } else { cuMember = getCuMemberByKey(orderParam.getCenterCodeId()); @@ -1832,12 +1821,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl } else if (ESystemConfig.getPayMentTimeList().get(i).getKey().equals(ESystemConfig.REPURCHASE_ORDER_TIME.getKey())) { // 复购专区时间 orderType = EOrderType.REPURCHASE_ORDER.getValue(); - } else if (ESystemConfig.getPayMentTimeList().get(i).getKey().equals(ESystemConfig.EXCHANGE_ORDER_TIME.getKey())) { - // 兑换订单-积分专区 - orderType = EOrderType.EXCHANGE_ORDER.getValue(); - } else if (ESystemConfig.getPayMentTimeList().get(i).getKey().equals(ESystemConfig.WELFARE_ORDER_TIME.getKey())) { - // 福利订单 - orderType = EOrderType.WELFARE_ORDER.getValue(); } ESpecialAreaTime specialAreaTime = ESpecialAreaTime.getSpecialAreaTime(date); if (orderType != null && specialAreaTime != null) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java index f926b94c..dc709de0 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java @@ -180,8 +180,7 @@ public class ApiBdWaresController extends BaseController { List bdWaresRangeList = new ArrayList<>(); if (EOrderType.REPURCHASE_ORDER.getValue() == cuWaresParams.getSpecialArea() - || EOrderType.MALL_ORDER.getValue() == cuWaresParams.getSpecialArea() - || EOrderType.COOPERATE_ORDER.getValue() == cuWaresParams.getSpecialArea()) { + || EOrderType.MALL_ORDER.getValue() == cuWaresParams.getSpecialArea()) { // 复购业绩计算 if (waresIdList.size() > 0) { bdWaresRangeList = iBdWaresRangeService.queryWaresRangeByCondition(cuMember, waresIdList); @@ -230,8 +229,7 @@ public class ApiBdWaresController extends BaseController { BigDecimal retailPrice = BigDecimal.ZERO; if (EOrderType.REPURCHASE_ORDER.getValue() == cuWaresParams.getSpecialArea() - || EOrderType.MALL_ORDER.getValue() == cuWaresParams.getSpecialArea() - || EOrderType.COOPERATE_ORDER.getValue() == cuWaresParams.getSpecialArea()) { + || EOrderType.MALL_ORDER.getValue() == cuWaresParams.getSpecialArea()) { for (BdWaresRange bdWaresRange : bdWaresRangeList) { if (waresExt.getPkId().equals(bdWaresRange.getPkWares())) { waresPrice = waresPrice.add(bdWaresRange.getPrice()); @@ -293,12 +291,7 @@ public class ApiBdWaresController extends BaseController { waresParamsList.add(waresParams); } // 封装抵扣 - if (ESpecialArea.INTEGRAL_AREA.getValue() == cuWaresParams.getSpecialArea()) { - BigDecimal deductRatio = getSpecialDeductRatio(cuWaresParams, pkCountry, EAccount.INTEGRAL.getValue()); - for (CuWaresParams waresParams : waresParamsList) { - waresParams.setDeductMoney(ComputeUtil.computeBonusMultiply(waresParams.getWaresPrice(), deductRatio)); - } - } else if (ESpecialArea.RESCISSION_AREA.getValue() == cuWaresParams.getSpecialArea()) { + if (ESpecialArea.RESCISSION_AREA.getValue() == cuWaresParams.getSpecialArea()) { BigDecimal deductRatio = getSpecialDeductRatio(cuWaresParams, pkCountry, EAccount.REPEAT.getValue()); Set pkCurrencySet = new HashSet<>(); for (CuWaresParams waresParams : waresParamsList) { @@ -402,10 +395,7 @@ public class ApiBdWaresController extends BaseController { } // 封装抵扣 - if (ESpecialArea.INTEGRAL_AREA.getValue() == cuWaresParams.getSpecialArea()) { - BigDecimal deductRatio = getSpecialDeductRatio(cuWaresParams, SecurityUtils.getPkCountry(), EAccount.INTEGRAL.getValue()); - cuWaresParams.setDeductMoney(ComputeUtil.computeBonusMultiply(cuWaresParams.getWaresPrice(), deductRatio)); - } else if (ESpecialArea.RESCISSION_AREA.getValue() == cuWaresParams.getSpecialArea()) { + if (ESpecialArea.RESCISSION_AREA.getValue() == cuWaresParams.getSpecialArea()) { BigDecimal deductRatio = getSpecialDeductRatio(cuWaresParams, pkCountry, EAccount.REPEAT.getValue()); Set pkCurrencySet = new HashSet<>(); if (cuWaresParams.getPkSpecialCurrency() != null) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java index 7e4c51c6..f8289c72 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java @@ -139,7 +139,7 @@ public class BdWaresController extends BaseController { if (CollectionUtil.isNotEmpty(resultList)) { resultList.parallelStream().forEach(waresVo -> { // 所属专区 - waresVo.setSpecialAreaVal(ESpecialArea.getESpecialArea(waresVo.getSpecialArea())); + waresVo.setSpecialAreaVal(ESpecialArea.getLabelByValue(waresVo.getSpecialArea())); // 供应方式 waresVo.setOperateScopeVal(ESupplyWay.getLabelByVal(waresVo.getOperateScope())); // 预售状态 @@ -894,7 +894,7 @@ public class BdWaresController extends BaseController { eo.setWaresPrice(ws.getWaresPrice()); eo.setAmountPrice(eo.getWaresPrice().multiply(new BigDecimal(eo.getQuantity()))); eo.setSpecialArea(ws.getSpecialArea()); - eo.setSpecialAreaStr(ESpecialArea.getESpecialArea(ws.getSpecialArea())); + eo.setSpecialAreaStr(ESpecialArea.getLabelByValue(ws.getSpecialArea())); eo.setIsSingle(ws.getIsSingle()); eo.setProductName(ws.getProductName()); LambdaQueryWrapper qer = new LambdaQueryWrapper<>(); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java index c909da84..213748ae 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java @@ -75,8 +75,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl memberDate = iMemberServiceApi.getMember(loginMemberId); CuMember cuMember = memberDate.getData(); if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea - || EOrderType.MALL_ORDER.getValue() == specialArea - || EOrderType.COOPERATE_ORDER.getValue() == specialArea) { + || EOrderType.MALL_ORDER.getValue() == specialArea) { int level = cuMember.getPkSettleGrade(); int rangeType = ERangeType.GRADE.getValue(); BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); @@ -191,8 +190,7 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl bdWaresSpecsSkuExtList; if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea - || EOrderType.MALL_ORDER.getValue() == specialArea - || EOrderType.COOPERATE_ORDER.getValue() == specialArea) { + || EOrderType.MALL_ORDER.getValue() == specialArea) { R memberDate = iMemberServiceApi.getMember(loginMemberId); CuMember cuMember = memberDate.getData(); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdMemberSpecialCurrencyController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdMemberSpecialCurrencyController.java index e70e9872..6acd0155 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdMemberSpecialCurrencyController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdMemberSpecialCurrencyController.java @@ -29,11 +29,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description: 会员特殊支付配置 - * @Author: jiang chao - * @Time: 2025/2/20 16:39 - * @Classname: BdMemberSpecialCurrencyController - * @PackageName: com.hzs.system.config.controller.manage + * 会员特殊支付配置 */ @RestController @RequestMapping("/manage/member-special-currency") @@ -64,7 +60,7 @@ public class BdMemberSpecialCurrencyController extends BaseController { if (CollectionUtil.isNotEmpty(list)) { for (BdMemberSpecialCurrencyExt memberSpecialCurrency : list) { BdMemberSpecialCurrencyVO vo = BeanUtil.copyProperties(memberSpecialCurrency, BdMemberSpecialCurrencyVO.class); - vo.setSpecialAreaVal(ESpecialArea.getESpecialArea(vo.getSpecialArea())); + vo.setSpecialAreaVal(ESpecialArea.getLabelByValue(vo.getSpecialArea())); resultList.add(vo); } } @@ -116,7 +112,7 @@ public class BdMemberSpecialCurrencyController extends BaseController { // 查询配置数据 BdMemberSpecialCurrencyExt memberSpecialCurrency = iBdMemberSpecialCurrencyService.getData(pkId); BdMemberSpecialCurrencyVO vo = BeanUtil.copyProperties(memberSpecialCurrency, BdMemberSpecialCurrencyVO.class); - vo.setSpecialAreaVal(ESpecialArea.getESpecialArea(vo.getSpecialArea())); + vo.setSpecialAreaVal(ESpecialArea.getLabelByValue(vo.getSpecialArea())); return AjaxResult.success(vo); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index 2d29cf8c..3b836928 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -1059,20 +1059,6 @@ public class EnumsController extends BaseController { return AjaxResult.success(enumEntityList); } - /** - * 查询专区 - * - * @return - */ - @GetMapping("/order-type-special") - public AjaxResult orderTypeSpecial() { - List enumEntityList = new ArrayList<>(); - for (EOrderType eOrderType : EOrderType.getOrderTypeSpecial()) { - enumEntityList.add(new EnumEntity(eOrderType.getValue(), eOrderType.getLabel(), EnumsPrefixConstants.ORDER_TYPE)); - } - return AjaxResult.success(enumEntityList); - } - /** * 订单状态 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java index 61ba0717..3dbcedce 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java @@ -161,11 +161,6 @@ public class EnumsInitController { initList.add(this.createData(value.getKey(), value.getLabel())); } - // 订单类型 - for (EOrderType value : EOrderType.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } - // 货币种类 for (EAccount value : EAccount.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); @@ -201,11 +196,6 @@ public class EnumsInitController { initList.add(this.createData(value.getKey(), value.getLabel())); } - // 专区枚举 - for (ESpecialArea value : ESpecialArea.values()) { - initList.add(this.createData(value.getKey(), value.getLabel())); - } - // 统计值枚举 for (EStatisticalValue value : EStatisticalValue.values()) { initList.add(this.createData(value.getKey(), value.getLabel())); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java index 4865a687..20d5e7c8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java @@ -10,9 +10,9 @@ import java.util.List; public class SysConstants { /** - * 新零售前缀 + * 众康系统前缀 */ - public static final String RETAIL_PREFIX = "BF"; + public static final String RETAIL_PREFIX = "ZK"; /** * 顶点 */ @@ -31,7 +31,7 @@ public class SysConstants { /** * 特殊处理编号（对外开放使用，主要用于支付接入审核） */ - public static final String SPECIAL_CODE = "BD68880628"; + public static final String SPECIAL_CODE = "ZK68880628"; /** * 血缘累计业绩30万 @@ -46,6 +46,6 @@ public class SysConstants { /** * 开放使用会员编号（用于支付登录查看数据） */ - public static final List CONTROL_MEMBER_LIST = Collections.singletonList("BF66886688"); + public static final List CONTROL_MEMBER_LIST = Collections.singletonList("ZK66886688"); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java index 61cdcf79..5c1d8493 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java @@ -1,12 +1,8 @@ package com.hzs.common.core.enums; -import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.List; - /** * 订单类型枚举类 */ @@ -17,68 +13,53 @@ public enum EOrderType { /** * 注册订单 */ - REGISTER_ORDER(1, "注册订单", 1, EnumsPrefixConstants.ORDER_TYPE + 1), + REGISTER_ORDER(1, "注册订单", 1), /** * 升级订单 */ - UPGRADE_ORDER(2, "升级订单", 1, EnumsPrefixConstants.ORDER_TYPE + 2), + UPGRADE_ORDER(2, "升级订单", 1), /** * 复购订单 */ - REPURCHASE_ORDER(3, "复购订单", 1, EnumsPrefixConstants.ORDER_TYPE + 3), + REPURCHASE_ORDER(3, "复购订单", 1), /** * 重消订单-重消专区 */ - CONSUME_ORDER(10, "重消订单", 1, EnumsPrefixConstants.ORDER_TYPE + 10), - - /** - * 兑换订单-积分专区 - */ - EXCHANGE_ORDER(11, "积分订单", 1, EnumsPrefixConstants.ORDER_TYPE + 11), - - /** - * 福利订单-福利专区 bv - */ - WELFARE_ORDER(13, "福利订单", 1, EnumsPrefixConstants.ORDER_TYPE + 13), + CONSUME_ORDER(10, "重消订单", 1), /** * 直播订单 */ - MALL_ORDER(14, "直播订单", 1, EnumsPrefixConstants.ORDER_TYPE + 14), + MALL_ORDER(14, "直播订单", 1), /** * 虚拟订单 */ - FICTITIOUS_ORDER(20, "虚拟订单", 1, EnumsPrefixConstants.ORDER_TYPE + 20), + FICTITIOUS_ORDER(20, "虚拟订单", 1), /** - * 团队带过来的商品 + * 注册订单 */ - COOPERATE_ORDER(22, "合作订单", 1, EnumsPrefixConstants.ORDER_TYPE + 22), + RETAIL_REGISTER(41, "注册订单", 0), + /** + * 升级订单 + */ + RETAIL_UPGRADE(42, "升级订单", 0), + /** + * 复购订单 + */ + RETAIL_REPURCHASE(43, "复购订单", 0), + /** + * 重消订单 + */ + RETAIL_CONSUME(44, "重消订单", 0), - /** - * 新零售注册订单 - */ - RETAIL_REGISTER(41, "注册订单", 0, EnumsPrefixConstants.ORDER_TYPE + 41), - /** - * 新零售升级订单 - */ - RETAIL_UPGRADE(42, "升级订单", 0, EnumsPrefixConstants.ORDER_TYPE + 42), - /** - * 新零售复购订单 - */ - RETAIL_REPURCHASE(43, "复购订单", 0, EnumsPrefixConstants.ORDER_TYPE + 43), - /** - * 新零售重消订单 - */ - RETAIL_CONSUME(44, "重消订单", 0, EnumsPrefixConstants.ORDER_TYPE + 44), + RETAIL_TICKET(45, "自助购票", 0), - RETAIL_TICKET(45, "自助购票", 0, EnumsPrefixConstants.ORDER_TYPE + 45), - - RETAIL_PICK(46, "提货订单", 0, EnumsPrefixConstants.ORDER_TYPE + 46), + RETAIL_PICK(46, "提货订单", 0), ; @@ -94,10 +75,6 @@ public enum EOrderType { * 是否启用（0=是,1=否） -- 来源EYesNo */ private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; /** * 根据值，返回枚举 @@ -117,31 +94,6 @@ public enum EOrderType { return null; } - /** - * 根据值返回显示 - * - * @param value - * @return - */ - public static String getEnumLabelByValue(Integer value) { - if (null == value) { - return ""; - } - for (EOrderType eOrderType : EOrderType.values()) { - if (eOrderType.getValue() == value) { - return eOrderType.getLabel(); - } - } - return ""; - } - - public static List getOrderTypeSpecial() { - List resultList = new ArrayList<>(); - resultList.add(EOrderType.REGISTER_ORDER); - resultList.add(EOrderType.UPGRADE_ORDER); - resultList.add(EOrderType.REPURCHASE_ORDER); - return resultList; - } public static String getLabelByValue(Integer value) { if (null == value) { return ""; @@ -154,5 +106,4 @@ public enum EOrderType { return ""; } - } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java index 130cc4ab..061ae73a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java @@ -1,6 +1,5 @@ package com.hzs.common.core.enums; -import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; @@ -14,61 +13,46 @@ public enum ESpecialArea { /** * 注册专区 */ - REGISTER_AREA(1, "注册专区", 1, EnumsPrefixConstants.SPECIAL_AREA + "1", 3, EMenuDetail.REGISTER.getValue()), + REGISTER_AREA(1, "注册专区", 1, 3, EMenuDetail.REGISTER.getValue()), /** * 升级专区 */ - UPGRADE_AREA(2, "升级专区", 1, EnumsPrefixConstants.SPECIAL_AREA + "2", 4, EMenuDetail.UPGRADE.getValue()), + UPGRADE_AREA(2, "升级专区", 1, 4, EMenuDetail.UPGRADE.getValue()), /** * 复购专区 名字修改为自营专区（复购自营） */ - REPURCHASE_AREA(3, "复购自营", 1, EnumsPrefixConstants.SPECIAL_AREA + "3", 5, EMenuDetail.REPURCHASE.getValue()), + REPURCHASE_AREA(3, "复购自营", 1, 5, EMenuDetail.REPURCHASE.getValue()), /** * 重消专区 */ - RESCISSION_AREA(10, "重消专区", 1, EnumsPrefixConstants.SPECIAL_AREA + "10", 8, EMenuDetail.REPEATED_CONSUMPTION.getValue()), - - /** - * 积分专区 - */ - INTEGRAL_AREA(11, "积分专区", 1, EnumsPrefixConstants.SPECIAL_AREA + "11", 13, EMenuDetail.INTEGRAL_AREA.getValue()), - - /** - * 福利专区 - */ - WELFARE_AREA(13, "福利专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 13, 9, EMenuDetail.WELFARE_AREA.getValue()), + RESCISSION_AREA(10, "重消专区", 1, 8, EMenuDetail.REPEATED_CONSUMPTION.getValue()), /** * 直播专区 */ - LIVE_BROADCAST(14, "直播专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 14, 14, EMenuDetail.LIVE.getValue()), + LIVE_BROADCAST(14, "直播专区", 1, 14, EMenuDetail.LIVE.getValue()), /** - * 复购合作 团队带过来的产品 + * 会员专区（注册） */ - COOPERATE_AREA(22, "复购合作", 1, EnumsPrefixConstants.SPECIAL_AREA + 22, 6, EMenuDetail.COOPERATE.getValue()), + RETAIL_REGISTER(41, "注册专区", 0, 41, -1), + /** + * 会员专区（升级） + */ + RETAIL_UPGRADE(42, "升级专区", 0, 42, -1), + /** + * 复购专区 + */ + RETAIL_REPURCHASE(43, "复购专区", 0, 43, -1), + /** + * 重消专区 + */ + RETAIL_RESCISSION(44, "重消专区", 0, 44, -1), - /** - * 新零售会员专区（注册） - */ - RETAIL_REGISTER(41, "新零售注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 41, 41, -1), - /** - * 新零售会员专区（升级） - */ - RETAIL_UPGRADE(42, "新零售升级专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 42, 42, -1), - /** - * 新零售复购专区 - */ - RETAIL_REPURCHASE(43, "新零售复购专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 43, 43, -1), - /** - * 新零售重消专区 - */ - RETAIL_RESCISSION(44, "新零售重消专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 44, 44, -1), - - RETAIL_TICKET(45, "自助购票", 0, EnumsPrefixConstants.SPECIAL_AREA + 45, 45, -1), + RETAIL_TICKET(45, "自助购票", 0, 45, -1), ; @@ -84,10 +68,6 @@ public enum ESpecialArea { * 是否启用（0=是,1=否） -- 来源EYesNo */ private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; /** * 排序 @@ -111,18 +91,6 @@ public enum ESpecialArea { return ""; } - public static String getESpecialArea(Integer value) { - if (null == value) { - return ""; - } - for (ESpecialArea eSpecialArea : ESpecialArea.values()) { - if (eSpecialArea.getValue() == value) { - return eSpecialArea.getLabel(); - } - } - return ""; - } - /** * 新零售专区值匹配 -- 注册、升级，对应商品都是会员专区 * diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java index b6f2df5e..1e834e8c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java @@ -17,16 +17,13 @@ public enum ETradeType { UPGRADE_ORDER(102, 0, "升级订单", 0, EnumsPrefixConstants.TRADE_TYPE + 102, EOrderType.UPGRADE_ORDER.getValue()), REPURCHASE_ORDER(103, 0, "复购订单", 0, EnumsPrefixConstants.TRADE_TYPE + 103, EOrderType.REPURCHASE_ORDER.getValue()), CONSUME_ORDER(110, 0, "消费订单", 0, EnumsPrefixConstants.TRADE_TYPE + 110, EOrderType.CONSUME_ORDER.getValue()), - EXCHANGE_ORDER(111, 0, "积分订单", 0, EnumsPrefixConstants.TRADE_TYPE + 111, EOrderType.EXCHANGE_ORDER.getValue()), - WELFARE_ORDER(113, 0, "福利订单", 0, EnumsPrefixConstants.TRADE_TYPE + 113, EOrderType.WELFARE_ORDER.getValue()), MALL_ORDER(114, 0, "商城订单", 0, EnumsPrefixConstants.TRADE_TYPE + 114, EOrderType.MALL_ORDER.getValue()), FICTITIOUS_ORDER(120, 0, "虚拟订单", 0, EnumsPrefixConstants.TRADE_TYPE + 120, EOrderType.FICTITIOUS_ORDER.getValue()), - COOPERATE_ORDER(122, 0, "复购合作", 0, EnumsPrefixConstants.TRADE_TYPE + 122, EOrderType.COOPERATE_ORDER.getValue()), - RETAIL_REGISTER_ORDER(141, 0, "新零售注册订单", 0, EnumsPrefixConstants.TRADE_TYPE + 141, EOrderType.RETAIL_REGISTER.getValue()), - RETAIL_UPGRADE_ORDER(142, 0, "新零售升级订单", 0, EnumsPrefixConstants.TRADE_TYPE + 142, EOrderType.RETAIL_UPGRADE.getValue()), - RETAIL_REPURCHASE_ORDER(143, 0, "新零售复购订单", 0, EnumsPrefixConstants.TRADE_TYPE + 143, EOrderType.RETAIL_REPURCHASE.getValue()), - RETAIL_CONSUME_ORDER(144, 0, "新零售重消订单", 0, EnumsPrefixConstants.TRADE_TYPE + 144, EOrderType.RETAIL_CONSUME.getValue()), + RETAIL_REGISTER_ORDER(141, 0, "注册订单", 0, EnumsPrefixConstants.TRADE_TYPE + 141, EOrderType.RETAIL_REGISTER.getValue()), + RETAIL_UPGRADE_ORDER(142, 0, "升级订单", 0, EnumsPrefixConstants.TRADE_TYPE + 142, EOrderType.RETAIL_UPGRADE.getValue()), + RETAIL_REPURCHASE_ORDER(143, 0, "复购订单", 0, EnumsPrefixConstants.TRADE_TYPE + 143, EOrderType.RETAIL_REPURCHASE.getValue()), + RETAIL_CONSUME_ORDER(144, 0, "重消订单", 0, EnumsPrefixConstants.TRADE_TYPE + 144, EOrderType.RETAIL_CONSUME.getValue()), RETAIL_TICKET_ORDER(145, 0, "自主购票", 0, EnumsPrefixConstants.TRADE_TYPE + 145, EOrderType.RETAIL_TICKET.getValue()), EMPTY_ORDER(190, 190, "空单注册", 0, EnumsPrefixConstants.TRADE_TYPE + 190, EOrderType.REGISTER_ORDER.getValue()), @@ -70,16 +67,13 @@ public enum ETradeType { REVOKE_UPGRADE_ORDER(603, 0, "升级订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 603, -EOrderType.UPGRADE_ORDER.getValue()), REVOKE_REPURCHASE_ORDER(604, 0, "复购订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 604, -EOrderType.REPURCHASE_ORDER.getValue()), REVOKE_CONSUME_ORDER(611, 0, "消费订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 611, -EOrderType.CONSUME_ORDER.getValue()), - REVOKE_EXCHANGE_ORDER(612, 0, "积分订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 612, -EOrderType.EXCHANGE_ORDER.getValue()), - REVOKE_WELFARE_ORDER(614, 0, "福利订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 614, -EOrderType.WELFARE_ORDER.getValue()), REVOKE_MALL_ORDER(615, 0, "商城订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 615, -EOrderType.MALL_ORDER.getValue()), REVOKE_FICTITIOUS_ORDER(618, 0, "虚拟订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 618, -EOrderType.FICTITIOUS_ORDER.getValue()), - REVOKE_COOPERATE_ORDER(620, 0, "合作订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 620, -EOrderType.COOPERATE_ORDER.getValue()), - REVOKE_RETAIL_REGISTER_ORDER(641, 0, "新零售注册订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 641, -EOrderType.RETAIL_REGISTER.getValue()), - REVOKE_RETAIL_UPGRADE_ORDER(642, 0, "新零售升级订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 642, -EOrderType.RETAIL_UPGRADE.getValue()), - REVOKE_RETAIL_REPURCHASE_ORDER(643, 0, "新零售复购订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 643, -EOrderType.RETAIL_REPURCHASE.getValue()), - REVOKE_RETAIL_CONSUME_ORDER(644, 0, "新零售重消订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 644, -EOrderType.RETAIL_CONSUME.getValue()), + REVOKE_RETAIL_REGISTER_ORDER(641, 0, "注册订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 641, -EOrderType.RETAIL_REGISTER.getValue()), + REVOKE_RETAIL_UPGRADE_ORDER(642, 0, "升级订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 642, -EOrderType.RETAIL_UPGRADE.getValue()), + REVOKE_RETAIL_REPURCHASE_ORDER(643, 0, "复购订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 643, -EOrderType.RETAIL_REPURCHASE.getValue()), + REVOKE_RETAIL_CONSUME_ORDER(644, 0, "重消订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 644, -EOrderType.RETAIL_CONSUME.getValue()), REVOKE_RETAIL_TICKET_ORDER(645, 0, "自主购票撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 645, -EOrderType.RETAIL_TICKET.getValue()), ORDER_SELF_DELIVER(680, 0, "自提返还邮费", 0, EnumsPrefixConstants.TRADE_TYPE + 680, -99),