|
@@ -147,11 +147,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setFirstPayment(commodityFirstPayment);
|
|
tOrder.setFirstPayment(commodityFirstPayment);
|
|
|
tOrder.setSignTotalAmount(discountPrice);
|
|
tOrder.setSignTotalAmount(discountPrice);
|
|
|
tOrder.setSignFirstPayment(discountFirstPayment);
|
|
tOrder.setSignFirstPayment(discountFirstPayment);
|
|
|
- tOrder.setOrderRemarks(remarks);
|
|
|
|
|
|
|
+ tOrder.setSignBrokerageAmount(discountPrice.multiply(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION)));
|
|
|
|
|
+ tOrder.setSignWithdrawAmount(discountPrice.subtract(discountPrice.multiply(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION))));
|
|
|
tOrder.setDeleteSign(DeleteStatus.UNDELETE.getCode());
|
|
tOrder.setDeleteSign(DeleteStatus.UNDELETE.getCode());
|
|
|
tOrder.setOrderChannel(OrderChannel.APP.getCode());
|
|
tOrder.setOrderChannel(OrderChannel.APP.getCode());
|
|
|
tOrder.setApproval(ApprovalState.NORMAL.getCode());
|
|
tOrder.setApproval(ApprovalState.NORMAL.getCode());
|
|
|
tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));
|
|
tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));
|
|
|
|
|
+ tOrder.setOrderRemarks(remarks);
|
|
|
setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
|
|
setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
|
|
|
|
|
|
|
|
TOrderDetail tOrderDetail = new TOrderDetail();
|
|
TOrderDetail tOrderDetail = new TOrderDetail();
|
|
@@ -191,13 +193,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setOrderStage(OrderStage.INTENTION.getCode());
|
|
tOrder.setOrderStage(OrderStage.INTENTION.getCode());
|
|
|
tOrder.setProjectStage(ProjectStage.NOT_SATISFY_CONDITION.getCode());
|
|
tOrder.setProjectStage(ProjectStage.NOT_SATISFY_CONDITION.getCode());
|
|
|
tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode());
|
|
tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode());
|
|
|
- tOrder.setSignFirstPayment(initial);
|
|
|
|
|
tOrder.setActuallyFirstPayment(initial);
|
|
tOrder.setActuallyFirstPayment(initial);
|
|
|
- tOrder.setSignBrokerageAmount(initial);
|
|
|
|
|
tOrder.setActuallyBrokerageAmount(initial);
|
|
tOrder.setActuallyBrokerageAmount(initial);
|
|
|
- tOrder.setSignTotalAmount(initial);
|
|
|
|
|
tOrder.setActuallyTotalAmount(initial);
|
|
tOrder.setActuallyTotalAmount(initial);
|
|
|
- tOrder.setSignWithdrawAmount(initial);
|
|
|
|
|
tOrder.setActuallyWithdrawAmount(initial);
|
|
tOrder.setActuallyWithdrawAmount(initial);
|
|
|
}else if(orderAction == OrderAction.CONFIRM_INTENTION){ //确认意向订单 (用户确认)
|
|
}else if(orderAction == OrderAction.CONFIRM_INTENTION){ //确认意向订单 (用户确认)
|
|
|
if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_CONFIRM.getCode()){
|
|
if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_CONFIRM.getCode()){
|