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