Merge remote-tracking branch 'origin/user_action' into user_action

zxl

1 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

 framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponClaimRecordServiceImpl.java

@@ -266,7 +266,7 @@
        Row header = sheet.createRow(0);
        String[] headers = {
                "会员名称", "优惠券名称", "发布店铺", "面额/折扣",
                 "获取方式", "会员优惠券状态", "优惠券类型",
                 "获取方式", "会员优惠券状态", "优惠券类型","订单状态",
                 "使用起始时间", "截止时间","领取时间"
        };
        for (int i = 0; i < headers.length; i++) {
@@ -355,9 +355,33 @@
            }
            row.createCell(6).setCellValue(couponTypeDesc);


            //7.订单状态
            String orderStatusType = dto.getOrderStatus();
            System.out.println(orderStatusType);
            String orderStatusDesc;
            if ("UNPAID".equals(orderStatusType)) {
                orderStatusDesc = "未付款";
            } else if ("PAID".equals(orderStatusType)) {
                orderStatusDesc = "已付款";
            }else if ("UNDELIVERED".equals(orderStatusType)) {
                orderStatusDesc = "待发货";
            }else if ("DELIVERED".equals(orderStatusType)) {
                orderStatusDesc = "已发货";
            }else if ("COMPLETED".equals(orderStatusType)) {
                orderStatusDesc = "已完成";
            }else if ("STAY_PICKED_UP".equals(orderStatusType)) {
                orderStatusDesc = "待自提";
            }else if ("TAKE".equals(orderStatusType)) {
                orderStatusDesc = "待核验";
            }else if ("CANCELLED".equals(orderStatusType)) {
                orderStatusDesc = "已关闭";
            }else {
                orderStatusDesc ="未知";
            }
            Cell orderStatus = row.createCell(7);
            orderStatus.setCellValue(orderStatusDesc);
            // 10. 使用起始时间（处理null，格式化时间）
            Cell startTimeCell = row.createCell(7);
            Cell startTimeCell = row.createCell(8);
            if (Objects.nonNull(dto.getStartTime())) {
                startTimeCell.setCellValue(DateUtil.formatDateTime(dto.getStartTime()));
            } else {
@@ -365,13 +389,13 @@
            }

            // 11. 截止时间（同上）
            Cell endTimeCell = row.createCell(8);
            Cell endTimeCell = row.createCell(9);
            if (Objects.nonNull(dto.getEndTime())) {
                endTimeCell.setCellValue(DateUtil.formatDateTime(dto.getEndTime()));
            } else {
                endTimeCell.setCellValue("");
            }
            Cell claimTimeCell = row.createCell(9);
            Cell claimTimeCell = row.createCell(10);
            if (Objects.nonNull(dto.getClaimTime())) {
                endTimeCell.setCellValue(DateUtil.formatDateTime(dto.getClaimTime()));
            } else {