developrelease_toaliyun_real
| @@ -53,6 +53,9 @@ public class WxCoupon implements Serializable { | |||||
| @Transient | @Transient | ||||
| private String priceStr; | private String priceStr; | ||||
| @Transient | |||||
| private String subsidyNumStr; | |||||
| @Transient | @Transient | ||||
| private Date startdate; | private Date startdate; | ||||
| @@ -318,6 +321,18 @@ public class WxCoupon implements Serializable { | |||||
| return priceStr; | 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) { | public void setPriceStr(String priceStr) { | ||||
| this.priceStr = priceStr; | this.priceStr = priceStr; | ||||
| } | } | ||||
| @@ -95,6 +95,9 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| if (StringUtils.isNotEmpty(record.getPriceStr())) { | if (StringUtils.isNotEmpty(record.getPriceStr())) { | ||||
| record.setPrice((int) (Double.parseDouble(record.getPriceStr()) * 100)); | 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() != null) { | ||||
| if (record.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) { | if (record.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) { | ||||
| @@ -986,13 +986,16 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| public void queryMerchantCount(String tenantId, Map<String, Object> result) { | public void queryMerchantCount(String tenantId, Map<String, Object> result) { | ||||
| String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); | |||||
| //全部商户个数 | //全部商户个数 | ||||
| Map<String, Object> params = new HashMap<>(); | Map<String, Object> params = new HashMap<>(); | ||||
| params.put("tenantId", tenantId); | 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); | Long allMerchantCount=wxOrderMapper.queryOrderForMerchantCount(params); | ||||
| result.put("allMerchantCount",allMerchantCount); | result.put("allMerchantCount",allMerchantCount); | ||||
| //今日 | //今日 | ||||
| String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); | |||||
| params.put("startdate", systemTime + " 00:00:00"); | params.put("startdate", systemTime + " 00:00:00"); | ||||
| params.put("enddate", systemTime + " 23:59:59"); | params.put("enddate", systemTime + " 23:59:59"); | ||||
| Long todayMerchantCount=wxOrderMapper.queryOrderForMerchantCount(params); | Long todayMerchantCount=wxOrderMapper.queryOrderForMerchantCount(params); | ||||
| @@ -1028,13 +1031,16 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| public void queryOrderSummary(String tenantId, Map<String, Object> result) { | public void queryOrderSummary(String tenantId, Map<String, Object> result) { | ||||
| String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); | |||||
| //全部商户个数 | //全部商户个数 | ||||
| Map<String, Object> params = new HashMap<>(); | Map<String, Object> params = new HashMap<>(); | ||||
| params.put("tenantId", tenantId); | 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); | Long allOrderSummary=wxOrderMapper.queryOrderForSum(params); | ||||
| result.put("allOrderSummary",allOrderSummary); | result.put("allOrderSummary",allOrderSummary); | ||||
| //今日 | //今日 | ||||
| String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); | |||||
| params.put("startdate", systemTime + " 00:00:00"); | params.put("startdate", systemTime + " 00:00:00"); | ||||
| params.put("enddate", systemTime + " 23:59:59"); | params.put("enddate", systemTime + " 23:59:59"); | ||||
| Long todayOrderSummary=wxOrderMapper.queryOrderForSum(params); | Long todayOrderSummary=wxOrderMapper.queryOrderForSum(params); | ||||
| @@ -1069,5 +1075,4 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -665,13 +665,16 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| } | } | ||||
| public void queryMerchantCount(String tenantId, Map<String, Object> result) { | public void queryMerchantCount(String tenantId, Map<String, Object> result) { | ||||
| String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); | |||||
| //全部商户个数 | //全部商户个数 | ||||
| Map<String, Object> params = new HashMap<>(); | Map<String, Object> params = new HashMap<>(); | ||||
| params.put("tenantId", tenantId); | 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); | Long allMerchantCount=wxProfitSharingOrderMapper.queryOrderForMerchantCount(params); | ||||
| result.put("allMerchantCount",allMerchantCount); | result.put("allMerchantCount",allMerchantCount); | ||||
| //今日 | //今日 | ||||
| String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); | |||||
| params.put("startdate", systemTime + " 00:00:00"); | params.put("startdate", systemTime + " 00:00:00"); | ||||
| params.put("enddate", systemTime + " 23:59:59"); | params.put("enddate", systemTime + " 23:59:59"); | ||||
| Long todayMerchantCount=wxProfitSharingOrderMapper.queryOrderForMerchantCount(params); | Long todayMerchantCount=wxProfitSharingOrderMapper.queryOrderForMerchantCount(params); | ||||