Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2022-12-06 2a212f983f35e1c569dfec3a172fb5f0c9f85fac

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

@@ -19,15 +19,10 @@

    @Resource
    private ComShopFlowerGoodsService comShopFlowerGoodsService;
    //    @Resource
//    private ComShopOperLogService comShopOperLogService;
    @Resource
    private ComShopFlowerOrderService comShopFlowerOrderService;
    //    @Resource
//    private ComShopCartService comShopCartService;
    @Resource
    private ComShopFlowerUserAddressService comShopUserAddressService;

    @Resource
    private ConvenientMerchantService convenientMerchantService;
    @Resource
@@ -36,6 +31,8 @@
    private ComShopFlowerOrderDeliveryService comShopFlowerOrderDeliveryService;
    @Resource
    private ComShopFlowerRefundOrderService comShopFlowerRefundOrderService;
    @Resource
    private ComShopFlowerOrderPayService comShopFlowerOrderPayService;


    /**
@@ -156,7 +153,7 @@
     * @param addressId 收货地址id
     * @return 删除结果
     */
    @PostMapping("shopDelUserAddress")
    @DeleteMapping("shopDelUserAddress")
    public R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId) {
        return comShopUserAddressService.shopDelUserAddress(addressId);
    }
@@ -200,9 +197,9 @@
     * @param orderId 订单id
     * @return 订单详情
     */
    @PostMapping("orderDetail")
    public R orderDetailFlower(@RequestParam("orderId") Long orderId) {
        return comShopFlowerOrderService.orderDetail(orderId);
    @GetMapping("orderDetail")
    public R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone) {
        return comShopFlowerOrderService.orderDetail(orderId,phone);
    }

    /**
@@ -222,7 +219,7 @@
     * @param orderId 订单id
     * @return 删除结果
     */
    @PostMapping("orderDelete")
    @DeleteMapping("orderDelete")
    public R orderDeleteFlower(@RequestParam("orderId") Long orderId) {
        return comShopFlowerOrderService.orderDelete(orderId);
    }
@@ -433,18 +430,18 @@
     * @return
     */
    @GetMapping("/selectCountByDeliveryType")
    public R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("storeId")  Long storeId){
        return comShopFlowerOrderService.selectCountByDeliveryType(deliveryType,storeId);
    public R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("userId")  Long userId){
        return comShopFlowerOrderService.selectCountByDeliveryType(deliveryType,userId);
    }

    /**
     * 查询我的店铺各类统计数据
     * @param storeId
     * @param userId
     * @return
     */
    @GetMapping("/selectCountByStoreId")
    public R selectCountByStoreId(Long storeId){
        return comShopFlowerOrderService.selectCountByStoreId(storeId);
    @GetMapping("/selectCountByUserId")
    public R selectCountByUserId(@RequestParam("userId") Long userId){
        return comShopFlowerOrderService.selectCountByUserId(userId);
    }

    /**
@@ -484,187 +481,100 @@
     * @return
     */
    @GetMapping("selectCountGroupStatus")
    public R selectCountGroupStatus(Long storeId){
    public R selectCountGroupStatus(@RequestParam("storeId") Long storeId){
        return comShopFlowerRefundOrderService.selectCountGroupStatus(storeId);
    }

    /**
     * 新增商品浏览量
     * @param goodsId
     * @return
     */
    @GetMapping("incrGoodsView")
    public R incrGoodsView(@RequestParam("goodsId") Long goodsId){
        return comShopFlowerGoodsService.incrGoodsView(goodsId);
    }

    /**
     * 出入账分页
     * @param pageComShopFlowerOrderPayDTO
     * @return
     */
    @PostMapping("pageOrderPay")
    public R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO){
        return comShopFlowerOrderPayService.pageOrderPay(pageComShopFlowerOrderPayDTO);
    }

    /**
     * 获取商家的营业额和可结算金额
     * @param storeId
     * @return
     */
    @GetMapping("getQuota")
    public R getQuota(@RequestParam("storeId") Long storeId){
        return comShopFlowerOrderService.getQuota(storeId);
    }


    /**
     * 统计用户订单数量
     *
     * @param userId
     *            用户id
     * @return 统计结果
     * 商家后台经营数据统计-上
     * @param storeId
     * @return
     */
/*    @PostMapping("orderStatistics")
    public R orderStatistics(@RequestParam("userId") Long userId) {
        return comShopOrderService.orderStatistics(userId);
    }*/


    /*


     *//**
     * 根据店铺id查询店铺详情
     *
     * @param comShopStoreDTO
     *            请求参数
     * @return 店铺详情
     *//*
    @PostMapping("shopStoreDetail")
    public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
        return comShopStoreService.shopStoreDetail(comShopStoreDTO);
    @GetMapping("selectSumOrderAndAmountByStoreId")
    public R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId){
        return comShopFlowerOrderService.selectSumOrderAndAmountByStoreId(storeId);
    }

    /**
     * 统计时间区域的订单量 15天 30天 一年
     * @param storeId
     * @param type
     * @return
     */
    @GetMapping("selectOrderLineChart")
    public  R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type")  Integer type,@RequestParam("tab")  Integer tab){
        return comShopFlowerOrderService.selectOrderLineChart(storeId,type,tab);
    }




    *//**
     * 商家资金的订单详情
     *
    /**
     * 取消退款
     * @param id
     * @return
     *//*
    @GetMapping("capitalDetailByStore")
    public R capitalDetailByStore(@RequestParam("id") Long id) {
        return comShopOrderService.capitalDetailByStore(id);
     */
    @GetMapping("refundOrderCancel")
    public R refundOrderCancel(@RequestParam("id") Long id){
        return comShopFlowerRefundOrderService.orderCancel(id);
    }



    *//**
     * 订单导出信息
     *
     * @param comShopOrderExportDTO
     *            订单导出信息
     * @return 订单导出信息
     *//*
    @PostMapping("/shopOrderExportData")
    R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO) {
        return comShopOrderService.shopOrderExportData(comShopOrderExportDTO);
    }

    *//**
     * 资金管理导出信息
     *
     * @param comShopFundsExportDTO
     *            资金管理导出信息
     * @return 资金管理导出信息
     *//*
    @PostMapping("/shopOrderFundsExportData")
    R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO) {
        return comShopOrderService.shopOrderFundsExportData(comShopFundsExportDTO);
    }

    *//**
     * 用户资金统计信息
     *
     * @param userId
     *            用户ID
     * @return 统计信息
     *//*
    @GetMapping("/getFundsStat")
    R getFundsStat(@RequestParam("userId") Long userId) {
        return comShopOrderService.getFundsStat(userId);
    }

    *//**
     * 店铺资金统计信息
     *
     * @param pageComShopFundsSearchDTO
     *            店铺资金
     * @return 店铺资金统计信息
     *//*
    @PostMapping("/pageShopFunds")
    R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO) {
        return comShopOrderService.pageShopFunds(pageComShopFundsSearchDTO);
    }

    *//**
     * 微信支付订单回调
     *
     * @param wxPayNotifyOrderDTO
     *            订单支付回调参数
     *//*
    @PostMapping("/wxOrderPayNotify")
    public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
        comShopOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
    }

    *//**
     * 点击去支付订单
     *
     * @param orderPayDTO
     *            请求参数
     * @return 支付对象
     *//*
    @PostMapping("/wxPay")
    public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
        return comShopOrderService.wxPay(orderPayDTO);
    }

    *//**
     * 商城系统配置
     *
     * @param comShopSysConfDTO
    /**
     * 退款订单详情
     * @param id
     * @return
     *//*
    @PostMapping("/conf/edit")
    R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO) {
        ComShopSysConfDO comShopSysConfDO = comShopSysConfService.getBaseMapper().selectById(comShopSysConfDTO.getId());
        switch (comShopSysConfDTO.getHidden()) {
            case 0:
                comShopSysConfDO.setVal("0");
                comShopSysConfDO.setEnabled("1");
                break;
            case 1:
                comShopSysConfDO.setVal("1");
                comShopSysConfDO.setEnabled("1");
                break;
            default:
                break;
        }
        int updated = comShopSysConfService.getBaseMapper().updateById(comShopSysConfDO);
        if (updated == 1) {
            return R.ok();
        }
        return R.fail();
     */
    @GetMapping("refundOrderDetail")
    public R refundOrderDetail(@RequestParam("id") Long id){
        return comShopFlowerRefundOrderService.refundOrderDetail(id);
    }

    *//**
     * 商城系统配置查询
     *
     * @param pageComShopSysConfDTO
    /**
     * 清点商品 确认送达详情
     * @param pageComFlowerOrderListDTO
     * @return
     *//*
    @PostMapping("/conf/get")
    R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO) {
        List<ComShopSysConfDO> confList =
                comShopSysConfService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopSysConfDO>()
                        .eq(ComShopSysConfDO::getName, "SHOP_HIDDEN").orderByDesc(ComShopSysConfDO::getCreate_at));
        ComShopSysConfVO comShopSysConfVO = new ComShopSysConfVO();
        if (confList != null && confList.size() > 0) {
            ComShopSysConfDO firstConf = confList.get(0);
            BeanUtils.copyProperties(firstConf, comShopSysConfVO);
            return R.ok(comShopSysConfVO);
        }
        return R.ok();
     */
    @PostMapping("pageOrderByDeliveryNo")
    public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){
        return comShopFlowerOrderService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO);
    }

    *//**
     * check商家/店铺是否有效
    /**
     * 统计上架的上下架商品数量
     * @param userId
     * @return
     *//*
    @GetMapping("/checkStoreIsValid")
    public R checkStoreIsValid(@RequestParam("userId") Long userId) {
        Boolean isShopValid = comShopStoreService.checkStoreIsValid(userId);
        Boolean isConvenientValid = convenientMerchantService.checkStoreIsValid(userId);
        Boolean isMcsValid = userService.checkUserIsValid(userId, 11);
        return R.ok(isShopValid || isConvenientValid || isMcsValid);
    }*/

     */
    @GetMapping("/countSaleByUserId")
    R countSaleByUserId(@RequestParam("userId") Long userId){
        return comShopFlowerGoodsService.countSaleByUserId(userId);
    }

}