Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-21 3ffa739e77cdafdc4be1aa153acb3423071cd102

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java

@@ -2,7 +2,6 @@

import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
@@ -20,9 +19,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import javax.validation.constraints.NotNull;

@Slf4j
@RestController
@@ -73,6 +70,11 @@
    @PostMapping("/editStore/{id}")
    public R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) {
        return comShopStoreService.editStore(id, storeVO);
    }

    @GetMapping("/getStoreByPhone")
    R GetStoreByPhone(@RequestParam("phone") String phone){
        return comShopStoreService.getStoreByPhone(phone);
    }

    /**
@@ -183,6 +185,16 @@
    }

    /**
     * 查询用户购物车数量
     * @param userId    用户id
     * @return  用户购物车商品数量
     */
    @PostMapping("shopCartUserTotal")
    public R shopCartUserTotal(@RequestParam("userId") Long userId) {
        return comShopCartService.shopCartUserTotal(userId);
    }

    /**
     * 购物车添加
     * @param comShopCartDTO    请求参数
     * @return  添加结果