Browse Source

/、update

release_toaliyun_real
xhxu 4 years ago
parent
commit
52701e06ed
2 changed files with 11 additions and 6 deletions
  1. +8
    -4
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  2. +3
    -2
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 8
- 4
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java View File

@@ -56,6 +56,10 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@io.swagger.annotations.ApiModelProperty(value="c用户绑定的手机号",name="cUserPhone")
private String cUserPhone;

@Excel(name = "微信昵称", width = 20, orderNum = "14")
@io.swagger.annotations.ApiModelProperty(value="微信昵称",name="userNickName")
private String userNickName;

@Excel(name = "交易时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate")
private Date createDate;
@@ -72,7 +76,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@TableField(exist = false)
private String couponPriceStr;

@Excel(name = "状态", width = 20, replace = {"待使用_0", "已核销_1", "已过期_2", "已退款_3"}, orderNum = "14")
@Excel(name = "状态", width = 20, replace = {"待使用_0", "已核销_1", "已过期_2", "已退款_3"}, orderNum = "15")
@io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus")
private Integer couponOrderStatus;

@@ -189,7 +193,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@TableField(exist = false)
private Long couponId;

@Excel(name = "类型", width = 50, orderNum = "15", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "预购商品_10", "可配送商品_11", "券礼包_12", "积分券_50", "积分停车券_51", "消费卡_100"})
@Excel(name = "类型", width = 50, orderNum = "16", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "预购商品_10", "可配送商品_11", "券礼包_12", "积分券_50", "积分停车券_51", "消费卡_100"})
@TableField(exist = false)
private Integer couponType;

@@ -249,11 +253,11 @@ public class WxCouponOrderBVo extends WxCouponOrder {
}
return couponPriceStr;
}
@Excel(name = "配送类型", width = 50, orderNum = "16", replace = {"线上购买_0", "到店自提_1", "配送到家_2"})
@Excel(name = "配送类型", width = 50, orderNum = "17", replace = {"线上购买_0", "到店自提_1", "配送到家_2"})
@io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType")
private Integer shippingType;

@Excel(name = "配送状态", width = 50, orderNum = "17", replace = {"线上购买_0", "待自提_10", "待自提_14", "已自提_15", "待发货_20", "待收货_24", "已收货_25"})
@Excel(name = "配送状态", width = 50, orderNum = "18", replace = {"线上购买_0", "待自提_10", "待自提_14", "已自提_15", "待发货_20", "待收货_24", "已收货_25"})
@io.swagger.annotations.ApiModelProperty(value="配送状态 0:默认(无) 1*:自提 2*:配送",name="shippingStatus")
private Integer shippingStatus;



+ 3
- 2
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml View File

@@ -864,6 +864,7 @@
<result column="name" jdbcType="VARCHAR" property="bUserName" />
<result column="bphone" jdbcType="VARCHAR" property="bUserPhone" />
<result column="phone" jdbcType="VARCHAR" property="cUserPhone" />
<result column="nick_name" jdbcType="VARCHAR" property="userNickName" />
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />

<result column="verify_merchant_name" jdbcType="VARCHAR" property="verifyMerchantName"/>
@@ -896,7 +897,7 @@
co.send_merchant_id,c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num,
(CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name,
(CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id,
cu.phone,m2.name AS verify_merchant_name,cal.channel_type
cu.phone,cu.nick_name,m2.name AS verify_merchant_name,cal.channel_type
</sql>

<sql id="allAdminCouponOrderDetailColumns">
@@ -1059,7 +1060,7 @@
co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark, co.pay_vendor,
co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,
c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,
cu.phone
cu.phone,cu.nick_name
FROM wx_coupon_order co
left join wx_coupon_merchant wcm on co.coupon_id = wcm.product_id and wcm.merchant_id = #{merchantId}
LEFT JOIN wx_c_user_basic_info cu ON cu.id=co.c_user_id


Loading…
Cancel
Save