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