xuhy
2024-08-17 afe8ee5197f663fb5289b4b6ccc5b63470945059
接口
4个文件已修改
14 ■■■■ 已修改文件
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/CouponClient.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java
@@ -25,7 +25,7 @@
        return new CouponClient() {
            
            @Override
            public R<TCoupon> getCouponById(Integer id) {
            public R<TCoupon> getCouponById1(Integer id) {
                return R.fail("根据id获取优惠券信息失败:" + throwable.getMessage());
            }
        };
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/CouponClient.java
@@ -22,6 +22,6 @@
     * @param id
     * @return
     */
    @PostMapping("/t-coupon/getCouponById/{id}")
    R<TCoupon> getCouponById(@PathVariable("id") Integer id);
    @PostMapping("/t-coupon/getCouponById1/{id}")
    R<TCoupon> getCouponById1(@PathVariable("id") Integer id);
}
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java
@@ -82,7 +82,7 @@
                name = goods.getName();
                imgUrl = goods.getCoverPicture();
            }else{
                TCoupon coupon = couponClient.getCouponById(tExchangeOrder.getGoodsId()).getData();
                TCoupon coupon = couponClient.getCouponById1(tExchangeOrder.getGoodsId()).getData();
                name = coupon.getName();
                imgUrl = coupon.getCoverPicture();
            }
@@ -118,7 +118,7 @@
            name = goods.getName();
            imgUrl = goods.getCoverPicture();
        }else{
            TCoupon coupon = couponClient.getCouponById(exchangeOrder.getGoodsId()).getData();
            TCoupon coupon = couponClient.getCouponById1(exchangeOrder.getGoodsId()).getData();
            info.setCouponType(coupon.getType());
            info.setDays(coupon.getDays());
            info.setEndTime(coupon.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -141,8 +141,8 @@
     * @param id
     * @return
     */
    @PostMapping(value = "/getCouponById/{id}")
    public R<TCoupon> getCouponById(@PathVariable Integer id){
    @PostMapping(value = "/getCouponById1/{id}")
    public R<TCoupon> getCouponById1(@PathVariable(value = "id") Integer id){
        TCoupon coupon = tCouponService.getById(id);
        return R.ok(coupon);
    }