From f29cba945a12cb6207343371a1fb474b1cc5e344 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 九月 2024 18:53:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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 d911e40..97901b7 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
@@ -16,6 +16,8 @@
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.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.model.TShoppingOrder;
@@ -84,6 +86,7 @@
@PostMapping("/saveGoods")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品添加")
+ @Log(title = "【商品管理】添加商品", businessType = BusinessType.INSERT)
public AjaxResult saveActivity(@RequestBody TGoods dto) {
goodsService.save(dto);
return AjaxResult.success();
@@ -93,6 +96,7 @@
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品删除")
+ @Log(title = "【商品管理】删除商品", businessType = BusinessType.DELETE)
public AjaxResult delete(String ids) {
goodsService.removeBatchByIds(Arrays.asList(ids.split(",")));
return AjaxResult.success();
@@ -102,6 +106,7 @@
@PostMapping("/updateVip")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品修改")
+ @Log(title = "【商品管理】修改商品", businessType = BusinessType.UPDATE)
public AjaxResult updateActivity(@RequestBody TGoods dto) {
goodsService.updateById(dto);
return AjaxResult.success();
@@ -179,12 +184,14 @@
return R.ok();
}
- @ApiOperation(tags = {"小程序-兑换商城"},value = "积分兑换商品")
+ @ApiOperation(tags = {"小程序-" +
+ "兑换商城"},value = "积分兑换商品")
@PostMapping(value = "/app/shop")
public AjaxResult<PageInfo<TGoods>> shop(@RequestBody ExchangeDto exchangeDto) {
//检查当前用户积分是否够
Long userId = tokenService.getLoginUserApplet().getUserId();
Integer point = 0;
+ TAppUser user = appUserClient.getUserById(userId).getData();
if (exchangeDto.getGoodType()==1) {
//查询当前商品信息
@@ -195,7 +202,6 @@
if (good.getLimitExchangeTimes() != -1 && count >= good.getLimitExchangeTimes()) {
return AjaxResult.error("当前用户已兑换"+count+"张");
}
- TAppUser user = appUserClient.getUserById(userId).getData();
if (user.getPoints()<good.getRedeemPoints()){
return AjaxResult.error("当前用户积分不足");
}
@@ -207,18 +213,32 @@
if (coupon.getInventoryQuantity() != -1 && count >= coupon.getInventoryQuantity()) {
return AjaxResult.error("当前用户已到达兑换"+coupon+"次");
}
+ if (user.getPoints()<point){
+ return AjaxResult.error("当前用户积分不足");
+ }
}
exchangeDto.setPoint(point);
exchangeDto.setUserId(userId);
//生成积分兑换成功的订单
R<Long> longR = orderClient.exchangeCreate(exchangeDto);
if (exchangeDto.getGoodType()==2) {
+ TCoupon coupon = couponService.getById(exchangeDto.getGoodId());
+
//如果是优惠卷，赠送优惠卷给用户
GrantCouponDto grantCouponDto = new GrantCouponDto();
grantCouponDto.setUserIds(userId.toString());
grantCouponDto.setCouponId(exchangeDto.getGoodId());
grantCouponDto.setWaysToObtain(1);
grantCouponDto.setEndTime(LocalDateTime.now());
+ grantCouponDto.setType(3);
+ switch (coupon.getValidityPeriodMode()){
+ case 1:
+ grantCouponDto.setEndTime(coupon.getEndTime());
+ break;
+ case 2:
+ grantCouponDto.setEndTime(LocalDateTime.now().plusDays(coupon.getDays()));
+ break;
+ }
appCouponClient.grantCoupon(grantCouponDto);
}
//生成消耗积分的记录
@@ -250,6 +270,7 @@
if (exchangeDto.getGoodType()==1){
TGoods good = goodsService.getById(exchangeDto.getGoodId());
BigDecimal originalPrice = good.getPreferentialPrice();
+ exchangeDto.setTitle("【商品购买】"+good.getName());
if (isVip){
if (good.getVipPrice()!=null){
vipDiscount = originalPrice.subtract(good.getVipPrice()).multiply(BigDecimal.valueOf(exchangeDto.getNum()));
@@ -258,7 +279,9 @@
}
orderPrice = orderPrice.add(originalPrice.multiply(BigDecimal.valueOf(exchangeDto.getNum())));
}else {
+
TCoupon coupon = couponService.getById(exchangeDto.getGoodId());
+ exchangeDto.setTitle("【优惠卷购买】"+coupon.getName());
BigDecimal originalPrice = coupon.getPaymentAmount();
if (isVip){
if (coupon.getVipPaymentAmount()!=null) {
@@ -282,21 +305,25 @@
}
payPrice = orderPrice.subtract(coupon.getDiscountAmount());
discountPrice = coupon.getDiscountAmount();
+ }else {
+ payPrice = orderPrice;
}
exchangeDto.setPayPrice(payPrice);
exchangeDto.setDiscountPrice(discountPrice);
exchangeDto.setVipDiscount(vipDiscount);
exchangeDto.setUserId(userId);
+ exchangeDto.setPhone(user.getPhone());
//创建订单
TShoppingOrder shopOrder = orderClient.shopCreate(exchangeDto).getData();
if (exchangeDto.getPayMethod()==1) {
//调起支付
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setCode(shopOrder.getCode());
- paymentOrder.setAmount(shopOrder.getPaymentAmount());
+ paymentOrder.setAmount(exchangeDto.getOrderPrice());
paymentOrder.setOpenId(user.getWxOpenid());
paymentOrder.setDescription("购买商品");
- return wxPaymentClient.orderPay(paymentOrder);
+ R<Map<String, Object>> mapR = wxPaymentClient.orderPay(paymentOrder);
+ return mapR;
}else {
//todo 罗 支付宝支付
return R.ok();
@@ -318,5 +345,17 @@
TGoods goods = goodsService.getById(id);
return R.ok(goods);
}
+
+
+ /**
+ * 修改商品
+ * @param goods
+ * @return
+ */
+ @PostMapping("/updateGoods")
+ public R updateGoods(@RequestBody TGoods goods){
+ goodsService.updateById(goods);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1