From 3377b39512ec70b52af58261be16ee494dc3852f Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 11 Jul 2019 17:22:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9needpay=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 2 +- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 4eb47ca0f..9f4ca1f61 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -225,7 +225,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService bill.setCreatetime(new Date()); bill.setTenantId(record.getTenantId()); bill.setOwe(bill.getReceivePay()); - bill.setNeedPay(bill.getReceivePay()); + bill.setNeedPay(bill.getNeedPay()); bill.setUpdatetime(new Date()); bill.setRentShopType(record.getRentShopType()); bill.setPeriod(count); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 3822a1608..e1869faf5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -459,7 +459,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { bill.setCreatetime(new Date()); bill.setTenantId(record.getTenantId()); bill.setOwe(bill.getReceivePay()); - bill.setNeedPay(bill.getReceivePay()); + bill.setNeedPay(bill.getNeedPay()); bill.setUpdatetime(new Date()); bill.setRentShopType(record.getRentShopType()); bill.setPeriod(count); From 6ce8fb5c5e12a15ed7cb67e961dda36749e4051c Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 11 Jul 2019 17:41:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E6=89=93=E6=A0=87=E7=AD=BE][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E6=89=93=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/mapper/WxCardSpendMapper.java | 2 +- .../java/com/iformall/mapper/WxCouponOrderMapper.java | 2 +- .../iformall/service/impl/WxCUserTagsServiceImpl.java | 4 ++-- .../src/main/resources/mapper/WxCardSpendMapper.xml | 10 ++++++---- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 10 ++++++---- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java index 88f2cacf8..846417c90 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java @@ -14,7 +14,7 @@ public interface WxCardSpendMapper extends CommonMapper { int findCount(WxCardSpend wxCardSpend); List> getCountByBusinessId(WxCardSpend wxCardSpend); - List> getCountByBusinessIdAndSubId(WxCardSpend wxCardSpend); + List> getCountBySubBusinessId(WxCardSpend wxCardSpend); List findCardSpendVoList(WxCardSpendVo wxCardSpend); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index eac6412c2..7c74034ec 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -27,7 +27,7 @@ public interface WxCouponOrderMapper extends CommonMapper { //统一的计数接口 int findCount(WxCouponOrder wxCouponOrder); List> getCountByBusinessId(WxCouponOrder wxCouponOrder); - List> getCountByBusinessIdAndSubId(WxCouponOrder wxCouponOrder); + List> getCountBySubBusinessId(WxCouponOrder wxCouponOrder); //统一额度统计接口 int queryPriceTotal(WxCouponOrder wxCouponOrder); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 97fe45e1b..2558545cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -433,8 +433,8 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { subBusiness.setBusinessId(EnumBusiness.BUSINESS_ID1.getCode()); List list = wxSubBusinessMapper.findList(subBusiness); - List> cardSpendCountList = wxCardSpendMapper.getCountByBusinessIdAndSubId(wxCardSpend); - List> cardOrderCountList = wxCouponOrderMapper.getCountByBusinessIdAndSubId(wxCouponOrder); + List> cardSpendCountList = wxCardSpendMapper.getCountBySubBusinessId(wxCardSpend); + List> cardOrderCountList = wxCouponOrderMapper.getCountBySubBusinessId(wxCouponOrder); list.stream().forEach(sb->{ int count = 0; diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 6343c3840..36a2a0eff 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -209,10 +209,12 @@ group by m.business_id - + select m.sub_business_id, count(m.sub_business_id) bu_count from wx_card_spend cs - inner join wx_merchant m on m.id = cs.merchant_id + + inner join wx_merchant m on m.id = cs.merchant_id and m.business_id = #{businessId} + where 1 = 1 and cs.`owner_id` = #{ownerId} @@ -250,7 +252,7 @@ ((date_format(cs.create_date,'%H:%m') < '06:00') and date_format(cs.create_date,'%w') in (6,0))) - group by m.business_id, m.sub_business_id + group by m.sub_business_id diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index bb39ab356..1d5a54d9f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -418,10 +418,12 @@ group by c.business - + select c.sub_business, COUNT(c.sub_business) bu_count FROM wx_coupon_order co - inner join wx_coupon c on c.id = co.coupon_id + + inner join wx_coupon c on c.id = co.coupon_id and c.business = #{businessId} + where 1=1 and co.tenant_id = #{tenantId} @@ -504,7 +506,7 @@ and date_format(co.create_date,'%w') in (6,0))) - group by c.business, c.sub_business + group by c.sub_business