From 672b01623d672626c0bf3a36b4dfa3daa6c78b2e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 22 Mar 2019 17:36:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=BA=93=E5=AD=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=80=80=E5=9B=9E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxOrderServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 472af5d28..b7a6d1d6e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -299,10 +299,12 @@ public class WxOrderServiceImpl implements WxOrderService { coupon = wxCouponMapper.selectByPrimaryKey(couponId); } catch (Exception e) { logger.error("券未找到, e:" + e.getMessage()); + redisLock.unlock(couponIdStr, timeStr); throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); } if (coupon == null) { logger.error("券未找到, " + couponIdStr); + redisLock.unlock(couponIdStr, timeStr); throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); } From f89cf622a5fd137c9da101ea09abf2982f822fcb Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 22 Mar 2019 17:37:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/vo/WxCouponStatisVo.java | 157 ++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java new file mode 100644 index 000000000..51068178b --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java @@ -0,0 +1,157 @@ +package com.iformall.domain.vo; + +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @author luozukai + * coupon 营销分析 + * @date 2019/3/22 17:29 + */ +public class WxCouponStatisVo implements Serializable { + + @Transient + private String xtime; + @Transient + private String xcount; + /**售出卡数量**/ + @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") + @Transient + private Long saleCount; + /**转增数量**/ + @io.swagger.annotations.ApiModelProperty(value="转增数量",name="transferCount") + @Transient + private Long transferCount; + /**售出金额**/ + @io.swagger.annotations.ApiModelProperty(value="售出金额",name="saleAmount") + @Transient + private Integer saleAmount; + /**核销数量**/ + @io.swagger.annotations.ApiModelProperty(value="核销数量",name="sumPayment") + @Transient + private Integer sumPayment; + /**退款数量**/ + @io.swagger.annotations.ApiModelProperty(value="退款数量",name="backpayCount") + @Transient + private Integer backpayCount; + + /**砍价发起次数**/ + @io.swagger.annotations.ApiModelProperty(value="砍价发起次数",name="pressSendCount") + @Transient + private Integer pressSendCount; + /**砍价成功次数**/ + @io.swagger.annotations.ApiModelProperty(value="砍价成功次数",name="pressSuccCount") + @Transient + private Integer pressSuccCount; + /**砍价参与人数**/ + @io.swagger.annotations.ApiModelProperty(value="砍价参与人数",name="pressJoinCount") + @Transient + private Integer pressJoinCount; + + /**商场补贴**/ + @io.swagger.annotations.ApiModelProperty(value="商场补贴",name="sumSubsidy") + @Transient + private Integer sumSubsidy; + /**核销比**/ + @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRate") + @Transient + private String paymentRate; + + + + public String getXtime() { + return xtime; + } + + public void setXtime(String xtime) { + this.xtime = xtime; + } + + public String getXcount() { + return xcount; + } + + public void setXcount(String xcount) { + this.xcount = xcount; + } + + public Long getSaleCount() { + return saleCount; + } + + public void setSaleCount(Long saleCount) { + this.saleCount = saleCount; + } + + public Long getTransferCount() { + return transferCount; + } + + public void setTransferCount(Long transferCount) { + this.transferCount = transferCount; + } + + public Integer getSaleAmount() { + return saleAmount; + } + + public void setSaleAmount(Integer saleAmount) { + this.saleAmount = saleAmount; + } + + public Integer getSumPayment() { + return sumPayment; + } + + public void setSumPayment(Integer sumPayment) { + this.sumPayment = sumPayment; + } + + public Integer getBackpayCount() { + return backpayCount; + } + + public void setBackpayCount(Integer backpayCount) { + this.backpayCount = backpayCount; + } + + public Integer getPressSendCount() { + return pressSendCount; + } + + public void setPressSendCount(Integer pressSendCount) { + this.pressSendCount = pressSendCount; + } + + public Integer getPressSuccCount() { + return pressSuccCount; + } + + public void setPressSuccCount(Integer pressSuccCount) { + this.pressSuccCount = pressSuccCount; + } + + public Integer getPressJoinCount() { + return pressJoinCount; + } + + public void setPressJoinCount(Integer pressJoinCount) { + this.pressJoinCount = pressJoinCount; + } + + public Integer getSumSubsidy() { + return sumSubsidy; + } + + public void setSumSubsidy(Integer sumSubsidy) { + this.sumSubsidy = sumSubsidy; + } + + public String getPaymentRate() { + return paymentRate; + } + + public void setPaymentRate(String paymentRate) { + this.paymentRate = paymentRate; + } +}