代码提交

无关风月

2024-09-11 0d3ff69e4e7d7f29806d5372aeb1c2ddab1f2814

代码提交

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java

@@ -41,7 +41,7 @@
            }

            @Override
            public R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(ExchangeRecordGoodsQuery couponId) {
            public R<List<ExchangeRecordVO>> getExchangeRecordByCouponId(ExchangeRecordGoodsQuery couponId) {
                return R.fail("根据优惠券id查询领取记录:"+throwable.getMessage());
            }
    

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java

@@ -43,7 +43,7 @@
     * @return
     */
    @PostMapping("/t-app-coupon/getExchangeRecordByCouponId")
    R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId);
    R<List<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId);
    /**
     * 后台远程调用 给用户发放优惠券
     */

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java

@@ -202,7 +202,7 @@
     * @return
     */
    @PostMapping("/getExchangeRecordByCouponId")
    public R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId){
    public R<List<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId){
        return R.ok(tAppCouponService.pagelist(couponId));
    }


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java

@@ -20,7 +20,7 @@
 */
public interface TAppCouponMapper extends BaseMapper<TAppCoupon> {

    List<ExchangeRecordVO> pageList(@Param("pageInfo")PageInfo<ExchangeRecordVO> pageInfo,@Param("req") ExchangeRecordGoodsQuery dto);
    List<ExchangeRecordVO> pageList(@Param("req") ExchangeRecordGoodsQuery dto);

    List<CouponListVOVO> couponList(@Param("pageInfo")PageInfo<CouponListVOVO> pageInfo,@Param("userId") Long userId);


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java

@@ -9,6 +9,8 @@
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;

import java.util.List;

/**
 * <p>
 *  服务类
@@ -19,7 +21,7 @@
 */
public interface TAppCouponService extends IService<TAppCoupon> {

    PageInfo<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery couponId);
    List<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery couponId);

    PageInfo<CouponListVOVO> couponList(CouponListDto dto);


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java

@@ -69,10 +69,9 @@
    private TokenService tokenService;

    @Override
    public PageInfo<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
    public List<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
        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);
        List<ExchangeRecordVO> list = this.baseMapper.pageList(dto);
        // 订单ids
        StringBuilder stringBuilder = new StringBuilder();
        for (ExchangeRecordVO exchangeRecordVO : list) {
@@ -120,7 +119,6 @@
                }
            }
        }

        // 去除最后一个字符
        if (StringUtils.hasText(stringBuilder.toString())){
            String string = stringBuilder.deleteCharAt(stringBuilder.length() - 1).toString();
@@ -130,9 +128,7 @@
                list.get(i).setOrderId(data.get(i));
            }
        }

        pageInfo.setRecords(list);
        return pageInfo;
        return list;
    }



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

@@ -112,10 +112,9 @@

    @PostMapping("/exchangeRecord")
    @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情-兑换记录")
    public AjaxResult<PageInfo<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) {
        PageInfo<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData();
        List<ExchangeRecordVO> records = data.getRecords();
        for (ExchangeRecordVO record : records) {
    public AjaxResult<List<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) {
        List<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData();
        for (ExchangeRecordVO record : data) {
            TCoupon byId = tCouponService.getById(record.getCouponId());
            if (byId!=null){
                    record.setDiscountAmount("￥"+byId.getDiscountAmount());