From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 7beaf25..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,7 +1,9 @@
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;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TExchangeOrder;
@@ -51,9 +53,9 @@
}
@PostMapping("/addVipOrder")
@ApiOperation(value = "添加会员订单", tags = {"管理后台-会员订单"})
- public AjaxResult addVipOrder(@RequestBody TVipOrder dto) {
+ public R<Long> addVipOrder(@RequestBody TVipOrder dto) {
vipOrderService.saveOrUpdate(dto);
- return AjaxResult.success();
+ return R.ok(dto.getId());
}
@GetMapping("/deleteVipOrder")
@ApiOperation(value = "批量删除会员订单", tags = {"管理后台-会员订单"})
@@ -61,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