From d67c449d59f41b7248b42af5426bbcd848967e2b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Dec 2018 11:10:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 2 +- .../src/main/resources/mapper/WxProfitSharingOrderMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 101813ac6..1f7c7ee90 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -161,7 +161,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } WxMerchantTax wxMerchantTax = new WxMerchantTax(); - wxMerchantCorp.setMerchantId(wxMerchant.getId()); + wxMerchantTax.setMerchantId(wxMerchant.getId()); List taxes = wxMerchantTaxMapper.findList(wxMerchantTax); if(!taxes.isEmpty()){ wxMerchant.setWxMerchantTax(taxes.get(0)); diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index d34a213cb..d65314805 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -140,7 +140,7 @@ and m.`name` like concat('%',#{merchantName},'%') - and pso.create_date between #{startdate} and #{enddate} + and pso.create_time between #{startdate} and #{enddate} order by pso.id desc