Merge remote-tracking branch 'origin/master'

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardHourTypeEnum.java

@@ -0,0 +1,26 @@
+package com.bsd.pjcloud.hard.api.constant.order;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 时间短类型
+ */
+@AllArgsConstructor
+@Getter
+public enum HardHourTypeEnum {
+    MORNING("1", "早餐"),
+    NOONING("2", "午餐"),
+    NIGHT("3", "晚餐"),
+    ;
+    private final String type;
+    private final String description;
+
+    public static HardHourTypeEnum valueOfByType(String type) {
+        if (ObjectUtil.isEmpty(type)) return null;
+        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
+    }
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/excel/HardOrderExcelVo.java

@@ -0,0 +1,44 @@
+package com.bsd.pjcloud.hard.api.vo.order.excel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ColumnWidth(30)
+public class HardOrderExcelVo {
+
+    @ExcelProperty("商户")
+    private String merchantName;
+
+    @ExcelProperty("姓名")
+    private String username;
+
+    @ExcelProperty("手机号")
+    private String userMobile;
+
+    @ExcelProperty("部门")
+    private String deptName;
+
+    @ExcelProperty("支付方式")
+    private String payType;
+
+    @ExcelProperty("用餐时间段")
+    private String hourType;
+
+    @ExcelProperty("商品总价")
+    private Integer totalPrice;
+
+    @ExcelProperty("额外支付")
+    private Integer extraPrice;
+
+    @ExcelProperty("实际支付")
+    private Integer payPrice;
+
+    @ExcelProperty("订单支付时间")
+    private LocalDateTime payTime;
+
+}

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java

@@ -1,10 +1,19 @@
 package com.bsd.pjcloud.hard.controller.order;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.idempotent.annotation.Idempotent;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
@@ -12,15 +21,19 @@ import com.bsd.pjcloud.common.security.annotation.Inner;
 import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
+import com.bsd.pjcloud.hard.api.constant.order.HardHourTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderPreferencesDto;
 import com.bsd.pjcloud.hard.api.dto.order.app.HardAppCreateOrderDto;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
+import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo;
+import com.bsd.pjcloud.hard.api.vo.order.excel.HardOrderExcelVo;
 import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper;
 import com.bsd.pjcloud.hard.service.HardOrderService;
 import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -31,7 +44,12 @@ import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单表
@@ -137,10 +155,56 @@ public class HardOrderController {
         return R.ok(hardwareOrderService.removeBatchByIds(CollUtil.toList(ids)));
     }
 
-    @ResponseExcel
     @GetMapping("/export")
     @PreAuthorize("@pms.hasPermission('hard_hardwareOrder_export')")
-    public List<HardOrderEntity> export(HardOrderEntity hardwareOrder, Long[] ids) {
-        return hardwareOrderService.list(Wrappers.lambdaQuery(hardwareOrder).in(ArrayUtil.isNotEmpty(ids), HardOrderEntity::getId, ids));
+    public void export(HttpServletResponse response, HardOrderDto dto) throws IOException {
+        List<HardOrderVo> list = hardwareOrderService.scopeList(dto);
+        List<HardOrderExcelVo> excelList = BeanUtils.toBean(list, HardOrderExcelVo.class);
+        try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(ResourceUtil.getStream("file/订单交易汇总.xlsx")).build()) {
+            WriteSheet writeSheet = EasyExcel.writerSheet().build();
+            FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
+            Map<String, Object> map = new HashMap<String, Object>();
+            if (ObjectUtil.isNotEmpty(dto.getPayTimeList())) {
+                map.put("timeSpan", " 到 ");
+                map.put("startTime", LocalDateTimeUtil.format(dto.getPayTimeList()[0], DatePattern.NORM_DATETIME_PATTERN));
+                map.put("endTime", LocalDateTimeUtil.format(dto.getPayTimeList()[0], DatePattern.NORM_DATETIME_PATTERN));
+            }
+            if (ObjectUtil.isNotEmpty(excelList)) {
+                BigDecimal totalPriceSum = BigDecimal.ZERO;
+                BigDecimal extraPriceSum = BigDecimal.ZERO;
+                BigDecimal payPriceSum = BigDecimal.ZERO;
+                for (HardOrderExcelVo v : excelList) {
+                    if (ObjectUtil.isNotEmpty(v.getTotalPrice())) {
+                        totalPriceSum = totalPriceSum.add(BigDecimal.valueOf(v.getTotalPrice()));
+                        v.setTotalPrice(BigDecimal.valueOf(v.getTotalPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).intValue());
+                    }
+                    if (ObjectUtil.isNotEmpty(v.getExtraPrice())) {
+                        extraPriceSum = extraPriceSum.add(BigDecimal.valueOf(v.getExtraPrice()));
+                        v.setExtraPrice(BigDecimal.valueOf(v.getExtraPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).intValue());
+                    }
+                    if (ObjectUtil.isNotEmpty(v.getPayPrice())) {
+                        payPriceSum = payPriceSum.add(BigDecimal.valueOf(v.getPayPrice()));
+                        v.setPayPrice(BigDecimal.valueOf(v.getPayPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).intValue());
+                    }
+                    if (ObjectUtil.isNotEmpty(v.getHourType())) {
+                        HardHourTypeEnum hardHourTypeEnum = HardHourTypeEnum.valueOfByType(v.getHourType());
+                        if (ObjectUtil.isNotEmpty(hardHourTypeEnum)) {
+                            v.setHourType(hardHourTypeEnum.getDescription());
+                        }
+                    }
+                    if (ObjectUtil.isNotEmpty(v.getPayType())) {
+                        HardPayTypeEnum hardPayTypeEnum = HardPayTypeEnum.valueOfByType(v.getPayType());
+                        if (ObjectUtil.isNotEmpty(hardPayTypeEnum)) {
+                            v.setPayType(hardPayTypeEnum.getDescription());
+                        }
+                    }
+                }
+                map.put("totalPriceSum", totalPriceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString());
+                map.put("extraPriceSum", extraPriceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString());
+                map.put("payPriceSum", payPriceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString());
+            }
+            excelWriter.fill(map, writeSheet);
+            excelWriter.fill(excelList, fillConfig, writeSheet);
+        }
     }
 }

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java

@@ -80,7 +80,28 @@ public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {
 
     default List<HardOrderEntity> list(HardOrderDto dto) {
         LambdaQueryWrapper<HardOrderEntity> wrapper = new LambdaQueryWrapper<HardOrderEntity>()
-                .in(ObjectUtil.isNotEmpty(dto.getOrderIds()), HardOrderEntity::getId, dto.getOrderIds());
+                .eq(ObjectUtil.isNotEmpty(dto.getOrderType()), HardOrderEntity::getOrderType, dto.getOrderType())
+                .eq(ObjectUtil.isNotEmpty(dto.getPayType()), HardOrderEntity::getPayType, dto.getPayType())
+                .eq(ObjectUtil.isNotEmpty(dto.getOrderStatus()), HardOrderEntity::getOrderStatus, dto.getOrderStatus())
+                .eq(ObjectUtil.isNotEmpty(dto.getHourType()), HardOrderEntity::getHourType, dto.getHourType())
+                .in(ObjectUtil.isNotEmpty(dto.getOrderIds()), HardOrderEntity::getId, dto.getOrderIds())
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), HardOrderEntity::getUserId, dto.getUserIds())
+                .in(ObjectUtil.isNotEmpty(dto.getHardIds()), HardOrderEntity::getHardId, dto.getHardIds())
+                .in(ObjectUtil.isNotEmpty(dto.getMchIds()), HardOrderEntity::getMerchantId, dto.getMchIds())
+                .in(ObjectUtil.isNotEmpty(dto.getUserDeptIds()), HardOrderEntity::getDeptId, dto.getUserDeptIds())
+                .between(
+                        ObjectUtil.isNotEmpty(dto.getCreateTimeList()),
+                        HardOrderEntity::getCreateTime,
+                        ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[0] : null,
+                        ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[1] : null
+                )
+                .between(
+                        ObjectUtil.isNotEmpty(dto.getPayTimeList()),
+                        HardOrderEntity::getPayTime,
+                        ObjectUtil.isNotEmpty(dto.getPayTimeList()) ? dto.getPayTimeList()[0] : null,
+                        ObjectUtil.isNotEmpty(dto.getPayTimeList()) ? dto.getPayTimeList()[1] : null
+                )
+                .orderByDesc(HardOrderEntity::getCreateTime);
         return selectListByScope(wrapper, DataScope.of());
     }
 

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java

@@ -9,14 +9,19 @@ import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.app.HardAppCreateOrderDto;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo;
+import com.bsd.pjcloud.hard.api.vo.order.excel.HardOrderExcelVo;
 import jakarta.validation.Valid;
 
+import java.util.List;
+
 public interface HardOrderService extends IService<HardOrderEntity> {
 
     Page<HardOrderVo> pagejoin(Page page, HardOrderDto dto);
 
     Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto);
 
+    List<HardOrderVo> scopeList(HardOrderDto dto);
+
     HardOrderVo join(Long id);
 
     Long createOrder(HardCreateOrderDto dto);

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java

@@ -102,53 +102,18 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
     @Override
     public Page<HardOrderVo> pagejoin(Page page, HardOrderDto dto) {
         Page<HardOrderVo> list = baseMapper.pageJoin(page, dto);
-        if (ObjectUtil.isNotEmpty(list.getRecords())) {
-            // 用户
-            List<Long> userIds = list.getRecords().stream().map(HardOrderVo::getUserId).filter(ObjectUtil::isNotEmpty).distinct().toList();
-            if (ObjectUtil.isNotEmpty(userIds)) {
-                R<List<SysUser>> userList = userService.getUserById(new ArrayList<>(userIds));
-                if (ObjectUtil.isNotEmpty(userList.getData())) {
-                    DataUtil.convertUserList(list.getRecords(), CollectionUtils.convertMap(userList.getData(), SysUser::getUserId));
-                }
-            }
-            // 部门
-            List<Long> deptIds = list.getRecords().stream().map(HardOrderVo::getDeptId).filter(ObjectUtil::isNotEmpty).distinct().toList();
-            if (ObjectUtil.isNotEmpty(deptIds)) {
-                R<Map<Long, SysDept>> deptList = deptService.getDeptByDeptIds(deptIds);
-                if (ObjectUtil.isNotEmpty(deptList.getData())) {
-                    DataUtil.convertDeptList(list.getRecords(), deptList.getData());
-                }
-            }
-            // 商户
-            List<Long> mchIds = list.getRecords().stream().map(HardOrderVo::getMerchantId).filter(ObjectUtil::isNotEmpty).distinct().toList();
-            if (ObjectUtil.isNotEmpty(mchIds)) {
-                R<List<MchManageVo>> mchList = remoteMchService.getByIds(mchIds);
-                if (ObjectUtil.isNotEmpty(mchList.getData())) {
-                    WalletDataUtil.convertMchList(list.getRecords(), CollectionUtils.convertMap(mchList.getData(), MchManageVo::getId));
-                }
-            }
-            // 设备
-            List<Long> hardIds = list.getRecords().stream().map(HardOrderVo::getHardId).filter(ObjectUtil::isNotEmpty).distinct().toList();
-            if (ObjectUtil.isNotEmpty(mchIds)) {
-                HardManagerDto hardManagerDto = new HardManagerDto();
-                hardManagerDto.setIds(hardIds);
-                List<HardManagerEntity> hardList = hardManagerMapper.list(hardManagerDto);
-                if (ObjectUtil.isNotEmpty(hardList)) {
-                    HardUtil.convertHardList(list.getRecords(), CollectionUtils.convertMap(hardList, HardManagerEntity::getId));
-                }
-            }
-            // 购物车
-            if (dto.getIsFindCarList()) {
-                for (HardOrderVo v : list.getRecords()) {
-                    List<HardCarEntity> carList = hardCarService.getByParentCarId(v.getParentCarId());
-                    List<HardCarVo> carVoList = BeanUtils.toBean(carList, HardCarVo.class);
-                    v.setCarList(carVoList);
-                }
-            }
-        }
+        disposeList(list.getRecords(), dto);
         return list;
     }
 
+    @Override
+    public List<HardOrderVo> scopeList(HardOrderDto dto) {
+        List<HardOrderEntity> list = baseMapper.list(dto);
+        List<HardOrderVo> resultList = BeanUtils.toBean(list, HardOrderVo.class);
+        disposeList(resultList, dto);
+        return resultList;
+    }
+
     @Override
     public Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto) {
         if (ObjectUtil.isNotEmpty(dto.getDeptIdIdDeepen())) {
@@ -207,6 +172,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         return list;
     }
 
+
     @Override
     public HardOrderVo join(Long id) {
         HardOrderDto dto = new HardOrderDto();
@@ -592,4 +558,50 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
     private HardOrderServiceImpl getSelf() {
         return SpringUtil.getBean(getClass());
     }
+
+    private void disposeList(List<HardOrderVo> list, HardOrderDto dto) {
+        if (ObjectUtil.isEmpty(list)) return;
+        // 用户
+        List<Long> userIds = list.stream().map(HardOrderVo::getUserId).filter(ObjectUtil::isNotEmpty).distinct().toList();
+        if (ObjectUtil.isNotEmpty(userIds)) {
+            R<List<SysUser>> userList = userService.getUserById(new ArrayList<>(userIds));
+            if (ObjectUtil.isNotEmpty(userList.getData())) {
+                DataUtil.convertUserList(list, CollectionUtils.convertMap(userList.getData(), SysUser::getUserId));
+            }
+        }
+        // 部门
+        List<Long> deptIds = list.stream().map(HardOrderVo::getDeptId).filter(ObjectUtil::isNotEmpty).distinct().toList();
+        if (ObjectUtil.isNotEmpty(deptIds)) {
+            R<Map<Long, SysDept>> deptList = deptService.getDeptByDeptIds(deptIds);
+            if (ObjectUtil.isNotEmpty(deptList.getData())) {
+                DataUtil.convertDeptList(list, deptList.getData());
+            }
+        }
+        // 商户
+        List<Long> mchIds = list.stream().map(HardOrderVo::getMerchantId).filter(ObjectUtil::isNotEmpty).distinct().toList();
+        if (ObjectUtil.isNotEmpty(mchIds)) {
+            R<List<MchManageVo>> mchList = remoteMchService.getByIds(mchIds);
+            if (ObjectUtil.isNotEmpty(mchList.getData())) {
+                WalletDataUtil.convertMchList(list, CollectionUtils.convertMap(mchList.getData(), MchManageVo::getId));
+            }
+        }
+        // 设备
+        List<Long> hardIds = list.stream().map(HardOrderVo::getHardId).filter(ObjectUtil::isNotEmpty).distinct().toList();
+        if (ObjectUtil.isNotEmpty(mchIds)) {
+            HardManagerDto hardManagerDto = new HardManagerDto();
+            hardManagerDto.setIds(hardIds);
+            List<HardManagerEntity> hardList = hardManagerMapper.list(hardManagerDto);
+            if (ObjectUtil.isNotEmpty(hardList)) {
+                HardUtil.convertHardList(list, CollectionUtils.convertMap(hardList, HardManagerEntity::getId));
+            }
+        }
+        // 购物车
+        if (dto.getIsFindCarList()) {
+            for (HardOrderVo v : list) {
+                List<HardCarEntity> carList = hardCarService.getByParentCarId(v.getParentCarId());
+                List<HardCarVo> carVoList = BeanUtils.toBean(carList, HardCarVo.class);
+                v.setCarList(carVoList);
+            }
+        }
+    }
 }

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletActiveMapper.java

@@ -22,7 +22,7 @@ public interface WalletActiveMapper extends PjcloudBaseMapper<WalletActiveEntity
                 .eqIfExists(WalletActiveEntity::getIsActiveHardware, dto.getIsActiveHardware())
                 .eqIfExists(WalletActiveEntity::getDeptId, dto.getDeptId())
                 .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletActiveEntity::getId, dto.getUserIds())
-                .orderByDesc(WalletActiveEntity::getCreateTime);
+                .orderByDesc(WalletActiveEntity::getCardSort);
         return selectJoinPage(page, WalletActiveVo.class, wrapper);
     }
 
@@ -32,7 +32,7 @@ public interface WalletActiveMapper extends PjcloudBaseMapper<WalletActiveEntity
                 .eq(ObjectUtil.isNotEmpty(dto.getIsActiveHardware()), WalletActiveEntity::getIsActiveHardware, dto.getIsActiveHardware())
                 .eq(ObjectUtil.isNotEmpty(dto.getDeptId()), WalletActiveEntity::getDeptId, dto.getDeptId())
                 .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletActiveEntity::getId, dto.getUserIds())
-                .orderByDesc(WalletActiveEntity::getCreateTime);
+                .orderByDesc(WalletActiveEntity::getCardSort);
         Page list = selectPageByScope(page, wrapper, DataScope.of());
         list.setRecords(BeanUtils.toBean(list.getRecords(), WalletActiveVo.class));
         return list;