|
|
@@ -2,6 +2,7 @@ package com.cyksj.web.controller.manage.channel;
|
|
|
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.cyksj.common.constant.Constant;
|
|
|
@@ -13,9 +14,11 @@ import com.cyksj.mapper.UserMapper;
|
|
|
import com.cyksj.mapper.channel.ChannelPopularizeVisitMapper;
|
|
|
import com.cyksj.mapper.corp.CorpCustomerAcquisitionLinkPopularizeMapper;
|
|
|
import com.cyksj.mapper.sys.SysConfigMapper;
|
|
|
+import com.cyksj.mapper.vip.VipOrderDonMapper;
|
|
|
import com.cyksj.model.entity.*;
|
|
|
import com.cyksj.model.views.ChannelPopularizeDetailView;
|
|
|
import com.cyksj.model.views.ChannelPopularizeView;
|
|
|
+import com.cyksj.model.views.VipOrderDonPopularizeView;
|
|
|
import com.cyksj.service.mange.channel.ChannelPopularizeService;
|
|
|
import com.cyksj.service.mange.cms.service.CmsUserService;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
@@ -50,6 +53,8 @@ public class CmsChannelPopularizeController {
|
|
|
|
|
|
private final OrderDonMapper orderDonMapper;
|
|
|
|
|
|
+ private final VipOrderDonMapper vipOrderDonMapper;
|
|
|
+
|
|
|
private final ChannelPopularizeVisitMapper visitMapper;
|
|
|
|
|
|
private final CorpCustomerAcquisitionLinkPopularizeMapper acquisitionLinkPopularizeMapper;
|
|
|
@@ -103,6 +108,14 @@ public class CmsChannelPopularizeController {
|
|
|
data.setOrderMoney(channelPopularizeView.getOrderMoney());
|
|
|
data.setRefundCount(channelPopularizeView.getRefundCount());
|
|
|
data.setRefundMoney(channelPopularizeView.getRefundMoney());
|
|
|
+
|
|
|
+ //AI会员订单数据
|
|
|
+ ChannelPopularizeView vipView = vipOrderDonMapper.countPopularizeOrderDetail(data.getId(), goodsId, startTime, endTime);
|
|
|
+ data.setOrderCount(data.getOrderCount() + vipView.getOrderCount());
|
|
|
+ data.setOrderMoney(data.getOrderMoney().add(vipView.getOrderMoney()));
|
|
|
+ data.setRefundCount(data.getRefundCount() + vipView.getRefundCount());
|
|
|
+ data.setRefundMoney(data.getRefundMoney().add(vipView.getRefundMoney()));
|
|
|
+
|
|
|
Integer visitCount = visitMapper.selectCount(Wrappers.lambdaQuery(ChannelPopularizeVisit.class)
|
|
|
.eq(ChannelPopularizeVisit::getPopularizeId, data.getId())
|
|
|
.ge(StrUtil.isNotEmpty(startTime), ChannelPopularizeVisit::getCreatedTime, startTime)
|
|
|
@@ -123,7 +136,7 @@ public class CmsChannelPopularizeController {
|
|
|
public Result<List<ChannelPopularizeDetailView>> getById(@PathVariable Long id, String startTime, String endTime){
|
|
|
String timeSql = StringUtils.EMPTY;
|
|
|
if(StringUtils.isNotBlank(startTime)){
|
|
|
- timeSql += " o.created_time >= '" + startTime + "'";
|
|
|
+ timeSql += " and o.created_time >= '" + startTime + "'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(endTime)){
|
|
|
timeSql += " and o.created_time <= '" + endTime + "'";
|
|
|
@@ -134,6 +147,11 @@ public class CmsChannelPopularizeController {
|
|
|
.put("time", timeSql)
|
|
|
.orderBy(ChannelPopularizeDetailView::getGoodsId).asc()
|
|
|
.build());
|
|
|
+ //银河AI会员订单 单独查询
|
|
|
+ VipOrderDonPopularizeView view = beanSearcher.searchFirst(VipOrderDonPopularizeView.class, MapUtils.builder().field(VipOrderDonPopularizeView::getPopularizeId, id).put("time", timeSql).build());
|
|
|
+ ChannelPopularizeDetailView vipOrderDonPopularizeView = new ChannelPopularizeDetailView();
|
|
|
+ BeanUtil.copyProperties(view, vipOrderDonPopularizeView);
|
|
|
+ result.add(vipOrderDonPopularizeView);
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(result);
|
|
|
}
|
|
|
|