diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index 4b13c7eac..df08d5f2c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -615,12 +615,12 @@ public class AdapayService { // 发送提现申请 Map settleCountParams = Maps.newHashMap(); - settleCountParams.put("order_no", "drawcash_" + System.currentTimeMillis()); + String orderNo = "drawcash_" + dto.getMerchantId() + "_" +System.currentTimeMillis(); + settleCountParams.put("order_no", orderNo); settleCountParams.put("cash_amt", AdapayUtil.formatAmount(cashAmt)); settleCountParams.put("member_id", adapayAccountBalanceVO.getAdapayMemberId()); settleCountParams.put("app_id", config.getAdapayAppId()); settleCountParams.put("settle_account_id", adapayAccountBalanceVO.getSettleAccountId()); - settleCountParams.put("cash_type", "T1"); settleCountParams.put("notify_url", ADAPAY_CALLBACK_URL); Map settleCount = Drawcash.create(settleCountParams, config.getWechatAppId()); log.info("申请取现接口,请求参数:{}, 返回参数:{}", JSON.toJSONString(settleCountParams), JSON.toJSONString(settleCount)); @@ -638,6 +638,7 @@ public class AdapayService { ClearingWithdrawInfo record = new ClearingWithdrawInfo(); record.setMerchantId(dto.getMerchantId()); record.setWithdrawCode(id); + record.setOrderNo(orderNo); record.setWithdrawStatus(Constants.ZERO); Date now = new Date(); record.setApplicationTime(now); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingWithdrawInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingWithdrawInfo.java index 17c6fddaa..de34dcbd3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingWithdrawInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingWithdrawInfo.java @@ -1,11 +1,8 @@ package com.jsowell.pile.domain; +import lombok.*; + import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; /** * 提现记录表 @@ -26,6 +23,11 @@ public class ClearingWithdrawInfo { */ private String merchantId; + /** + * 交易单号 + */ + private String orderNo; + /** * 提现编号 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml index 5d76a58ad..931acb173 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - id, merchant_id, withdraw_code, withdraw_status, application_time, arrival_time, + id, merchant_id, order_no, withdraw_code, withdraw_status, application_time, arrival_time, create_by, create_time, update_by, update_time, del_flag