From 185520f4360ce5cca05b2f830fe16987b948c0c3 Mon Sep 17 00:00:00 2001 From: seesaw Date: Wed, 16 Oct 2024 09:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/business/vo/BusinessRespVO.java | 2 +- .../admin/business/vo/StatisticsVo.java | 17 +++++ .../admin/customizeExcel/vo/OrderExcelVO.java | 6 +- .../orderdetail/vo/AppOrderDetailRespVO.java | 5 ++ .../dal/dataobject/business/BusinessDO.java | 3 + .../dal/mysql/business/BusinessMapper.java | 6 ++ .../member/job/BalanceDeductionJob.java | 21 +++++- .../module/member/job/BusinessNewJob.java | 60 +++++++++++++++++ .../service/business/BusinessService.java | 4 ++ .../service/business/BusinessServiceImpl.java | 67 +++++++++++++++++++ .../service/order/OrderServiceImpl.java | 17 ++++- .../customizeExcel/CustomizeExcelMapper.xml | 4 +- .../dishimage/vo/DishImagePageReqVO.java | 2 + .../admin/dishimage/vo/DishImageRespVO.java | 2 + .../dishimage/vo/DishImageSaveReqVO.java | 2 + .../controller/app/dishes/vo/AppUpdateVO.java | 12 ++++ .../app/dishimage/AppDishImageController.java | 49 ++++++++++++++ .../dal/dataobject/dishimage/DishImageDO.java | 2 + .../dal/mysql/dishimage/DishImageMapper.java | 1 + .../service/dishimage/DishImageService.java | 8 ++- .../dishimage/DishImageServiceImpl.java | 30 +++++++++ 21 files changed, 310 insertions(+), 10 deletions(-) create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/StatisticsVo.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BusinessNewJob.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dishimage/AppDishImageController.java diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java index 4158ee03..9d6915e7 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java @@ -72,5 +72,5 @@ public class BusinessRespVO { */ private BigDecimal withdrawal; - + private BigDecimal reduce; } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/StatisticsVo.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/StatisticsVo.java new file mode 100644 index 00000000..819f1c9e --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/StatisticsVo.java @@ -0,0 +1,17 @@ +package cn.iocoder.yudao.module.member.controller.admin.business.vo; + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +public class StatisticsVo { + private Long orderId; + private BigDecimal totalMoney; + private BigDecimal reduceMoney; + private Long carteenId; + private LocalDateTime time; + private int order_sum; + +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/OrderExcelVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/OrderExcelVO.java index ef7c3c66..722b0b89 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/OrderExcelVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/OrderExcelVO.java @@ -9,9 +9,6 @@ import java.math.BigDecimal; @Data public class OrderExcelVO { - @ExcelProperty("日期") - private String dayTime; - @ExcelProperty("用户名") private String nickname; @@ -39,4 +36,7 @@ public class OrderExcelVO { @NumberFormat("#0.00") private BigDecimal price; + @ExcelProperty("日期") + private String dayTime; + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/orderdetail/vo/AppOrderDetailRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/orderdetail/vo/AppOrderDetailRespVO.java index 4e255f94..2e328417 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/orderdetail/vo/AppOrderDetailRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/orderdetail/vo/AppOrderDetailRespVO.java @@ -55,4 +55,9 @@ public class AppOrderDetailRespVO { */ private BigDecimal dishesNumber; + /** + * 菜品单价 + */ + private BigDecimal unitPrice; + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/business/BusinessDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/business/BusinessDO.java index 2d41fbf4..edc7d34a 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/business/BusinessDO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/business/BusinessDO.java @@ -88,4 +88,7 @@ public class BusinessDO extends BaseDO { */ private Long carteenId; + + private BigDecimal reduce; + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/business/BusinessMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/business/BusinessMapper.java index c5a59c63..61b04029 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/business/BusinessMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/business/BusinessMapper.java @@ -6,6 +6,9 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.member.controller.admin.business.vo.BusinessPageReqVO; import cn.iocoder.yudao.module.member.dal.dataobject.business.BusinessDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 营业统计 Mapper @@ -32,4 +35,7 @@ public interface BusinessMapper extends BaseMapperX { .orderByDesc(BusinessDO::getId)); } + @Select("select id from t_carteen where deleted = false") + List getAllStoreId(); + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java index 9a227bef..014c922f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java @@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; +import cn.iocoder.yudao.module.member.controller.admin.business.vo.StatisticsVo; import cn.iocoder.yudao.module.member.dal.dataobject.card.CardDO; import cn.iocoder.yudao.module.member.dal.dataobject.diningplates.DiningPlatesDO; import cn.iocoder.yudao.module.member.dal.dataobject.order.DishOrderDO; import cn.iocoder.yudao.module.member.enums.TimePeriodEnum; +import cn.iocoder.yudao.module.member.service.business.BusinessService; import cn.iocoder.yudao.module.member.service.card.CardService; import cn.iocoder.yudao.module.member.service.diningplates.DiningPlatesService; import cn.iocoder.yudao.module.member.service.order.OrderService; @@ -22,6 +24,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; /** @@ -43,7 +46,8 @@ public class BalanceDeductionJob implements JobHandler { private StringRedisTemplate stringRedisTemplate; @Resource private MemberUserService userService; - + @Resource + private BusinessService businessService; /** * 30分钟之后自动解绑并扣款 */ @@ -74,7 +78,7 @@ public class BalanceDeductionJob implements JobHandler { //BigDecimal total = new BigDecimal(0.01); Long userId = dishOrderDO.getUserId(); CardDO cardDO = new CardDO(); - cardDO.setType(TimePeriodEnum.getTimePeriod(LocalDateTime.now())); + cardDO.setType(TimePeriodEnum.getTimePeriod(dishOrderDO.getCreateTime())); CardDO oldCardDO = cardService.getCardDoByUserId(userId); @@ -162,6 +166,19 @@ public class BalanceDeductionJob implements JobHandler { dishOrderDO.setTotalMoney(total); dishOrderDO.setUpdateTime(LocalDateTime.now()); stringRedisTemplate.delete(dishOrderDO.getDiningPlatesNum() + "-" + dishOrderDO.getStoreId()); + + //更新营业数据 + if(dishOrderDO.getOrderStatus().equals(DishOrderDO.COMPLETE)){ + StatisticsVo statisticsVo = new StatisticsVo(); + statisticsVo.setCarteenId(dishOrderDO.getStoreId()); + statisticsVo.setTotalMoney(dishOrderDO.getTotalMoney()); + statisticsVo.setOrder_sum(1); + statisticsVo.setReduceMoney(dishOrderDO.getReductionAmount()); + statisticsVo.setTime(dishOrderDO.getCreateTime()); + statisticsVo.setOrderId(dishOrderDO.getId()); + businessService.updateStatistics(statisticsVo); + } + }); //取消批量，防止同一人订餐少扣款 //cardService.insertBatch(list); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BusinessNewJob.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BusinessNewJob.java new file mode 100644 index 00000000..6cd8951f --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BusinessNewJob.java @@ -0,0 +1,60 @@ +package cn.iocoder.yudao.module.member.job; + +import cn.hutool.core.date.LocalDateTimeUtil; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; +import cn.iocoder.yudao.module.member.dal.dataobject.business.BusinessDO; +import cn.iocoder.yudao.module.member.dal.dataobject.card.CardDO; +import cn.iocoder.yudao.module.member.dal.dataobject.order.DishOrderDO; +import cn.iocoder.yudao.module.member.dal.dataobject.orderdetail.OrderDetailDO; +import cn.iocoder.yudao.module.member.dal.mysql.business.BusinessMapper; +import cn.iocoder.yudao.module.member.dal.mysql.card.CardMapper; +import cn.iocoder.yudao.module.member.dal.mysql.order.DishOrderMapper; +import cn.iocoder.yudao.module.member.dal.mysql.orderdetail.OrderDetailMapper; +import cn.iocoder.yudao.module.member.enums.CostTypeEnum; +import cn.iocoder.yudao.module.member.enums.TimePeriodEnum; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author:qjq + * @Date:2024/4/3 14:50 + */ +@Slf4j +@Component +public class BusinessNewJob implements JobHandler { + @Resource + private BusinessMapper businessMapper; + + /** + * 执行任务 + * + * @param param 参数 + * @return 结果 + * @throws Exception 异常 + */ + @Override + @TenantIgnore + public String execute(String param){ + List allStoreId = businessMapper.getAllStoreId(); + for (Long storeId : allStoreId) { + BusinessDO businessDO = new BusinessDO(); + businessDO.setCarteenId(storeId); + businessMapper.insert(businessDO); + } + log.info("[execute][生成当天统计营业数据 {}条]", allStoreId.size()); + return String.format("生成当天统计营业数据 %s 条 ", allStoreId.size()); + } +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessService.java index 75d5101a..d051ed14 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessService.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.service.business; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.business.vo.BusinessPageReqVO; import cn.iocoder.yudao.module.member.controller.admin.business.vo.BusinessSaveReqVO; +import cn.iocoder.yudao.module.member.controller.admin.business.vo.StatisticsVo; import cn.iocoder.yudao.module.member.dal.dataobject.business.BusinessDO; import javax.validation.*; @@ -52,4 +53,7 @@ public interface BusinessService { */ PageResult getBusinessPage(BusinessPageReqVO pageReqVO); + + void updateStatistics(StatisticsVo vo); + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessServiceImpl.java index 9bca6f12..9ee271b3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessServiceImpl.java @@ -1,20 +1,35 @@ package cn.iocoder.yudao.module.member.service.business; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.business.vo.BusinessPageReqVO; import cn.iocoder.yudao.module.member.controller.admin.business.vo.BusinessSaveReqVO; +import cn.iocoder.yudao.module.member.controller.admin.business.vo.StatisticsVo; import cn.iocoder.yudao.module.member.dal.dataobject.business.BusinessDO; +import cn.iocoder.yudao.module.member.dal.dataobject.orderdetail.OrderDetailDO; import cn.iocoder.yudao.module.member.dal.mysql.business.BusinessMapper; import cn.iocoder.yudao.module.member.dal.mysql.card.CardMapper; import cn.iocoder.yudao.module.member.dal.mysql.order.DishOrderMapper; import cn.iocoder.yudao.module.member.dal.mysql.orderdetail.OrderDetailMapper; +import cn.iocoder.yudao.module.member.enums.CostTypeEnum; +import cn.iocoder.yudao.module.member.enums.TimePeriodEnum; +import cn.iocoder.yudao.module.member.service.orderdetail.OrderDetailService; import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.stereotype.Service; + import javax.annotation.Resource; + import org.springframework.validation.annotation.Validated; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -35,6 +50,7 @@ public class BusinessServiceImpl implements BusinessService { private OrderDetailMapper orderDetailMapper; @Resource private CardMapper cardMapper; + @Override public Long createBusiness(BusinessSaveReqVO createReqVO) { // 插入 @@ -77,5 +93,56 @@ public class BusinessServiceImpl implements BusinessService { return businessMapper.selectPage(pageReqVO); } + @Override + public synchronized void updateStatistics(StatisticsVo vo) { + // 获取今天的开始时间 + LocalDateTime startOfDay = LocalDate.now().atStartOfDay(); + // 获取今天的结束时间 (23:59:59.999) + LocalDateTime endOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MAX); + List businessDOS = businessMapper.selectList(Wrappers.lambdaQuery() + .between(BusinessDO::getCreateTime, startOfDay, endOfDay) + .eq(BusinessDO::getCarteenId, vo.getCarteenId())); + if (CollectionUtil.isNotEmpty(businessDOS)) { + BusinessDO businessDO = businessDOS.get(0); + + //重量 + if(ObjectUtil.isNotEmpty(vo.getOrderId())){ + List orderDetailDOS = orderDetailMapper.selectList(Wrappers.lambdaQuery().eq(OrderDetailDO::getOrderId, vo.getOrderId())); + if (CollectionUtil.isNotEmpty(orderDetailDOS)) { + BigDecimal reduce = orderDetailDOS.stream().map(OrderDetailDO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add); + businessDO.setWeigh(businessDO.getWeigh().add(reduce)); + } + } + //订单数 + businessDO.setOrderSum(businessDO.getOrderSum() + vo.getOrder_sum()); + + //营业额 + if(ObjectUtil.isNotEmpty(vo.getTotalMoney())){ + businessDO.setTurnover(businessDO.getTurnover().add(vo.getTotalMoney())); + } + //减免金额 + if(ObjectUtil.isNotEmpty(vo.getReduceMoney())){ + businessDO.setReduce(businessDO.getReduce().add(vo.getReduceMoney())); + } + + //早中晚金额 + if(ObjectUtil.isNotEmpty(vo.getTime())){ + String timePeriod = TimePeriodEnum.getTimePeriod(vo.getTime()); + + if(timePeriod.equals(CostTypeEnum.MORNING.getCode())){ + businessDO.setBreakfast(businessDO.getBreakfast().add(vo.getTotalMoney())); + }else if (timePeriod.equals(CostTypeEnum.NOON.getCode())){ + businessDO.setLunch(businessDO.getLunch().add(vo.getTotalMoney())); + }else if (timePeriod.equals(CostTypeEnum.NIGHT.getCode())){ + businessDO.setDinner(businessDO.getDinner().add(vo.getTotalMoney())); + } + } + + businessMapper.updateById(businessDO); + } + + + + } } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java index a6363506..c8a79055 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java @@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.module.member.controller.admin.business.vo.StatisticsVo; import cn.iocoder.yudao.module.member.controller.admin.order.vo.OrderDetailsReqVO; import cn.iocoder.yudao.module.member.controller.admin.order.vo.OrderDetailsRespVO; import cn.iocoder.yudao.module.member.controller.admin.order.vo.OrderMoneyRespVO; @@ -27,6 +28,7 @@ import cn.iocoder.yudao.module.member.dal.mysql.order.DishOrderMapper; import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; import cn.iocoder.yudao.module.member.enums.CostTypeEnum; import cn.iocoder.yudao.module.member.enums.TimePeriodEnum; +import cn.iocoder.yudao.module.member.service.business.BusinessService; import cn.iocoder.yudao.module.member.service.orderdetail.OrderDetailService; import cn.iocoder.yudao.module.member.service.refund.RefundService; import cn.iocoder.yudao.module.member.util.MemberConstants; @@ -81,6 +83,8 @@ public class OrderServiceImpl implements OrderService { private MemberGroupMapper groupMapper; @Resource private RefundService refundService; + @Resource + private BusinessService businessService; @Override public Long createOrder(AppOrderSaveReqVO createReqVO) { @@ -184,7 +188,7 @@ public class OrderServiceImpl implements OrderService { DishesRespDto dishesRespDto = dishMap.get(respVo.getDishesId()); if (ObjectUtil.isNotEmpty(dishesRespDto)) { respVo.setDishesBasePrice(dishesRespDto.getDishesBasePrice()) - .setDishesSumPrice(dishesRespDto.getDishesSumPrice()) + .setDishesSumPrice(ObjectUtil.isNotEmpty(respVo.getUnitPrice())?respVo.getUnitPrice():dishesRespDto.getDishesSumPrice()) .setDishesNumber(dishesRespDto.getDishesNumber()); } @@ -478,6 +482,17 @@ public class OrderServiceImpl implements OrderService { cardDO.setGiftAmount(oldGiftAmount.add(giftAmount)); cardMapper.insert(cardDO); + //更新营业数据 + if(dishOrderDO.getOrderStatus().equals(DishOrderDO.COMPLETE)){ + StatisticsVo statisticsVo = new StatisticsVo(); + statisticsVo.setCarteenId(dishOrderDO.getStoreId()); + statisticsVo.setTotalMoney(money.negate()); + statisticsVo.setOrder_sum(0); + statisticsVo.setReduceMoney(money); + statisticsVo.setTime(dishOrderDO.getCreateTime()); + businessService.updateStatistics(statisticsVo); + } + }else{ dishOrderDO.setReductionAmount(dishOrderDO.getReductionAmount().add(money)); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/customizeExcel/CustomizeExcelMapper.xml b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/customizeExcel/CustomizeExcelMapper.xml index d6e3add5..9577c687 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/customizeExcel/CustomizeExcelMapper.xml +++ b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/customizeExcel/CustomizeExcelMapper.xml @@ -10,7 +10,6 @@ -->