diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/cart/impl/CereShopCartServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/cart/impl/CereShopCartServiceImpl.java
index 60344ac..dcc18d7 100644
--- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/cart/impl/CereShopCartServiceImpl.java
+++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/cart/impl/CereShopCartServiceImpl.java
@@ -37,6 +37,7 @@ import com.shop.cereshop.app.service.seckill.CereShopSeckillDetailService;
import com.shop.cereshop.app.service.seckill.CereShopSeckillService;
import com.shop.cereshop.app.service.shop.CereShopConversionService;
import com.shop.cereshop.app.service.stock.CereStockService;
+import com.shop.cereshop.app.utils.ContextUtil;
import com.shop.cereshop.app.utils.SceneUtil;
import com.shop.cereshop.commons.constant.CoReturnFormat;
import com.shop.cereshop.commons.constant.IntegerEnum;
@@ -212,6 +213,7 @@ public class CereShopCartServiceImpl implements CereShopCartService {
cereShopConversion.setShopId(shopCart.getShopId());
cereShopConversion.setCreateTime(time);
cereShopConversion.setType(ParamEnum.CONVERSION_CART.getCode());
+ cereShopConversion.setProject(ContextUtil.getProject());
cereShopConversionService.insert(cereShopConversion);
//新增日志
cerePlatformLogService.addLog(user,"购物车模块","客户端操作","加入购物车",user.getBuyerUserId(),time);
@@ -717,6 +719,7 @@ public class CereShopCartServiceImpl implements CereShopCartService {
cereShopConversion.setShopId(shopCart.getShopId());
cereShopConversion.setCreateTime(time);
cereShopConversion.setType(ParamEnum.CONVERSION_CART.getCode());
+ cereShopConversion.setProject(ContextUtil.getProject());
cereShopConversionService.insert(cereShopConversion);
}
}
diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java
index 01058f7..293688b 100644
--- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java
+++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java
@@ -99,6 +99,7 @@ import com.shop.cereshop.app.service.shop.CereShopCommentService;
import com.shop.cereshop.app.service.shop.CereShopConversionService;
import com.shop.cereshop.app.service.stock.CereStockService;
import com.shop.cereshop.app.service.storehouse.CereShopStorehouseService;
+import com.shop.cereshop.app.utils.ContextUtil;
import com.shop.cereshop.app.utils.DistributionUtil;
import com.shop.cereshop.commons.config.AlipayConfig;
import com.shop.cereshop.commons.config.PayConfig;
@@ -552,6 +553,7 @@ public class CereShopOrderServiceImpl implements CereShopOrderService {
cereShopConversion.setShopId(id);
cereShopConversion.setCreateTime(TimeUtils.yyMMddHHmmss());
cereShopConversion.setType(ParamEnum.CONVERSION_PAY.getCode());
+ cereShopConversion.setProject(ContextUtil.getProject());
conversions.add(cereShopConversion);
});
//批量插入转化数据
@@ -615,6 +617,7 @@ public class CereShopOrderServiceImpl implements CereShopOrderService {
cereShopConversion.setShopId(id);
cereShopConversion.setCreateTime(TimeUtils.yyMMddHHmmss());
cereShopConversion.setType(ParamEnum.CONVERSION_PAY.getCode());
+ cereShopConversion.setProject(ContextUtil.getProject());
conversions.add(cereShopConversion);
});
//批量插入转化数据
@@ -652,6 +655,7 @@ public class CereShopOrderServiceImpl implements CereShopOrderService {
shopIds.forEach(id -> {
//新增转化数据
CereShopConversion cereShopConversion = new CereShopConversion();
+ cereShopConversion.setProject(ContextUtil.getProject());
cereShopConversion.setShopId(id);
cereShopConversion.setCreateTime(TimeUtils.yyMMddHHmmss());
cereShopConversion.setType(ParamEnum.CONVERSION_PAY.getCode());
@@ -900,6 +904,7 @@ public class CereShopOrderServiceImpl implements CereShopOrderService {
addPayLog(order, time, orderNo, transactionId);
//新增转化数据
CereShopConversion cereShopConversion = new CereShopConversion();
+ cereShopConversion.setProject(ContextUtil.getProject());
cereShopConversion.setType(ParamEnum.CONVERSION_PAY_SUCCESS.getCode());
cereShopConversion.setShopId(order.getShopId());
cereShopConversion.setCreateTime(time);
diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java
index d274699..c77452f 100644
--- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java
+++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/product/impl/CereShopProductServiceImpl.java
@@ -278,6 +278,7 @@ public class CereShopProductServiceImpl implements CereShopProductService {
visit.setTerminal(param.getTerminal());
visit.setSystem(param.getSystem());
visit.setCity(param.getCity());
+ visit.setProject(ContextUtil.getProject());
cereShopVisitService.insert(visit);
//新增转化数据
CereShopConversion cereShopConversion=new CereShopConversion();
diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/index/Index.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/index/Index.java
index 4127a14..4291077 100644
--- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/index/Index.java
+++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/index/Index.java
@@ -21,7 +21,7 @@ import java.util.List;
public class Index {
/**
- * 店铺访问人数
+ * 商家店铺访问人数
*/
@ApiModelProperty(value = "店铺访问人数")
private Integer total;
diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/business/impl/CerePlatformBusinessServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/business/impl/CerePlatformBusinessServiceImpl.java
index 4df44ac..83303c8 100644
--- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/business/impl/CerePlatformBusinessServiceImpl.java
+++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/business/impl/CerePlatformBusinessServiceImpl.java
@@ -213,7 +213,7 @@ public class CerePlatformBusinessServiceImpl implements CerePlatformBusinessServ
String project = ContextUtil.getProject();
Index index=new Index();
- //查询今日商家访问人数
+ //查询今日商家所有店铺访问人数
index.setTotal(cerePlatformBusinessDAO.getTotal(project, param.getBusinessId()));
//查询今日待处理订单数
index.setStayOrders(cerePlatformBusinessDAO.getStayOrders(project,param.getBusinessId()));
diff --git a/cereshop-business/src/main/resources/mybatis/mapper/business/CerePlatformBusinessDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/business/CerePlatformBusinessDAO.xml
index be78fd9..2c417ad 100644
--- a/cereshop-business/src/main/resources/mybatis/mapper/business/CerePlatformBusinessDAO.xml
+++ b/cereshop-business/src/main/resources/mybatis/mapper/business/CerePlatformBusinessDAO.xml
@@ -307,41 +307,37 @@