Просмотр исходного кода

Merge remote-tracking branch 'origin/test'

anderx лет назад: 8
Родитель
Сommit
e94f5d5951
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

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

@@ -144,7 +144,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}
 		}
 		tOrder.setOrderType(commodityType);
 		tOrder.setOrderType(commodityType);
 		tOrder.setBrokerageAmount(discountPrice.multiply(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION)));
 		tOrder.setBrokerageAmount(discountPrice.multiply(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION)));
-		tOrder.setFirstPayment(DEFAULT_FIRST_PAYMENT);
+		tOrder.setFirstPayment(commodityFirstPayment);
 		tOrder.setOrderAmount(orderAmount);
 		tOrder.setOrderAmount(orderAmount);
 		tOrder.setSignFirstPayment(discountFirstPayment);
 		tOrder.setSignFirstPayment(discountFirstPayment);
 		tOrder.setSignTotalAmount(discountPrice);
 		tOrder.setSignTotalAmount(discountPrice);
@@ -289,12 +289,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				if(TokenManager.getUserId().equals(tOrder.getSellerId())){
 				if(TokenManager.getUserId().equals(tOrder.getSellerId())){
 					if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode())
 					if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode())
 						tOrder.setOrderStatus(OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode());
 						tOrder.setOrderStatus(OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode());
-					if( tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode())
+					if( tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode())
 						tOrder.setOrderStatus(OrderState.SELLER_CANCEL_AFTER_SIGN.getCode());
 						tOrder.setOrderStatus(OrderState.SELLER_CANCEL_AFTER_SIGN.getCode());
 				}else if(TokenManager.getUserId().equals(tOrder.getBuyerId())){
 				}else if(TokenManager.getUserId().equals(tOrder.getBuyerId())){
 					if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode())
 					if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode())
 						tOrder.setOrderStatus(OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode());
 						tOrder.setOrderStatus(OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode());
-					if( tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode())
+					if( tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode())
 						tOrder.setOrderStatus(OrderState.BUYER_CANCEL_AFTER_SIGN.getCode());
 						tOrder.setOrderStatus(OrderState.BUYER_CANCEL_AFTER_SIGN.getCode());
 				}
 				}
 			}		
 			}