#feat 调试修改问题

yanghui

2022-11-22 e60572581d3a8b97bb8cc35536daaa7b3f2c0a14

#feat 调试修改问题

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

@@ -68,11 +68,13 @@
    public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
        return communityService.shopFlowerGoodsDetail(goodsId);
    }

    @ApiOperation(value = "删除商品")
    @DeleteMapping("/goods/delete")
    public R deleteShopGoods(@RequestParam("goodsId") Long goodsId) {
        return communityService.deleteFlowerShopGoods(goodsId);
    }

    @ApiOperation(value = "商品上下架")
    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "商品Id"),
            @ApiImplicitParam(name = "status", value = "1.上架  2.下架 ")})
@@ -80,12 +82,14 @@
    public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
        return communityService.changeFlowerStatus(id, status);
    }

    @ApiOperation(value = "编辑商品")
    @PostMapping("/goods/edit/{id}")
    public R editShopGoods(@PathVariable("id") Long id,
                           @RequestBody @Validated(AddGroup.class) AddShopFlowerGoodsVO addShopGoodsVO) {
        return communityService.editFlowerShopGoods(id, addShopGoodsVO);
    }

    @ApiOperation(value = "新增商品")
    @PostMapping("/goods/save")
    public R saveShopGoods(@RequestBody @Validated(AddGroup.class) AddShopFlowerGoodsVO addShopGoodsVO) {
@@ -238,7 +242,7 @@
    public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
        String evaluateContent = comShopFlowerEvaluateDTO.getEvaluateContent();
        if (StrUtil.isNotBlank(evaluateContent)) {
            String result = checkService.checkMessageBy(evaluateContent,this.getLoginUserInfo().getOpenid(),this.getAppId());
            String result = checkService.checkMessageBy(evaluateContent, this.getLoginUserInfo().getOpenid(), this.getAppId());
            if (StrUtil.isNotBlank(result)) {
                return R.fail(501, "填写内容存在 " + result + " 违规信息");
            }
@@ -367,59 +371,64 @@

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


    /**
     * 创建退款订单
     *
     * @param comShopFlowerRefundOrderDTO
     * @return
     */
    @PostMapping("createRefundOrder")
    @ApiOperation(value = "创建退款订单")
    public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
    public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO) {
        return communityService.createRefundOrder(comShopFlowerRefundOrderDTO);
    }

    /**
     * 用户 分页查询退款订单
     *
     * @param pageComOrderRefundDTO
     * @return
     */
    @PostMapping("pageRefundOrder")
    @ApiOperation(value = "退款订单分页查询 用户",response = ComShopFlowerRefundOrderVO.class)
    public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO){
    @ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
    public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
        pageComOrderRefundDTO.setUserId(this.getUserId());
        return communityService.pageRefundOrder(pageComOrderRefundDTO);
    }

    /**
     * 修改退款订单
     *
     * @param comShopFlowerRefundOrderDTO
     * @return
     */
    @PostMapping("updateRefundOrder")
    @ApiOperation(value = "修改退款订单")
    public R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
    public R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO) {
        return communityService.updateRefundOrder(comShopFlowerRefundOrderDTO);
    }


    /**
     * 商家后台-退款申请统计
     *
     * @param storeId
     * @return
     */
    @GetMapping("selectCountGroupStatus")
    @ApiOperation(value = "商家后台-退款申请统计")
    public R selectCountGroupStatus(Long storeId){
    public R selectCountGroupStatus(Long storeId) {
        return communityService.selectCountGroupStatus(storeId);
    }

@@ -428,6 +437,7 @@
    public R getAllGoodsCategories() {
        return communityService.getAllGoodsCategories();
    }

    @ApiOperation(value = "分页查询便民服务分类", response = ConvenientServiceCategoryVO.class)
    @PostMapping("/service-category/page")
    public R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO) {
@@ -435,4 +445,43 @@
        return communityService.pageServiceCategory(pageConvenientServiceCategoryDTO);
    }

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

    @ApiOperation(value = "增加商家咨询量")
    @GetMapping("/merchant/incr-consult")
    public R incrMerchantConsult(@RequestParam("merchantId") Long merchantId) {
        return communityService.consultMerchant(merchantId);
    }

    @ApiOperation(value = "增加商家浏览量")
    @GetMapping("/merchant/incr-view")
    public R incrMerchantView(@RequestParam("merchantId") Long merchantId) {
        return communityService.incrMerchantView(merchantId);
    }

    @ApiOperation(value = "出入账分页", response = ComShopFlowerOrderPayVO.class)
    @PostMapping("pageOrderPay")
    public R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO) {
        return communityService.pageOrderPay(pageComShopFlowerOrderPayDTO);
    }

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerOrderPayDTO.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.common.model.dtos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @auther yh
 * @create 2022-11-08 17:25:45
 * @describe 分页查询支付记录
 */
@Data
@ApiModel("支付退款记录")
public class PageComShopFlowerOrderPayDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "类型：1.入账 2 出账")
    private Integer type;

    @ApiModelProperty(value = "商户id")
    private Long storeId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java

@@ -49,4 +49,7 @@

    @ApiModelProperty("配送方式（1.自提  2.快递）")
    private Integer deliveryType;

    @ApiModelProperty(value = "关键词")
    private String keyWord;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java

@@ -2,10 +2,12 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -126,8 +128,17 @@
    private Integer orderNum;

    /**
     * 浏览量
     */
    private Integer viewNum;

    /**
     * 商品规格列表
     */
    @ApiModelProperty("评价列表，最新三条")
    private List<ComShopFlowerEvaluateVO> shopFlowerEvaluateVOList;

    @ApiModelProperty("商品分类")
    @NotEmpty(groups = {AddGroup.class}, message = "商品分类不能为空")
    private List<Long> categoryIds;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPayVO.java

New file
@@ -0,0 +1,101 @@
package com.panzhihua.common.model.vos.shop;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * @ClassName: ComShopFlowerOrderPay
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: 花城订单支付记录表
 */
@Data
@ApiModel("花城订单支付记录")
public class ComShopFlowerOrderPayVO {
    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;

    /**
     * 订单号
     */
    @ApiModelProperty(value = "订单号")
    private String orderNo;

    /**
     * 支付单号
     */
    @ApiModelProperty(value = "支付单号")
    private String payNo;

    /**
     * 微信交易号
     */
    @ApiModelProperty(value = "微信交易号")
    private String wxTradeNo;

    /**
     * 支付状态（1.未支付  2.已支付）
     */
    @ApiModelProperty(value = "支付状态（1.未支付  2.已支付）")
    private Integer payStatus;

    /**
     * 订单金额
     */
    @ApiModelProperty(value = "订单金额")
    private BigDecimal orderAmount;

    /**
     * 支付金额
     */
    @ApiModelProperty(value = "支付金额")
    private BigDecimal payAmount;

    /**
     * 支付时间
     */
    @ApiModelProperty(value = "支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date payTime;

    /**
     * 商家id
     */
    @ApiModelProperty(value = "商家id")
    private Long storeId;
    /**
     * 配送方式（1.自提  2.快递）
     */
    @ApiModelProperty(value = "配送方式（1.自提  2.快递）")
    private Integer deliveryType;
    /**
     * 原始订单id
     */
    @ApiModelProperty(value = "原始订单id")
    private Long orderId;
    /**
     * 退款订单号
     */
    @ApiModelProperty(value = "退款订单号")
    private String refundOrderNo;
    /**
     * 退款状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中)
     */
    @ApiModelProperty(value = "退款状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中)")
    private Integer refundStatus;
    /**
     * 类型（1.支付 2.退款 3.取消）
     */
    @ApiModelProperty(value = "类型（1.支付 2.退款 3.取消）")
    private Integer payType;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -11023,5 +11023,29 @@
     * @return
     */
    @GetMapping("/shopFlower/selectCountGroupStatus")
    R selectCountGroupStatus(Long storeId);
    R selectCountGroupStatus(@RequestParam("storeId") Long storeId);

    /**
     * 新增商品浏览量
     * @param goodsId
     * @return
     */
    @GetMapping("/shopFlower/incrGoodsView")
    R incrGoodsView(@RequestParam("goodsId") Long goodsId);

    /**
     * 出入账分页
     * @param pageComShopFlowerOrderPayDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderPay")
    R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);

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

 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;


    /**
@@ -484,187 +481,39 @@
     * @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 userId
     *            用户id
     * @return 统计结果
     * 出入账分页
     * @param pageComShopFlowerOrderPayDTO
     * @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);
    @PostMapping("pageOrderPay")
    public R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO){
        return comShopFlowerOrderPayService.pageOrderPay(pageComShopFlowerOrderPayDTO);
    }





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



    *//**
     * 订单导出信息
     *
     * @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
     * @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();
    }

    *//**
     * 商城系统配置查询
     *
     * @param pageComShopSysConfDTO
     * @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();
    }

    *//**
     * 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);
    }*/


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsViewStatisticsDAO.java

New file
@@ -0,0 +1,65 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.convenient.ConvenientViewStatisticsVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsViewStatisticsDO;
import com.panzhihua.service_community.model.dos.ConvenientViewStatisticsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @title: ConvenientViewStatisticsDAO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 便民服务商品浏览量统计DAO
 * @author: hans
 * @date: 2021/09/23 16:53
 */
@Mapper
public interface ComShopFlowerGoodsViewStatisticsDAO extends BaseMapper<ComShopFlowerGoodsViewStatisticsDO> {

    /**
     * 创建当天统计数据
     * @param goodsId
     * @return
     */
    int createTodayStatistic(@Param("goodsId") Long goodsId);

    /**
     * 增加当天浏览量
     * @param goodsId
     * @param nowDate
     * @return
     */
    int incrViewNum(@Param("goodsId") Long goodsId, @Param("nowDate") String nowDate);

    /**
     * 获取月浏览量
     * @param goodsId
     * @param moth
     * @return
     */
    int selectMonthViewNum(@Param("goodsId") Long goodsId, @Param("moth") String moth);

    /**
     * 获取当天浏览量
     * @param goodsId
     * @param day
     * @return
     */
    int selectDayViewNum(@Param("goodsId") Long goodsId, @Param("day") String day);

    /**
     * 获取商品总浏览量
     * @return
     */
    List<ConvenientViewStatisticsVO> selectSumForViewNum();

    /**
     * 获取商品总浏览量
     * @param goodsId
     * @return
     */
    int selectTotalViewNum(@Param("goodsId") Long goodsId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java

@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -55,17 +56,33 @@
     */
    void updateOrderStatus(@Param("deliveryId") Long deliveryId, @Param("serviceTime") Date serviceTime, @Param("status") int status);

    IPage<ComShopFlowerOrderStoreListVO> pageOrderByStoreId(@Param("page") Page page,@Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);
    IPage<ComShopFlowerOrderStoreListVO> pageOrderByStoreId(@Param("page") Page page, @Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);

    /**
     * 根据类型统计订单数量
     *
     * @param deliveryType
     * @return
     */
    List<ComShopOrderCountVO>  selectCountByDeliveryType(@Param("deliveryType") Integer deliveryType,@Param("storeId") Long storeId);
    List<ComShopOrderCountVO> selectCountByDeliveryType(@Param("deliveryType") Integer deliveryType, @Param("storeId") Long storeId);


    List<ComShopOrderStoreIdCountVO> selectCountByStoreId(@Param("storeId") Long storeId,@Param("deliveryType") Integer deliveryType);
    List<ComShopOrderStoreIdCountVO> selectCountByStoreId(@Param("storeId") Long storeId, @Param("deliveryType") Integer deliveryType);

    List<ComShopOrderStoreIdCountVO> selectSumAmountByStoreId(@Param("storeId") Long storeId);

    /**
     * 获取商家总营业额
     *
     * @param storeId
     * @return
     */
    BigDecimal selectTurnover(@Param("storeId") Long storeId);

    /**
     * 获取商家可结算额度 15天以前的完成的订单
     * @param storeId
     * @return
     */
    BigDecimal selectSettlement(@Param("storeId") Long storeId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderPayDAO.java

@@ -2,11 +2,15 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerOrderPayDTO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPayVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderPayDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @ClassName:  ComShopFlowerOrderPayMapper
 * @ClassName: ComShopFlowerOrderPayMapper
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: TODO
@@ -15,4 +19,13 @@
public interface ComShopFlowerOrderPayDAO extends BaseMapper<ComShopFlowerOrderPayDO> {


    /**
     * 根据类型和商家id分页查询
     * @param page
     * @param pageComShopFlowerOrderPayDTO
     * @return
     */
    IPage<ComShopFlowerOrderPayVO> pageOrderPay(@Param("page") Page page, @Param("pageComShopFlowerOrderPayDTO") PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsViewStatisticsDO.java

New file
@@ -0,0 +1,41 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @title: ComShopFlowerGoodsViewStatisticsDO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 便民服务商品浏览量统计DO
 * @author: yh
 * @date: 2022-11-08 17:25:45
 */
@Data
@TableName(value = "com_shop_flower_goods_view_statistics")
public class ComShopFlowerGoodsViewStatisticsDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 商家id
     */
    private Long goodsId;
    /**
     * 统计日期
     */
    private Date statisticDate;
    /**
     * 浏览量
     */
    private Integer viewNum;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerGoodsService.java

@@ -79,4 +79,12 @@
     * @return
     */
    R changeStatus(Long id, Integer status);

    /**
     * 新增商品浏览量
     * @param goodsId
     * @return
     */
    R incrGoodsView(Long goodsId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderPayService.java

New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerOrderPayDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderPayDO;

/**
 * @ClassName: ComShopFlowerOrderPayService
 * @Author: yh
 * @Date: 2022/11/22 10:53
 * @Description:
 */
public interface ComShopFlowerOrderPayService extends IService<ComShopFlowerOrderPayDO> {

    /**
     * 分页查询出入账
     * @param pageComShopFlowerOrderPayDTO
     * @return
     */
    R pageOrderPay(PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderService.java

@@ -205,4 +205,11 @@
     * @return
     */
    R selectCountByUserId(Long storeId);

    /**
     * 获取商家的营业额和可结算金额
     * @param storeId
     * @return
     */
    R getQuota(Long storeId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java

@@ -25,10 +25,13 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

/**
@@ -53,6 +56,8 @@
    private ComShopFlowerOrderGoodsDAO comShopFlowerOrderGoodsDAO;
    @Resource
    private ComShopFlowerEvaluateDAO comShopFlowerEvaluateDAO;
    @Resource
    private ComShopFlowerGoodsViewStatisticsDAO comShopFlowerGoodsViewStatisticsDAO;

    @Override
    public R saveShopFlowerGoods(AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
@@ -165,7 +170,8 @@
                    goodsVo.setOriginalPrice(comShopFlowerGoodsAttrVO.getPrice());
                    goodsVo.setPrice(comShopFlowerGoodsAttrVO.getCollatePrice());
                }

                //设置商品总浏览量
                goodsVo.setViewNum(comShopFlowerGoodsViewStatisticsDAO.selectTotalViewNum(goodsId));
            });
        }
        return R.ok(goodsVOIPage);
@@ -211,6 +217,9 @@
        shopGoods.setOrderNum(orderNum);
        List<ComShopFlowerEvaluateVO> comShopFlowerEvaluateVOList = comShopFlowerEvaluateDAO.selectListLimit(goodsId);
        shopGoods.setShopFlowerEvaluateVOList(comShopFlowerEvaluateVOList);

        List<Long> categoryIds = convenientGoodsCategoryDAO.selectCategoryIdsForGoods(goodsId);
        shopGoods.setCategoryIds(categoryIds);
        return R.ok(shopGoods);
    }

@@ -301,4 +310,22 @@
        this.baseMapper.updateById(shopGoodsDO);
        return R.ok();
    }

    @Override
    public R incrGoodsView(Long goodsId) {
        ComShopFlowerGoodsDO comShopFlowerGoodsDO = this.baseMapper.selectById(goodsId);
        if (isNull(comShopFlowerGoodsDO)) {
            return R.fail("商品不存在");
        }
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        String nowDate = simpleDateFormat.format(new Date());
        ComShopFlowerGoodsViewStatisticsDO statisticsDO = comShopFlowerGoodsViewStatisticsDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerGoodsViewStatisticsDO>()
                .eq(ComShopFlowerGoodsViewStatisticsDO::getGoodsId, goodsId).eq(ComShopFlowerGoodsViewStatisticsDO::getStatisticDate, nowDate));
        if (isNull(statisticsDO)) {
            comShopFlowerGoodsViewStatisticsDAO.createTodayStatistic(goodsId);
        } else {
            comShopFlowerGoodsViewStatisticsDAO.incrViewNum(goodsId, nowDate);
        }
        return R.ok();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderPayServiceImpl.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerOrderPayDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPayVO;
import com.panzhihua.service_community.dao.ComShopFlowerOrderPayDAO;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderPayDO;
import com.panzhihua.service_community.service.ComShopFlowerOrderPayService;
import org.springframework.stereotype.Service;

/**
 * @ClassName: ComShopFlowerOrderPayServiceImpl
 * @Author: yh
 * @Date: 2022/11/22 10:53
 * @Description: 流水
 */
@Service
public class ComShopFlowerOrderPayServiceImpl extends ServiceImpl<ComShopFlowerOrderPayDAO, ComShopFlowerOrderPayDO> implements ComShopFlowerOrderPayService {

    @Override
    public R pageOrderPay(PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO) {
        Page page = new Page<>(pageComShopFlowerOrderPayDTO.getPageNum(),pageComShopFlowerOrderPayDTO.getPageSize());
        IPage<ComShopFlowerOrderPayVO> comShopFlowerOrderPayVOIPage = this.baseMapper.pageOrderPay(page, pageComShopFlowerOrderPayDTO);
        return R.ok(comShopFlowerOrderPayVOIPage);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java

@@ -1050,4 +1050,23 @@
    }


    /**
     * 获取商家的营业额和可结算金额
     * @param storeId
     * @return
     */
    public R getQuota(Long storeId){
        //营业额
        BigDecimal turnover = this.baseMapper.selectTurnover(storeId);
        //可结算
        BigDecimal settlement = this.baseMapper.selectSettlement(storeId);

        Map<String,Object> retMap = new HashMap<>();
        retMap.put("turnover",turnover);
        retMap.put("settlement",settlement);
        return R.ok(retMap);

    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml

@@ -66,14 +66,13 @@
        left join com_convenient_merchants as css on css.id = csg.store_id
        left join  com_convenient_goods_scope as cgs on cgs.goods_id = csg.id
        where 1=1 and csg.delete_status = 1 and
        css.`business_status` = 0
        css.`business_status` = 1
        <if test='comShopFlowerGoodsDTO.name != null and comShopFlowerGoodsDTO.name !=&quot;&quot;'>
            AND csg.`name` like concat('%',#{comShopFlowerGoodsDTO.name},'%')
        </if>
        <if test='comShopFlowerGoodsDTO.status != null '>AND csg.`status` = #{comShopFlowerGoodsDTO.status}</if>
        <if test='comShopFlowerGoodsDTO.storeId != null '>AND csg.store_id = #{comShopFlowerGoodsDTO.storeId}</if>
        <if test='comShopFlowerGoodsDTO.status != null '>AND csg.status = #{comShopFlowerGoodsDTO.status}</if>
        <if test='comShopFlowerGoodsDTO.deliveryType != null '>AND csg.delivery_type like concat('%',#{comShopFlowerGoodsDTO.deliveryType},'%' </if>
        <if test='comShopFlowerGoodsDTO.deliveryType != null '>AND csg.delivery_type like concat('%',#{comShopFlowerGoodsDTO.deliveryType},'%') </if>
        <if test='comShopFlowerGoodsDTO.categoriesId != null '>AND cgs.goods_category_id = #{comShopFlowerGoodsDTO.categoriesId}</if>
        order by sale desc,create_at desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsViewStatisticsMapper.xml

New file
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerGoodsViewStatisticsDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerGoodsViewStatisticsDO">
                <id column="id" property="id" />
                <id column="goods_id" property="goodsId" />
                <id column="statistic_date" property="statisticDate" />
                <id column="view_num" property="viewNum" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id,goods_id,statistic_date,view_num
    </sql>
    <insert id="createTodayStatistic">
        INSERT INTO com_shop_flower_goods_view_statistics (goods_id, statistic_date) VALUES (#{goodsId}, NOW())
    </insert>
    <update id="incrViewNum">
        UPDATE com_shop_flower_goods_view_statistics SET view_num = view_num + 1
        WHERE goods_id = #{goodsId} AND statistic_date = #{nowDate}
    </update>
    <select id="selectMonthViewNum" resultType="java.lang.Integer">
        SELECT IF(SUM(view_num) IS NULL,0,SUM(view_num))
        FROM com_shop_flower_goods_view_statistics
        WHERE goods_id = #{goodsId} AND (statistic_date LIKE CONCAT(#{moth}, '%') OR statistic_date IS NULL)
    </select>
    <select id="selectDayViewNum" resultType="java.lang.Integer">
        SELECT IF(SUM(view_num) IS NULL,0,SUM(view_num))
        FROM com_shop_flower_goods_view_statistics
        WHERE goods_id = #{goodsId} AND (statistic_date = #{day} OR statistic_date IS NULL)
    </select>
    <select id="selectSumForViewNum" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientViewStatisticsVO">
        SELECT goods_id, SUM(view_num) AS totalViewNum
        FROM com_shop_flower_goods_view_statistics GROUP BY goods_id
    </select>
    <select id="selectTotalViewNum" resultType="java.lang.Integer">
        SELECT IF(SUM(view_num) IS NULL,0,SUM(view_num))
        FROM com_shop_flower_goods_view_statistics
        WHERE goods_id = #{goodsId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml

@@ -113,6 +113,12 @@
        <if test='pageComShopOrderSearchDTO.deliveryType != null '>
            AND sr.delivery_type = #{pageComShopOrderSearchDTO.deliveryType}
        </if>
        <if test="pageComShopOrderSearchDTO.keyWord != null and pageComShopOrderSearchDTO.keyWord != ''">
            AND (ss.name like concat('%',#{pageComShopOrderSearchDTO.keyWord}, '%')
                OR sr.order_no like concat('%',#{pageComShopOrderSearchDTO.keyWord}, '%')
                OR og.goods_name like concat('%',#{pageComShopOrderSearchDTO.keyWord}, '%')
            )
        </if>
        GROUP BY sr.id ORDER BY sr.create_at DESC
    </select>
    <update id="updateOrder">
@@ -215,5 +221,11 @@
                and store_id = #{storeId}
            </if>
    </select>
    <select id="selectTurnover" resultType="java.math.BigDecimal">
         SELECT IFNULL(sum(pay_amount),0) as count FROM com_shop_flower_order  WHERE   `status` not in (6,7) and store_id = #{storeId}
    </select>
    <select id="selectSettlement" resultType="java.math.BigDecimal">
        SELECT IFNULL(sum(pay_amount),0) as count FROM com_shop_flower_order  WHERE   `status` in (4,5) and create_at &lt;= date_sub(now(), INTERVAL 15 DAY)
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderPayDAO.xml

@@ -26,5 +26,17 @@
    id, order_no, pay_no, wx_trade_no, pay_status, order_amount, pay_amount, pay_time, 
    create_at, update_at
  </sql>
  <select id="pageOrderPay" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPayVO">
    SELECT * FROM `com_shop_flower_order_pay` WHERE 1=1
    <if test="pageComShopFlowerOrderPayDTO.type != null and  pageComShopFlowerOrderPayDTO.type == 1">
      and pay_type = 1 OR (pay_type = 2 and refund_status = 3)
    </if>
    <if test="pageComShopFlowerOrderPayDTO.type != null and  pageComShopFlowerOrderPayDTO.type == 2">
      and  pay_type = 2
    </if>
    <if test="pageComShopFlowerOrderPayDTO.storeId != null">
      and store_id = #{pageComShopFlowerOrderPayDTO.storeId}
    </if>
  </select>

</mapper>