|
|
@@ -216,23 +216,19 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(boundary2 == 1){
|
|
|
throw new BusinessException(new Error(ErrorConstants.PAY_BEYOND_SIGN,"支付首付款"));
|
|
|
}else if(boundary2 == 0){ //全付清
|
|
|
- System.out.println("-----------全付清-------------");
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getSignTotalAmount());
|
|
|
tOrder.setActuallyFirstPayment(tOrder.getSignFirstPayment());
|
|
|
tOrder.setLiquidationStatus(LiquidationState.ALREADY_PAY.getCode());
|
|
|
tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}else if(boundary == 1){ //超过首付未达尾款
|
|
|
- System.out.println("-----------超过首付未达尾款-------------");
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
tOrder.setActuallyFirstPayment(tOrder.getSignFirstPayment());
|
|
|
tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_LAST_BALANCE.getCode());
|
|
|
tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}else if(boundary == -1){ //首付待付清
|
|
|
- System.out.println("-----------首付待付清-------------");
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
tOrder.setActuallyFirstPayment(tOrder.getActuallyFirstPayment().add(changeAmount));
|
|
|
}else if(boundary == 0){ //首付已结清
|
|
|
- System.out.println("-----------首付已结清-------------");
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
tOrder.setActuallyFirstPayment(tOrder.getSignFirstPayment());
|
|
|
tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_LAST_BALANCE.getCode());
|
|
|
@@ -821,6 +817,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
private Map<String,Object> disposeParams(OrderListBo bo,String startDate,String endDate){
|
|
|
Map<String,Object> params = new HashMap<>();
|
|
|
if(StringUtils.isNotBlank(bo.getBuyerName())) params.put("buyerName", bo.getBuyerName());
|
|
|
+ if(StringUtils.isNotBlank(bo.getSalesmanName())) params.put("salesmanName", bo.getSalesmanName());
|
|
|
if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate +" 00:00:00");
|
|
|
if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate + "23:59:59");
|
|
|
if(bo.getOrderStatus() != null) params.put("orderStatus", bo.getOrderStatus());
|
|
|
@@ -883,6 +880,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setApproval(Integer.valueOf(approval));
|
|
|
tOrder.setUpdateTime(signTime);
|
|
|
tOrder.setSignTime(signTime);
|
|
|
+ tOrder.setOrderRemarks(orderRemarks);
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
}
|
|
|
return 1;
|
|
|
@@ -1127,8 +1125,11 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setBrokerageAmount(initial);
|
|
|
tOrder.setFirstPayment(initial);
|
|
|
tOrder.setOrderAmount(initial);
|
|
|
+ tOrder.setSignBrokerageAmount(initial);
|
|
|
+ tOrder.setSignFirstPayment(initial);
|
|
|
+ tOrder.setSignTotalAmount(initial);
|
|
|
+ tOrder.setSignWithdrawAmount(initial);
|
|
|
tOrder.setOrderChannel(OrderChannel.PORTAL.getCode());
|
|
|
- tOrder.setOrderRemarks("");
|
|
|
tOrder.setDeleteSign(ActiveState.NORMAL.getCode());
|
|
|
tOrder.setApproval(ApprovalState.NORMAL.getCode());
|
|
|
setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
|
|
|
@@ -1183,13 +1184,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
public Pagination<BillListBo> selectMyBillList(String payeeName, String payerName, String depId,
|
|
|
String salesmanName,String orderNo, Integer confirmSign,Integer deleteSign, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
- if(StringUtils.isNotBlank(payerName)) params.put("payeeName", payeeName);
|
|
|
+ if(StringUtils.isNotBlank(payeeName)) params.put("payeeName", payeeName);
|
|
|
if(StringUtils.isNotBlank(payerName)) params.put("payerName", payerName);
|
|
|
if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
|
|
|
if(StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
|
|
|
if(confirmSign != null) params.put("confirmSign", confirmSign);
|
|
|
- if(confirmSign != null) params.put("deleteSign", deleteSign);
|
|
|
+ if(deleteSign != null) params.put("deleteSign", deleteSign);
|
|
|
/** 特殊处理字段开始 **/
|
|
|
if(!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
|
|
|
params.put("isFinance", 1);
|