jinshihui 1 nedēļu atpakaļ
vecāks
revīzija
de2cc9f5e0

+ 7 - 7
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/CouponReceiveController.java

@@ -157,19 +157,19 @@ public class CouponReceiveController {
     }
 
     /**
-     * 通过分享ID查询优惠券详情
+     * 通过优惠券ID查询优惠券详情(调用本地生活的接口)
      *
-     * @param shareVolutionId
+     * @param couponId
      * @return R<ShareVolutionDetailVO>
      */
     @GetMapping("getShareVolutionDetail")
-    @ApiOperation("通过分享ID查询优惠券详情")
-    public R<ShareVolutionDetailVO> getShareVolutionDetail(@RequestParam("shareVolutionId") String shareVolutionId) {
+    @ApiOperation("通过优惠券ID查询优惠券详情")
+    public R<ShareVolutionDetailVO> getShareVolutionDetail(@RequestParam("couponId") String couponId) {
         try {
-            log.info("通过分享ID查询优惠券详情, shareVolutionId: {}", shareVolutionId);
-            return shareVolutionService.getVolutionDetailByShareVolutionId(shareVolutionId);
+            log.info("通过优惠券ID查询优惠券详情, couponId: {}", couponId);
+            return shareVolutionService.getVolutionDetailByCouponId(couponId);
         } catch (Exception e) {
-            log.error("通过分享ID查询优惠券详情异常, shareVolutionId: {}", shareVolutionId, e);
+            log.error("通过优惠券ID查询优惠券详情异常, couponId: {}", couponId, e);
             return R.fail(e.getMessage());
         }
     }

+ 2 - 2
nightFragrance-admin/src/main/resources/application-dev.yml

@@ -290,8 +290,8 @@ remote:
   # 本地生活
   local-live:
     # 基础URL
-    base-url: https://life.baoxianzhanggui.com/locallive-pro-java
-    # base-url: http://192.168.1.190:8082/jeecg-boot
+    # base-url: https://life.baoxianzhanggui.com/locallive-pro-java
+    base-url: http://192.168.1.190:8082/jeecg-boot
     #本地生活平台id
     client-id: bdsh-X9yZ1wV3uT5sR7qP9o
   # 广誉远

+ 1 - 1
nightFragrance-massage/src/main/java/com/ylx/massage/service/ShareVolutionService.java

@@ -5,5 +5,5 @@ import com.ylx.massage.domain.vo.ShareVolutionDetailVO;
 
 public interface ShareVolutionService {
 
-    R<ShareVolutionDetailVO> getVolutionDetailByShareVolutionId(String shareVolutionId);
+    R<ShareVolutionDetailVO> getVolutionDetailByCouponId(String couponId);
 }

+ 10 - 10
nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/ShareVolutionServiceImpl.java

@@ -19,24 +19,24 @@ public class ShareVolutionServiceImpl implements ShareVolutionService {
     @Value("${remote.local-live.base-url}")
     private String localLiveBaseUrl;
 
-    private static final String GET_VOLUTION_DETAIL_PATH = "/customer/volution/getVolutionDetailByShareVolutionId";
+    private static final String GET_VOLUTION_DETAIL_PATH = "/customer/volution/getVolutionDetailByCouponId";
 
     private static final int DEFAULT_TIMEOUT = 5000;
 
     @Override
-    public R<ShareVolutionDetailVO> getVolutionDetailByShareVolutionId(String shareVolutionId) {
-        if (StrUtil.isBlank(shareVolutionId)) {
-            return R.fail("分享优惠券ID不能为空");
+    public R<ShareVolutionDetailVO> getVolutionDetailByCouponId(String couponId) {
+        if (StrUtil.isBlank(couponId)) {
+            return R.fail("优惠券ID不能为空");
         }
 
         try {
-            String url = localLiveBaseUrl + GET_VOLUTION_DETAIL_PATH + "?shareVolutionId=" + shareVolutionId;
-            log.info("调用远程接口查询分享优惠券详情, URL: {}, shareVolutionId: {}", url, shareVolutionId);
+            String url = localLiveBaseUrl + GET_VOLUTION_DETAIL_PATH + "?couponId=" + couponId;
+            log.info("调用远程接口查询优惠券详情, URL: {}, couponId: {}", url, couponId);
 
             String result = HttpUtil.get(url, DEFAULT_TIMEOUT);
             if (StrUtil.isEmpty(result)) {
-                log.error("调用远程接口返回为空, shareVolutionId: {}", shareVolutionId);
-                return R.fail("查询分享优惠券详情失败");
+                log.error("调用远程接口返回为空, couponId: {}", couponId);
+                return R.fail("查询优惠券详情失败");
             }
             log.info("调用远程接口返回结果: {}", result);
 
@@ -56,8 +56,8 @@ public class ShareVolutionServiceImpl implements ShareVolutionService {
             ShareVolutionDetailVO detailVO = JSON.parseObject(resultData.toJSONString(), ShareVolutionDetailVO.class);
             return R.ok(detailVO);
         } catch (Exception e) {
-            log.error("调用远程接口异常, shareVolutionId: {}", shareVolutionId, e);
-            throw new ServiceException("查询分享优惠券详情异常: " + e.getMessage());
+            log.error("调用远程接口异常, couponId: {}", couponId, e);
+            throw new ServiceException("查询优惠券详情异常: " + e.getMessage());
         }
     }
 }