From 71baf350b2c3deab60c165b7deefbba1d0a9c1dd Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Wed, 25 Jun 2025 18:19:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=95=86=E5=93=81=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/small/client/controller/WebController.java  | 2 +-
 .../client/service/SxDataAbst/SxDataAbstService.java     | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/src/main/java/com/small/client/controller/WebController.java b/client/src/main/java/com/small/client/controller/WebController.java
index bbe2e707..4567f33f 100644
--- a/client/src/main/java/com/small/client/controller/WebController.java
+++ b/client/src/main/java/com/small/client/controller/WebController.java
@@ -99,7 +99,7 @@ public class WebController {
         sxDataService.syncAtive(new DataBaseInfo(),sxDataService.getCommentModel());
     }
 
-    @RequestMapping("/syncActives")
+    @RequestMapping("/syncAtiveShops")
     public void syncAtiveShops(){
         sxDataService.syncAtiveShops(new DataBaseInfo(),sxDataService.getCommentModel());
     }
diff --git a/client/src/main/java/com/small/client/service/SxDataAbst/SxDataAbstService.java b/client/src/main/java/com/small/client/service/SxDataAbst/SxDataAbstService.java
index a9fc47ba..6f85b210 100644
--- a/client/src/main/java/com/small/client/service/SxDataAbst/SxDataAbstService.java
+++ b/client/src/main/java/com/small/client/service/SxDataAbst/SxDataAbstService.java
@@ -175,15 +175,16 @@ public abstract class SxDataAbstService {
             sxGoosModel.setIsSpecial("0");
             SxGoosModel finalSxGoosModel = sxGoosModel;
             specPriceDtoList.forEach(m->{
+                //特价转为活动
                 if(sxSyncGood.getItem_no().equals(m.getItemNo())){
                     String type=m.getDiscountType();
                     if(type.equals("1")){
-                        finalSxGoosModel.setPrice(m.getSpecPrice());
+                       // finalSxGoosModel.setPrice(m.getSpecPrice());
                         finalSxGoosModel.setBuy_limit(m.getSaleQty());//最大购买商品量 todo
                     }
-                    if(type.equals("2")){
-                        finalSxGoosModel.setPrice(finalSxGoosModel.getPrice().multiply(m.getDiscount()));
-                    }
+//                    if(type.equals("2")){
+//                        finalSxGoosModel.setPrice(finalSxGoosModel.getPrice().multiply(m.getDiscount()));
+//                    }
                     finalSxGoosModel.setIsSpecial("1");
                 }
             });