diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index b72248438..b1f778394 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -75,6 +75,10 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_msg_record".equals(tableName)) { return true; } + + if ("wx_coupon".equals(tableName)) { + return true; + } return false; } @@ -88,6 +92,8 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxShopMapper.rentRateHistory".equals(ms.getId())) return true; + if ("com.iformall.mapper.WxCouponMapper.findCouponData".equals(ms.getId())) + return true; return false; } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 14338dd10..496df221e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -83,6 +83,9 @@ public class WxMerchantTradeDailyController extends BaseController { public ResultData saveOrUpdate(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::saveOrUpdate"); wxMerchantTradeDaily.setTenantId(super.getTenantId()); + if(wxMerchantTradeDaily.getTradeAmt()!= null){ + wxMerchantTradeDaily.setTradeAmt(wxMerchantTradeDaily.getTradeAmt()*100); + } wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 8d17a5d5d..c72c4422a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -213,6 +213,19 @@ public class WxCoupon extends BaseEntity { //营销分析 private WxCouponStatisVo wxCouponStatisVo; + @Transient + @SortColumn(column = "press_count") + private Integer pressSendCount; + @Transient + private Integer pressCount; + @Transient + private Integer changeRate; + @Transient + @SortColumn(column = "join_count") + private Integer pressJoinCount; + @Transient + private Integer paymentRate; + public Long getCouponChannelId() { return couponChannelId; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java index 4df4f4afc..8af038190 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java @@ -9,9 +9,7 @@ import java.util.Date; import java.util.List; @Table(name = "wx_device") -public class WxDevice implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxDevice extends BaseEntity { @Id protected Long id; @@ -28,8 +26,10 @@ public class WxDevice implements Serializable { this.id = id; } + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } public List getIds() { diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 040bb9497..4bf4460a0 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -537,9 +537,14 @@ +