|
|
@@ -146,6 +146,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setBrokerageAmount(discountPrice.multiply(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION)));
|
|
|
tOrder.setFirstPayment(DEFAULT_FIRST_PAYMENT);
|
|
|
tOrder.setOrderAmount(orderAmount);
|
|
|
+ tOrder.setSignFirstPayment(discountFirstPayment);
|
|
|
+ tOrder.setSignTotalAmount(discountPrice);
|
|
|
tOrder.setOrderRemarks(remarks);
|
|
|
tOrder.setDeleteSign(DeleteStatus.UNDELETE.getCode());
|
|
|
tOrder.setOrderChannel(OrderChannel.APP.getCode());
|
|
|
@@ -389,13 +391,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
active.setConfirmIntention(false);
|
|
|
active.setRefuseIntention(false);
|
|
|
}
|
|
|
- if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_CONFIRM.getCode()
|
|
|
+ if ((tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode() || tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode())
|
|
|
&&tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()) {
|
|
|
active.setPayForFirst(true); //支付首付
|
|
|
} else {
|
|
|
active.setPayForFirst(false); //支付首付
|
|
|
}
|
|
|
- if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_CONFIRM.getCode()
|
|
|
+ if ((tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode() || tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode())
|
|
|
&& tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()) {
|
|
|
active.setPayForLast(true); //支付尾款
|
|
|
} else {
|
|
|
@@ -957,7 +959,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
|
- public int updateOrderCommodity(String detailId,String orderNo,String discountPrice,String discountFirstPayment,Integer commodityQuantity,String remarks) {
|
|
|
+ public int updateOrderCommodity(String detailId,String discountPrice,String discountFirstPayment,Integer commodityQuantity,String remarks) {
|
|
|
TOrderDetail oldDetail = tOrderDetailMapper.selectByPrimaryKey(detailId);
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(oldDetail.getOrderNo());
|
|
|
checkOrder(tOrder);
|