From 8453a342552632b4e5a6ee8597a03b47fd84a13f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 11:05:00 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java           |   16 ++++----
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java        |   14 +++----
 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java            |    2 
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TGrantVip.java                 |    2 
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java   |   49 +++++++++++-------------
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java      |   22 ++++++++---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java         |    2 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java |    9 ++--
 8 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
index 02994b0..50ce67e 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -44,7 +44,7 @@
 
     @PostMapping("/t-exchange-order/create")
     public R<ExchangeBackDto> exchangeCreate(@RequestBody ExchangeDto exchangeDto);
-    @PostMapping("/t-vip-order//addVipOrder")
+    @PostMapping("/t-vip-order/addVipOrder1")
     public R<Long> addVipOrder(@RequestBody TVipOrder vipOrder);
     @PostMapping("/t-shopping-order/create")
     public R<TShoppingOrder> shopCreate(@RequestBody ExchangeDto exchangeDto);
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TGrantVip.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TGrantVip.java
index 0c997ed..091121d 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TGrantVip.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TGrantVip.java
@@ -29,7 +29,7 @@
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.NONE)
     private Long id;
 
     @ApiModelProperty(value = "订单编号")
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index d808e07..2ea18aa 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -798,35 +798,32 @@
     public R giveVip(@RequestBody GiveVipDto  giveVipDto) {
         String[] split = giveVipDto.getUserIds().split(",");
         for (String s : split) {
-
-
-        TAppUser nowUser = appUserService.getById(s);
-
-        int plusDay = 0;
-        if (giveVipDto.getType() == 1) {
-            plusDay = 1;
-        } else if (giveVipDto.getType() == 2) {
-            plusDay = 3;
-        } else if (giveVipDto.getType() == 3) {
-            plusDay = 12;
-        }
+            TAppUser nowUser = appUserService.getById(s);
+            int plusDay = 0;
+            if (giveVipDto.getType() == 1) {
+                plusDay = 1;
+            } else if (giveVipDto.getType() == 2) {
+                plusDay = 3;
+            } else if (giveVipDto.getType() == 3) {
+                plusDay = 12;
+            }
             BigDecimal bigDecimal = new BigDecimal("0");
             TVip info = vipClient.getInfo1(giveVipDto.getVipId()).getData();
-        switch (giveVipDto.getType()){
-            case 1:
-                bigDecimal = bigDecimal.add(info.getMonthlyCard()==null?new BigDecimal(0):info.getMonthlyCard());
-                break;
-            case 2:
-                bigDecimal = bigDecimal.add(info.getSeasonCard()==null?new BigDecimal(0):info.getSeasonCard());
-                break;
-            case 3:
-                bigDecimal = bigDecimal.add(info.getAnnualCard()==null?new BigDecimal(0):info.getAnnualCard());
-                break;
-        }
+            switch (giveVipDto.getType()){
+                case 1:
+                    bigDecimal = bigDecimal.add(info.getMonthlyCard()==null?new BigDecimal(0):info.getMonthlyCard());
+                    break;
+                case 2:
+                    bigDecimal = bigDecimal.add(info.getSeasonCard()==null?new BigDecimal(0):info.getSeasonCard());
+                    break;
+                case 3:
+                    bigDecimal = bigDecimal.add(info.getAnnualCard()==null?new BigDecimal(0):info.getAnnualCard());
+                    break;
+            }
             //增加vipDetail
-        giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType());
-        appUserService.updateById(nowUser);
-        // 新增后台赠送记录
+            giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType());
+            appUserService.updateById(nowUser);
+            // 新增后台赠送记录
             TGrantVip tGrantVip = new TGrantVip();
             tGrantVip.setCode(OrderCodeUtil.getOrderCode("ZS"));
             tGrantVip.setAppUserId(nowUser.getId());
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index e450b99..2675d0a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -140,6 +140,10 @@
     private TOrderInvoiceService invoiceService;
     @Resource
     private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
+    @Resource
+    private PartnerClient partnerClient;
+    @Resource
+    private SysUserClient sysUserClient;
     
     
     
@@ -964,10 +968,7 @@
         return R.ok(map);
     }
 
-    @Resource
-    private PartnerClient partnerClient;
-    @Resource
-    private SysUserClient sysUserClient;
+    
     @RequiresPermissions(value = {"/chargeOrderMonitoring"}, logical = Logical.OR)
     @ResponseBody
     @PostMapping(value = "/watch/chargingOrder")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
index abe14db..b58cdde 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -94,6 +94,22 @@
     }
     
     
+    @PostMapping("/addVipOrder1")
+    public R<Long> addVipOrder1(@RequestBody TVipOrder dto) {
+        if (dto.getId()!=null){
+            List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode())
+                    .ne(TVipOrder::getId, dto.getId()).list();
+            if (!list.isEmpty())return R.fail("订单编号已存在");
+        }else{
+            List<TVipOrder> list = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, dto.getCode()).list();
+            if (!list.isEmpty())return R.fail("订单编号已存在");
+        }
+        vipOrderService.saveOrUpdate(dto);
+        return R.ok(dto.getId());
+    }
+    
+    
+    
     @RequiresPermissions(value = {"/vipOrder/del"}, logical = Logical.OR)
     @GetMapping("/deleteVipOrder")
     @ApiOperation(value = "批量删除会员订单", tags = {"管理后台-会员订单"})
@@ -106,7 +122,6 @@
 
     @PostMapping("/callBack")
     public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo){
-
         TVipOrder one = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, code).one();
         one.setSerialNumber(outTradeNo);
         one.setPaymentStatus(2);
@@ -115,13 +130,8 @@
         giveVipDto.setVipId(one.getVipId());
         giveVipDto.setType(one.getVipType());
         giveVipDto.setUserIds(one.getAppUserId().toString());
-
-
-
         appUserClient.giveVip(giveVipDto);
-
         return R.ok();
-
     }
 
 
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index 02c2d68..700ba9e 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -361,14 +361,14 @@
                     payMoney = byId.getMonthlyCard();
                 }
                 break;
-                case 2:
-                    if (byId.getSeasonCardDiscountStart()!=null&&(now.isAfter(byId.getSeasonCardDiscountStart())&&now.isBefore(byId.getSeasonCardDiscountEnd()))){
-                        payMoney = byId.getSeasonCard().multiply(byId.getSeasonCardDiscount().divide(new BigDecimal(10)));
-                        discountMoney = byId.getSeasonCard().subtract(payMoney);
-                        discount = byId.getSeasonCardDiscount();
-                    }else {
-                        payMoney = byId.getSeasonCard();
-                    }
+            case 2:
+                if (byId.getSeasonCardDiscountStart()!=null&&(now.isAfter(byId.getSeasonCardDiscountStart())&&now.isBefore(byId.getSeasonCardDiscountEnd()))){
+                    payMoney = byId.getSeasonCard().multiply(byId.getSeasonCardDiscount().divide(new BigDecimal(10)));
+                    discountMoney = byId.getSeasonCard().subtract(payMoney);
+                    discount = byId.getSeasonCardDiscount();
+                }else {
+                    payMoney = byId.getSeasonCard();
+                }
                 break;
             case 3:
                 if (byId.getAnnualCardDiscountStart()!=null&&(now.isAfter(byId.getAnnualCardDiscountStart())&&now.isBefore(byId.getAnnualCardDiscountEnd()))){
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
index 6df0a5e..38db787 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
@@ -5,6 +5,7 @@
 import com.alibaba.fastjson.JSONObject;
 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.utils.OrderCodeUtil;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageInfo;
@@ -87,14 +88,10 @@
     @Override
     public Object vipInfoPay(TVip byId, BigDecimal payMoney, Integer payType,BigDecimal discountMoney,BigDecimal discount,Integer buyType, Long userId) {
         TAppUser user = appUserClient.getUserById(userId).getData();
-
-
         //生成会员购买订单
-
         TVipOrder shopOrder = new TVipOrder();
         shopOrder.setCode(OrderCodeUtil.getOrderCode("HY"));
         shopOrder.setType(1);
-
         shopOrder.setAppUserId(userId);
         shopOrder.setType(1);
         shopOrder.setVipId(byId.getId());
@@ -114,9 +111,11 @@
         shopOrder.setPaymentStatus(1);
         shopOrder.setPaymentType(payType);
         shopOrder.setPayTime(LocalDateTime.now());
-        orderClient.addVipOrder(shopOrder).getData();
-
-
+        R<Long> longR = orderClient.addVipOrder(shopOrder);
+        if(200 != longR.getCode()){
+            return AjaxResult.error(longR.getMsg());
+        }
+    
         if (payType==1){
             //调起支付
             PaymentOrder paymentOrder = new PaymentOrder();
@@ -138,7 +137,6 @@
                 return AjaxResult.success(data);
             }
         }
-
         return null;
     }
 }
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
index 194651b..bb0156c 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
@@ -132,7 +132,7 @@
 			log.info("请求参数:{}", req);
 			log.info("返回结果:{}", response.getBody());
 			if (response.isSuccess()) {
-				JSONObject jsonObject = JSON.parseObject("");
+				JSONObject jsonObject = JSON.parseObject(response.getBody());
 				RefundResp alipay_trade_refund_response = jsonObject.getObject("alipay_trade_refund_response", RefundResp.class);
 				return alipay_trade_refund_response;
 			}

--
Gitblit v1.7.1