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 2717502eb..26fa601b7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -53,6 +53,9 @@ public class WxCoupon implements Serializable { @Transient private String priceStr; + @Transient + private String subsidyNumStr; + @Transient private Date startdate; @@ -318,6 +321,18 @@ public class WxCoupon implements Serializable { return priceStr; } + public String getSubsidyNumStr() { + if(subsidyNum!=null) { + subsidyNumStr = new BigDecimal(subsidyNum).divide(new BigDecimal(100)).toString(); + } + return subsidyNumStr; + } + + public void setSubsidyNumStr(String subsidyNumStr) { + this.subsidyNumStr = subsidyNumStr; + + } + public void setPriceStr(String priceStr) { this.priceStr = priceStr; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index a9a17aaef..dc17646f0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -95,6 +95,9 @@ public class WxCouponServiceImpl implements WxCouponService { if (StringUtils.isNotEmpty(record.getPriceStr())) { record.setPrice((int) (Double.parseDouble(record.getPriceStr()) * 100)); } + if (StringUtils.isNotEmpty(record.getSubsidyNumStr())) { + record.setSubsidyNum((int) (Double.parseDouble(record.getSubsidyNumStr()) * 100)); + } if (record.getValidType() != null) { if (record.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) { 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 1c1eab2b7..d658ec1ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -986,13 +986,16 @@ public class WxOrderServiceImpl implements WxOrderService { } public void queryMerchantCount(String tenantId, Map result) { + String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); //全部商户个数 Map params = new HashMap<>(); params.put("tenantId", tenantId); + String thirtyTime = DateUtils.getTimeBefore(29, new Date()); + params.put("startdate", thirtyTime + " 00:00:00"); + params.put("enddate", systemTime + " 23:59:59"); Long allMerchantCount=wxOrderMapper.queryOrderForMerchantCount(params); result.put("allMerchantCount",allMerchantCount); //今日 - String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); params.put("startdate", systemTime + " 00:00:00"); params.put("enddate", systemTime + " 23:59:59"); Long todayMerchantCount=wxOrderMapper.queryOrderForMerchantCount(params); @@ -1028,13 +1031,16 @@ public class WxOrderServiceImpl implements WxOrderService { } public void queryOrderSummary(String tenantId, Map result) { + String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); //全部商户个数 Map params = new HashMap<>(); params.put("tenantId", tenantId); + String thirtyTime = DateUtils.getTimeBefore(29, new Date()); + params.put("startdate", thirtyTime + " 00:00:00"); + params.put("enddate", systemTime + " 23:59:59"); Long allOrderSummary=wxOrderMapper.queryOrderForSum(params); result.put("allOrderSummary",allOrderSummary); //今日 - String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); params.put("startdate", systemTime + " 00:00:00"); params.put("enddate", systemTime + " 23:59:59"); Long todayOrderSummary=wxOrderMapper.queryOrderForSum(params); @@ -1069,5 +1075,4 @@ public class WxOrderServiceImpl implements WxOrderService { } } - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 51d0ed53c..d03e3af09 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -665,13 +665,16 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ } public void queryMerchantCount(String tenantId, Map result) { + String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); //全部商户个数 Map params = new HashMap<>(); params.put("tenantId", tenantId); + String thirtyTime = DateUtils.getTimeBefore(29, new Date()); + params.put("startdate", thirtyTime + " 00:00:00"); + params.put("enddate", systemTime + " 23:59:59"); Long allMerchantCount=wxProfitSharingOrderMapper.queryOrderForMerchantCount(params); result.put("allMerchantCount",allMerchantCount); //今日 - String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); params.put("startdate", systemTime + " 00:00:00"); params.put("enddate", systemTime + " 23:59:59"); Long todayMerchantCount=wxProfitSharingOrderMapper.queryOrderForMerchantCount(params);