From 14f62b1e99c93facce4245dbae56b9f43cb0e017 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 18 九月 2024 18:23:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
index 1ad49f2..db0a79a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.order.controller;
 
 
+import com.ruoyi.account.api.dto.GiveVipDto;
 import com.ruoyi.account.api.feignClient.AppUserClient;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -62,5 +63,26 @@
         vipOrderService.removeBatchByIds(Arrays.asList(id.split(",")));
         return AjaxResult.success();
     }
+
+    @PostMapping("/callBack")
+    public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo){
+
+        TVipOrder one = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, code).one();
+        one.setSerialNumber(outTradeNo);
+        vipOrderService.updateById(one);
+        GiveVipDto giveVipDto = new GiveVipDto();
+        giveVipDto.setVipId(one.getVipId());
+        giveVipDto.setType(one.getVipType());
+        giveVipDto.setUserIds(one.getAppUserId().toString());
+
+
+
+        appUserClient.giveVip(giveVipDto);
+
+        return R.ok();
+
+    }
+
+
 }
 

--
Gitblit v1.7.1