From bd6dabf89f4200bcabf18b50152c991736e36b91 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 2 Dec 2025 18:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heyu/api/controller/vv/AppOrderController.java    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
index f9cc479..455125d 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
@@ -175,7 +175,7 @@ public class AppOrderController {
 
 
     /***
-     *  订单添加
+     *  订单详情
      *
      *  http://localhost:8888/app/order/detail
      */
@@ -344,7 +344,8 @@ public class AppOrderController {
         for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
             tradeOrderLineEntity.setTradeOrderId(vvTradeOrderEntity.getId());
             // 如果在奖励金额
-            if (tradeOrderLineEntity.getAwardAmount().compareTo(BigDecimal.ZERO) > 0) {
+            if (tradeOrderLineEntity.getAwardAmount() != null
+                    && tradeOrderLineEntity.getAwardAmount().compareTo(BigDecimal.ZERO) > 0) {
                 VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity = new VvPromoterTradeOrderLineAwardEntity();
                 vvPromoterTradeOrderLineAwardEntity.setPromoterId(tradeOrderLineEntity.getPromoterId());
                 vvPromoterTradeOrderLineAwardEntity.setAwardAmount(vvActivityDTO.getAwardAmount());
@@ -358,10 +359,14 @@ public class AppOrderController {
                 vvPromoterTradeOrderLineAwardEntity.setGmtCreate(new Date());
                 vvPromoterTradeOrderLineAwardEntityList.add(vvPromoterTradeOrderLineAwardEntity);
             }
+
             vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity);
         }
 
-        List<VvPromoterBuyerEntity> vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId());
+        List<VvPromoterBuyerEntity> vvPromoterBuyerList = null;
+        if (vvActivityDTO != null) {
+            vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId());
+        }
 
         if (CollectionUtils.isNotEmpty(vvPromoterBuyerList)
                 && CollectionUtils.isNotEmpty(vvPromoterTradeOrderLineAwardEntityList)) {