From c4558ef096db556d234bf04fe797dc2d17ec13ee Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 20 八月 2024 19:12:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 82 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 1 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 f714570..d91debd 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
@@ -1,11 +1,18 @@
package com.ruoyi.other.controller;
+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.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.other.api.domain.TActivity;
import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.dto.AdvertisingDTO;
+import com.ruoyi.other.api.dto.ExchangeDto;
import com.ruoyi.other.api.dto.GoodsDTO;
import com.ruoyi.other.service.TActivityService;
import com.ruoyi.other.service.TAdvertisingService;
@@ -13,6 +20,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -29,33 +38,104 @@
private TGoodsService goodsService;
@Autowired
private TActivityService activityService;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private OrderClient orderClient;
+
+
+
+
@PostMapping("/saveGoods")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品添加")
public AjaxResult saveActivity(@RequestBody TGoods dto) {
goodsService.save(dto);
return AjaxResult.success();
}
+
+
+
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品删除")
public AjaxResult delete(Integer id) {
goodsService.removeById(id);
return AjaxResult.success();
}
+
+
+
@PostMapping("/updateVip")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品修改")
public AjaxResult updateActivity(@RequestBody TGoods dto) {
goodsService.updateById(dto);
return AjaxResult.success();
}
+
+
+
@GetMapping("/getInfo")
- @ApiOperation(tags = {"管理后台-商品管理"},value = "商品查看详情")
+ @ApiOperation(tags = {"管理后台-商品管理","小程序-兑换商城"},value = "商品查看详情")
public AjaxResult<TGoods> getInfo(Integer id) {
return AjaxResult.ok(goodsService.getById(id));
}
+
+
+
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品列表分页查询")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TGoods>> pageList(@RequestBody GoodsDTO dto) {
return AjaxResult.ok(goodsService.pageList(dto));
}
+
+
+ @ApiOperation(tags = {"小程序-兑换商城"},value = "商品列表分页查询")
+ @PostMapping(value = "/app/pageList")
+ public AjaxResult<PageInfo<TGoods>> apppageList(BasePage basePage) {
+ return AjaxResult.ok(goodsService.pageList1(basePage));
+ }
+
+ @ApiOperation(tags = {"小程序-兑换商城"},value = "兑换商品")
+ @PostMapping(value = "/app/shop")
+ public AjaxResult<PageInfo<TGoods>> shop(@RequestBody ExchangeDto exchangeDto) {
+ //查询当前商品信息
+ TGoods good = goodsService.getById(exchangeDto.getGoodId());
+
+ //检查当前用户积分是否够
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ TAppUser user = appUserClient.getUserById(userId).getData();
+ if (user.getPoints()<good.getRedeemPoints()){
+ return AjaxResult.error("当前用户积分不足");
+ }
+ //检查当前用户是否到达兑换上限
+ Long count = orderClient.getExchangeById(exchangeDto.getGoodId(), userId).getData();
+ if (good.getLimitExchangeTimes()!=-1&&count>=good.getLimitExchangeTimes()){
+ return AjaxResult.error("当前用户已到达兑换上限");
+ }
+ //生成积分兑换成功的订单
+ orderClient.exchangeCreate(exchangeDto);
+
+ //如果是优惠卷，赠送优惠卷给用户
+
+
+
+
+ //生成消耗积分的记录
+
+
+ }
+
+
+ /**
+ * 根据id获取商品信息
+ * @param id
+ * @return
+ */
+ @PostMapping("/getGoodsById/{id}")
+ public R<TGoods> getGoodsById(@PathVariable Integer id){
+ TGoods goods = goodsService.getById(id);
+ return R.ok(goods);
+ }
}
--
Gitblit v1.7.1