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"); } });