From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java |  185 +++++++++++++++++++++++++++------------------
 1 files changed, 110 insertions(+), 75 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 4c6d803..49e2728 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -1,5 +1,8 @@
 package com.ruoyi.order.service.impl;
 
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,6 +18,7 @@
 import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.order.enums.OrderStatus;
+import com.ruoyi.order.event.ConfirmDeliveryEvent;
 import com.ruoyi.order.mapper.OrderGoodMapper;
 import com.ruoyi.order.mapper.OrderMapper;
 import com.ruoyi.order.model.Order;
@@ -45,6 +49,7 @@
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jetbrains.annotations.Nullable;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,6 +64,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -97,6 +103,7 @@
 
     @Resource
     private BalanceChangeRecordClient balanceChangeRecordClient;
+    
 
     @Resource
     private UserPointClient userPointClient;
@@ -138,6 +145,8 @@
     private AppUserGiveawayTemporaryClient appUserGiveawayTemporaryClient;
     @Resource
     private ShopGiveawayTemporaryClient shopGiveawayTemporaryClient;
+    @Resource
+    private ApplicationEventPublisher applicationEventPublisher;
 
 
     @Override
@@ -447,22 +456,6 @@
         if (200 == r.getCode()) {
             this.updateById(order);
         }
-
-        R r1 = balanceChangeRecordClient.deleteBalanceChangeRecordCopy(orderId, Arrays.asList(4));
-        if (200 != r1.getCode()) { // 项目没有分布式事务,此处报错可能会导致数据不一致
-         throw new RuntimeException("订单取消失败");
-        }
-        R r2 = userPointClient.deleteUserPointCopy(orderId, Arrays.asList(2,8,9,10,14));
-        if (200 != r2.getCode()) { // 项目没有分布式事务,此处报错可能会导致数据不一致
-            throw new RuntimeException("订单取消失败");
-        }
-        R<Boolean> r3 = shopBalanceStatementClient.deleteShopBalanceStatementCopy(orderId, Arrays.asList(1,2,3));
-        if (200 != r3.getCode()) { // 项目没有分布式事务,此处报错可能会导致数据不一致
-            throw new RuntimeException("订单取消失败");
-        }
-        shopPointClient.deleteShopPointCopy(orderId, Arrays.asList(1,2,3));
-        appUserGiveawayTemporaryClient.delAppUserGiveawayTemporary(orderId);
-        shopGiveawayTemporaryClient.delShopGiveawayTemporary(orderId);
         return r;
     }
 
@@ -502,7 +495,7 @@
         //开始退款
         Integer payMethod = order.getPayMethod();
         BigDecimal expressAmount = order.getExpressAmount() == null ? BigDecimal.ZERO : order.getExpressAmount();
-        BigDecimal paymentAmount = order.getPaymentAmount().add(expressAmount);
+        BigDecimal paymentAmount = order.getPaymentAmount();
         AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
         if (1 == payMethod) {
             //微信退款
@@ -519,10 +512,13 @@
             OrderBalancePayment orderBalancePayment = orderBalancePaymentService.getOne(new LambdaQueryWrapper<OrderBalancePayment>().eq(OrderBalancePayment::getOrderId, order.getId()));
             BigDecimal balance = appUser.getBalance();
             if (null != orderBalancePayment) {
+                //回加红包金额
                 appUser.setTotalRedPacketAmount(appUser.getTotalRedPacketAmount().add(orderBalancePayment.getRedPacketAmount()).setScale(2, RoundingMode.HALF_EVEN));
 //                appUser.setTotalDistributionAmount(appUser.getTotalDistributionAmount().add(orderBalancePayment.getDistributionAmount()).setScale(2, RoundingMode.HALF_EVEN));
             }
+            //回加账户余额
             appUser.setBalance(balance.add(paymentAmount).setScale(2, RoundingMode.HALF_EVEN));
+            //扣减门店消费金额
             appUser.setShopAmount(appUser.getShopAmount().subtract(paymentAmount).setScale(2, RoundingMode.HALF_EVEN));
             //查询最后一次的消费订单
             Order order1 = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, order.getAppUserId()).eq(Order::getPayStatus, 2)
@@ -533,24 +529,21 @@
                 appUser.setLastShopTime(null);
             }
 
-            //构建账户余额流水明细
+            //构建账户余额流水明细(账户支付订单的流水,不属于冻结数据)
             BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
             balanceChangeRecord.setOrderId(order.getId());
             balanceChangeRecord.setAppUserId(order.getAppUserId());
             balanceChangeRecord.setVipId(appUser.getVipId());
             balanceChangeRecord.setChangeType(6);
-            balanceChangeRecord.setBeforeAmount(balance);
             balanceChangeRecord.setChangeAmount(paymentAmount);
-            balanceChangeRecord.setAfterAmount(appUser.getBalance());
             balanceChangeRecord.setDelFlag(0);
             balanceChangeRecord.setCreateTime(LocalDateTime.now());
+            balanceChangeRecord.setChangeDirection(1);
             balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
 
 
             //退回获得的消费积分
             //需要先检查会员等级时候回回退,使用回退后的会员等级查询配置
-            Integer lavePoint = appUser.getLavePoint();
-
             UserPoint userPoint1 = new UserPoint();
             userPoint1.setType(1);
             userPoint1.setAppUserId(appUser.getId());
@@ -569,24 +562,18 @@
             }
             appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
 
-            //构建积分流水明细
+            //构建积分流水明细(消费金额,不属于冻结数据)
             if (shopPoint > 0) {
                 UserPoint userPoint = new UserPoint();
                 userPoint.setType(1);
-                userPoint.setHistoricalPoint(lavePoint);
                 userPoint.setVariablePoint(shopPoint);
-                userPoint.setBalance(appUser.getLavePoint());
                 userPoint.setCreateTime(LocalDateTime.now());
                 userPoint.setAppUserId(order.getAppUserId());
                 userPoint.setObjectId(order.getId());
+                userPoint.setChangeDirection(-1);
                 userPointClient.saveUserPoint(userPoint);
             }
             appUserClient.editAppUserById(appUser);
-
-            //降级检测
-            if (1 < appUser.getVipId() && appUser.getVipId() < 4) {
-                appUserClient.vipDemotion(appUser.getId());
-            }
             //回退优惠券状态
             if (null != order.getUserCouponId()) {
                 UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
@@ -616,17 +603,16 @@
 //                        appUser.setTotalDistributionAmount(appUser.getTotalDistributionAmount().add(orderBalancePayment.getDistributionAmount()).setScale(2, RoundingMode.HALF_EVEN));
                     }
                     appUser.setBalance(balance.add(expressAmount).setScale(2, RoundingMode.HALF_EVEN));
-                    //构建账户余额流水明细
+                    //构建账户余额流水明细(消费支付的余额流水)
                     BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
                     balanceChangeRecord.setOrderId(order.getId());
                     balanceChangeRecord.setAppUserId(order.getAppUserId());
                     balanceChangeRecord.setVipId(appUser.getVipId());
                     balanceChangeRecord.setChangeType(6);
-                    balanceChangeRecord.setBeforeAmount(balance);
                     balanceChangeRecord.setChangeAmount(expressAmount);
-                    balanceChangeRecord.setAfterAmount(appUser.getBalance());
                     balanceChangeRecord.setDelFlag(0);
                     balanceChangeRecord.setCreateTime(LocalDateTime.now());
+                    balanceChangeRecord.setChangeDirection(1);
                     balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
                 }
             }
@@ -646,16 +632,15 @@
             }
             appUser.setTransferablePoint(appUser.getTransferablePoint() + transferablePoint);
 
-            //构建积分流水明细
+            //构建积分流水明细(支付的积分,不属于冻结数据)
             if (order.getPoint() > 0) {
                 UserPoint userPoint = new UserPoint();
                 userPoint.setType(11);
-                userPoint.setHistoricalPoint(lavePoint);
                 userPoint.setVariablePoint(order.getPoint());
-                userPoint.setBalance(appUser.getLavePoint());
                 userPoint.setCreateTime(LocalDateTime.now());
                 userPoint.setAppUserId(order.getAppUserId());
                 userPoint.setObjectId(order.getId());
+                userPoint.setChangeDirection(1);
                 userPointClient.saveUserPoint(userPoint);
             }
             appUserClient.editAppUserById(appUser);
@@ -664,10 +649,43 @@
         order.setRefundStatus(2);
         order.setRefundTime(LocalDateTime.now());
 
-        shopPointClient.deleteShopPointCopy(order.getId(), Arrays.asList(1,2,3));
-        shopBalanceStatementClient.deleteShopBalanceStatementCopy(order.getId(), Arrays.asList(1,2,3));
+        //生成反向冻结流水数据
+        List<UserPointCopy> data2 = userPointClient.getUserPointCopy(order.getId(), Arrays.asList(2, 8, 9, 10, 14)).getData();
+        for (UserPointCopy userPointCopy : data2) {
+            userPointCopy.setId(null);
+            userPointCopy.setCreateTime(LocalDateTime.now());
+            userPointCopy.setChangeDirection(-1);
+            userPointClient.saveUserPointCopy(userPointCopy);
+        }
+        List<BalanceChangeRecordCopy> data3 = balanceChangeRecordClient.getBalanceChangeRecordCopy(order.getId(), Arrays.asList(4)).getData();
+        for (BalanceChangeRecordCopy balanceChangeRecordCopy : data3) {
+            balanceChangeRecordCopy.setId(null);
+            balanceChangeRecordCopy.setCreateTime(LocalDateTime.now());
+            balanceChangeRecordCopy.setChangeDirection(-1);
+            balanceChangeRecordClient.saveBalanceChangeRecordCopy(balanceChangeRecordCopy);
+        }
+        List<ShopPointCopy> data = shopPointClient.getShopPointCopy(order.getId(), Arrays.asList(1, 2, 3)).getData();
+        for (ShopPointCopy datum : data) {
+            datum.setId(null);
+            datum.setCreateTime(LocalDateTime.now());
+            datum.setChangeDirection(-1);
+            shopPointClient.saveShopPointCopy(datum);
+        }
+        List<ShopBalanceStatementCopy> data1 = shopBalanceStatementClient.getShopBalanceStatementCopy(order.getId(), Arrays.asList(1, 2, 3)).getData();
+        for (ShopBalanceStatementCopy shopBalanceStatementCopy : data1) {
+            shopBalanceStatementCopy.setId(null);
+            shopBalanceStatementCopy.setCreateTime(LocalDateTime.now());
+            shopBalanceStatementCopy.setChangeDirection(-1);
+            shopBalanceStatementClient.saveShopBalanceStatementCopy(shopBalanceStatementCopy);
+        }
+        //删除用户和门店添加的汇总数据(冻结数据)
         appUserGiveawayTemporaryClient.delAppUserGiveawayTemporary(order.getId());
         shopGiveawayTemporaryClient.delShopGiveawayTemporary(order.getId());
+    
+        //降级检测
+        if (1 < appUser.getVipId() && appUser.getVipId() < 4) {
+            appUserClient.vipDemotion(appUser.getId());
+        }
         return R.ok();
     }
 
@@ -714,26 +732,58 @@
         if (shopPoint > 0) {
             UserPoint userPoint = new UserPoint();
             userPoint.setType(1);
-            userPoint.setHistoricalPoint(lavePoint);
             userPoint.setVariablePoint(shopPoint);
-            userPoint.setBalance(appUser.getLavePoint());
             userPoint.setCreateTime(LocalDateTime.now());
             userPoint.setAppUserId(order.getAppUserId());
             userPoint.setObjectId(order.getId());
+            userPoint.setChangeDirection(-1);
             userPointClient.saveUserPoint(userPoint);
         }
         appUserClient.editAppUserById(appUser);
-
-        //降级检测
-        if (1 < appUser.getVipId() && appUser.getVipId() < 4) {
-            appUserClient.vipDemotion(appUser.getId());
-        }
 
         //回退优惠券状态
         if (null != order.getUserCouponId()) {
             UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
             userCoupon.setUseTime(null);
             userCouponClient.editReturnUse(userCoupon);
+        }
+    
+        //生成反向冻结流水数据
+        List<UserPointCopy> data2 = userPointClient.getUserPointCopy(order.getId(), Arrays.asList(2, 8, 9, 10, 14)).getData();
+        for (UserPointCopy userPointCopy : data2) {
+            userPointCopy.setId(null);
+            userPointCopy.setCreateTime(LocalDateTime.now());
+            userPointCopy.setChangeDirection(-1);
+            userPointClient.saveUserPointCopy(userPointCopy);
+        }
+        List<BalanceChangeRecordCopy> data3 = balanceChangeRecordClient.getBalanceChangeRecordCopy(order.getId(), Arrays.asList(4)).getData();
+        for (BalanceChangeRecordCopy balanceChangeRecordCopy : data3) {
+            balanceChangeRecordCopy.setId(null);
+            balanceChangeRecordCopy.setCreateTime(LocalDateTime.now());
+            balanceChangeRecordCopy.setChangeDirection(-1);
+            balanceChangeRecordClient.saveBalanceChangeRecordCopy(balanceChangeRecordCopy);
+        }
+        List<ShopPointCopy> data = shopPointClient.getShopPointCopy(order.getId(), Arrays.asList(1, 2, 3)).getData();
+        for (ShopPointCopy datum : data) {
+            datum.setId(null);
+            datum.setCreateTime(LocalDateTime.now());
+            datum.setChangeDirection(-1);
+            shopPointClient.saveShopPointCopy(datum);
+        }
+        List<ShopBalanceStatementCopy> data1 = shopBalanceStatementClient.getShopBalanceStatementCopy(order.getId(), Arrays.asList(1, 2, 3)).getData();
+        for (ShopBalanceStatementCopy shopBalanceStatementCopy : data1) {
+            shopBalanceStatementCopy.setId(null);
+            shopBalanceStatementCopy.setCreateTime(LocalDateTime.now());
+            shopBalanceStatementCopy.setChangeDirection(-1);
+            shopBalanceStatementClient.saveShopBalanceStatementCopy(shopBalanceStatementCopy);
+        }
+        //删除用户和门店添加的汇总数据(冻结数据)
+        appUserGiveawayTemporaryClient.delAppUserGiveawayTemporary(order.getId());
+        shopGiveawayTemporaryClient.delShopGiveawayTemporary(order.getId());
+        
+        //降级检测
+        if (1 < appUser.getVipId() && appUser.getVipId() < 4) {
+            appUserClient.vipDemotion(appUser.getId());
         }
         return R.ok();
     }
@@ -776,12 +826,11 @@
         if (order.getPoint() > 0) {
             UserPoint userPoint = new UserPoint();
             userPoint.setType(11);
-            userPoint.setHistoricalPoint(lavePoint);
             userPoint.setVariablePoint(order.getPoint());
-            userPoint.setBalance(appUser.getLavePoint());
             userPoint.setCreateTime(LocalDateTime.now());
             userPoint.setAppUserId(order.getAppUserId());
             userPoint.setObjectId(order.getId());
+            userPoint.setChangeDirection(1);
             userPointClient.saveUserPoint(userPoint);
         }
         return R.ok();
@@ -814,7 +863,6 @@
         Long days = jsonObject.getLong("days");
         order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
         this.updateById(order);
-        commissionService.calculationCommissionShop(order.getId());
         return R.ok();
     }
 
@@ -1116,36 +1164,11 @@
         order.setExpressResult(JSON.toJSONString(mapTrackKD100Vo));
         this.updateById(order);
 
-
-        String s = HttpUtils.sendGet("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wxdeed472c98e42a54&secret=c89c697c981452480e0781fb82d4284c");
-        JSONObject jsonObject2 = JSONObject.parseObject(s);
-        System.out.println(jsonObject.getString("access_token"));
-
+        // 发布事件
+        applicationEventPublisher.publishEvent(new ConfirmDeliveryEvent(order.getId()));
         return R.ok();
     }
 
-    public static void main(String[] args) {
-        String a = "{\n" +
-                "  \"access_token\": \"90_4PJ8b5aLJa2M7aCtoskALEzfoap1me291Jc3ogi18NGH0Ts-Tol7K3COLLvkQ1JLcouvew11ORqcHf6mH5LA2KSC08NxiDhsjRPKuRh14mpvQRHmeFvwr-wKWjkANLdACAUHF\",\n" +
-                "  \"order_key\": {\n" +
-                "    \"order_number_type\": 1\n" +
-                "  },\n" +
-                "  \"logistics_type\": 1,\n" +
-                "  \"delivery_mode\": 1,\n" +
-                "  \"shipping_list\": [\n" +
-                "    {\n" +
-                "      \"item_desc\": \"这是一个测试\"\n" +
-                "    }\n" +
-                "  ],\n" +
-                "  \"upload_time\": \"2022-12-15T13:29:35.120+08:00\",\n" +
-                "  \"payer\": {\n" +
-                "    \"openid\": \"ooOrs63KYDHcyhnUmTFpprHc6sb4\"\n" +
-                "  }\n" +
-                "}";
-
-        JSONObject jsonObject = JSONObject.parseObject(a);
-        System.out.println(jsonObject);
-    }
 
 
     public static void importExpress2(String filePath) throws MalformedURLException {
@@ -1184,4 +1207,16 @@
     public List<OrderExport> getOrderExportList(OrderPageList orderPageList) {
         return Collections.emptyList();
     }
+    
+    
+    /**
+     * 查询给定用户在给定门店核销的订单
+     * @param shopId
+     * @param appUserId
+     * @return
+     */
+    @Override
+    public List<Order> getOrderByAppUserIdsAndWriteOffShop(Integer shopId, Set<Long> appUserId) {
+        return this.baseMapper.getOrderByAppUserIdsAndWriteOffShop(shopId, appUserId);
+    }
 }

--
Gitblit v1.7.1