Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
a6422e9aa9
|
|
@ -324,6 +324,7 @@ public class OrderBusiness {
|
|||
refundOrderInfo.setOrderState(OrderStateEnum.CANCEL.getKey());
|
||||
}else {
|
||||
refundOrderInfo.setOrderRefundState(OrderRefundStateEnum.PART_SUCC.getKey());
|
||||
refundOrderInfo.setOrderState(OrderStateEnum.Part_REFUND.getKey());
|
||||
}
|
||||
refundOrderInfo.setUpdateBy(SecurityUtils.getUsername());
|
||||
refundOrderInfo.setUpdateTime(DateUtils.getNowDate());
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@ public enum OrderStateEnum {
|
|||
PLACE(1, "已下单"),
|
||||
FINISH(2, "已完成"),
|
||||
CANCEL(3, "已取消"),
|
||||
WAIT_PLACE(4, "待下单");
|
||||
WAIT_PLACE(4, "待下单"),
|
||||
Part_REFUND(5, "部分退单");
|
||||
|
||||
private final Integer key;
|
||||
private final String desc;
|
||||
|
|
|
|||
Loading…
Reference in New Issue