会员修改

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/carteenmoney/vo/CarteenMoneyRespVO.java

@@ -1,13 +1,12 @@
 package cn.iocoder.yudao.module.member.controller.admin.carteenmoney.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import java.util.*;
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 门店流水 Response VO")
 @Data
@@ -19,7 +18,6 @@ public class CarteenMoneyRespVO {
     private Long id;
 
     @Schema(description = "门店id", requiredMode = Schema.RequiredMode.REQUIRED, example = "927")
-    @ExcelProperty("门店id")
     private Long carteenId;
 
     @Schema(description = "门店名称", example = "王五")

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/rechargeamount/RechargeAmountMapper.java

@@ -20,6 +20,7 @@ public interface RechargeAmountMapper extends BaseMapperX<RechargeAmountDO> {
                 .eqIfPresent(RechargeAmountDO::getMoney, reqVO.getMoney())
                 .eqIfPresent(RechargeAmountDO::getDonateMoney, reqVO.getDonateMoney())
                 .eqIfPresent(RechargeAmountDO::getStatus, reqVO.getStatus())
+                .likeIfPresent(RechargeAmountDO::getName,reqVO.getName())
                 .betweenIfPresent(RechargeAmountDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(RechargeAmountDO::getId));
     }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/CarteenMoneyJob.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.member.job;
+
+import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.module.member.service.carteenmoney.CarteenMoneyService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author:qjq 计算门店流水
+ * @Date:2024/4/24 下午3:22
+ */
+@Component
+@Slf4j
+public class CarteenMoneyJob implements JobHandler {
+    @Resource
+    private   CarteenMoneyService carteenMoneyService;
+    /**
+     * 执行任务
+     *
+     * @param param 参数
+     * @return 结果
+     * @throws Exception 异常
+     */
+    @Override
+    @TenantIgnore
+    public String execute(String param) throws Exception {
+        try {
+            carteenMoneyService.insertCarteenMoney();
+        } catch (Exception e) {
+            return "门店流水计算失败";
+        }
+        return "门店流水计算成功";
+    }
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/carteenmoney/CarteenMoneyService.java

@@ -64,4 +64,6 @@ public interface CarteenMoneyService {
      * @return 
      */
     DeviceMoneyRespVO getCarteenMoneyDevice(DeviceMoneyPageReqVO reqVO);
+
+    void insertCarteenMoney();
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/carteenmoney/CarteenMoneyServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
@@ -91,31 +92,47 @@ public class CarteenMoneyServiceImpl implements CarteenMoneyService {
 
     @Override
     public PageResult<CarteenMoneyDO> getCarteenMoneyPage(CarteenMoneyPageReqVO pageReqVO) {
+       if(ObjUtil.isNotEmpty(pageReqVO.getCreateTime())){
+           //开时间是否为今天
+           if(LocalDateTimeUtil.isSameDay(pageReqVO.getCreateTime()[0].toLocalDate(),LocalDateTime.now().toLocalDate())){
+               return  getCarteenMoneyDOPageResult(pageReqVO);
+           }else{
                List<CarteenMoneyDO> todayCarteenMoney = this.getTodayCarteenMoney(pageReqVO.getCreateTime()[1],pageReqVO.getCarteenId());
-        Long size= 0L;
-        //表示要进行处理
-        if(ObjUtil.isNotEmpty(todayCarteenMoney) && (pageReqVO.getPageNo()==1 || pageReqVO.getPageNo()==-1)){
                todayCarteenMoney.forEach(c -> c.setCreateTime(LocalDateTime.now()));
-            LocalDateTime localDateTime = pageReqVO.getCreateTime()[1];
-            LocalDateTime localDateTime1 = pageReqVO.getCreateTime()[0];
-            //获取昨天
-            LocalDateTime offset = LocalDateTimeUtil.offset(localDateTime, -1, ChronoUnit.DAYS);
-            LocalDateTime end = LocalDateTimeUtil.endOfDay(offset);
-            pageReqVO.setCreateTime(new LocalDateTime[]{localDateTime1,end});
                PageResult<CarteenMoneyDO> page = carteenMoneyMapper.selectPage(pageReqVO);
                List<CarteenMoneyDO> list = page.getList();
+               if(ObjUtil.isEmpty(list)){
+                   list=new ArrayList<>();
+               }
                list.addAll(todayCarteenMoney);
                list.sort(Comparator.comparing(CarteenMoneyDO::getCreateTime).reversed());
                page.setList(list);
-            page.setTotal(page.getTotal() + todayCarteenMoney.size());
+               page.setTotal(page.getTotal()+ todayCarteenMoney.size());
                return page;
-        }else if(ObjUtil.isNotEmpty(todayCarteenMoney)){
-            size= (long) todayCarteenMoney.size();
            }
-        PageResult<CarteenMoneyDO> pageResult = carteenMoneyMapper.selectPage(pageReqVO);
+       }else{
-        pageResult.setTotal(pageResult.getTotal() + size);
+           LocalDateTime endDate = LocalDateTimeUtil.now();
-        return pageResult;
+           LocalDateTime startDate = LocalDateTimeUtil.beginOfDay(endDate);
+           List<CarteenMoneyDO> dishOrderDO = this.getDishOrderDO(startDate, endDate, pageReqVO.getCarteenId());
+           PageResult<CarteenMoneyDO> page=new PageResult<>();
+           page.setList(dishOrderDO);
+           page.setTotal((long) dishOrderDO.size());
+           return page;
        }
+
+    }
+    @NotNull
+    private PageResult<CarteenMoneyDO> getCarteenMoneyDOPageResult(CarteenMoneyPageReqVO pageReqVO) {
+        List<CarteenMoneyDO> todayCarteenMoney = this.getTodayCarteenMoney(pageReqVO.getCreateTime()[1],pageReqVO.getCarteenId());
+        PageResult<CarteenMoneyDO> page=new PageResult<>();
+        page.setList(todayCarteenMoney);
+        page.setTotal((long) todayCarteenMoney.size());
+        return page;
+    }
+
+
+
+
     /**
      * @Description: 获取今日门店流水
      * @Author: qjq
@@ -139,6 +156,7 @@ public class CarteenMoneyServiceImpl implements CarteenMoneyService {
      * @Date: 2024/4/1 17:38
      * @return
      */
+    @Override
     public void  insertCarteenMoney(){
         //计算昨天的门店流水
         LocalDateTime now = LocalDateTimeUtil.now();