Browse Source

订单管理

wanghui 8 years ago
parent
commit
2cb3bc196b
1 changed files with 21 additions and 40 deletions
  1. 21 40
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

+ 21 - 40
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -354,53 +354,34 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				}
 				boolean flag = true;
 				if (tOrder.getCommodityType() == CommodityType.DEMAND_PROVIDE.getTypeCode()) { //需求订单
-					flag = false; //卖家取消
-				}else{
-					if (tOrder.getOrderStatus() == OrderState.CANCELLED.getCode())
-						flag = false;
-					if (tOrder.getIntentionStatus() == IntentionSate.SELLER_REFUSE.getCode()
-							|| tOrder.getIntentionStatus() == IntentionSate.BUYER_CANCELLED.getCode()
-							|| tOrder.getIntentionStatus() == IntentionSate.EXPIRED.getCode()) {
-						flag = false;
-					}
-					if (tOrder.getTradingStatus() == TradingState.TRADE_FAILED.getCode())
-						flag = false;
-					if (tOrder.getPaymentStatus() == PaymentState.WAIT_FOR_REFUND.getCode()
-							|| tOrder.getPaymentStatus() == PaymentState.ALREADY_REFUND.getCode())
-						flag = false;
-					if (tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_WITHDRAW.getCode()
-							|| tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_REFUND.getCode()
-							|| tOrder.getLiquidationStatus() == LiquidationSate.REFUND_SETTLE.getCode()) {
+					if(tOrder.getOrderStatus() == OrderState.INTENTION.getCode()
+							|| tOrder.getIntentionStatus() == IntentionSate.WAIT_SELLER_CONFIRM.getCode()
+							|| tOrder.getTradingStatus() == TradingState.WAIT_FOR_TRADE.getCode()){
 						flag = false;
 					}
 				}
+				if (tOrder.getOrderStatus() == OrderState.CANCELLED.getCode())
+					flag = false;
+				if (tOrder.getIntentionStatus() == IntentionSate.SELLER_REFUSE.getCode()
+						|| tOrder.getIntentionStatus() == IntentionSate.BUYER_CANCELLED.getCode()
+						|| tOrder.getIntentionStatus() == IntentionSate.EXPIRED.getCode()) {
+					flag = false;
+				}
+				if (tOrder.getTradingStatus() == TradingState.TRADE_FAILED.getCode())
+					flag = false;
+				if (tOrder.getPaymentStatus() == PaymentState.WAIT_FOR_REFUND.getCode()
+						|| tOrder.getPaymentStatus() == PaymentState.ALREADY_REFUND.getCode())
+					flag = false;
+				if (tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_WITHDRAW.getCode()
+						|| tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_REFUND.getCode()
+						|| tOrder.getLiquidationStatus() == LiquidationSate.REFUND_SETTLE.getCode()) {
+					flag = false;
+				}
 				active.setApplyForCancel(flag);
 			} else if (TokenManager.getUserId().equals(tOrder.getSellerId())) { //卖方
 				active.setPayForFirst(false);
 				active.setPayForLast(false);
-				if (tOrder.getCommodityType() == CommodityType.DEMAND_PROVIDE.getTypeCode()) { //需求订单
-					boolean flag = true;
-					if (tOrder.getOrderStatus() == OrderState.CANCELLED.getCode())
-						flag = false;
-					if (tOrder.getIntentionStatus() == IntentionSate.SELLER_REFUSE.getCode()
-							|| tOrder.getIntentionStatus() == IntentionSate.BUYER_CANCELLED.getCode()
-							|| tOrder.getIntentionStatus() == IntentionSate.EXPIRED.getCode()) {
-						flag = false;
-					}
-					if (tOrder.getTradingStatus() == TradingState.TRADE_FAILED.getCode())
-						flag = false;
-					if (tOrder.getPaymentStatus() == PaymentState.WAIT_FOR_REFUND.getCode()
-							|| tOrder.getPaymentStatus() == PaymentState.ALREADY_REFUND.getCode())
-						flag = false;
-					if (tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_WITHDRAW.getCode()
-							|| tOrder.getLiquidationStatus() == LiquidationSate.WAIT_FOR_REFUND.getCode()
-							|| tOrder.getLiquidationStatus() == LiquidationSate.REFUND_SETTLE.getCode()) {
-						flag = false;
-					}
-					active.setApplyForCancel(flag);
-				}else{
-					active.setApplyForCancel(false);
-				}
+				active.setApplyForCancel(false);
 				if (tOrder.getOrderStatus() == OrderState.INTENTION.getCode()
 						&& tOrder.getIntentionStatus() == IntentionSate.WAIT_SELLER_CONFIRM.getCode()
 						&& tOrder.getTradingStatus() == TradingState.WAIT_FOR_TRADE.getCode()