|
|
|
@@ -333,8 +333,6 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} else { |
|
|
|
PageInfo<WxOrderPayVo> pageResult = orderPayVoPageInfo(wxMerchantBUser, pageIndex, pageSize, dateMap); |
|
|
|
resultMap.put("list", pageResult); |
|
|
|
int amount = pageResult.getList() != null ? pageResult.getList().stream().mapToInt(WxOrderPayVo::getPayment).sum() : 0; |
|
|
|
resultMap.put("amount", amount); |
|
|
|
} |
|
|
|
return resultMap; |
|
|
|
} |
|
|
|
@@ -3922,6 +3920,27 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
// } |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData sumMicroPay(WxMerchantBUser bUser, Integer type, Date startDate, Date endDate) { |
|
|
|
Map dataMap = new HashMap(); |
|
|
|
dataMap.put("startDate", startDate); |
|
|
|
dataMap.put("endDate", endDate); |
|
|
|
dataMap.put("merchantId", bUser.getMerchantId()); |
|
|
|
dataMap.put("type", type); |
|
|
|
dataMap.put("tenantId", bUser.getTenantId()); |
|
|
|
dataMap.put("finalTenantId", bUser.getFinalTenantId()); |
|
|
|
WxMerchantBUser merchantBUserQ = new WxMerchantBUser(); |
|
|
|
merchantBUserQ.updateTenantInfo(bUser); |
|
|
|
merchantBUserQ.setMerchantId(bUser.getMerchantId()); |
|
|
|
List<Long> bUserIds = wxMerchantBUserMapper.findIdList(merchantBUserQ); |
|
|
|
if (null == bUserIds || bUserIds.size() <= 0 ) { |
|
|
|
throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); |
|
|
|
} |
|
|
|
dataMap.put("bUserIds", bUserIds); |
|
|
|
SumMicroPayVO vo = wxOrderMapper.sumMicroPay(dataMap); |
|
|
|
return new ResultData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
private Map<Long,List<WxOrderCouponVo>> getBatchOrderMap(TenantEntity tenantEntity,List<Long> batchOrderIds){ |
|
|
|
WxOrder recordQ = new WxOrder(); |
|
|
|
recordQ.updateTenantInfo(tenantEntity); |
|
|
|
|