From 0347dbe51bd044611442644fb50014cd31f60dc1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 12 Nov 2018 13:31:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=8E=92=E5=BA=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxRentContractServiceImpl.java | 6 +++--- .../src/main/resources/mapper/WxBillAllMapper.xml | 2 +- .../src/main/resources/mapper/WxBillDailyMapper.xml | 2 +- .../src/main/resources/mapper/WxBillDepositMapper.xml | 2 +- .../src/main/resources/mapper/WxBillOtherMapper.xml | 2 +- .../main/resources/mapper/WxBillPropertyDepositMapper.xml | 2 +- .../src/main/resources/mapper/WxBillPropertyMapper.xml | 2 +- .../src/main/resources/mapper/WxBillRentMapper.xml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) 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 a349fb9b8..231a6e9e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -88,9 +88,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //关联的店铺 if (wxRentContract.getShopId() != null) { - List list = new ArrayList<>(); - WxShop wxShop = wxShopMapper.selectByPrimaryKey(wxRentContract.getShopId()); - list.add(wxShop); + WxShop record = new WxShop(); + record.setId(wxRentContract.getShopId()); + List> list = wxShopMapper.findListMap(record); result.put("wxShops", list); } else { result.put("wxShops", Collections.EMPTY_LIST); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 2c058fbc6..54618fcbc 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -29,7 +29,7 @@ and m.`name` like concat('%',#{merchantName},'%') and bill.bill_type_value = #{billTypeValue} and bill.`status` = #{status} - order by bill.id,bill.merchant_id + order by bill.id desc,bill.merchant_id,bill.status,bill.receive_date desc diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 7f85ec115..6490b6f97 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -74,7 +74,7 @@ and br.`is_del` = #{isDel} and br.`type` = #{type} - order by id + order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 6d928372f..660ca28fa 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -75,7 +75,7 @@ and br.`is_del` = #{isDel} - order by id + order by id desc diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index fe2ea8515..ee2b7dd2a 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -74,7 +74,7 @@ and br.`is_del` = #{isDel} - order by id + order by id desc