From 44bd6324ac0713bf31194b474f2c11b2756a86d0 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 27 Oct 2018 11:40:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=97=A5=E5=B8=B8=E8=B4=B9=E7=94=A8=E5=90=88?= =?UTF-8?q?=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=95=B0=E6=8D=AE=E5=9B=9E?= =?UTF-8?q?=E6=98=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBillDailyServiceImpl.java | 23 ++++++++++++++----- .../resources/mapper/WxBillDailyMapper.xml | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 039c5e9a7..87df8b6cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -7,11 +7,12 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBillDaily; -import com.iformall.domain.po.WxBillDeposit; +import com.iformall.domain.po.WxShop; import com.iformall.enums.EnumBillDailyStatus; import com.iformall.enums.EnumBillRentStatus; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillDailyMapper; +import com.iformall.mapper.WxShopMapper; import com.iformall.service.WxBillDailyService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,10 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author gongbiao @@ -34,6 +32,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Autowired WxBillDailyMapper wxBillDailyMapper; + @Autowired + WxShopMapper wxShopMapper; @Override public PageInfo> listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize) { @@ -82,7 +82,18 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { public Map getById(Long id) { WxBillDaily record = new WxBillDaily(); record.setId(id); - return wxBillDailyMapper.queryBillDailyList(record).get(0); + Map wxBillDaily = wxBillDailyMapper.queryBillDailyList(record).get(0); + + if(wxBillDaily.get("shopId")!=null) { + WxShop shop = new WxShop(); + shop.setId((Long)wxBillDaily.get("shopId")); + List> shoplist = wxShopMapper.findListMap(shop); + wxBillDaily.put("shops",shoplist); + }else{ + wxBillDaily.put("shops",Collections.EMPTY_LIST); + } + + return wxBillDaily; } @Override diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index c7d68cd0e..79f42231b 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -58,7 +58,7 @@ select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, - br.`merchant_id` merchantId + br.`merchant_id` merchantId,br.shop_id shopId from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id