From a84ec20993bc390c82a50a47b9ea0e12f3dbba43 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 八月 2024 17:12:45 +0800
Subject: [PATCH] 消息监听处理
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
index 55fb297..14de43b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -7,6 +7,8 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.AppGoodQuery;
+import com.ruoyi.common.core.dto.PointChangeDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -100,11 +102,11 @@
@ApiOperation(tags = {"小程序-兑换商城"},value = "商品列表分页查询")
@PostMapping(value = "/app/pageList")
- public AjaxResult<PageInfo<TGoods>> apppageList(BasePage basePage) {
- return AjaxResult.ok(goodsService.pageList1(basePage));
+ public AjaxResult<PageInfo<TGoods>> apppageList(@RequestBody AppGoodQuery appGoodQuery) {
+ return AjaxResult.ok(goodsService.pageList1(appGoodQuery));
}
- @ApiOperation(tags = {"小程序-兑换商城"},value = "兑换商品")
+ @ApiOperation(tags = {"小程序-兑换商城"},value = "积分兑换商品")
@PostMapping(value = "/app/shop")
public AjaxResult<PageInfo<TGoods>> shop(@RequestBody ExchangeDto exchangeDto) {
//检查当前用户积分是否够
@@ -135,7 +137,7 @@
}
exchangeDto.setPoint(point);
//生成积分兑换成功的订单
- orderClient.exchangeCreate(exchangeDto);
+ R<Long> longR = orderClient.exchangeCreate(exchangeDto);
if (exchangeDto.getGoodType()==2) {
//如果是优惠卷，赠送优惠卷给用户
GrantCouponDto grantCouponDto = new GrantCouponDto();
@@ -146,14 +148,31 @@
appCouponClient.grantCoupon(grantCouponDto);
}
//生成消耗积分的记录
-
-
-
+ PointChangeDto pointChangeDto = new PointChangeDto();
+ pointChangeDto.setUserId(userId);
+ pointChangeDto.setPoints(point);
+ pointChangeDto.setRemark(longR.getData().toString());
+ pointChangeDto.setType(6);
+ appUserClient.change(pointChangeDto);
return AjaxResult.success();
}
+// @ApiOperation(tags = {"小程序-兑换商城"},value = "支付商品")
+// @PostMapping(value = "/app/pay")
+// public AjaxResult<PageInfo<TGoods>> pay(@RequestBody ExchangeDto exchangeDto) {
+//
+// //创建订单
+//
+// //计算价格
+//
+// //调起支付
+//
+//
+//
+// }
+
/**
* 根据id获取商品信息
--
Gitblit v1.7.1