|
|
|
@@ -18,6 +18,7 @@ import com.iformall.domain.vo.WxCouponOrderBVo; |
|
|
|
import com.iformall.domain.vo.WxMerchantTradeDailyVo; |
|
|
|
import com.iformall.enums.EnumTradeDailyDateType; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.mapper.WxMerchantMapper; |
|
|
|
import com.iformall.mapper.WxMerchantTradeDailyHistoryMapper; |
|
|
|
import com.iformall.mapper.WxMerchantTradeDailyMapper; |
|
|
|
import com.iformall.mapper.WxShopMapper; |
|
|
|
@@ -26,6 +27,7 @@ import com.iformall.utils.DateUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.context.annotation.Lazy; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
@@ -41,23 +43,31 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
@Autowired |
|
|
|
WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxMerchantBUserService wxMerchantBUserService; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxMerchantService wxMerchantService; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxMallService wxMallService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
ExcelService excelService; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxShopService wxShopService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxMerchantTradeDailyHistoryMapper wxMerchantTradeDailyHistoryMapper; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
MallUserInfoService mallUserInfoService; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -146,16 +156,110 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) { |
|
|
|
// PageInfo<WxMerchantTradeDaily> tradeDailyPage = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record)); |
|
|
|
// PageInfo<WxCouponOrderBVo> retPageInfo = new PageInfo(); |
|
|
|
// retPageInfo.setPageNum(pageIndex); |
|
|
|
// retPageInfo.setPageSize(pageSize); |
|
|
|
// retPageInfo.setPages(pageInfo.getPages()); |
|
|
|
// retPageInfo.setTotal(pageInfo.getTotal()); |
|
|
|
// retPageInfo.setList(handleQueryResult(false,pageInfo.getList(), wxCouponOrderBVo)); |
|
|
|
// |
|
|
|
// return new ResultData(retPageInfo); |
|
|
|
return null; |
|
|
|
PageInfo<WxMerchantTradeDaily> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record)); |
|
|
|
PageInfo<WxMerchantTradeDailyVo> retPageInfo = new PageInfo<WxMerchantTradeDailyVo>(); |
|
|
|
retPageInfo.setPageNum(pageIndex); |
|
|
|
retPageInfo.setPageSize(pageSize); |
|
|
|
retPageInfo.setPages(pageInfo.getPages()); |
|
|
|
retPageInfo.setTotal(pageInfo.getTotal()); |
|
|
|
retPageInfo.setList(toVoList(pageInfo.getList(), record)); |
|
|
|
return retPageInfo; |
|
|
|
} |
|
|
|
|
|
|
|
private List<WxMerchantTradeDailyVo> toVoList(List<WxMerchantTradeDaily> list,TenantEntity tenantEntity) { |
|
|
|
if (null == list || list.size() <= 0 ){ |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
List<Long> merchantIdList = new ArrayList<Long>(); |
|
|
|
List<Long> merchantBUserIdList = new ArrayList<Long>(); |
|
|
|
List<Long> mallUserIdList = new ArrayList<Long>(); |
|
|
|
for ( int i = 0 ; i < list.size() ; i++ ) { |
|
|
|
WxMerchantTradeDaily td = list.get(i); |
|
|
|
if (null != td.getMerchantId() && (!merchantIdList.contains(td.getMerchantId()))) { |
|
|
|
merchantIdList.add(td.getMerchantId()); |
|
|
|
} |
|
|
|
|
|
|
|
if (null != td.getbUserId() && (!merchantBUserIdList.contains(td.getbUserId()))) { |
|
|
|
merchantBUserIdList.add(td.getbUserId()); |
|
|
|
} |
|
|
|
|
|
|
|
if (null != td.getMallUserId() && (!mallUserIdList.contains(td.getMallUserId()))) { |
|
|
|
mallUserIdList.add(td.getMallUserId()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Map<Long,WxMerchant> merchantMap = new HashMap<Long,WxMerchant>(); |
|
|
|
if (merchantIdList.size() > 0 ){ |
|
|
|
WxMerchant mq = new WxMerchant(); |
|
|
|
mq.updateTenantInfo(tenantEntity); |
|
|
|
mq.setIds(merchantIdList); |
|
|
|
merchantMap = wxMerchantService.findMerchantMap(mq); |
|
|
|
} |
|
|
|
|
|
|
|
Map<Long,WxMerchantBUser> merchantBUserMap = new HashMap<Long,WxMerchantBUser>(); |
|
|
|
if (merchantBUserIdList.size() > 0) { |
|
|
|
WxMerchantBUser mbu = new WxMerchantBUser(); |
|
|
|
mbu.updateTenantInfo(tenantEntity); |
|
|
|
mbu.setIds(merchantBUserIdList); |
|
|
|
List<WxMerchantBUser> buserList = wxMerchantBUserService.findList(mbu); |
|
|
|
if (null != buserList) { |
|
|
|
for (int i = 0 ; i < buserList.size(); i++) { |
|
|
|
WxMerchantBUser mu = buserList.get(i); |
|
|
|
merchantBUserMap.put(mu.getId(), mu); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Map<Long,MallUserInfo> mallUserMap = new HashMap<Long,MallUserInfo>(); |
|
|
|
if (mallUserIdList.size() > 0 ) { |
|
|
|
MallUserInfo mui = new MallUserInfo(); |
|
|
|
mui.updateTenantInfo(tenantEntity); |
|
|
|
mui.setIds(mallUserIdList); |
|
|
|
List<MallUserInfo> mallUserInfoList = mallUserInfoService.findList(mui); |
|
|
|
if (null != mallUserInfoList) { |
|
|
|
for (int i = 0 ; i < mallUserInfoList.size(); i++) { |
|
|
|
MallUserInfo _mui = mallUserInfoList.get(i); |
|
|
|
mallUserMap.put(_mui.getId(),_mui); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
List<WxMerchantTradeDailyVo> retList = new ArrayList<WxMerchantTradeDailyVo>(); |
|
|
|
for ( int i = 0 ; i < list.size() ; i++ ) { |
|
|
|
WxMerchantTradeDaily td = list.get(i); |
|
|
|
WxMerchantTradeDailyVo vo = new WxMerchantTradeDailyVo(); |
|
|
|
vo.setId(td.getId()); |
|
|
|
vo.setMerchantId(td.getMerchantId()); |
|
|
|
vo.setBUserId(td.getbUserId()); |
|
|
|
vo.setTradeAmt(td.getTradeAmtInteger()); |
|
|
|
vo.setCreateDate(td.getCreateDate()); |
|
|
|
vo.setUpdateDate(td.getUpdateDate()); |
|
|
|
vo.setReportDate(td.getReportDate()); |
|
|
|
vo.setDateType(td.getDateType()); |
|
|
|
if (null != td.getMerchantId()) { |
|
|
|
WxMerchant m = merchantMap.get(td.getMerchantId()); |
|
|
|
if (null != m) { |
|
|
|
vo.setMerchantName(m.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != td.getbUserId()) { |
|
|
|
WxMerchantBUser mbu = merchantBUserMap.get(td.getbUserId()); |
|
|
|
if (null != mbu) { |
|
|
|
vo.setbUserName(mbu.getName()); |
|
|
|
vo.setbUserPhone(mbu.getPhone()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != td.getMallUserId()) { |
|
|
|
MallUserInfo mui = mallUserMap.get(td.getMallUserId()); |
|
|
|
if (null != mui) { |
|
|
|
vo.setMallUserName(mui.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
vo.setTradeCount(td.getTradeCount()); |
|
|
|
vo.setProof(td.getProof()); |
|
|
|
retList.add(vo); |
|
|
|
} |
|
|
|
return retList; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -287,10 +391,6 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
List<WxMerchantTradeDailyVo> list = new ArrayList<WxMerchantTradeDailyVo>(); |
|
|
|
if (null != page && null != page.getList()) { |
|
|
|
list = page.getList(); |
|
|
|
list.stream().forEach(m -> { |
|
|
|
//商铺信息 |
|
|
|
m.setShopVos(wxShopService.findMerchantShopVoList(m,m.getMerchantId())); |
|
|
|
}); |
|
|
|
//商铺信息 |
|
|
|
} |
|
|
|
excelService.exportExcel(list, "商户解单数据", "商户解单数据", WxMerchantTradeDailyVo.class, "商户解单数据.xlsx", response, false); |
|
|
|
|