From 11acaaf1e2e5e71dff57a788fb26b263bcd117b7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 20:16:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 4e010fd..c003b2e 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
@@ -125,25 +125,28 @@
@GetMapping("/getInfoByType")
@ApiOperation(tags = {"小程序-兑换商城"},value = "商品查看详情")
- public R getInfoByType(Integer goodType,Integer id) {
+ public R getInfoByType(Integer goodType,Integer id,Integer type) {
if (goodType==1){
TGoods byId = goodsService.getById(id);
if (byId==null||byId.getStatus()==2){
- return R.fail(2,"内容不存在");
+ return R.fail(2,"该商品已不存在");
}
// List<Integer> data = orderClient.getSalesCountByGoodsId(String.valueOf(id)).getData();
// for (int i = 0; i < list.size(); i++) {
// list.get(i).setSalesCount(data.get(i));
// }
-
+ Integer data = orderClient.getSalesCountByGoodsIdgetCount(byId.getId(), 1, type).getData();
+ byId.setSalesCount(data);
return R.ok(byId);
}
else {
TCoupon byId = couponService.getById(id);
if (byId==null||byId.getStatus()==2){
- return R.fail(2,"内容不存在");
+ return R.fail(2,"该商品已不存在");
}
- return R.ok(byId);
+ Integer data = orderClient.getSalesCountByGoodsIdgetCount(byId.getId(),2, type).getData();
+ byId.setSalesCount(data);
+ return R.ok(byId);
}
}
@@ -215,8 +218,10 @@
return AjaxResult.error("当前用户已兑换"+count+"张");
}else {
//减少库存
- good.setInventory(good.getInventory()-exchangeDto.getNum());
- goodsService.updateById(good);
+ if (good.getInventory()!=-1) {
+ good.setInventory(good.getInventory() - exchangeDto.getNum());
+ goodsService.updateById(good);
+ }
}
if (user.getPoints()<good.getRedeemPoints()){
return AjaxResult.error("当前用户积分不足");
@@ -232,8 +237,10 @@
if (coupon.getInventoryQuantity() != -1 && count >= coupon.getInventoryQuantity()) {
return AjaxResult.error("当前用户已到达兑换"+coupon+"次");
}else {
- coupon.setInventoryQuantity(coupon.getInventoryQuantity()-1);
- couponService.updateById(coupon);
+ if (coupon.getInventoryQuantity()!=-1) {
+ coupon.setInventoryQuantity(coupon.getInventoryQuantity() - 1);
+ couponService.updateById(coupon);
+ }
}
@@ -347,10 +354,11 @@
//调起支付
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setCode(shopOrder.getCode());
- paymentOrder.setAmount(exchangeDto.getOrderPrice());
+ paymentOrder.setAmount(exchangeDto.getPayPrice());
paymentOrder.setOpenId(user.getWxOpenid());
paymentOrder.setDescription("购买商品");
R<Map<String, Object>> mapR = wxPaymentClient.orderPay(paymentOrder);
+ mapR.getData().put("orderId",shopOrder.getId().toString());
return mapR;
}else {
//todo 罗 支付宝支付
--
Gitblit v1.7.1