无关风月
2024-08-09 3d47ca033f4fa8de44f5fa709ac3c40486cb1831
优惠券管理代码提交
2个文件已修改
16 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
@@ -30,7 +30,4 @@
    private Integer waysToObtain;
    @ApiModelProperty(value = " 是否删除0否1是")
    private Integer delFlag;
    @ApiModelProperty(value = "三方支付流水号 前端忽略")
    private String serialNumber;
}
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -32,23 +32,23 @@
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        PageInfo<ExchangeRecordVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<ExchangeRecordVO> list = this.baseMapper.pageList(pageInfo,dto);
        // 现金优惠券
        // 现金优惠券订单
        StringBuilder stringBuilder = new StringBuilder();
        // 积分优惠券
        // 积分优惠券订单
        StringBuilder stringBuilder1 = new StringBuilder();
        for (ExchangeRecordVO exchangeRecordVO : list) {
            switch (exchangeRecordVO.getWaysToObtain()){
                case 1:
                    if (exchangeRecordVO.getSerialNumber()!=null){
                        stringBuilder.append(exchangeRecordVO.getSerialNumber()).append(",");
                    if (exchangeRecordVO.getOrderId()!=null){
                        stringBuilder.append(exchangeRecordVO.getOrderId()).append(",");
                    }else{
                        stringBuilder.append("0").append(",");
                    }
                    break;
                case 2:
                    if (exchangeRecordVO.getSerialNumber()!=null){
                        stringBuilder1.append(exchangeRecordVO.getSerialNumber()).append(",");
                    if (exchangeRecordVO.getOrderId()!=null){
                        stringBuilder1.append(exchangeRecordVO.getOrderId()).append(",");
                    }else{
                        stringBuilder1.append("0").append(",");
                    }
@@ -80,7 +80,6 @@
                    exchangeRecordVO.setStatus(2);
                }
            }
            // 根据购买方式 查询对应订单号
        }
        // 去除最后一个字符