Browse Source

//sharing

release_toaliyun_real
xhxu 3 years ago
parent
commit
47c852f11b
2 changed files with 6 additions and 14 deletions
  1. +5
    -5
      mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java
  2. +1
    -9
      mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml

+ 5
- 5
mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java View File

@@ -25,14 +25,14 @@ public class WxProfitSharingOrderDetailsVo extends TenantEntity {
private String failedReason;
private String description;
private Long sharingReceiverId;
private Integer receiverType;
// private Integer receiverType;
private String receiverAccount;
private String receiverComments;
private Integer sharingType;
private Integer status;
// private String receiverComments;
// private Integer sharingType;
// private Integer status;

public String getReceiverAccount(){
if(sharingReceiverId.equals(0l) && StringUtils.isNotBlank(this.description)){
if(StringUtils.isNotBlank(this.description)){
JSONObject jsonObject = JSON.parseObject(this.description);
if(jsonObject != null){
this.receiverAccount = jsonObject.getString("account");


+ 1
- 9
mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml View File

@@ -271,23 +271,15 @@
<result column="failed_reason" jdbcType="VARCHAR" property="failedReason" />
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="sharing_receiver_id" jdbcType="BIGINT" property="sharingReceiverId" />
<result column="receiver_type" jdbcType="INTEGER" property="receiverType" />
<result column="receiver_account" jdbcType="VARCHAR" property="receiverAccount" />
<result column="receiver_comments" jdbcType="VARCHAR" property="receiverComments" />
<result column="sharing_type" jdbcType="INTEGER" property="sharingType" />
<result column="status" jdbcType="VARCHAR" property="status" />
</resultMap>
<select id="findOrderDetails" parameterType="java.util.HashMap" resultMap="orderDetailsMap">
select psr.id,psr.tenant_id,psr.parent_tenant_id,psr.pay_amount,psr.create_time,sharing_status,finish_time,failed_reason,description,
psr.sharing_receiver_id,psre.receiver_type,psre.receiver_account,psre.receiver_comments,psre.sharing_type,psre.`status`
psr.sharing_receiver_id
from wx_profit_sharing_result psr
left join wx_profit_sharing_receiver psre on psr.sharing_receiver_id = psre.id
where psr.sharing_order_id = #{id} and psr.tenant_id = #{tenantId}
<if test=" null != isPrivate ">
and psr.`is_private` = #{isPrivate}

</if>
</select>



Loading…
Cancel
Save