ソースを参照

[订单查询][修复]:修改订单查询逻辑

release_toaliyun_real
Stormeye.Wu 7年前
コミット
e603e0e5cb
2個のファイルの変更60行の追加36行の削除
  1. +43
    -24
      mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java
  2. +17
    -12
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 43
- 24
mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java ファイルの表示

@@ -8,49 +8,60 @@ public class OrderVo implements Serializable {
/*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
/*商户ID**/
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;
/*订单ID**/
@io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId")
private Long orderId;
/*卡券ID**/
@io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId")
private Long couponId;
/*商户ID**/
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;
/*c端用户id**/
@io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId")
private Long cUserId;
/*b端用户id**/
@io.swagger.annotations.ApiModelProperty(value="b端用户id",name="bUserId")
private Long bUserId;
/*订单状态**/
@io.swagger.annotations.ApiModelProperty(value="订单状态",name="status")
private Integer status;
@io.swagger.annotations.ApiModelProperty(value="订单状态",name="orderStatus")
private Integer orderStatus;
/*券状态**/
@io.swagger.annotations.ApiModelProperty(value="券状态",name="status")
private Integer couponStatus;

public String getTenantId() {
public String getTenantId() {
return tenantId;
}
public void setTenantId(String _tenantId) {
tenantId = _tenantId;

public void setTenantId(String tenantId) {
this.tenantId = tenantId;
}
public Long getOrderId() {
return orderId;

public Long getMerchantId() {
return merchantId;
}
public void setOrderId(Long _orderId) {
orderId = _orderId;

public void setMerchantId(Long merchantId) {
this.merchantId = merchantId;
}
public Long getCouponId() {
return couponId;

public Long getOrderId() {
return orderId;
}
public void setCouponId(Long _couponId) {
couponId = _couponId;

public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public Long getMerchantId() {
return merchantId;

public Long getCouponId() {
return couponId;
}
public void setMerchantId(Long _merchantId) {
merchantId = _merchantId;

public void setCouponId(Long couponId) {
this.couponId = couponId;
}

public Long getcUserId() {
return cUserId;
}
@@ -59,12 +70,20 @@ public class OrderVo implements Serializable {
this.cUserId = cUserId;
}

public Integer getStatus() {
return status;
public Long getbUserId() {
return bUserId;
}

public void setbUserId(Long bUserId) {
this.bUserId = bUserId;
}

public Integer getOrderStatus() {
return orderStatus;
}

public void setStatus(Integer status) {
this.status = status;
public void setOrderStatus(Integer orderStatus) {
this.orderStatus = orderStatus;
}

public Integer getCouponStatus() {


+ 17
- 12
mallinkService/src/main/resources/mapper/WxOrderMapper.xml ファイルの表示

@@ -98,13 +98,15 @@


<select id="queryListMap" parameterType="com.simple.domain.vo.OrderVo" resultType="hashmap">
select o.id, o.coupon_id, c.title, v.verification_date,
o.c_user_id, u.phone, u.nick_name, c.price, c.sale_price,
o.status, o.coupon_status
select o.id orderId, c.title, v.verification_date,
o.c_user_id, uc.phone, uc.nick_name, c.price, c.sale_price,
o.`order_status`, co.`coupon_status`
from wx_order o
left join wx_coupon_order co on co.id = o.coupon_id
left join wx_coupon_verify v on v.coupon_id= o.coupon_id
left join wx_c_user u on u.id = o.c_user_id
left join wx_coupon_order co on co.order_id = o.id
left join wx_coupon c on c.id = co.coupon_id
left join wx_coupon_verify v on v.coupon_id= co.coupon_id
left join wx_c_user uc on uc.id = o.c_user_id
left join wx_merchant_b_user ub on ub.id = o.b_user_id
<where>
<if test="tenantId != null and tenantId !=''">
and c.`tenant_id` = #{tenantId}
@@ -116,21 +118,24 @@
and o.`id` = #{orderId}
</if>
<if test="couponId != null and couponId!=''">
and o.`coupon_id` = #{couponId}
and co.`coupon_id` = #{couponId}
</if>
<if test="cUserId != null and cUserId !=''">
and o.`c_user_id` = #{cUserId}
</if>
<if test="status != null and status != ''" >
and o.`status` = #{status}
<if test="bUserId != null and bUserId !=''">
and o.`b_user_id` = #{bUserId}
</if>
<if test="couponStatus != null and couponStatus.trim() != ''">
and o.`coupon_status` = #{couponStatus}
<if test="orderStatus != null and orderStatus != ''" >
and o.`order_status` = #{status}
</if>
<if test="couponStatus != null and couponStatus != ''">
and co.`coupon_status` = #{couponStatus}
</if>
</where>
<choose>
<otherwise>
order by id desc
order by o.`id` desc
</otherwise>
</choose>
</select>


読み込み中…
キャンセル
保存