diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 53c4c3efb..1be08ee07 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -126,10 +126,10 @@ public class WxMerchant extends BaseEntity { private String talkUserAux; @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "startTime") - private transient Date starttime; + private Date starttime; @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endTime") - private transient Date endtime; + private Date endtime; @io.swagger.annotations.ApiModelProperty(value = "昵称", name = "userName") private transient String userName; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java index 522590acc..6bd2af802 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java @@ -40,6 +40,6 @@ public class WxMerchantTradeDetailVo extends BaseEntity { @Excel(name="交易时间",width = 20,orderNum = "7") @io.swagger.annotations.ApiModelProperty(value = "交易时间", name = "tradeDate") - private Date tradeDateStr; + private String tradeDateStr; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index cfe9f2610..2b701496e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -19,6 +19,9 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; import com.iformall.utils.BeanMapping; +import com.iformall.utils.DataUtil; +import com.iformall.utils.DateUtils; +import me.chanjar.weixin.common.util.DataUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -749,6 +752,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public void exportUserTradeList(WxMerchant record,HttpServletRequest request, HttpServletResponse response) { List datalist = wxMerchantMapper.userTradeDetailList(record); + datalist.stream().forEach(e->{ + e.setTradeDateStr(DateUtils.formatDateTime(e.getTradeDate())); + }); excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeDetailVo.class, "商户会员消费列表.xlsx", response, false); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 53dcdb3f9..05425c8c2 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -428,11 +428,13 @@ (select count(*) from wx_coupon_order o left join wx_coupon co on(o.`coupon_id`=co.id) left join wx_coupon_merchant cm on(cm.product_id=co.id) - inner join wx_c_user_basic_info c on(o.c_user_id=c.id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 - + inner join wx_c_user_basic_info c on(o.c_user_id=c.id) + left join wx_merchant_b_user mb on(mb.id=c.id) + where cm.`merchant_id`=m.id and o.coupon_order_status=1 and mb.merchant_id=m.id + and o.create_date >= #{starttime} - + and o.create_date <= #{endtime} ) consumeCount, @@ -440,11 +442,13 @@ (select count(distinct c.id) from wx_coupon_order o left join wx_coupon co on(o.`coupon_id`=co.id) left join wx_coupon_merchant cm on(cm.product_id=co.id) - inner join wx_c_user_basic_info c on(o.c_user_id=c.id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 - + inner join wx_c_user_basic_info c on(o.c_user_id=c.id) + left join wx_merchant_b_user mb on(mb.id=c.id) + where cm.`merchant_id`=m.id and o.coupon_order_status=1 and mb.merchant_id=m.id + and o.create_date >= #{starttime} - + and o.create_date <= #{endtime} ) consumeCountP, @@ -452,13 +456,16 @@ IFNULL((select sum(co.price) from wx_coupon_order o left join wx_coupon co on(o.`coupon_id`=co.id) left join wx_coupon_merchant cm on(cm.product_id=co.id) - inner join wx_c_user_basic_info c on(o.c_user_id=c.id) where cm.`merchant_id`=m.id and o.coupon_order_status=1 - + inner join wx_c_user_basic_info c on(o.c_user_id=c.id) + left join wx_merchant_b_user mb on(mb.id=c.id) + where cm.`merchant_id`=m.id and o.coupon_order_status=1 and mb.merchant_id=m.id + and o.create_date >= #{starttime} - + and o.create_date <= #{endtime} + ),0) tradeAmt from wx_merchant m where 1=1 @@ -494,6 +501,12 @@ and co.`title` like concat('%', #{couponName},'%') + + and o.create_date >= #{starttime} + + + and o.create_date <= #{endtime} + order by o.create_date desc