Browse Source

//sharing

release_toaliyun_real
xhxu 3 years ago
parent
commit
b39a611de2
2 changed files with 28 additions and 12 deletions
  1. +23
    -8
      mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java
  2. +5
    -4
      mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml

+ 23
- 8
mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java View File

@@ -24,13 +24,28 @@ public class WxProfitSharingOrderVo extends TenantEntity {
private String mchId; private String mchId;
private Long sharingMerchantId; private Long sharingMerchantId;
@Excel(name="商户名称",width = 20,orderNum = "2")
private String merchantName;
@Excel(name="商户单号",width = 20,orderNum = "1") @Excel(name="商户单号",width = 20,orderNum = "1")
private Long orderId; private Long orderId;


@Excel(name="交易金额(分)",width = 20,orderNum = "3")
@Excel(name="商户名称",width = 20,orderNum = "2")
private String merchantName;

@Excel(name="收款商户",width = 20,orderNum = "3")
private String payMerchantName;

@Excel(name="到账商户",width = 20,orderNum = "4")
private String sharingMerchantName;

public String getSharingMerchantName(){
if(this.sharingMerchantId != null && this.sharingMerchantId.equals(this.merchantId)){
this.sharingMerchantName = this.merchantName;
}else if(this.sharingMerchantId != null && this.sharingMerchantId.equals(this.payMerchantId)){
this.sharingMerchantName = this.payMerchantName;
}
return sharingMerchantName;
}

@Excel(name="交易金额(分)",width = 20,orderNum = "5")
private Integer payAmount; private Integer payAmount;


@io.swagger.annotations.ApiModelProperty(value="订单ID",name="singleOrderId") @io.swagger.annotations.ApiModelProperty(value="订单ID",name="singleOrderId")
@@ -38,23 +53,23 @@ public class WxProfitSharingOrderVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="单个订单分账总金额(分)",name="singleOrderAmount") @io.swagger.annotations.ApiModelProperty(value="单个订单分账总金额(分)",name="singleOrderAmount")
private Integer singleOrderAmount; private Integer singleOrderAmount;
@Excel(name="交易结束时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "5")
@Excel(name="交易结束时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "7")
private Date payTimeEnd; private Date payTimeEnd;
@Excel(name="交易开始时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "4")
@Excel(name="交易开始时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "6")
private Date payTimeStart; private Date payTimeStart;
private String transactionId; private String transactionId;
private String sharingOrderNo; private String sharingOrderNo;
@Excel(name="分账类型",width = 20,replace = { "单次分账_0", "多次分账_1", "完结分账(多次)_2", "完结分账(单次)_3"},orderNum = "6")
@Excel(name="分账类型",width = 20,replace = { "单次分账_0", "多次分账_1", "完结分账(多次)_2", "完结分账(单次)_3"},orderNum = "8")
private Integer type; private Integer type;
private String pointDeduction; private String pointDeduction;
private String receivers; private String receivers;
private String errorMsg; private String errorMsg;
@Excel(name="分账状态",width = 20,replace = { "未知_0", "提交订单失败_1", "提交业务失败_2", "受理成功_3", "处理中_4", "处理完成_5", "处理失败_6"},orderNum = "7")
@Excel(name="分账状态",width = 20,replace = { "未知_0", "提交订单失败_1", "提交业务失败_2", "受理成功_3", "处理中_4", "处理完成_5", "处理失败_6"},orderNum = "9")
private Integer sharingStatus; private Integer sharingStatus;
private Date updateTime; private Date updateTime;
private Date createTime; private Date createTime;


+ 5
- 4
mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml View File

@@ -154,9 +154,7 @@
from wx_profit_sharing_order from wx_profit_sharing_order
<include refid="dynamicWhereConditions" /> <include refid="dynamicWhereConditions" />
</select> </select>

<resultMap id="orderMap" type="com.iformall.domain.vo.WxProfitSharingOrderVo"> <resultMap id="orderMap" type="com.iformall.domain.vo.WxProfitSharingOrderVo">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
@@ -168,6 +166,7 @@
<result column="pay_merchant_mch_id" jdbcType="VARCHAR" property="payMerchantMchId" /> <result column="pay_merchant_mch_id" jdbcType="VARCHAR" property="payMerchantMchId" />
<result column="sharing_merchant_id" jdbcType="BIGINT" property="sharingMerchantId" /> <result column="sharing_merchant_id" jdbcType="BIGINT" property="sharingMerchantId" />
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName" /> <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />
<result column="pay_merchant_name" jdbcType="VARCHAR" property="payMerchantName" />
<result column="order_id" jdbcType="BIGINT" property="orderId" /> <result column="order_id" jdbcType="BIGINT" property="orderId" />
<result column="pay_amount" jdbcType="INTEGER" property="payAmount" /> <result column="pay_amount" jdbcType="INTEGER" property="payAmount" />
<result column="single_order_amount" jdbcType="INTEGER" property="singleOrderAmount" /> <result column="single_order_amount" jdbcType="INTEGER" property="singleOrderAmount" />
@@ -184,11 +183,13 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap> </resultMap>

<select id="findOrderList" parameterType="com.iformall.domain.vo.WxProfitSharingOrderQueryVo" resultMap="orderMap"> <select id="findOrderList" parameterType="com.iformall.domain.vo.WxProfitSharingOrderQueryVo" resultMap="orderMap">
select pso.*,m.`name` merchant_name
select pso.*,m.`name` merchant_name,m1.`name` pay_merchant_name
from wx_profit_sharing_order pso from wx_profit_sharing_order pso
left join wx_merchant m on pso.merchant_id=m.id left join wx_merchant m on pso.merchant_id=m.id
left join wx_merchant m1 on pso.pay_merchant_id=m1.id
<where> <where>
<if test=" null != tenantId and '' != tenantId"> <if test=" null != tenantId and '' != tenantId">
and pso.`tenant_id` = #{tenantId} and pso.`tenant_id` = #{tenantId}


Loading…
Cancel
Save