bugfixed: 商家订单导出问题

CeDo

2021-05-08 698e4871447e4a7b5459ec1684418d60f6b57269

bugfixed: 商家订单导出问题

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java

@@ -91,7 +91,7 @@
    @ApiOperation(value = "查询便民服务商家详情")
    @GetMapping("/business/get")
    public R getComCvtBusiness(@RequestParam("id") Long id) {
        return communityService.getComCvtBusiness(id, null);
        return communityService.getComCvtBusiness(id);
    }



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

@@ -29,6 +29,6 @@
    private Date payTimeEnd;
    @ApiModelProperty(value = "订单ID-如果指定了订单ID，只导出指定订单，其它搜索条件将被忽略", notes = "如果指定了订单ID，其它搜索条件将被忽略，只导出指定订单")
    private Long[] orderIds;
    @JsonIgnore
    @ApiModelProperty(hidden = true)
    private Long userId;
}

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

@@ -1218,7 +1218,7 @@
     * @return 返回结果
     */
    @GetMapping("/convenient/business/get")
    R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode);
    R getComCvtBusiness(@RequestParam("id") Long id);

    /**
     * 删除便民服务商家信息

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java

@@ -107,8 +107,7 @@
    @ApiOperation(value = "查询便民服务商家详情")
    @GetMapping("/business/get")
    public R getComCvtBusiness(@RequestParam("id") Long id) {
        String cityCode = "510400";
        return communityService.getComCvtBusiness(id, cityCode);
        return communityService.getComCvtBusiness(id);
    }

    @ApiOperation(value = "删除便民服务商家详情")

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

@@ -84,12 +84,11 @@
     * 查询便民服务商家详情
     *
     * @param id 商家主键
     * @param cityCode 城市编码
     * @return 返回结果
     */
    @GetMapping("/business/get")
    public R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode) {
        return comCvtBusinessService.getComCvtBusiness(id, cityCode);
    public R getComCvtBusiness(@RequestParam("id") Long id) {
        return comCvtBusinessService.getComCvtBusiness(id);
    }

    /**

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

@@ -37,10 +37,9 @@
    /**
     * 查询便民服务商家详情
     * @param id 商家主键
     * @param cityCode 城市编码
     * @return
     */
    R getComCvtBusiness(Long id, String cityCode);
    R getComCvtBusiness(Long id);

    /**
     * 删除便民服务商家信息

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

@@ -146,7 +146,7 @@
    }

    @Override
    public R getComCvtBusiness(Long id, String cityCode) {
    public R getComCvtBusiness(Long id) {
        ComCvtBusinessDO comCvtBusinessDO = comCvtBusinessDAO.selectById(id);
        if (null == comCvtBusinessDO) {
            return R.fail("商家不存在");
@@ -157,18 +157,11 @@

        if(comCvtBusinessDO.getAreaFlag()==1){
            LambdaQueryWrapper<ComActDO> lambdaQueryWrapper = new LambdaQueryWrapper<ComActDO>().eq(ComActDO::getState,0);
            if(!StringUtils.isEmpty(cityCode)){
                lambdaQueryWrapper.eq(ComActDO::getCityCode, cityCode);
            }
            comActDOS = comActDAO.selectList(lambdaQueryWrapper);
        }else{
            List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
            if(!ObjectUtils.isEmpty(areaIds)){
                List<ComActDO> busiDO = comActDAO.selectBatchIds(areaIds);
                if(!StringUtils.isEmpty(cityCode) && busiDO!=null && busiDO.size()>0){
                    comActDOS = busiDO.stream().filter(comActDO -> cityCode.equals(comActDO.getCityCode()))
                            .collect(Collectors.toList());
                }
            }
        }