diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 1c70db2ed..d2f73a8cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -201,9 +201,9 @@ public class DataTowerServiceImpl implements DataTowerService { //今日车流量*********************************************** private Map carRunning(TenantEntity tenantEntity) { HashMap carMap = new HashMap<>(); - List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); +// List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); HashMap paramsCar = new HashMap<>(); - paramsCar.put("tenantEntitys",tenantEntitys); +// paramsCar.put("tenantEntitys",tenantEntitys); paramsCar.put("tenantId", tenantEntity.getTenantId()); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { paramsCar.put("parentTenantId", tenantEntity.getParentTenantId()); @@ -413,7 +413,7 @@ public class DataTowerServiceImpl implements DataTowerService { dataMap.put("rent", rentRunning(tenantEntity)); dataMap.put("report", reportRunning(tenantEntity)); //TODO 待优化数据 - //dataMap.put("car", carRunning(tenantEntity)); + dataMap.put("car", carRunning(tenantEntity)); dataMap.put("car", null); dataMap.put("coupon", couponRunning(tenantEntity)); dataMap.put("visitor", visitorRunning(tenantEntity)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 838861604..69d24ab9f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1610,6 +1610,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { public WxMerchantSubsidy recordAfterVerified(WxCouponOrder couponOrder, Long merchantId) { WxCoupon wxCoupon = wxCouponMapper.selectById(couponOrder.getCouponId(),couponOrder.getTenantId()); WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); + merchantSubsidy.updateTenantInfo(couponOrder); if (couponOrder.getCouponType().equals(EnumCouponType.COUPON_PRESS.getCode()) && couponOrder.getCouponPrice().equals(wxCoupon.getSalePrice())) { //砍价 @@ -1642,7 +1643,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { final IdWorker idWorker = IdWorker.get(); Date curDate = new Date(); merchantSubsidy.setId(idWorker.nextId()); - merchantSubsidy.updateTenantInfo(couponOrder); merchantSubsidy.setMerchantId(merchantId); merchantSubsidy.setOrderPayment(couponOrder.getCouponPrice()); merchantSubsidy.setReceiverPayment(couponOrder.getCouponPrice()); 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 e4dbbcea4..3526df8b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2383,7 +2383,7 @@ public class WxOrderServiceImpl implements WxOrderService { Long allRefundOrderSummary = wxOrderMapper.queryOrderForSum(params); result.put("allRefundOrderSummary", allRefundOrderSummary); Long allOrderSummary = allPayOrderSummary - allRefundOrderSummary; - result.put("allOrderSummary", allPayOrderSummary); + result.put("allOrderSummary", allOrderSummary); //今日 params.put("startdate", systemTime + " 00:00:00"); params.put("enddate", systemTime + " 23:59:59"); diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 0f5896397..7cc272d1b 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -226,12 +226,6 @@ ((date_format(cs.create_date,'%H:%m') < '06:00') and date_format(cs.create_date,'%w') in (6,0))) - - and cs.merchant_id in - - #{merchantIdItem} - - group by cs.merchant_id diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 1e7fe418b..fcd23f893 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -921,21 +921,17 @@