diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index 702def792..9a42ce94e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -217,10 +217,15 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { queryWrapper.eq(CardFuelRecord::getStoreId,cardFuelRecordDTO.getStoreId()); queryWrapper.eq(CardFuelRecord::getMtUserId,cardFuelRecordDTO.getMtUserId()); List cardFuelRecords = cardFuelRecordMapper.selectList(queryWrapper); - Optional max = cardFuelRecords.stream().min(Comparator.comparing(CardFuelRecord::getLockupPrice)); - CardFuelRecord cardFuelRecord = max.get(); + CardFuelRecord cardFuelRecord = new CardFuelRecord(); + + if (ObjectUtils.isNotEmpty(cardFuelRecords)){ + Optional max = cardFuelRecords.stream().max(Comparator.comparing(CardFuelRecord::getLockupPrice)); + cardFuelRecord = max.get(); + } CardFuelDiesel cardFuelDiesel = cardFuelDieselService.getById(cardFuelRecord.getCardFuelId()); - if ("2".equals(cardFuelDiesel.getActiveTime())){ + + if (ObjectUtils.isNotEmpty(cardFuelDiesel) && "2".equals(cardFuelDiesel.getActiveTime())){ cardFuelRecordDTO.setExpireTime(cardFuelDiesel.getEndTime()); }else { LocalDate today = LocalDate.now(); // 获取当前日期 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/HandoverRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/HandoverRecord.java index afd1a626c..e7dccae09 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/HandoverRecord.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/HandoverRecord.java @@ -28,6 +28,8 @@ public class HandoverRecord extends BaseEntity { * 交班数据记录 */ private String recordData; + @TableField(exist = false) + private String totalPayMoney; private String staffName; private String type; private String status; @@ -36,6 +38,10 @@ public class HandoverRecord extends BaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date startTime; + @TableField(exist = false) + private String startTime1; + @TableField(exist = false) + private String endTime1; /** * 交班结束时间 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java index 2531846f7..54435c235 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.order.dto.AllOrderInfoDto; import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.CardBalanceChange; +import com.fuint.business.order.entity.HandoverRecord; import com.fuint.business.order.vo.AllOrderInfoVo; import com.fuint.business.order.vo.CardBalanceChangeVo; import com.fuint.business.store.entity.MtStore; @@ -47,4 +48,5 @@ public interface AllOrderInfoMapper extends BaseMapper { AllOrderInfoVo getIndexData4Pos(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo); + AllOrderInfoVo getHandOverList(HandoverRecord record); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml index 10259421f..a5a1aeb30 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml @@ -365,6 +365,32 @@ all_order_info - + + + + + + + + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java index 88efe5c74..55da5abb4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.order.dto.AllOrderInfoDto; import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.CashierOrder; +import com.fuint.business.order.entity.HandoverRecord; import com.fuint.business.order.vo.AllOrderInfoVo; import com.fuint.business.order.vo.CardBalanceChangeVo; import com.fuint.framework.exception.BusinessCheckException; @@ -91,5 +92,4 @@ public interface AllOrderInfoService { AllOrderInfoVo getIndexData4Pos(); AllOrderInfoVo getOperatingDataPos(AllOrderInfoDto allOrderInfo); - } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index 3a13deb0e..3ba032ef2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -15,10 +15,7 @@ import com.fuint.business.convenienceSore.service.LJGoodsService; import com.fuint.business.convenienceSore.service.StockTrackService; import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableRecordService; import com.fuint.business.order.dto.AllOrderInfoDto; -import com.fuint.business.order.entity.AllOrderInfo; -import com.fuint.business.order.entity.CashierOrder; -import com.fuint.business.order.entity.LJOrder; -import com.fuint.business.order.entity.OilOrder; +import com.fuint.business.order.entity.*; import com.fuint.business.order.mapper.AllOrderInfoMapper; import com.fuint.business.order.service.*; import com.fuint.business.order.vo.AllOrderInfoVo; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java index e2352a350..ae9573b39 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java @@ -1,12 +1,15 @@ package com.fuint.business.order.service.impl; +import cn.hutool.core.date.DateTime; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.member.entity.LJStaff; import com.fuint.business.member.service.ILJStaffService; import com.fuint.business.order.entity.HandoverRecord; +import com.fuint.business.order.mapper.AllOrderInfoMapper; import com.fuint.business.order.mapper.HandoverRecordMapper; +import com.fuint.business.order.service.AllOrderInfoService; import com.fuint.business.order.service.HandoverRecordService; import com.fuint.business.store.entity.MtStore; import com.fuint.business.store.service.StoreService; @@ -62,6 +65,9 @@ public class HandoverRecordServiceImpl implements HandoverRecordService { return this.handoverRecordMapper.queryById(id); } + + @Resource + AllOrderInfoMapper allOrderInfoMapper; /** * 分页查询 * @@ -73,6 +79,17 @@ public class HandoverRecordServiceImpl implements HandoverRecordService { public IPage queryByPage(@Param("page") Page page,@Param("handoverRecord") HandoverRecord handoverRecord) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); handoverRecord.setStoreId(nowAccountInfo.getStoreId()); + IPage handoverRecordIPage = this.handoverRecordMapper.queryAllByLimit(page, handoverRecord); + + for (HandoverRecord record : handoverRecordIPage.getRecords()) { + + DateTime dateTime = DateTime.of(record.getStartTime()); + DateTime dateTime1 = DateTime.of(record.getEndTime()); + record.setEndTime1(dateTime.toString()); + record.setStartTime1(dateTime1.toString()); + allOrderInfoMapper.getHandOverList(record); + record.setTotalPayMoney(record.getTotalPayMoney()); + } return this.handoverRecordMapper.queryAllByLimit(page, handoverRecord); } diff --git a/pos-uni/pagesHome/changeShifts/changeShifts.vue b/pos-uni/pagesHome/changeShifts/changeShifts.vue index c4a20fa5b..4976d5048 100644 --- a/pos-uni/pagesHome/changeShifts/changeShifts.vue +++ b/pos-uni/pagesHome/changeShifts/changeShifts.vue @@ -7,7 +7,7 @@ 今日累计:￥{{indexData.totalPayMoney}} - + 交班记录 @@ -67,8 +67,8 @@ totalPayMoney: '0', totalCount: '0', totalRefund: '0', - } - + }, + form: {} } }, onShow() { @@ -110,7 +110,11 @@ } }) }, - + jump() { + uni.navigateTo({ + url: '/pagesHome/changeShifts/list' + }) + }, // 获取销售数据 getIndexData() { request({ diff --git a/pos-uni/pagesHome/changeShifts/list.vue b/pos-uni/pagesHome/changeShifts/list.vue index ad0b04b0f..feedd563f 100644 --- a/pos-uni/pagesHome/changeShifts/list.vue +++ b/pos-uni/pagesHome/changeShifts/list.vue @@ -7,9 +7,9 @@ - 结束日期 - + - 姓名 + {{item.staffName}} ￥400.00 2024-05-11 07:10-2024-05-13 16:45 @@ -21,6 +21,8 @@