diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java index 11b63c48d..ace974000 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java @@ -11,8 +11,6 @@ public interface WxMerchantTradeDailyMapper extends CommonMapper findListOfWeek(WxMerchantTradeDaily wxMerchantTradeDaily); - List findVoList(WxMerchantTradeDaily wxMerchantTradeDaily); - List findTotalListOfMonth(WxMerchantTradeDaily wxMerchantTradeDaily); String findSumMoney(WxMerchantTradeDaily wxMerchantTradeDaily); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 1d1bc5b72..b294fcbbc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -645,6 +645,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } else { //wxCreditHistoryMapper.updateById(record); } + }else { + record.setCreditNum(0); } return record; } @@ -827,6 +829,12 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return infoAddCredit(record,tenantEntity); } if (record.getCreditType() == EnumScoreType.SPEND_CREDIT.getCode()) { + WxMerchant wxMerchant = wxMerchantMapper.selectById(record.getMerchantId()); + if(wxMerchant == null){ + throw new MallinkException(ErrorCode.SHOP_IS_NOT_FOUND); + } + record.setCreditType(EnumScoreType.SPEND_CREDIT.getCode()); + record.setBusinessId(wxMerchant.getBusinessId()); return payAddCredit(record,tenantEntity,wxCUserBasicInfo,hasBirthDateCredit); } if (record.getCreditType() == EnumScoreType.CHANGE_CREDIT.getCode()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index b5845abce..feb335848 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -14,6 +14,7 @@ import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantTradeDaily; import com.iformall.domain.po.WxMerchantTradeDailyHistory; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxCouponOrderBVo; import com.iformall.domain.vo.WxMerchantTradeDailyVo; import com.iformall.enums.EnumTradeDailyDateType; import com.iformall.exception.MallinkException; @@ -145,7 +146,16 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ @Override public PageInfo listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findVoList(record)); +// PageInfo tradeDailyPage = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record)); +// PageInfo 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; } @Override @@ -273,22 +283,29 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ @Override public void exportData(WxMerchantTradeDaily tradeDaily, HttpServletRequest request, HttpServletResponse response) { //没有商户ID导出全部数据 - List list = wxMerchantTradeDailyMapper.findVoList(tradeDaily); - - list.stream().forEach(m -> { - //商铺信息 - m.setShopVos(wxShopService.findMerchantShopVoList(m,m.getMerchantId())); - }); - //商铺信息 - + PageInfo page = listAsPageVo(tradeDaily,1,10000); + List list = new ArrayList(); + 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); } @Override public ResultData summary(WxMerchantTradeDaily record) { - List voList = wxMerchantTradeDailyMapper.findVoList(record); - Integer tradeAmt = voList.stream().collect(Collectors.summingInt(WxMerchantTradeDailyVo::getTradeAmt)); - Integer tradeCount = voList.stream().collect(Collectors.summingInt(WxMerchantTradeDailyVo::getTradeCount)); + PageInfo page = listAsPageVo(record,1,10000); + Integer tradeAmt = 0; + Integer tradeCount = 0; + if (null != page && null != page.getList()) { + List voList = page.getList(); + tradeAmt = voList.stream().collect(Collectors.summingInt(WxMerchantTradeDailyVo::getTradeAmt)); + tradeCount = voList.stream().collect(Collectors.summingInt(WxMerchantTradeDailyVo::getTradeCount)); + } Map data = new HashMap<>(); data.put("tradeAmt", tradeAmt); data.put("tradeCount", tradeCount); @@ -323,7 +340,11 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ String endTime = DateUtils.getSystemTime("yyyy-MM-dd"); wxMerchantTradeDaily.setStartTime(startTime); wxMerchantTradeDaily.setEndTime(endTime); - List recordList = wxMerchantTradeDailyMapper.findVoList(wxMerchantTradeDaily); + PageInfo page = listAsPageVo(wxMerchantTradeDaily,1,10000); + List recordList = new ArrayList(); + if (null != page && null != page.getList()) { + recordList = page.getList(); + } Map recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDailyVo::getReportDate, r -> r)); List tradeList = new ArrayList<>(); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index e2186cd74..296847ad9 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -115,89 +115,6 @@ order by create_date desc LIMIT 7 - - - - - - - - - - - - - - - - - - - - - - - - - mtd.id as id, mtd.b_user_id as b_user_id, ifnull(mtd.trade_amt,0) as trade_amt, mtd.report_date, - ifnull(mtd.trade_count,0) as trade_count, mtd.proof,mtd.create_date as create_date, mtd.update_date as update_date, - m.tenant_id as tenant_id,m.parent_tenant_id as parent_tenant_id, - m.id as merchant_id, m.name as merchant_name, m.business_id, m.sub_business_id, - mbu.name as b_user_name, mbu.phone as b_user_phone - - - -