From d1b73c4c9b72d365afc48ae04561e6dd0816440e Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 11 Jul 2019 20:36:33 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=B8=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=88=B8=E6=9D=A5?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/device/KwMeterController.java | 2 +- .../main/java/com/iformall/domain/vo/WxCouponOrderBVo.java | 4 ++++ .../src/main/resources/mapper/WxCouponOrderMapper.xml | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 6b05e395b..12a1a50eb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -81,7 +81,7 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (kwMeter.getBoxId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - if (kwMeter.getAddress() == null) + if (kwMeter.getId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 31236e152..75517e14f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -148,6 +148,10 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; + /**发券渠道信息*/ + @io.swagger.annotations.ApiModelProperty(value="商户列表",name="channelType") + private Integer channelType; + @Transient private Date startDate; diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 1d5a54d9f..198826595 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -575,7 +575,7 @@ where m.id = cm.merchant_id and cm.product_id=co.coupon_id and cm.status = 0) else '[多商户通用]' end) as merchant_name, (case when com.mc = 1 then (select m.id from wx_merchant m, wx_coupon_merchant cm where m.id = cm.merchant_id and cm.product_id = co.coupon_id - and cm.status = 0) else 0 end) as merchant_id,cu.phone,bu.verify_merchant_name + and cm.status = 0) else 0 end) as merchant_id,cu.phone,bu.verify_merchant_name,cal.channel_type @@ -601,6 +601,7 @@ from wx_merchant_b_user bu inner join wx_merchant m on bu.merchant_id=m.id where bu.tenant_id = #{tenantId} ) bu on bu.bu_id = co.b_user_id + left join wx_coupon_action_log cal on co.id = cal.coupon_order_id and co.coupon_id = cal.coupon_id where 1=1