From c2060ca066394dd10b8b2b7f9ec486f5df099a24 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 九月 2024 18:16:56 +0800
Subject: [PATCH] mq对列修改

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 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 6021c3a..7283df9 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();
@@ -219,6 +224,7 @@
             grantCouponDto.setCouponId(exchangeDto.getGoodId());
             grantCouponDto.setWaysToObtain(1);
             grantCouponDto.setEndTime(LocalDateTime.now());
+            grantCouponDto.setType(3);
             appCouponClient.grantCoupon(grantCouponDto);
         }
         //生成消耗积分的记录
@@ -239,7 +245,7 @@
         Long userId = tokenService.getLoginUserApplet().getUserId();
         TAppUser user = appUserClient.getUserById(userId).getData();
         boolean isVip = false;
-        if (user.getVipEndTime().isAfter(LocalDateTime.now())){
+        if (user.getVipEndTime()!=null&&user.getVipEndTime().isAfter(LocalDateTime.now())){
             isVip = true;
         }
         //计算价格
@@ -256,7 +262,7 @@
                     originalPrice = good.getVipPrice();
                 }
             }
-            orderPrice.add(originalPrice.multiply(BigDecimal.valueOf(exchangeDto.getNum())));
+            orderPrice =  orderPrice.add(originalPrice.multiply(BigDecimal.valueOf(exchangeDto.getNum())));
         }else {
             TCoupon coupon = couponService.getById(exchangeDto.getGoodId());
             BigDecimal originalPrice = coupon.getPaymentAmount();
@@ -266,7 +272,7 @@
                     originalPrice = coupon.getVipPaymentAmount();
                 }
             }
-            orderPrice.add(originalPrice);
+            orderPrice  = orderPrice.add(originalPrice);
         }
 
         exchangeDto.setOrderPrice(orderPrice);
@@ -283,19 +289,21 @@
             payPrice = orderPrice.subtract(coupon.getDiscountAmount());
             discountPrice = coupon.getDiscountAmount();
         }
-        exchangeDto.setPayPrice(payPrice);
+        exchangeDto.setPayPrice(orderPrice);
         exchangeDto.setDiscountPrice(discountPrice);
         exchangeDto.setVipDiscount(vipDiscount);
+        exchangeDto.setUserId(userId);
         //创建订单
         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();
@@ -317,5 +325,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