12.18

luodangjia

2025-01-16 96a8b59e4325195ad585b242c9d90b6822fe006b

12.18

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java

@@ -63,6 +63,9 @@
    @TableField("auth_time")
    private LocalDateTime authTime;

    @ApiModelProperty(value = "平台收货时间")
    private LocalDateTime receiveTime;

    @ApiModelProperty(value = "后台审核备注")
    @TableField("pass_remark")
    private String passRemark;

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java

@@ -219,6 +219,7 @@
            return R.fail("操作失败");
        }
        refundPass.setStatus(2);
        refundPass.setReceiveTime(LocalDateTime.now());
        //仅退款的售后需要将支付金额原路返回，然后再扣减支付获得的积分
        Order order = orderService.getById(refundPass.getOrderId());
        order.setOrderStatus(6);

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java

@@ -89,12 +89,16 @@
        }
        GoodsSeckill goodsSeckill = goodsSeckillService.getOne(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, one.getId()).eq(GoodsSeckill::getVip, info.getVip()));
        if(null != goodsSeckill){
            goodsSeckill.setEndTime(one.getEndTime().toEpochSecond(ZoneOffset.UTC) * 1000);
            LocalDateTime endTime = one.getEndTime();
            // 转时间戳
            long timeStamp = endTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
            goodsSeckill.setEndTime(timeStamp);
        }
        return R.ok(goodsSeckill);
    }



    /**
     * 获取商品秒杀活动
     * @param id