Browse Source

修改流水确认

wanghui 8 years ago
parent
commit
56df54f11c
1 changed files with 7 additions and 10 deletions
  1. 7 10
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

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

@@ -231,7 +231,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				tOrder.setActuallyFirstPayment(tOrder.getActuallyFirstPayment().add(changeAmount));
 			}else if(boundary == 0){ //首付已结清
 				tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
-				tOrder.setActuallyFirstPayment(tOrder.getActuallyFirstPayment().add(changeAmount));
+				tOrder.setActuallyFirstPayment(tOrder.getSignFirstPayment());
 				tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_LAST_BALANCE.getCode());
 				tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
 			}
@@ -241,7 +241,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			}
 			int boundary = tOrder.getActuallyTotalAmount().add(changeAmount).compareTo(tOrder.getSignTotalAmount());
 			if(boundary == 1){
-				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"支付尾款"));
+				throw new BusinessException(new Error(ErrorConstants.PAY_BEYOND_SIGN,"支付尾款"));
 			}else if(boundary == -1){
 				tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
 			}else if(boundary == 0){
@@ -624,8 +624,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks, 
 				TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
 		tOrder.setUpdateTime(new Date());
-		tOrderMapper.updateByPrimaryKeySelective(tOrder);
-		return 1;
+		return tOrderMapper.updateByPrimaryKeySelective(tOrder);
 	}
 
 	@Override
@@ -634,13 +633,11 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks, 
 				TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
 		tOrder.setUpdateTime(new Date());
-		tOrderMapper.updateByPrimaryKeySelective(tOrder);
-		return 1;
+		return tOrderMapper.updateByPrimaryKeySelective(tOrder);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	//to update 18
 	public Pagination<C2BOrderDetailBo> selectOrderList(boolean confirm,Integer pageNo,Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		Pagination<C2BOrderDetailBo> result = new Pagination<C2BOrderDetailBo>();
@@ -1285,11 +1282,11 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				checkOrder(order);
 				if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode())
 					setOrderState(OrderAction.CONFIRM_PAY_FOR_FIRST, bill.getTransactionAmount(), order, false);
-				if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode())
+				else if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode())
 					setOrderState(OrderAction.CONFIRM_PAY_FOR_LAST, bill.getTransactionAmount(), order, false);
-				if(order.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode())
+				else if(order.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode())
 					setOrderState(OrderAction.COMPLETE_REFUND, bill.getTransactionAmount(), order, false);
-				if(order.getLiquidationStatus() == LiquidationState.WAIT_FOR_WITHDRAW.getCode())
+				else if(order.getLiquidationStatus() == LiquidationState.WAIT_FOR_WITHDRAW.getCode())
 					setOrderState(OrderAction.CONFIRM_WITHDRAW, bill.getTransactionAmount(), order, false);
 				order.setUpdateTime(new Date());
 				tOrderMapper.updateByPrimaryKeySelective(order);