From f1d53b391b0a780e409d597f2066a811908592c0 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 15 Jul 2025 17:21:27 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E9=A1=BE=E5=AE=A2=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9C=80=E7=BB=88=E4=BF=9D=E5=AD=98=E6=97=B6?=
 =?UTF-8?q?=E4=B8=BA=E5=A4=8D=E8=B4=AD=E8=AE=A2=E5=8D=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/SaOrderServiceImpl.java | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
index de014094..17e2e3a2 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
@@ -621,11 +621,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
         return false;
     }
 
-    /**
-     * 保存订单信息
-     *
-     * @param saOrderExt 订单
-     */
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void processOrder(SaOrderExt saOrderExt) {
@@ -709,13 +704,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
         return timeSecond;
     }
 
-    /**
-     * 点击支付按钮，输入密码，确认下单
-     *
-     * @param saOrderExt         订单
-     * @param newCuMember        新会员信息
-     * @param cuMemberAccountExt 支付账户信息
-     */
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean payRegSaOrder(SaOrderExt saOrderExt, CuMember newCuMember,
@@ -766,6 +754,12 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
                 saOrderItems.setOrderStatus(EOrderStatus.PAY.getValue());
             }
 
+            // 2025.07.15 顾客等级的注册订单类型，需要更新为复购订单
+            GradeDTO gradeDTO = iGradeServiceApi.getGradeByGradeValue(newCuMember.getPkRegisterGrade(), saOrderExt.getPkSettleCountry()).getData();
+            if (EGrade.HAI_FAN.getValue() == gradeDTO.getGradeValue()) {
+                saOrderExt.setOrderType(EOrderType.REPURCHASE_ORDER.getValue());
+            }
+
             // 保存订单信息
             processOrder(saOrderExt);
         }