Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-17 0c0ca0349e7392cd08d8bb1417f51c320e77088d

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

@@ -87,6 +87,8 @@
                }else{
                    record.setMeetTheConditions("满"+byId.getMeetTheConditions()+"元可用");
                }
                record.setCoverPicture(byId.getCoverPicture());
                record.setDetailsPicture(byId.getDetailsPicture());
            }
        }
        return AjaxResult.ok(data);
@@ -115,6 +117,11 @@
        return AjaxResult.ok(tCouponService.pageList(dto));
    }

    @PostMapping(value = "/getCouponById")
    public R<TCoupon> getCouponById(@RequestParam Integer id) {
        return R.ok(tCouponService.getById(id));

    }
    /**
     * 小程序远程调用 获取优惠券信息
     */
@@ -127,5 +134,17 @@
        }
        return R.ok(list);
    }
    
    
    /**
     * 根据id获取优惠券信息
     * @param id
     * @return
     */
    @PostMapping(value = "/getCouponById/{id}")
    public R<TCoupon> getCouponById(@PathVariable Integer id){
        TCoupon coupon = tCouponService.getById(id);
        return R.ok(coupon);
    }
}