From 3d330c18e88df17d994cc45dddd2294f91c90942 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 17 Jun 2021 16:46:43 +0800 Subject: [PATCH] fix coupon order --- .../com/iformall/domain/vo/WxCouponOrderBVo.java | 7 ++++++- .../service/impl/WxCouponOrderServiceImpl.java | 13 +++++++++++++ .../main/resources/mapper/WxCouponOrderMapper.xml | 4 +++- 3 files changed, 22 insertions(+), 2 deletions(-) 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 47e7db6df..e62baec56 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -134,10 +134,15 @@ public class WxCouponOrderBVo extends WxCouponOrder { private String bUserName; @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") private String bUserPhone; - @Excel(name = "发券商户", width = 50, orderNum = "3") + @Excel(name = "券所属商户", width = 50, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName") private String merchantName; + + @Excel(name = "发券商户(商户注券)", width = 50, orderNum = "3") + @io.swagger.annotations.ApiModelProperty(value="发券商户(商户注券)",name="sendMerchantName") + @TableField(exist = false) + private String sendMerchantName; // public String getMerchantName() { // if(this.getCmCount() != null && this.getCmCount() > 1){ // this.merchantName = "[多商户通用]"; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index fea6014b2..ec39ec985 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -332,11 +332,24 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public void exportData(WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) { String filename = "券订单"; + WxMerchant merchantQ = new WxMerchant(); + merchantQ.updateTenantInfo(wxCouponOrder); + List merchantList = wxMerchantMapper.findIdNameList(merchantQ); + Map merchantNameMap = new HashMap(); + if (null != merchantList) { + merchantList.parallelStream().forEach(m -> { + merchantNameMap.put(m.getId(), m.getName()); + }); + } + List list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); list.parallelStream().forEach(c -> { if (c.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())) { c.setUpdateDate(null); } + if (null != c.getSendMerchantId()) { + c.setSendMerchantName(merchantNameMap.get(c.getSendMerchantId())); + } // if (!c.getMerchantId().equals(0L)) { // List merchantVoList = c.getMerchantVoList(); // if (!CollectionUtils.isEmpty(merchantVoList)) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index f04b4aecf..7683a5301 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -764,6 +764,8 @@ + + @@ -786,7 +788,7 @@ co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.order_id, co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price, - c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num, + 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