From 458929ac1cb285f31dae9d645b043a014ecc6209 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 15 Feb 2022 15:59:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?/=E3=80=82=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataTowerServiceImpl.java | 6 ++--- .../impl/WxCouponOrderServiceImpl.java | 2 +- .../service/impl/WxOrderServiceImpl.java | 2 +- .../resources/mapper/WxCardSpendMapper.xml | 6 ----- .../main/resources/mapper/WxOrderMapper.xml | 24 ++++++++----------- 5 files changed, 15 insertions(+), 25 deletions(-) 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 @@ - SELECT DATE_FORMAT(create_date,'%Y-%m-%d') as xTime,IFNULL(SUM(coupon_price),0) as price from wx_coupon_order where create_date_times >= unix_timestamp(#{startTime}) and create_date_times < unix_timestamp(#{endTime}) From 3ce3e39d462a4ed0151c8f6b1fe601d2f9e89027 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 15 Feb 2022 16:52:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?/=E3=80=82=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxOrderCouponPressVo.java | 3 --- .../src/main/resources/mapper/WxOrderMapper.xml | 9 +++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java index bd16b9ef4..c0355ae9c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java @@ -48,7 +48,4 @@ public class WxOrderCouponPressVo extends WxOrder { @io.swagger.annotations.ApiModelProperty(value="商户列表",name="orderPressList") private List orderPressList; - @io.swagger.annotations.ApiModelProperty(value="组合订单类型EnumComposeOrder",name="composeOrderType") - private Integer composeOrderType; - } diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index fcd23f893..a44c3b8b4 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -987,7 +987,8 @@ - + + @@ -1030,6 +1031,9 @@ + + +