From 30bc5274884e0f6d11580f9d3af9e71d7a320888 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 24 八月 2023 19:03:10 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 348 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 242 insertions(+), 106 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 3c83650..a77412b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -734,6 +734,9 @@
order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
order.setGoodsNum(goodsNum);
order.setCreateTime(new Date());
+ if(appPlaceOrderDto.getNewMemberFlag()!=null&&appPlaceOrderDto.getNewMemberFlag()==1){
+ order.setNewMemberFlag(1);
+ }
// 保存订单
this.save(order);
// 更新用户商品类型
@@ -1073,6 +1076,9 @@
order.setOrderRemark(appPlaceActivityDto.getOrderRemark());
order.setGoodsNum(goodsNum);
order.setCreateTime(new Date());
+ if(appPlaceActivityDto.getNewMemberFlag()!=null&&appPlaceActivityDto.getNewMemberFlag()==1){
+ order.setNewMemberFlag(1);
+ }
// 保存订单
this.save(order);
// 更新用户商品类型
@@ -1629,7 +1635,7 @@
// 调用remoteMemberService的getMember方法获取Member对象
Member member = remoteMemberService.getMember(userId).getData();
//如果是商户优惠券，验证商户一致
- if (memberCoupon.getCouponFrom() == 2 && !memberCoupon.getShopId().equals(shopId)) {
+ if (memberCoupon.getCouponFrom() == 2) {
if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}
@@ -1642,6 +1648,7 @@
/*if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}*/
+ //判断绑定商户是否和核销商户一致
if(!member.getRelationShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
@@ -2186,14 +2193,6 @@
} else {
order.setCloseFlag(0);
}
- //保存订单和服务
- this.save(order);
- orderGoodsService.saveBatch(orderGoodsList);
- consumerGoodsService.saveBatchConsumerGoods(consumerGoodsList);
- //减去优惠券
- if (StringUtils.isNotBlank(memberCouponSJ.toString())) {
- remoteCouponService.useMemberCoupon(memberCouponSJ.toString());
- }
//用户未绑定则绑定商户
Member member = remoteMemberService.getMember(userId).getData();
if (member != null && member.getBindingFlag() != 1) {
@@ -2205,7 +2204,17 @@
appMemberBindingDto.setBindingFlag(1);
appMemberBindingDto.setBindingType(3);
remoteMemberService.updateMemberBinding(appMemberBindingDto);
+ order.setNewMemberFlag(1);
}
+ //保存订单和服务
+ this.save(order);
+ orderGoodsService.saveBatch(orderGoodsList);
+ consumerGoodsService.saveBatchConsumerGoods(consumerGoodsList);
+ //减去优惠券
+ if (StringUtils.isNotBlank(memberCouponSJ.toString())) {
+ remoteCouponService.useMemberCoupon(memberCouponSJ.toString());
+ }
+
//更新商户统计
/*ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
shopTotalChangeDto.setShopId(order.getShopId());
@@ -2916,13 +2925,31 @@
*/
@Override
public MgtTotalDataTotalVo getTotalDataTotal(MgtBaseShopDto mgtBaseShopDto) {
- //获取人数统计
- MgtTotalDataTotalVo mgtTotalDataTotalVo = orderMapper.getTotalDataTotal(mgtBaseShopDto);
+
+ //营业额
BigDecimal salesTotal = orderMapper.shopSalesTotal(mgtBaseShopDto);
- mgtTotalDataTotalVo.setSalesTotal(salesTotal);
+ MgtTotalDataTotalVo mgtTotalDataTotalVo = orderMapper.getTotalDataTotal(mgtBaseShopDto);
+ // 获取当月时间
+ LocalDate currentDate = LocalDate.now();
+ LocalDate firstDayOfMonth = currentDate.withDayOfMonth(1);
+ LocalDate lastDayOfMonth = currentDate.withDayOfMonth(currentDate.lengthOfMonth());
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ String firstDayOfMonthStr = firstDayOfMonth.format(formatter);
+ String lastDayOfMonthStr = lastDayOfMonth.format(formatter);
+ mgtBaseShopDto.setStartDate(firstDayOfMonthStr);
+ mgtBaseShopDto.setEndDate(lastDayOfMonthStr);
+ //总进店人数 体验人数 体验开单人数 没体验开单人数
+ MgtTotalDataTotalVo mgtTotalDataMemberTotalVo = orderMapper.getTotalDataMemberTotal(mgtBaseShopDto);
+ mgtTotalDataTotalVo.setOnlyExperiencePerson(mgtTotalDataMemberTotalVo.getOnlyExperiencePerson());
+ mgtTotalDataTotalVo.setExperienceCyclePerson(mgtTotalDataMemberTotalVo.getExperienceCyclePerson());
+ mgtTotalDataTotalVo.setOnlyCyclePerson(mgtTotalDataMemberTotalVo.getOnlyCyclePerson());
+ mgtTotalDataTotalVo.setOrderPerson(mgtTotalDataMemberTotalVo.getOrderPerson());
+ //续单人数
Integer reorderPerson = orderMapper.getReorderPerson(mgtBaseShopDto);
- mgtTotalDataTotalVo.setReorderPerson(reorderPerson);
+ //回头客
Integer returnedPerson = orderMapper.getReturnedPerson(mgtBaseShopDto);
+ mgtTotalDataTotalVo.setSalesTotal(salesTotal);
+ mgtTotalDataTotalVo.setReorderPerson(reorderPerson);
mgtTotalDataTotalVo.setReturnedPerson(returnedPerson);
return mgtTotalDataTotalVo;
}
@@ -3265,7 +3292,7 @@
Long userId = verifyCouponGetVo.getUserId();
Member member = remoteMemberService.getMember(userId).getData();
//如果是商户优惠券，验证商户一致
- if (memberCoupon.getCouponFrom() == 2 && !memberCoupon.getShopId().equals(shopId)) {
+ if (memberCoupon.getCouponFrom() == 2) {
if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}
@@ -3278,6 +3305,7 @@
/*if(!memberCoupon.getShopId().equals(member.getRelationShopId())){
throw new ServiceException(AppErrorConstant.BLINDING_VERIFY_SHOP_ERROR);
}*/
+ //判断绑定商户是否和核销商户一致
if(!member.getRelationShopId().equals(shopId)){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
@@ -3520,9 +3548,7 @@
orderTotalValue[i] = mgtMapTotalPlusVo.getMapValueFirst();
orderMoneyValue[i] = mgtMapTotalPlusVo.getMapValueSecond();
}
- orderDistributionTotalVo.setOrderTotalKey(orderTotalKey);
- orderDistributionTotalVo.setOrderTotalValue(orderTotalValue);
- orderDistributionTotalVo.setOrderMoneyValue(orderMoneyValue);
+ orderDistributionTotalVo = fillOrderTotalKeyAndValuesToRecentFiveDays(orderTotalKey,orderTotalValue,orderMoneyValue);
}
// 返回订单分布总数对象
return orderDistributionTotalVo;
@@ -4138,7 +4164,14 @@
*/
@Override
public StaffActivityOrderTotalVo getStaffActivityOrderTotal(StaffTotalDto staffTotalDto) {
- StaffActivityOrderTotalVo staffActivityOrderTotalVo = orderMapper.getStaffActivityOrderTotal(staffTotalDto);
+ StaffActivityOrderTotalVo staffActivityOrderTotalVo = new StaffActivityOrderTotalVo();
+ if(staffTotalDto.getActivityFrom()==1){
+ staffActivityOrderTotalVo = orderMapper.getStaffActivityOrderTotal(staffTotalDto);
+ StaffActivityOrderTotalVo staffActivityOrderGoodsTotalVo = orderMapper.getStaffActivityOrderGoodsTotal(staffTotalDto);
+ staffActivityOrderTotalVo.setCycleTotal(staffActivityOrderGoodsTotalVo.getCycleTotal());
+ staffActivityOrderTotalVo.setServiceTotal(staffActivityOrderGoodsTotalVo.getServiceTotal());
+ staffActivityOrderTotalVo.setExperienceTotal(staffActivityOrderGoodsTotalVo.getExperienceTotal());
+ }
return staffActivityOrderTotalVo;
}
@@ -4151,7 +4184,10 @@
*/
@Override
public StaffActivityTotalVo getStaffActivityTotal(StaffTotalDto staffTotalDto) {
- StaffActivityTotalVo staffActivityTotalVo = orderMapper.getStaffActivityTotal(staffTotalDto);
+ StaffActivityTotalVo staffActivityTotalVo = new StaffActivityTotalVo();
+ if(staffTotalDto.getActivityFrom()==1){
+ staffActivityTotalVo = orderMapper.getStaffActivityTotal(staffTotalDto);
+ }
return staffActivityTotalVo;
}
@@ -4166,11 +4202,11 @@
public MerOrderDistributionTotalVo getStaffOrderDistributionTotal(StaffTotalDto staffTotalDto) {
MerOrderDistributionTotalVo orderDistributionTotalVo = new MerOrderDistributionTotalVo();
// 获取订单年龄用户列表
- MerTotalDto merTotalDto = new MerTotalDto();
- merTotalDto.setShopId(staffTotalDto.getShopId());
- List<MerOrderAgeUserVo> orderAgeUserVoList = remoteMemberService.listOrderAgeUser(merTotalDto).getData();
+ //MerTotalDto merTotalDto = new MerTotalDto();
+ //merTotalDto.setShopId(staffTotalDto.getShopId());
+ //List<MerOrderAgeUserVo> orderAgeUserVoList = remoteMemberService.listOrderAgeUser(merTotalDto).getData();
// 如果订单年龄用户列表不为空
- if (orderAgeUserVoList != null && !orderAgeUserVoList.isEmpty()) {
+ /*if (orderAgeUserVoList != null && !orderAgeUserVoList.isEmpty()) {
// 定义变量
Integer ageType;
List<Long> userIdList;
@@ -4216,9 +4252,76 @@
orderDistributionTotalVo.setOrderTotalKey(orderTotalKey);
orderDistributionTotalVo.setOrderTotalValue(orderTotalValue);
orderDistributionTotalVo.setOrderMoneyValue(orderMoneyValue);
+ }*/
+ if(staffTotalDto.getActivityFrom()==1){
+ List<MgtMapTotalPlusVo> mgtMapTotalPlusVoList = orderMapper.listStaffActivityOrderDistributionTotal(staffTotalDto);
+ if (mgtMapTotalPlusVoList != null && !mgtMapTotalPlusVoList.isEmpty()) {
+ String[] orderTotalKey = new String[mgtMapTotalPlusVoList.size()];
+ Integer[] orderTotalValue = new Integer[mgtMapTotalPlusVoList.size()];
+ BigDecimal[] orderMoneyValue = new BigDecimal[mgtMapTotalPlusVoList.size()];
+ MgtMapTotalPlusVo mgtMapTotalPlusVo;
+ for (int i = 0; i < mgtMapTotalPlusVoList.size(); i++) {
+ mgtMapTotalPlusVo = mgtMapTotalPlusVoList.get(i);
+ orderTotalKey[i] = mgtMapTotalPlusVo.getMapKey();
+ orderTotalValue[i] = mgtMapTotalPlusVo.getMapValueFirst();
+ orderMoneyValue[i] = mgtMapTotalPlusVo.getMapValueSecond();
+ }
+ orderDistributionTotalVo = fillOrderTotalKeyAndValuesToRecentFiveDays(orderTotalKey,orderTotalValue,orderMoneyValue);
+ }
}
// 返回订单分布总数对象
return orderDistributionTotalVo;
+ }
+
+ public MerOrderDistributionTotalVo fillOrderTotalKeyAndValuesToRecentFiveDays(String[] orderTotalKey,Integer[] orderTotalValue,BigDecimal[] orderMoneyValue) {
+ MerOrderDistributionTotalVo orderDistributionTotalVo = new MerOrderDistributionTotalVo();
+ // 获取当前日期
+ LocalDate currentDate = LocalDate.now();
+
+ // 创建最近五天日期列表
+ List<String> recentFiveDays = new ArrayList<>();
+ for (int i = 0; i < 5; i++) {
+ LocalDate date = currentDate.minusDays(i);
+ recentFiveDays.add(date.toString());
+ }
+
+ // 创建新的数组
+ String[] newOrderTotalKey = new String[5];
+ Integer[] newOrderTotalValue = new Integer[5];
+ BigDecimal[] newOrderMoneyValue = new BigDecimal[5];
+
+ // 遍历最近五天日期列表，并补充数据
+ for (int i = 0; i < 5; i++) {
+ String day = recentFiveDays.get(i);
+ int index = getIndexInOrderTotalKey(day,orderTotalKey);
+ if (index != -1) {
+ newOrderTotalKey[i] = orderTotalKey[index];
+ newOrderTotalValue[i] = orderTotalValue[index];
+ newOrderMoneyValue[i] = orderMoneyValue[index];
+ } else {
+ newOrderTotalKey[i] = day;
+ newOrderTotalValue[i] = 0;
+ newOrderMoneyValue[i] = BigDecimal.ZERO;
+ }
+ }
+
+ // 更新属性
+ orderTotalKey = newOrderTotalKey;
+ orderTotalValue = newOrderTotalValue;
+ orderMoneyValue = newOrderMoneyValue;
+ orderDistributionTotalVo.setOrderTotalKey(orderTotalKey);
+ orderDistributionTotalVo.setOrderTotalValue(orderTotalValue);
+ orderDistributionTotalVo.setOrderMoneyValue(orderMoneyValue);
+ return orderDistributionTotalVo;
+ }
+
+ private int getIndexInOrderTotalKey(String day,String[] orderTotalKey) {
+ for (int i = 0; i < orderTotalKey.length; i++) {
+ if (orderTotalKey[i].equals(day)) {
+ return i;
+ }
+ }
+ return -1;
}
@@ -4232,37 +4335,39 @@
@Override
public MerOrderTypeTotalVo getStaffOrderTypeTotal(StaffTotalDto staffTotalDto) {
MerOrderTypeTotalVo orderTypeTotalVo = new MerOrderTypeTotalVo();
- //获取商品分类销售数据
- List<MgtMapTotalPlusVo> MgtMapIntTotalVoGoodsType = orderMapper.listStaffOrderTotalGoodsType(staffTotalDto);
- List<MgtMapIntTotalVo> goodsTypeTotalList = new ArrayList<>();
- List<MgtMapBigTotalVo> goodsTypeMoneyList = new ArrayList<>();
- if (MgtMapIntTotalVoGoodsType != null && MgtMapIntTotalVoGoodsType.size() > 0) {
- MgtMapIntTotalVo MgtMapIntTotalVo;
- MgtMapBigTotalVo mgtMapBigTotalVo;
- // 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
- for (int i = 0; i < MgtMapIntTotalVoGoodsType.size(); i++) {
- MgtMapIntTotalVo = new MgtMapIntTotalVo();
- mgtMapBigTotalVo = new MgtMapBigTotalVo();
- MgtMapIntTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
- mgtMapBigTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond());
- if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("1")) {
- MgtMapIntTotalVo.setMapKey("周期");
- mgtMapBigTotalVo.setMapKey("周期");
- } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("2")) {
- MgtMapIntTotalVo.setMapKey("服务");
- mgtMapBigTotalVo.setMapKey("服务");
- } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("3")) {
- MgtMapIntTotalVo.setMapKey("体验");
- mgtMapBigTotalVo.setMapKey("体验");
- } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("4")) {
- MgtMapIntTotalVo.setMapKey("单品");
- mgtMapBigTotalVo.setMapKey("单品");
+ if(staffTotalDto.getActivityFrom()==1){
+ //获取商品分类销售数据
+ List<MgtMapTotalPlusVo> MgtMapIntTotalVoGoodsType = orderMapper.listStaffOrderTotalGoodsType(staffTotalDto);
+ List<MgtMapIntTotalVo> goodsTypeTotalList = new ArrayList<>();
+ List<MgtMapBigTotalVo> goodsTypeMoneyList = new ArrayList<>();
+ if (MgtMapIntTotalVoGoodsType != null && MgtMapIntTotalVoGoodsType.size() > 0) {
+ MgtMapIntTotalVo MgtMapIntTotalVo;
+ MgtMapBigTotalVo mgtMapBigTotalVo;
+ // 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
+ for (int i = 0; i < MgtMapIntTotalVoGoodsType.size(); i++) {
+ MgtMapIntTotalVo = new MgtMapIntTotalVo();
+ mgtMapBigTotalVo = new MgtMapBigTotalVo();
+ MgtMapIntTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+ mgtMapBigTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond());
+ if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("1")) {
+ MgtMapIntTotalVo.setMapKey("周期");
+ mgtMapBigTotalVo.setMapKey("周期");
+ } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("2")) {
+ MgtMapIntTotalVo.setMapKey("服务");
+ mgtMapBigTotalVo.setMapKey("服务");
+ } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("3")) {
+ MgtMapIntTotalVo.setMapKey("体验");
+ mgtMapBigTotalVo.setMapKey("体验");
+ } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("4")) {
+ MgtMapIntTotalVo.setMapKey("单品");
+ mgtMapBigTotalVo.setMapKey("单品");
+ }
+ goodsTypeTotalList.add(MgtMapIntTotalVo);
+ goodsTypeMoneyList.add(mgtMapBigTotalVo);
}
- goodsTypeTotalList.add(MgtMapIntTotalVo);
- goodsTypeMoneyList.add(mgtMapBigTotalVo);
+ orderTypeTotalVo.setGoodsTypeTotalList(goodsTypeTotalList);
+ orderTypeTotalVo.setGoodsTypeMoneyList(goodsTypeMoneyList);
}
- orderTypeTotalVo.setGoodsTypeTotalList(goodsTypeTotalList);
- orderTypeTotalVo.setGoodsTypeMoneyList(goodsTypeMoneyList);
}
return orderTypeTotalVo;
}
@@ -4278,32 +4383,34 @@
public StaffActivityDateMemberTotalVo getStaffActivityGetMemberTotal(StaffTotalDto staffTotalDto) {
// 创建返回对象
StaffActivityDateMemberTotalVo staffActivityDateMemberTotalVo = new StaffActivityDateMemberTotalVo();
- // 查询数据库获取数据
- List<MgtMapIntTotalVo> mgtMapIntTotalVoList = orderMapper.getStaffActivityGetMemberTotal(staffTotalDto);
- // 将查询结果转为Map
- Map<String, Integer> map = new HashMap<>();
- if (mgtMapIntTotalVoList != null && !mgtMapIntTotalVoList.isEmpty()) {
- map = mgtMapIntTotalVoList.stream()
- .collect(Collectors.toMap(MgtMapIntTotalVo::getMapKey, MgtMapIntTotalVo::getMapValue));
+ if(staffTotalDto.getActivityFrom()==1){
+ // 查询数据库获取数据
+ List<MgtMapIntTotalVo> mgtMapIntTotalVoList = orderMapper.getStaffActivityGetMemberTotal(staffTotalDto);
+ // 将查询结果转为Map
+ Map<String, Integer> map = new HashMap<>();
+ if (mgtMapIntTotalVoList != null && !mgtMapIntTotalVoList.isEmpty()) {
+ map = mgtMapIntTotalVoList.stream()
+ .collect(Collectors.toMap(MgtMapIntTotalVo::getMapKey, MgtMapIntTotalVo::getMapValue));
+ }
+ // 获取日期范围
+ List<String> dateList = getDateRange(staffTotalDto.getStartDate(), staffTotalDto.getEndDate());
+ int size = dateList.size();
+ // 创建日期和成员总数的数组
+ String[] dateMemberTotalKey = new String[size];
+ Integer[] dateMemberTotalValue = new Integer[size];
+ // 遍历日期列表，设置日期和成员总数的数组
+ String str;
+ Integer value;
+ for (int i = 0; i < size; i++) {
+ str = dateList.get(i);
+ dateMemberTotalKey[i] = str;
+ value = map.get(str);
+ dateMemberTotalValue[i] = (value != null) ? value : 0;
+ }
+ // 设置返回对象的日期和成员总数数组
+ staffActivityDateMemberTotalVo.setDateMemberTotalKey(dateMemberTotalKey);
+ staffActivityDateMemberTotalVo.setDateMemberTotalValue(dateMemberTotalValue);
}
- // 获取日期范围
- List<String> dateList = getDateRange(staffTotalDto.getStartDate(), staffTotalDto.getEndDate());
- int size = dateList.size();
- // 创建日期和成员总数的数组
- String[] dateMemberTotalKey = new String[size];
- Integer[] dateMemberTotalValue = new Integer[size];
- // 遍历日期列表，设置日期和成员总数的数组
- String str;
- Integer value;
- for (int i = 0; i < size; i++) {
- str = dateList.get(i);
- dateMemberTotalKey[i] = str;
- value = map.get(str);
- dateMemberTotalValue[i] = (value != null) ? value : 0;
- }
- // 设置返回对象的日期和成员总数数组
- staffActivityDateMemberTotalVo.setDateMemberTotalKey(dateMemberTotalKey);
- staffActivityDateMemberTotalVo.setDateMemberTotalValue(dateMemberTotalValue);
// 返回结果对象
return staffActivityDateMemberTotalVo;
}
@@ -4319,32 +4426,40 @@
public StaffActivityDateMemberTotalVo getStaffActivityMemberTotal(StaffTotalDto staffTotalDto) {
// 创建返回对象
StaffActivityDateMemberTotalVo staffActivityDateMemberTotalVo = new StaffActivityDateMemberTotalVo();
- // 查询数据库获取数据
- List<MgtMapIntTotalVo> mgtMapIntTotalVoList = orderMapper.getStaffActivityMemberTotal(staffTotalDto);
- // 将查询结果转为Map
- Map<String, Integer> map = new HashMap<>();
- if (mgtMapIntTotalVoList != null && !mgtMapIntTotalVoList.isEmpty()) {
- map = mgtMapIntTotalVoList.stream()
- .collect(Collectors.toMap(MgtMapIntTotalVo::getMapKey, MgtMapIntTotalVo::getMapValue));
+ if(staffTotalDto.getActivityFrom()==1){
+ MerTotalDto merTotalDto = new MerTotalDto();
+ merTotalDto.setAgeType(staffTotalDto.getAgeType());
+ if(staffTotalDto.getAgeType()!=null){
+ List<Long> userIdList = remoteMemberService.listUserIdByAgeType(staffTotalDto.getAgeType()).getData();
+ staffTotalDto.setUserIdList(userIdList);
+ }
+ // 查询数据库获取数据
+ List<MgtMapIntTotalVo> mgtMapIntTotalVoList = orderMapper.getStaffActivityMemberTotal(staffTotalDto);
+ // 将查询结果转为Map
+ Map<String, Integer> map = new HashMap<>();
+ if (mgtMapIntTotalVoList != null && !mgtMapIntTotalVoList.isEmpty()) {
+ map = mgtMapIntTotalVoList.stream()
+ .collect(Collectors.toMap(MgtMapIntTotalVo::getMapKey, MgtMapIntTotalVo::getMapValue));
+ }
+ // 获取日期范围
+ List<String> dateList = getDateRange(staffTotalDto.getStartDate(), staffTotalDto.getEndDate());
+ int size = dateList.size();
+ // 创建日期和成员总数的数组
+ String[] dateMemberTotalKey = new String[size];
+ Integer[] dateMemberTotalValue = new Integer[size];
+ // 遍历日期列表，设置日期和成员总数的数组
+ String str;
+ Integer value;
+ for (int i = 0; i < size; i++) {
+ str = dateList.get(i);
+ dateMemberTotalKey[i] = str;
+ value = map.get(str);
+ dateMemberTotalValue[i] = (value != null) ? value : 0;
+ }
+ // 设置返回对象的日期和成员总数数组
+ staffActivityDateMemberTotalVo.setDateMemberTotalKey(dateMemberTotalKey);
+ staffActivityDateMemberTotalVo.setDateMemberTotalValue(dateMemberTotalValue);
}
- // 获取日期范围
- List<String> dateList = getDateRange(staffTotalDto.getStartDate(), staffTotalDto.getEndDate());
- int size = dateList.size();
- // 创建日期和成员总数的数组
- String[] dateMemberTotalKey = new String[size];
- Integer[] dateMemberTotalValue = new Integer[size];
- // 遍历日期列表，设置日期和成员总数的数组
- String str;
- Integer value;
- for (int i = 0; i < size; i++) {
- str = dateList.get(i);
- dateMemberTotalKey[i] = str;
- value = map.get(str);
- dateMemberTotalValue[i] = (value != null) ? value : 0;
- }
- // 设置返回对象的日期和成员总数数组
- staffActivityDateMemberTotalVo.setDateMemberTotalKey(dateMemberTotalKey);
- staffActivityDateMemberTotalVo.setDateMemberTotalValue(dateMemberTotalValue);
// 返回结果对象
return staffActivityDateMemberTotalVo;
}
@@ -4530,10 +4645,6 @@
orderFromDesc = "商城订单";
}
merOrderPageVo.setOrderFromDesc(orderFromDesc);
- merOrderPageVo.setUnPaidMoney(merOrderPageVo.getPayMoney().subtract(merOrderPageVo.getReceiveMoney()));
- if (merOrderPageVo.getUnPaidMoney() == null) {
- merOrderPageVo.setUnPaidMoney(zeroBig);
- }
if(merOrderPageVo.getUnPaidMoney().compareTo(zeroBig)<0){
merOrderPageVo.setUnPaidMoney(zeroBig);
}
@@ -4555,4 +4666,29 @@
}
return merOrderPageVoList;
}
+
+ /**
+ * @description 获取销售排行
+ * @author jqs
+ * @date 2023/8/24 18:00
+ * @param shopIdList
+ * @return List<MgtMapIntTotalVo>
+ */
+ @Override
+ public List<MgtMapBigTotalVo> shopSalesRank(List<Long> shopIdList){
+ return orderMapper.shopSalesRank(shopIdList);
+ }
+
+ /**
+ * @description 获取商户服务统计
+ * @author jqs
+ * @date 2023/8/24 18:28
+ * @param shopId
+ * @return MerHomeShopTotalVo
+ */
+ @Override
+ public MerHomeShopTotalVo getShopServiceTotal(Long shopId){
+ MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId);
+ return serviceTotalVo;
+ }
}
--
Gitblit v1.7.1