fix compile error

master
yixian 3 years ago
parent 491e36a244
commit be50e51d47

@ -4,6 +4,7 @@ import au.com.royalpay.payment.channels.wechat.runtime.MpPaymentApi;
import au.com.royalpay.payment.core.TransactionService;
import au.com.royalpay.payment.core.beans.PaymentQueryResult;
import au.com.royalpay.payment.core.beans.PreOrderRequest;
import au.com.royalpay.payment.core.beans.TransactionBizSubType;
import au.com.royalpay.payment.core.beans.coupon.CashCouponInfo;
import au.com.royalpay.payment.core.beans.coupon.CouponInfo;
import au.com.royalpay.payment.core.events.PaymentFinishedEvent;
@ -163,7 +164,7 @@ public class OneDollarDayActivitySupportImpl implements OneDollarDayActivity, Pa
log.put("transaction_time", format.format(paymentQueryResult.getPayTime()));
log.put("clearing_status", 0);
log.put("remark", "Activity: Day Of One Dollar");
transactionService.saveTransaction(log);
transactionService.saveTransaction(log, TransactionBizSubType.COUPON_PAY);
String transactionId = log.getString("transaction_id");
actDietOrderMapper.setTransactionId(orderId, transactionId, log.getDate("transaction_time"));
}
@ -214,7 +215,7 @@ public class OneDollarDayActivitySupportImpl implements OneDollarDayActivity, Pa
log.put("transaction_time", new Date());
log.put("clearing_status", 0);
log.put("remark", "Activity Refund: Day Of One Dollar");
transactionService.saveTransaction(log);
transactionService.saveTransaction(log,TransactionBizSubType.COUPON_REFUND);
actDietOrderMapper.updateRefund(orderId, log.getString("transaction_id"), log.getDate("transaction_time"));
}

@ -1,6 +1,5 @@
package au.com.royalpay.payment.manage.analysis.core;
import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery;
import com.alibaba.fastjson.JSONObject;
import java.util.Date;

@ -2,6 +2,7 @@ package au.com.royalpay.payment.manage.fund.core.impls;
import au.com.royalpay.payment.core.SettlementDetailCalculator;
import au.com.royalpay.payment.core.TransactionService;
import au.com.royalpay.payment.core.beans.TransactionBizSubType;
import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
import au.com.royalpay.payment.manage.fund.beans.XPlanFundConfig;
import au.com.royalpay.payment.manage.fund.core.XPlanFundConfigService;
@ -303,7 +304,7 @@ public class XPlanFundProcessorImpl implements XPlanFundProcesor {
tradeTransaction.put("channel", "System");
tradeTransaction.put("system_generate", 1);
tradeTransaction.put("remark", remark);
transactionService.saveTransaction(tradeTransaction);
transactionService.saveTransaction(tradeTransaction, TransactionBizSubType.DEPOSIT);
return tradeTransaction;
}

@ -4,6 +4,7 @@ import au.com.royalpay.payment.core.PaymentApi;
import au.com.royalpay.payment.core.TransactionService;
import au.com.royalpay.payment.core.beans.PaymentQueryResult;
import au.com.royalpay.payment.core.beans.PreOrderRequest;
import au.com.royalpay.payment.core.beans.TransactionBizSubType;
import au.com.royalpay.payment.core.beans.coupon.CouponInfo;
import au.com.royalpay.payment.core.events.PaymentFinishedEvent;
import au.com.royalpay.payment.core.events.RefundSendEvent;
@ -66,6 +67,7 @@ public class CtripCouponProvideProcessor implements PaymentProcessor {
private PmtOrderMapper pmtOrderMapper;
@Resource
private TransactionService transactionService;
@Override
public String processorId() {
return COUPON_ID + "_USE";
@ -180,7 +182,7 @@ public class CtripCouponProvideProcessor implements PaymentProcessor {
useCoupontrans.put("remark", "Ctrip Coupon from Customer:" + couponLogId);
accuessCouponLog = payCouponAccuessLogMapper.findAccuessLogByOrderId(orderId, new PageBounds(Order.formString("last_update_date.desc"))).get(0);
if (accuessCouponLog != null) {
transactionService.saveTransaction(useCoupontrans);
transactionService.saveTransaction(useCoupontrans, TransactionBizSubType.COUPON_PAY);
accuessCouponLog.put("is_valid", 1);
accuessCouponLog.put("last_update_date", new Date());
accuessCouponLog.put("transaction_id", useCoupontrans.getString("transaction_id"));
@ -221,7 +223,7 @@ public class CtripCouponProvideProcessor implements PaymentProcessor {
trans.put("transaction_time", new Date());
trans.put("remark", "Refund for Customer Ctrip Coupon:" + coupon_id);
logger.info("正在退款的券的信息" + trans.toJSONString());
transactionService.saveTransaction(trans);
transactionService.saveTransaction(trans, TransactionBizSubType.COUPON_REFUND);
logger.error("订单[" + orderId + "]发送全额退款,携程优惠券【" + coupon_id + "】转为Debit");
accuessCouponLog.put("transaction_refund_id", trans.getString("transaction_id"));
accuessCouponLog.put("refund_id", refundOrder.getString("refund_id"));

@ -1,6 +1,7 @@
package au.com.royalpay.payment.manage.rservices.core.impl;
import au.com.royalpay.payment.core.TransactionService;
import au.com.royalpay.payment.core.beans.TransactionBizSubType;
import au.com.royalpay.payment.core.mappers.PmtOrderMapper;
import au.com.royalpay.payment.manage.appclient.core.RetailAppService;
import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
@ -166,7 +167,7 @@ public class RServicesApplyServiceImpl implements RServicesApplyService {
transaction.put("clearing_status", 0);
transaction.put("remark", applyInfo.getString("service_code") + ":" + applyInfo.getString("title"));
transaction.put("system_generate", 1);
transactionService.saveTransaction(transaction);
transactionService.saveTransaction(transaction, TransactionBizSubType.OTHER);
JSONObject order = new JSONObject();
order.put("order_id", orderId);
order.put("org_id", client.getIntValue("org_id"));

Loading…
Cancel
Save