|
|
|
@@ -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<Map<String, Object>> listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize) { |
|
|
|
@@ -82,7 +82,18 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { |
|
|
|
public Map<String,Object> getById(Long id) { |
|
|
|
WxBillDaily record = new WxBillDaily(); |
|
|
|
record.setId(id); |
|
|
|
return wxBillDailyMapper.queryBillDailyList(record).get(0); |
|
|
|
Map<String, Object> wxBillDaily = wxBillDailyMapper.queryBillDailyList(record).get(0); |
|
|
|
|
|
|
|
if(wxBillDaily.get("shopId")!=null) { |
|
|
|
WxShop shop = new WxShop(); |
|
|
|
shop.setId((Long)wxBillDaily.get("shopId")); |
|
|
|
List<Map<String, Object>> shoplist = wxShopMapper.findListMap(shop); |
|
|
|
wxBillDaily.put("shops",shoplist); |
|
|
|
}else{ |
|
|
|
wxBillDaily.put("shops",Collections.EMPTY_LIST); |
|
|
|
} |
|
|
|
|
|
|
|
return wxBillDaily; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|