From ae711074a6dd11d6b0d0d72ad1f14e6f070adbc6 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 29 Jan 2024 17:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B6=E6=A2=AF=E4=BB=B7=E6=A0=BC=20?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/shoppingcart/ShoppingCartVo.java | 3 +- .../NewcomerRecoRecordMapper.java | 2 +- .../NewcomerRecoRecordRest.java | 2 +- .../biz/shoppingcart/ShoppingCartService.java | 73 ++++++++----------- 4 files changed, 34 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartVo.java b/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartVo.java index e17c88a..598b1f5 100644 --- a/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartVo.java +++ b/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartVo.java @@ -23,7 +23,8 @@ public class ShoppingCartVo implements Vo { private String customerSid; //客户sid private String weight; //每份重量 - private String totalPrice; //总价格 + private String totalPrice; + private String standbyPrice;//没有折扣的总价格 private String totalWeight; private String unitName; diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordMapper.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordMapper.java index ed84d8c..611422d 100644 --- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordMapper.java @@ -26,6 +26,6 @@ public interface NewcomerRecoRecordMapper extends BaseMapper List selInOrderSid(@Param("orderSids") List orderSids); @Select("select *,goodsNumber as num from lpk_reserve_order_goods where orderSid=#{orderSid}") List selByOrderSids(String orderSid); - @Select("select * from newcomer_reco_record r where r.recommendSid =#{customerSid} and r.recommendedSid is not null and r.state ='2' limit 5") + @Select("select * from newcomer_reco_record r where r.recommendSid =#{customerSid} and r.recommendedSid is not null and r.state ='2' ORDER BY r.createTime desc limit 5") List recordList(@Param("customerSid")String customerSid); } diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordRest.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordRest.java index b9a6b0f..44baaeb 100644 --- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordRest.java +++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordRest.java @@ -31,7 +31,7 @@ public class NewcomerRecoRecordRest { return newcomerRecoRecordService.recommendedAssistance(dto); } @ApiOperation("新人推荐列表") - @PostMapping("/recordList/{customerSid}") + @GetMapping("/recordList/{customerSid}") public ResultBean recordList(@PathVariable("customerSid") String customerSid){ return newcomerRecoRecordService.recordList(customerSid); } diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java index 15e0463..d5cdf41 100644 --- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java +++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java @@ -25,6 +25,9 @@ import com.yxt.yythmall.api.shoppingcart.ShoppingCartVo; import com.yxt.yythmall.biz.empcard.EmpCardService; import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService; import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; +import com.yxt.yythmall.mallplus.biz.pms.service.IPmsBrandService; +import com.yxt.yythmall.mallplus.biz.pms.service.impl.PmsBrandServiceImpl; +import com.yxt.yythmall.mallplus.mbg.pms.entity.PmsBrand; import com.yxt.yythmall.utils.DoubleUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +49,8 @@ public class ShoppingCartService extends MybatisBaseService list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId()); double price = 0; + double standbyPrice =0; double weight = 0; for (ShoppingCartVo vo : list) { LpkGoods lpkGoods = lpkGoodsService.fetchBySid(vo.getGoodsSid()); @@ -124,9 +130,6 @@ public class ShoppingCartService extends MybatisBaseService().eq("sid", vo.getCustomerSid())); + PmsBrand one=pmsBrandService.getOne(new QueryWrapper().eq("id",vo.getAffiliation())); + if(vo.getAffiliation().equals("1001045")){ + if (weight < one.getQssl()) { + vo.setRemarks("不足"+one.getQssl()+"斤"); + }else { + String c = String.valueOf(Double.valueOf(vo.getStandbyPrice())-Double.valueOf(vo.getTotalPrice())); + if(DoubleUtils.removeZeros(c).equals("0")){ + vo.setRemarks(""); + }else{ + vo.setRemarks("优惠" + removeZeros(c) + "元"); + } + } + return vo; + }; vo.setRemarks("已减免附加额"); if (weight <= 99) { - if (weight < 20) { + if (weight < one.getQssl()) { double a = 1.1; double d = Double.valueOf(vo.getTotalPrice()); double t = Double.valueOf(vo.getTotalPrice()) * a; @@ -173,7 +191,7 @@ public class ShoppingCartService extends MybatisBaseService= 100 && weight <= 199) { double a = 1.05; double d = Double.valueOf(vo.getTotalPrice());