|
|
@@ -202,8 +202,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setOrderStatus(OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode()); // 买家拒绝
|
|
|
}
|
|
|
}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_FIRST){ // 支付首付(审核流水)
|
|
|
- if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
- || tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()){
|
|
|
+ if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,""));
|
|
|
}
|
|
|
int boundary = tOrder.getActuallyFirstPayment().add(changeAmount).compareTo(tOrder.getFirstPayment());
|
|
|
@@ -219,8 +218,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}
|
|
|
}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_LAST){ //支付尾款 (审核流水)
|
|
|
- if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
- || tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()){
|
|
|
+ if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"支付尾款"));
|
|
|
}
|
|
|
int boundary = tOrder.getActuallyTotalAmount().add(changeAmount).compareTo(tOrder.getOrderAmount());
|
|
|
@@ -1143,61 +1141,70 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<BillListBo> selectMySettlementList(String payeeName, String payerName, String depId,
|
|
|
- String salesmanName, String orderNo, Integer pageNo, Integer pageSize) {
|
|
|
+ public Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,
|
|
|
+ String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,
|
|
|
+ String startDate,String endDate,Integer pageNo, Integer pageSize) {
|
|
|
+ Map<String, Object> params = new HashMap<String, Object>();
|
|
|
+ if(StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
|
|
|
+ if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
+ if(StringUtils.isNotBlank(buyerName)) params.put("buyerName", buyerName);
|
|
|
+ if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
|
|
|
+ if(StringUtils.isNotBlank(financeId)) params.put("financeId", financeId);
|
|
|
+ if(StringUtils.isNotBlank(financeName)) params.put("financeName", financeName);
|
|
|
+ if(orderStatus != null) params.put("orderStatus", OrderStage.SIGNED.getCode()); //已签单
|
|
|
+ if(liquidationStatus != null) params.put("liquidationStatus", liquidationStatus);
|
|
|
+ if(approval != null) params.put("approval", approval);
|
|
|
+ if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
|
|
|
+ if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
|
|
|
+ return (Pagination<OrderListBo>)findPage("selectSettlementByPage","selectSettlementCount", params, pageNo, pageSize);
|
|
|
+ }
|
|
|
+
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
+ @Override
|
|
|
+ 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(payerName)) params.put("payerName", payerName);
|
|
|
if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
|
|
|
- if(orderNo != null) params.put("orderNo", orderNo);
|
|
|
+ if(StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
|
|
|
+ if(confirmSign != null) params.put("confirmSign", confirmSign);
|
|
|
+ if(confirmSign != null) params.put("deleteSign", deleteSign);
|
|
|
/** 特殊处理字段开始 **/
|
|
|
if(!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
|
|
|
params.put("isFinance", 1);
|
|
|
}
|
|
|
params.put("aid", TokenManager.getAdminId());
|
|
|
/** 特殊处理字段结束 **/
|
|
|
- Pagination<BillListBo> data = (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
|
|
|
- List<BillListBo> list = (List<BillListBo>)data.getList();
|
|
|
- if(list.size()>0){
|
|
|
- for(BillListBo bo:list){
|
|
|
- bo.setBusinessDesc(setBusinessDesc(bo.getTransactionSubject(),bo.getTransactionAmount()));
|
|
|
- }
|
|
|
- }
|
|
|
- data.setList(list);
|
|
|
- return data;
|
|
|
+ return (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<BillListBo> selectMyBillList(String payeeName, String payerName, String depId,
|
|
|
- String salesmanName,String orderNo, Integer pageNo, Integer pageSize) {
|
|
|
+ public Pagination<BillListBo> queryMyBillList(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(payerName)) params.put("payerName", payerName);
|
|
|
if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
|
|
|
- if(orderNo != null) params.put("orderNo", orderNo);
|
|
|
+ if(StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
|
|
|
+ if(confirmSign != null) params.put("confirmSign", confirmSign);
|
|
|
+ if(confirmSign != null) params.put("deleteSign", deleteSign);
|
|
|
/** 特殊处理字段开始 **/
|
|
|
if(!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
|
|
|
params.put("isFinance", 0);
|
|
|
}
|
|
|
params.put("aid", TokenManager.getAdminId());
|
|
|
/** 特殊处理字段结束 **/
|
|
|
- Pagination<BillListBo> data = (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
|
|
|
- List<BillListBo> list = (List<BillListBo>)data.getList();
|
|
|
- if(list.size()>0){
|
|
|
- for(BillListBo bo:list){
|
|
|
- bo.setBusinessDesc(setBusinessDesc(bo.getTransactionSubject(),bo.getTransactionAmount()));
|
|
|
- }
|
|
|
- }
|
|
|
- data.setList(list);
|
|
|
- return data;
|
|
|
+ return (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<BillListBo> selectAllBillList(String payeeName, String payerName, String depId,
|
|
|
+ public Pagination<BillListBo> queryAllBillList(String payeeName, String payerName, String depId,
|
|
|
String salesmanName ,String financeName, String orderNo, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(StringUtils.isNotBlank(payerName)) params.put("payeeName", payeeName);
|
|
|
@@ -1227,6 +1234,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
public int updateBill(String billNo, String orderNo, Integer confrim,String financialPayNo,String financialPayTime,String remarks) {
|
|
|
TOrderBill bill = tOrderBillMapper.selectByPrimaryKey(billNo);
|
|
|
TOrder order = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
+ Date confirmTime = new Date();
|
|
|
if(bill != null && order != null){
|
|
|
bill.setBillNo(billNo);
|
|
|
bill.setFinancialPayNo(financialPayNo);
|
|
|
@@ -1237,6 +1245,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
bill.setRemarks(remarks);
|
|
|
if(confrim == AFTConstants.YES){
|
|
|
+ bill.setConfirmTime(confirmTime);
|
|
|
bill.setConfirmSign(AuditState.AUDIT_SUCCESS.getCode());
|
|
|
checkOrder(order);
|
|
|
if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode())
|
|
|
@@ -1246,6 +1255,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
order.setUpdateTime(new Date());
|
|
|
tOrderMapper.updateByPrimaryKeySelective(order);
|
|
|
}else if(confrim == AFTConstants.NO){
|
|
|
+ bill.setConfirmTime(confirmTime);
|
|
|
bill.setConfirmSign(AuditState.AUDIT_FAIL.getCode());
|
|
|
bill.setDeleteSign(Boolean.TRUE);
|
|
|
}
|
|
|
@@ -1255,9 +1265,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int updateBill(String billNo, String financialPayNo, String financialPayTime, String remarks) {
|
|
|
+ public int updateBill(String billNo,String orderNo, String financialPayNo, String financialPayTime, String remarks) {
|
|
|
TOrderBill bill = new TOrderBill();
|
|
|
bill.setBillNo(billNo);
|
|
|
+ bill.setOrderNo(orderNo);
|
|
|
bill.setFinancialPayNo(financialPayNo);
|
|
|
try {
|
|
|
bill.setFinancialPayTime(DateUtils.parseDate(financialPayTime, AFTConstants.YYYYMMDDHHMMSS));
|
|
|
@@ -1368,4 +1379,30 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
return tOrderMapper.selectOrderCommodity(orderNo);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public int updatePayForTest(String orderNo, String payAmount) {
|
|
|
+ TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
+ if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
+ || tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()){
|
|
|
+ addFundRecord(orderNo, "测试用户", DEFAULT_PLATFORM_ID, TokenManager.getUserId(), "",
|
|
|
+ TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, new BigDecimal(payAmount), TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
|
|
|
+ tOrder.setUpdateTime(new Date());
|
|
|
+ tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
+ }else{
|
|
|
+ throw new BusinessException(new Error(ErrorConstants.ORDER_CAN_NOT_MODIFY, orderNo, ""));
|
|
|
+ }
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int updateDistributionOrder(String orderNo, String financeId) {
|
|
|
+ TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
+ checkOrder(tOrder);
|
|
|
+ if(StringUtils.isBlank(tOrder.getFinanceId())){
|
|
|
+ tOrder.setFinanceId(financeId);
|
|
|
+ }
|
|
|
+ tOrder.setUpdateTime(new Date());
|
|
|
+ return tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
+ }
|
|
|
+
|
|
|
}
|