12.18

luodangjia

2025-01-14 a1777c21fbfffc5c2c190fdac20dee88eb16eca4

12.18

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java

@@ -179,7 +179,10 @@
     */
    @GetMapping("/goodsDetail/{goodsId}")
    @ApiOperation(value = "商品详情", tags = {"小程序-商城-首页"})
    public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId, String longitude, String latitude){
    public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId,
                                  Integer shopId,
                                  String longitude,
                                  String latitude){
        return R.ok(goodsService.goodsDetail(goodsId, longitude, latitude));
    }
    

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java

@@ -21,7 +21,7 @@

    PageInfo<GoodsVO> goodsList(Goods goods);

    GoodsVO goodsDetail(Long goodsId, String longitude, String latitude);
    GoodsVO goodsDetail(Long goodsId, Integer shopId, String longitude, String latitude);

    List<Goods> getGoodsListByShopId(PageInfo<Goods> pageInfo, Integer shopId);


 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java

@@ -183,7 +183,7 @@
    }

    @Override
    public GoodsVO goodsDetail(Long goodsId, String longitude, String latitude) {
    public GoodsVO goodsDetail(Long goodsId, Integer shopId, String longitude, String latitude) {
        if (goodsId == null || goodsId <= 0) {
            throw new NullPointerException("商品ID不能为空");
        }
@@ -216,7 +216,7 @@
        BeanUtils.copyBeanProp(goodsVO, goods);
        goodsVO.setGoodsId(goods.getId());
        goodsVO.setGoodsName(goods.getName());
        Price price = getPrice(vipId, goods.getId(), null, 1, provinceCode, cityCode, districtCode);
        Price price = getPrice(vipId, goods.getId(), shopId, 1, provinceCode, cityCode, districtCode);
        if(null != price){
            goodsVO.setPointPayment(price.getPointPayment() ? 1 : 0);
            goodsVO.setCashPayment(price.getCashPayment() ? 1 : 0);