From dd71caa701b3c6eed0ac6bd2996cead66dd40a20 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 5 Aug 2025 16:41:26 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E9=99=90=E8=B4=AD=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=9B=E6=B7=BB=E5=8A=A0=E7=A7=92=E6=9D=80?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B6=88=E8=B4=B9=E6=98=8E=E7=BB=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/sale/wares/BdWaresExtendMapper.xml | 2 +- .../src/main/java/com/hzs/common/core/enums/ETradeType.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresExtendMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresExtendMapper.xml index 678e5984..44a4a45f 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresExtendMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresExtendMapper.xml @@ -89,7 +89,7 @@ merge into bd_wares_extend bwe using ( - + select #{items.pkWares} pk_wares, #{items.quantity} quantity from dual 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 e354911d..47bde610 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 @@ -19,6 +19,7 @@ public enum ETradeType { REPURCHASE_ORDER(103, 0, "复购订单", 0, EnumsPrefixConstants.TRADE_TYPE + 103, EOrderType.REPURCHASE_ORDER.getValue()), PICK_ORDER(108, 0, "提货订单", 0, EnumsPrefixConstants.TRADE_TYPE + 108, EOrderType.PICK_ORDER.getValue()), CONSUME_ORDER(110, 0, "消费订单", 0, EnumsPrefixConstants.TRADE_TYPE + 110, EOrderType.CONSUME_ORDER.getValue()), + MALL_ORDER(114, 0, "秒杀订单", 0, EnumsPrefixConstants.TRADE_TYPE + 114, EOrderType.MALL_ORDER.getValue()), RENEWAL_ORDER(129, 0, "续约订单", 0, EnumsPrefixConstants.TRADE_TYPE + 129, EOrderType.RENEWAL_ORDER.getValue()), @@ -64,6 +65,8 @@ public enum ETradeType { REVOKE_REPURCHASE_ORDER(604, 0, "复购订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 604, -EOrderType.REPURCHASE_ORDER.getValue()), REVOKE_PICK_ORDER(609, 0, "提货订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 609, -EOrderType.PICK_ORDER.getValue()), REVOKE_CONSUME_ORDER(611, 0, "消费订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 611, -EOrderType.CONSUME_ORDER.getValue()), + REVOKE_MALL_ORDER(614, 0, "秒杀订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 614, -EOrderType.MALL_ORDER.getValue()), + REVOKE_RENEWAL_ORDER(629, 0, "续约订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 629, -EOrderType.RENEWAL_ORDER.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),