bug修复

ruoyi-api/src/main/java/com/ruoyi/api/controller/pay/ApiNotifyController.java

@@ -113,6 +113,12 @@ public class ApiNotifyController extends AbstractApiController {
                         DelayedConstant.OnLineOrderEndDelayedConstant.ON_LINE_ORDER_END_DELAYED_ROUTING,
                         String.valueOf(onlineOrder.getOrderId()),
                         lazyTime);
+                    try {
+                        sendPrivateMessageMsgService.send(new MessageBo(MessageType.PAY_MESSAGE,
+                            ModelType.ORDER_PAY_SUCCESS, onlineOrder.getOrderId()));
+                    } catch (Exception e) {
+                        log.error("订单：{} 订单支付成功发送站内消息队列失败", onlineOrder.getOrderNo());
+                    }
                 }
             }
         }

ruoyi-api/src/main/java/com/ruoyi/api/controller/user/ApiUserShoppingCartController.java

@@ -1,34 +1,28 @@
 package com.ruoyi.api.controller.user;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.api.controller.common.AbstractApiController;
-import com.ruoyi.common.enums.FilePathSplicingType;
-import com.ruoyi.common.filepathsplicing.FilePathSplicing;
-import com.ruoyi.shop.business.service.IUserBusinessRoleService;
-import com.ruoyi.shop.usershoppingcart.domain.vo.UserShoppingCartGroupVo;
-import com.ruoyi.shop.usershoppingcart.domain.vo.UserShoppingCartVo;
-import lombok.RequiredArgsConstructor;
-
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.shop.usershoppingcart.domain.bo.UserShoppingCartBo;
+import com.ruoyi.shop.usershoppingcart.domain.vo.UserShoppingCartGroupVo;
+import com.ruoyi.shop.usershoppingcart.domain.vo.UserShoppingCartVo;
 import com.ruoyi.shop.usershoppingcart.service.IUserShoppingCartService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 会员的购物车Controller
@@ -79,7 +73,6 @@ public class ApiUserShoppingCartController extends AbstractApiController {
      * 新增和设置会员的购物车
      */
     @ApiOperation("新增会员的购物车")
-    @RepeatSubmit()
     @PostMapping("/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserShoppingCartBo bo) {
         bo.setUserId(getUserId());

ruoyi-business/src/main/java/com/ruoyi/agent/service/impl/AgentServiceImpl.java

@@ -483,9 +483,14 @@ public class AgentServiceImpl implements IAgentService {
 
     @Override
     public AgentVo amount(Long userId) {
-        return baseMapper.selectVoOne(new LambdaQueryWrapper<Agent>()
-            .select(Agent::getBalance, Agent::getTotalAmount)
+        AgentVo agentVo = baseMapper.selectVoOne(new LambdaQueryWrapper<Agent>()
+            .select(Agent::getBalance, Agent::getTotalAmount, Agent::getAgentId)
             .eq(Agent::getUserId, userId));
+        if (ObjectUtil.isNull(agentVo)) {
+            return null;
+        }
+        agentVo.setTotalStatisticsAmount(agentBalanceRecordService.sumStatistics(agentVo.getAgentId(), BillType.INNER, BalanceSourceType.USER_ORDER, null));
+        return agentVo;
     }
 
     @Override

ruoyi-message/src/main/java/com/ruoyi/inneractmsg/impl/OrderInteractServiceImpl.java

@@ -47,7 +47,7 @@ public class OrderInteractServiceImpl implements IInteractMsgService {
             return;
         }
         //发送站内消息    --给下单会员
-        String remark = String.format("你已购买%d件商品，支付%s元，支付积分%d,点击查看详情", order.getProductNumber(), order.getActualPayment(), order.getPaymentPoints());
+        String remark = String.format("你已购买%d件商品，支付%s元，支付积分%s,点击查看详情", order.getProductNumber(), order.getActualPayment(), order.getPaymentPoints());
         List<ProductMessage> goodsList = new ArrayList<>();
 
         //增加子订单中的商品