From 628a5eb6156564267a45866ae96961c74b580271 Mon Sep 17 00:00:00 2001 From: Burce Date: Sun, 31 May 2020 09:41:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=B8=E6=93=8D=E4=BD=9C=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponSendController.java | 1 + .../main/java/com/iformall/domain/po/WxCouponSend.java | 8 ++++++++ .../src/main/resources/mapper/WxCouponSendMapper.xml | 2 ++ 3 files changed, 11 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 7251a339d..52d4bf843 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -122,6 +122,7 @@ public class WxCouponSendController extends BaseController { wxCouponSend.setUpdateDate(new Date()); try { + wxCouponSend.setOperatorId(getUserId()); wxCouponSendService.saveOrUpdate(wxCouponSend); } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index f98d6690c..69a2f2446 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -112,6 +112,14 @@ public class WxCouponSend extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效,全部时不传",name="status") private Integer status; + @JsonIgnore + @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") + private Long operatorId; + + @io.swagger.annotations.ApiModelProperty(value="操作人",name="operator") + @TableField(exist = false) + private String operator; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index b5d888853..882e07916 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -107,8 +107,10 @@ select - from wx_card_info ci + from (select ci.`id`, ci.`tenant_id`, ci.`coupon_id`, ci.`transaction_id`, ci.`amount`, ci.`sale_amount`, ci.`remaining_amount`, ci.`service_fee_amount`, ci.`share_fee_amount`, ci.`remaining_share_fee_amount`, ci.`rate_amount`, ci.`create_date`, ci.`update_date` from wx_card_info ci where ci.`tenant_id` = #{tenantId}) ci + left join wx_coupon c on c.id = ci.coupon_id left join wx_coupon_order co on co.id = ci.id left join wx_c_user cu on cu.id = co.c_user_id diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 2840d2e8a..7498967d9 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -634,14 +634,29 @@ + + + co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status, + co.create_date,co.update_date,co.coupon_price, c.title,c.sale_price,c.use_price,c.price, + c.unit,c.auto_refund,c.business,c.subsidy_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 @@ -654,6 +669,7 @@