java/DolphinEnglish.git

			@@ -4,13 +4,16 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.web.page.PageInfo;
			import com.ruoyi.common.security.utils.SecurityUtils;
			import com.ruoyi.common.security.service.TokenService;
			import com.ruoyi.goods.domain.*;
			import com.ruoyi.goods.dto.GoodExchangeDTO;
			import com.ruoyi.goods.dto.GoodQueryDTO;
			import com.ruoyi.goods.dto.GoodsTypeQuery;
			import com.ruoyi.goods.service.*;
			import com.ruoyi.goods.vo.GoodDetailVO;
			import com.ruoyi.goods.vo.TGoodsVO;
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -19,9 +22,7 @@

			import javax.annotation.Resource;
			import java.util.Arrays;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;

			/**
			* <p>
			@@ -44,6 +45,8 @@
			private IRecipientService recipientService;
			@Resource
			private IRegionService regionService;
			@Resource
			private TokenService tokenService;

			@PostMapping("/listType")
			@ApiOperation(value = "列表查询", tags = {"后台-商品类型管理"})
			@@ -162,8 +165,22 @@
			@GetMapping("/exchangeRecord")
			@ApiOperation(value = "兑换记录", tags = {"兑换记录"})
			public R<List<TOrder>> exchangeRecord() {
			return R.ok(orderService.lambdaQuery().eq(TOrder::getUserId, SecurityUtils.getUserId())
			return R.ok(orderService.lambdaQuery().eq(TOrder::getUserId, tokenService.getLoginUserStudy().getUserid())
			.orderByDesc(TOrder::getCreateTime).list());
			}

			/**
			* 兑换记录
			*/
			@GetMapping("/confirm")
			@ApiOperation(value = "确认收货", tags = {"兑换记录"})
			@ApiImplicitParams({
			@ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
			})
			public R<Boolean> confirm(@RequestParam Integer id) {
			TOrder byId = orderService.getById(id);
			byId.setState(3);
			return R.ok(orderService.updateById(byId));
			}

			/**
			@@ -172,7 +189,8 @@
			@GetMapping("/shopAddress")
			@ApiOperation(value = "获取用户收货地址", tags = {"获取用户收货地址"})
			public R<List<Recipient>> shopAddress() {
			return R.ok(recipientService.lambdaQuery().eq(Recipient::getUserId, SecurityUtils.getUserId()).list());
			return R.ok(recipientService.lambdaQuery().eq(Recipient::getUserId,
			tokenService.getLoginUserStudy().getUserid()).list());
			}

			/**
			@@ -181,6 +199,7 @@
			@PostMapping("/addressSaveOrUpdate")
			@ApiOperation(value = "新增收货地址/修改收货地址", tags = {"新增收货地址/修改收货地址"})
			public R<String> addressSave(@RequestBody Recipient recipient) {
			recipient.setUserId(tokenService.getLoginUserStudy().getUserid());
			return R.ok(recipientService.addressSaveOrUpdate(recipient));
			}

			@@ -189,6 +208,9 @@
			*/
			@GetMapping("/addressDelete")
			@ApiOperation(value = "删除收货地址", tags = {"删除收货地址"})
			@ApiImplicitParams({
			@ApiImplicitParam(value = "地址信息id", name = "id", dataType = "String", required = true)
			})
			public R<String> addressDelete(@RequestParam String id) {
			return R.ok(recipientService.removeById(id) ? "删除成功！" : "删除失败！");
			}
			@@ -200,7 +222,12 @@
			*/
			@GetMapping("/updateOrderAddress")
			@ApiOperation(value = "修改订单收货地址", tags = {"修改订单收货地址"})
			public R<Boolean> updateOrderAddress(@RequestParam String orderId, @RequestParam String address) {
			@ApiImplicitParams({
			@ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
			@ApiImplicitParam(value = "完整收货地址", name = "address", dataType = "String", required = true)
			})
			public R<Boolean> updateOrderAddress(@RequestParam String orderId,
			@RequestParam String address) {
			return R.ok(orderService.lambdaUpdate().set(TOrder::getConsigneeAddress, address)
			.eq(TOrder::getId, orderId).eq(TOrder::getState, 1).update());
			}
			@@ -216,12 +243,12 @@

			/**
			* 可兑换商品推荐
			* 远程调用
			*/
			@GetMapping("/goodRecommend")
			@ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
			public R<List<TGoodsVO>> goodRecommend(@RequestParam String userId) {
			List<TGoodsVO> res = goodsService.goodRecommend(userId);
			return R.ok(res);
			public R<List<TGoodsVO>> goodRecommend() {
			return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
			}

			/**
			@@ -231,21 +258,17 @@
			*/
			@GetMapping("/goodDetail")
			@ApiOperation(value = "商品详情", tags = {"商品详情"})
			public R<Map<String, Object>> goodDetail(@RequestParam String goodId) {
			Map<String, Object> result = new HashMap<>(8);
			@ApiImplicitParams({
			@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
			})
			public R<GoodDetailVO> goodDetail(@RequestParam String goodId) {
			// 商品详情
			TGoods goods = goodsService.lambdaQuery().eq(TGoods::getId, goodId).one();
			result.put("goodDetail", goods);
			// 商品分类详情
			result.put("goodTypeDetail", goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.asList(goods.getTypeIds().split(","))).list());
			List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.asList(goods.getTypeIds().split(","))).list();
			// 已兑换人数
			result.put("number", goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId()));
			// 用户收货地址
			if (SecurityUtils.getUserId() != null) {
			result.put("address", recipientService.lambdaQuery()
			.eq(Recipient::getUserId, SecurityUtils.getUserId()).eq(Recipient::getIsDefault, 1).one());
			}
			return R.ok(result);
			int number = goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId());
			return R.ok(new GoodDetailVO(goods, goodsTypes, number));
			}

			/**
			@@ -253,9 +276,13 @@
			*/
			@GetMapping("/redeemNow")
			@ApiOperation(value = "商城-立即兑换", tags = {"立即兑换"})
			public R<Map<String, Object>> redeemNow(@RequestParam String goodId) {
			@ApiImplicitParams({
			@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
			})
			public R<GoodDetailVO> redeemNow(@RequestParam String goodId) {
			Recipient recipient = recipientService.lambdaQuery()
			.eq(Recipient::getUserId, SecurityUtils.getUserId()).eq(Recipient::getIsDefault, 1).one();
			.eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
			.eq(Recipient::getIsDefault, 1).one();
			return R.ok(goodsService.redeemNow(goodId, recipient));
			}

			@@ -266,7 +293,7 @@
			*/
			@PostMapping("/goodExchange")
			@ApiOperation(value = "商品兑换-确认", tags = {"商品兑换-确认"})
			public R<Object> goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
			public R<Boolean> goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
			Recipient recipient = recipientService.getById(goodExchange.getRecipientId());
			return R.ok(goodsService.goodExchange(goodExchange, recipient));
			}