|
|
@@ -279,6 +279,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
records.setTransactionAmount(transactionAmount);
|
|
|
records.setTransactionMode(transactionMode.getCode());
|
|
|
records.setTransactionSubject(transactionSubject.getCode());
|
|
|
+ records.setTransactionChannel(payChannel.getCode());
|
|
|
tFundingRecordsMapper.insert(records);
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -440,7 +441,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int payForFirst(Long orderNo, BigDecimal fundAmount,String remarks) {
|
|
|
+ public int updatePayForFirst(Long orderNo, BigDecimal fundAmount,String remarks) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks,
|
|
|
TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
|
|
|
@@ -449,7 +450,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int payForLast(Long orderNo, BigDecimal fundAmount, String remarks) {
|
|
|
+ public int updatePayForLast(Long orderNo, BigDecimal fundAmount, String remarks) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks,
|
|
|
TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
|
|
|
@@ -529,12 +530,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
bo.setBusinessDesc(setBusinessDesc(bo.getTransactionSubject(),bo.getTransactionAmount()));
|
|
|
}
|
|
|
}
|
|
|
+ data.setList(list);
|
|
|
return data;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
|
- public int applyForWithdraw(Long orderNo,String remarks) {
|
|
|
+ public int updateApplyForWithdraw(Long orderNo,String remarks) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
BigDecimal transactionAmount = new BigDecimal(DecimalCalculate.sub(tOrder.getActuallyTotalPayment().doubleValue(),
|
|
|
tOrder.getActuallyBrokerageAmount().doubleValue()));
|
|
|
@@ -547,7 +549,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
|
- public int applyForCancel(Long orderNo) {
|
|
|
+ public int updateApplyForCancel(Long orderNo) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
setOrderState(OrderAction.APPLY_FOR_CANCEL, new BigDecimal(0), tOrder, false);
|
|
|
if(tOrder.getPaymentStatus() == PaymentState.WAIT_FOR_REFUND.getCode()
|
|
|
@@ -561,6 +563,14 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param transactionSubject 交易科目
|
|
|
+ * @param transactionAmount 交易金额
|
|
|
+ * @param payeeId 收款人
|
|
|
+ * @param payerId 付款人
|
|
|
+ * @return
|
|
|
+ */
|
|
|
private String setBusinessDesc(Integer transactionSubject,BigDecimal transactionAmount){
|
|
|
String result = "";
|
|
|
if(transactionSubject == TransactionSubject.SUPPLY_PAY.getCode() || transactionSubject == TransactionSubject.REFUND.getCode()){
|
|
|
@@ -572,7 +582,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int confirmIntention(Long orderNo, boolean confirm) {
|
|
|
+ public int updateConfirmIntention(Long orderNo, boolean confirm) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
setOrderState(OrderAction.CONFIRM_INTENTION, new BigDecimal(0), tOrder, confirm);
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|