Просмотр исходного кода

[交易对账][修改][查询]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
63328bdff7
2 измененных файлов: 30 добавлений и 3 удалений
  1. +23
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java
  2. +7
    -2
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 23
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java Просмотреть файл

@@ -41,7 +41,13 @@ public class WxOrder implements Serializable {


@Transient @Transient
private String merchantName; private String merchantName;

@Transient
private String cUserName;

@Transient
private String phone;

/*订单码;正反向交易保持一致。**/ /*订单码;正反向交易保持一致。**/
@io.swagger.annotations.ApiModelProperty(value="订单码;正反向交易保持一致。",name="orderNumber") @io.swagger.annotations.ApiModelProperty(value="订单码;正反向交易保持一致。",name="orderNumber")
private Long orderNumber; private Long orderNumber;
@@ -166,6 +172,22 @@ public class WxOrder implements Serializable {
this.productId = productId; this.productId = productId;
} }


public String getcUserName() {
return cUserName;
}

public void setcUserName(String cUserName) {
this.cUserName = cUserName;
}

public String getPhone() {
return phone;
}

public void setPhone(String phone) {
this.phone = phone;
}

public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


+ 7
- 2
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Просмотреть файл

@@ -338,22 +338,27 @@
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
<result column="detail" jdbcType="VARCHAR" property="detail"/> <result column="detail" jdbcType="VARCHAR" property="detail"/>
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/> <result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/>
<result column="c_user_name" jdbcType="VARCHAR" property="cUserName"/>
<result column="phone" jdbcType="VARCHAR" property="phone"/>

</resultMap> </resultMap>
<select id="findListOrder" resultMap="orderMap" parameterType="com.iformall.domain.vo.WxOrderQueryVo"> <select id="findListOrder" resultMap="orderMap" parameterType="com.iformall.domain.vo.WxOrderQueryVo">
select o.* from ( select o.* from (
select o.*,m.`name` merchant_name from (
select o.*,m.`name` merchant_name,cubi.`name` c_user_name,cubi.phone from (
select o.*,cm.merchant_id from wx_order o select o.*,cm.merchant_id from wx_order o
left join wx_coupon_merchant cm on o.product_id=cm.product_id left join wx_coupon_merchant cm on o.product_id=cm.product_id
where type in (0,3)) o where type in (0,3)) o
left join wx_merchant m on o.merchant_id=m.id left join wx_merchant m on o.merchant_id=m.id
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id
union all union all
select o.*,m.`name` merchantName from (
select o.*,m.`name` merchantName,cubi.`name` c_user_name,cubi.phone from (
select o.*,mbu.merchant_id from wx_order o select o.*,mbu.merchant_id from wx_order o
left join wx_merchant_b_user mbu on o.product_id=mbu.id left join wx_merchant_b_user mbu on o.product_id=mbu.id
where type in (1,2)) o where type in (1,2)) o
left join wx_merchant m on o.merchant_id=m.id left join wx_merchant m on o.merchant_id=m.id
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id
) o ) o
<where> <where>
<if test="tenantId!=null"> <if test="tenantId!=null">


Загрузка…
Отмена
Сохранить