From 26e93a0cff890c71e1d8bf6a9f8a79c4c2039cc2 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 5 Mar 2024 16:05:56 +0800 Subject: [PATCH] 3/5 --- .../yythmall/api/lpkgoods/LpkGoodsDetailsVo.java | 10 ++++++++++ .../yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml | 4 +++- .../yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java | 6 +++--- .../yythmall/biz/lpkgoods/LpkGoodsService.java | 16 +++++++++++++++- .../transferrecords/TransferRecordsService.java | 15 +++++++++++++++ .../VegeCellarReserveOrderService.java | 11 +++++++++++ 6 files changed, 57 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java index 50677fd..5ab45fd 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java +++ b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.yythmall.api.lpkgoods; +import com.baomidou.mybatisplus.annotation.TableField; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,4 +40,13 @@ public class LpkGoodsDetailsVo implements Vo { @ApiModelProperty("阶梯价格") private String stepPrice; private String periodValidity; + private Integer qssl; + /** + * 订购协议 + */ + private String dgxy; + + private String qdxy; + private String goodsNumber; + private String mefenPrice; } diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml index 950ad43..c12d4f3 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml @@ -56,7 +56,9 @@ appContent, specificationUnit, number, - isAppletGrounding + isAppletGrounding, + brandId, + categoryId from lpk_goods where sid = #{sid} diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java index b52a8ca..b33886a 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java @@ -57,9 +57,9 @@ public class LpkGoodsRest { } @ApiOperation("商品详情") - @GetMapping("/goodsDetails/{sid}") - public ResultBean goodsDetails(@PathVariable("sid") String sid) { - return lpkGoodsService.goodsDetails(sid); + @GetMapping("/goodsDetails/{sid}/{customerSid}") + public ResultBean goodsDetails(@PathVariable("sid") String sid,@PathVariable("customerSid")String customerSid) { + return lpkGoodsService.goodsDetails(sid,customerSid); } @ApiOperation("小程序商品上下架") @GetMapping("/appletGrounding/{sid}/{state}") diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java index 32659ba..5a7df43 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java @@ -1,5 +1,6 @@ package com.yxt.yythmall.biz.lpkgoods; +import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUnit; @@ -19,6 +20,7 @@ import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertificationVo; import com.yxt.yythmall.api.lpkcustomer.LpkCustomer; import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery; import com.yxt.yythmall.api.lpkgoods.*; +import com.yxt.yythmall.api.shoppingcart.ShoppingCart; import com.yxt.yythmall.api.shoppingcart.ShoppingCartQuery; import com.yxt.yythmall.api.shoppingcart.ShoppingCartVo; import com.yxt.yythmall.biz.enterprisecertification.EnterpriseCertificationService; @@ -133,7 +135,7 @@ public class LpkGoodsService extends MybatisBaseService goodsDetails(String sid) { + public ResultBean goodsDetails(String sid,String customerSid) { ResultBean rb = ResultBean.fireFail(); LpkGoodsDetailsVo vo = new LpkGoodsDetailsVo(); LpkGoodsVo lpkGoods = baseMapper.getGoodsDetails(sid); @@ -145,6 +147,18 @@ public class LpkGoodsService extends MybatisBaseService().eq("sid",customerSid)); + PmsBrand pmsBrand= IPmsBrandService.getById(lpkGoods.getBrandId()); + ShoppingCart shoppingCart=shoppingCartService.getOne(new QueryWrapper().eq("customerSid",lpkCustomer.getSid()) + .eq("goodsSid",lpkGoods.getSid()).eq("affiliation",lpkGoods.getBrandId())); + vo.setPrice(removeZeros(lpkGoods.getPrice())); + vo.setDgxy(pmsBrand.getDgxy()); + vo.setQdxy(pmsBrand.getQdxy()); + vo.setQssl(pmsBrand.getQssl()); + vo.setCategoryId(lpkGoods.getCategoryId()); + vo.setGoodsNumber(shoppingCart.getGoodsNumber()); + vo.setMefenPrice(removeZeros(String.valueOf(Double.valueOf(lpkGoods.getWeight())*Double.valueOf(lpkGoods.getPrice())))); return rb.success().setData(vo); } diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java index 7cc8efb..7756c7e 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java @@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.regex.Pattern; /** * @author wangpengfei @@ -135,6 +136,9 @@ public class TransferRecordsService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); @@ -154,4 +158,15 @@ public class TransferRecordsService extends MybatisBaseService