orders 添加字段wallet_user_name
This commit is contained in:
1 parent
abdafd5c9d
commit
2d88b77325
4 files changed
+38
-2
No files matched your search
@@ -45,6 +45,10 @@ public class UsdtOrders extends BaseEntity
|
|||||||
@Excel(name = "钱包地址")
|
@Excel(name = "钱包地址")
|
||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
|
/** 支付用户,由商户创建订单时传入 */
|
||||||
|
@Excel(name = "支付用户")
|
||||||
|
private String walletUserName;
|
||||||
|
|
||||||
/** 状态 */
|
/** 状态 */
|
||||||
@Excel(name = "状态")
|
@Excel(name = "状态")
|
||||||
private Long status;
|
private Long status;
|
||||||
@@ -163,6 +167,15 @@ public class UsdtOrders extends BaseEntity
|
|||||||
{
|
{
|
||||||
return token;
|
return token;
|
||||||
}
|
}
|
||||||
|
public void setWalletUserName(String walletUserName)
|
||||||
|
{
|
||||||
|
this.walletUserName = walletUserName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getWalletUserName()
|
||||||
|
{
|
||||||
|
return walletUserName;
|
||||||
|
}
|
||||||
public void setStatus(Long status)
|
public void setStatus(Long status)
|
||||||
{
|
{
|
||||||
this.status = status;
|
this.status = status;
|
||||||
@@ -273,6 +286,7 @@ public class UsdtOrders extends BaseEntity
|
|||||||
.append("actualAmount", getActualAmount())
|
.append("actualAmount", getActualAmount())
|
||||||
.append("amount", getAmount())
|
.append("amount", getAmount())
|
||||||
.append("token", getToken())
|
.append("token", getToken())
|
||||||
|
.append("walletUserName", getWalletUserName())
|
||||||
.append("status", getStatus())
|
.append("status", getStatus())
|
||||||
.append("notifyUrl", getNotifyUrl())
|
.append("notifyUrl", getNotifyUrl())
|
||||||
.append("redirectUrl", getRedirectUrl())
|
.append("redirectUrl", getRedirectUrl())
|
||||||
|
|||||||
@@ -45,6 +45,9 @@ public class UsdtOrdersPlus implements Serializable
|
|||||||
/** 钱包地址 */
|
/** 钱包地址 */
|
||||||
@Excel(name = "钱包地址")
|
@Excel(name = "钱包地址")
|
||||||
private String token;
|
private String token;
|
||||||
|
/** 支付用户,由商户创建订单时传入 */
|
||||||
|
@Excel(name = "支付用户")
|
||||||
|
private String walletUserName;
|
||||||
/** 状态 */
|
/** 状态 */
|
||||||
@Excel(name = "状态 状态1:等待支付,2:支付成功,3:已过期")
|
@Excel(name = "状态 状态1:等待支付,2:支付成功,3:已过期")
|
||||||
private Long status;
|
private Long status;
|
||||||
@@ -154,6 +157,15 @@ public class UsdtOrdersPlus implements Serializable
|
|||||||
{
|
{
|
||||||
return token;
|
return token;
|
||||||
}
|
}
|
||||||
|
public void setWalletUserName(String walletUserName)
|
||||||
|
{
|
||||||
|
this.walletUserName = walletUserName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getWalletUserName()
|
||||||
|
{
|
||||||
|
return walletUserName;
|
||||||
|
}
|
||||||
public void setStatus(Long status)
|
public void setStatus(Long status)
|
||||||
{
|
{
|
||||||
this.status = status;
|
this.status = status;
|
||||||
@@ -264,6 +276,7 @@ public class UsdtOrdersPlus implements Serializable
|
|||||||
.append("actualAmount", getActualAmount())
|
.append("actualAmount", getActualAmount())
|
||||||
.append("amount", getAmount())
|
.append("amount", getAmount())
|
||||||
.append("token", getToken())
|
.append("token", getToken())
|
||||||
|
.append("walletUserName", getWalletUserName())
|
||||||
.append("status", getStatus())
|
.append("status", getStatus())
|
||||||
.append("notifyUrl", getNotifyUrl())
|
.append("notifyUrl", getNotifyUrl())
|
||||||
.append("redirectUrl", getRedirectUrl())
|
.append("redirectUrl", getRedirectUrl())
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ public class PaymentOrderOpenApiService {
|
|||||||
order.setAmount(amount);
|
order.setAmount(amount);
|
||||||
order.setActualAmount(actualAmount);
|
order.setActualAmount(actualAmount);
|
||||||
order.setToken(wallet.getToken());
|
order.setToken(wallet.getToken());
|
||||||
|
order.setWalletUserName(walletUserName);
|
||||||
order.setStatus(1L);
|
order.setStatus(1L);
|
||||||
order.setNotifyUrl(notifyUrl);
|
order.setNotifyUrl(notifyUrl);
|
||||||
order.setRedirectUrl(redirectUrl);
|
order.setRedirectUrl(redirectUrl);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="actualAmount" column="actual_amount" />
|
<result property="actualAmount" column="actual_amount" />
|
||||||
<result property="amount" column="amount" />
|
<result property="amount" column="amount" />
|
||||||
<result property="token" column="token" />
|
<result property="token" column="token" />
|
||||||
|
<result property="walletUserName" column="wallet_user_name" />
|
||||||
<result property="status" column="status" />
|
<result property="status" column="status" />
|
||||||
<result property="notifyUrl" column="notify_url" />
|
<result property="notifyUrl" column="notify_url" />
|
||||||
<result property="redirectUrl" column="redirect_url" />
|
<result property="redirectUrl" column="redirect_url" />
|
||||||
@@ -27,7 +28,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectUsdtOrdersVo">
|
<sql id="selectUsdtOrdersVo">
|
||||||
select id, trade_id, order_id,order_type, block_transaction_id, actual_amount, amount, token, status, notify_url, redirect_url, callback_num, callback_confirm, created_at, updated_at, deleted_at, app_id, settlement_status, user_id from orders
|
select id, trade_id, order_id, order_type, block_transaction_id, actual_amount, amount,
|
||||||
|
token, wallet_user_name, status, notify_url, redirect_url, callback_num,
|
||||||
|
callback_confirm, created_at, updated_at, deleted_at, app_id, settlement_status, user_id
|
||||||
|
from orders
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectUsdtOrdersList" parameterType="UsdtOrders" resultMap="UsdtOrdersResult">
|
<select id="selectUsdtOrdersList" parameterType="UsdtOrders" resultMap="UsdtOrdersResult">
|
||||||
@@ -36,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="tradeId != null and tradeId != ''"> and trade_id like concat('%', #{tradeId}, '%')</if>
|
<if test="tradeId != null and tradeId != ''"> and trade_id like concat('%', #{tradeId}, '%')</if>
|
||||||
<if test="orderId != null and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
|
<if test="orderId != null and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
|
||||||
<if test="token != null and token != ''"> and token = #{token}</if>
|
<if test="token != null and token != ''"> and token = #{token}</if>
|
||||||
|
<if test="walletUserName != null and walletUserName != ''"> and wallet_user_name like concat('%', #{walletUserName}, '%')</if>
|
||||||
<if test="status != null "> and status = #{status}</if>
|
<if test="status != null "> and status = #{status}</if>
|
||||||
<if test="callbackConfirm != null "> and callback_confirm = #{callbackConfirm}</if>
|
<if test="callbackConfirm != null "> and callback_confirm = #{callbackConfirm}</if>
|
||||||
<if test="appId != null "> and app_id = #{appId}</if>
|
<if test="appId != null "> and app_id = #{appId}</if>
|
||||||
@@ -51,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectByIdForUpdate" resultType="com.ruoyi.system.domain.UsdtOrdersPlus">
|
<select id="selectByIdForUpdate" resultType="com.ruoyi.system.domain.UsdtOrdersPlus">
|
||||||
select id, trade_id, order_id, block_transaction_id, actual_amount, amount, token,
|
select id, trade_id, order_id, block_transaction_id, actual_amount, amount, token, wallet_user_name,
|
||||||
status, notify_url, redirect_url, callback_num, callback_confirm, created_at,
|
status, notify_url, redirect_url, callback_num, callback_confirm, created_at,
|
||||||
updated_at, deleted_at, app_id, settlement_status, user_id, order_type
|
updated_at, deleted_at, app_id, settlement_status, user_id, order_type
|
||||||
from orders
|
from orders
|
||||||
@@ -120,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="actualAmount != null">actual_amount,</if>
|
<if test="actualAmount != null">actual_amount,</if>
|
||||||
<if test="amount != null">amount,</if>
|
<if test="amount != null">amount,</if>
|
||||||
<if test="token != null and token != ''">token,</if>
|
<if test="token != null and token != ''">token,</if>
|
||||||
|
<if test="walletUserName != null and walletUserName != ''">wallet_user_name,</if>
|
||||||
<if test="status != null">status,</if>
|
<if test="status != null">status,</if>
|
||||||
<if test="notifyUrl != null and notifyUrl != ''">notify_url,</if>
|
<if test="notifyUrl != null and notifyUrl != ''">notify_url,</if>
|
||||||
<if test="redirectUrl != null">redirect_url,</if>
|
<if test="redirectUrl != null">redirect_url,</if>
|
||||||
@@ -140,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="actualAmount != null">#{actualAmount},</if>
|
<if test="actualAmount != null">#{actualAmount},</if>
|
||||||
<if test="amount != null">#{amount},</if>
|
<if test="amount != null">#{amount},</if>
|
||||||
<if test="token != null and token != ''">#{token},</if>
|
<if test="token != null and token != ''">#{token},</if>
|
||||||
|
<if test="walletUserName != null and walletUserName != ''">#{walletUserName},</if>
|
||||||
<if test="status != null">#{status},</if>
|
<if test="status != null">#{status},</if>
|
||||||
<if test="notifyUrl != null and notifyUrl != ''">#{notifyUrl},</if>
|
<if test="notifyUrl != null and notifyUrl != ''">#{notifyUrl},</if>
|
||||||
<if test="redirectUrl != null">#{redirectUrl},</if>
|
<if test="redirectUrl != null">#{redirectUrl},</if>
|
||||||
@@ -164,6 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="actualAmount != null">actual_amount = #{actualAmount},</if>
|
<if test="actualAmount != null">actual_amount = #{actualAmount},</if>
|
||||||
<if test="amount != null">amount = #{amount},</if>
|
<if test="amount != null">amount = #{amount},</if>
|
||||||
<if test="token != null and token != ''">token = #{token},</if>
|
<if test="token != null and token != ''">token = #{token},</if>
|
||||||
|
<if test="walletUserName != null">wallet_user_name = #{walletUserName},</if>
|
||||||
<if test="status != null">status = #{status},</if>
|
<if test="status != null">status = #{status},</if>
|
||||||
<if test="notifyUrl != null and notifyUrl != ''">notify_url = #{notifyUrl},</if>
|
<if test="notifyUrl != null and notifyUrl != ''">notify_url = #{notifyUrl},</if>
|
||||||
<if test="redirectUrl != null">redirect_url = #{redirectUrl},</if>
|
<if test="redirectUrl != null">redirect_url = #{redirectUrl},</if>
|
||||||
|
|||||||
Reference in new issue
Block a user