rk
2025-12-16 2cfceadff437135a255990ab9698788a48adb636
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -562,8 +562,8 @@
     */
    public  enum OrderStatus{
        WAIT_PAY(0, "待支付", "待支付"),
        PAY_DONE(1, "待发货", "已支付待发货"),
        WAIT_RECEIVE(2, "待收货/待自提", "已发货待收货/待自提"),
        PAY_DONE(1, "待发货/待自提", "已支付待发货/待自提"),
        WAIT_RECEIVE(2, "待收货", "已发货待收货"),
        DONE(3, "交易完成", "交易完成"),
        CLOSE(4, "已关闭", "已关闭"),
        PART_DONE(5, "部分发货", "部分发货"),
@@ -838,7 +838,10 @@
        EXCHANGE_CARD(11,"卡充值","卡充值",0),
        SYSTEM_RECHARGE(12,"平台充值","平台充值",0),
        SYSTEM_DEDUCT(13,"平台扣款","平台扣款",0),
        SHOP_ORDER_CANCEL(14,"余额抵扣商品退还","余额抵扣商品退还",0)
        SHOP_ORDER_CANCEL(14,"余额抵扣商品退还","余额抵扣商品退还",0),
        SHOP_ORDER_SETTLEMENT(15,"下单结算金额","下单结算金额",0), //经销商下单结算金额
        SHOP_ORDER_CANCEL_SETTLEMENT(16,"取消订单结算金额返还","取消订单结算金额返还",0), //取消订单结算金额返还
        SHOP_YEAR_SETTLEMENT(17,"年度结算","年度结算",0) //年度结算
        ;
        // 成员变量
        private String name;
@@ -1111,7 +1114,6 @@
            this.type = type;
        }
    }
}