#feat 已解决

yanghui

2022-12-01 433da93fdd4441eefb4f8939d69421b54c6fcb3f

#feat 已解决

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

@@ -19,6 +19,8 @@
    private String storeName;
    @ApiModelProperty(value = "店铺Id")
    private Long storeId;
    @ApiModelProperty(value = "商品分类id")
    private Long categoryIds;

    @ApiModelProperty(value = "商品状态(1.出售中  2.已下架  3.回收站)", example = "1")
    private Integer status;

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

@@ -81,4 +81,7 @@

    @ApiModelProperty("规格")
    private List<AddShopFlowerGoodsAttrVO> goodsAttrs;

    @ApiModelProperty("所属分类")
    private String categoryName;
}

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

@@ -139,16 +139,24 @@
                        shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().lambda()
                                .eq(ComShopFlowerGoodsAttrDO::getGoodsId, shopGoods.getId()));
                ArrayList<AddShopFlowerGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
                int stock = 0;
                int sale = 0;
                for (ComShopFlowerGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
                    AddShopFlowerGoodsAttrVO goodsAttrVO = new AddShopFlowerGoodsAttrVO();
                    BeanUtils.copyProperties(oneGoodsAttrDO, goodsAttrVO);
                    goodsAttrVO.setGoodsAttrId(oneGoodsAttrDO.getId());
                    goodsAttrVOList.add(goodsAttrVO);
                    sale = sale + oneGoodsAttrDO.getSale();
                    stock = stock +oneGoodsAttrDO.getStock();
                }
                shopGoods.setGoodsAttrs(goodsAttrVOList);
                if (CollUtil.isNotEmpty(goodsAttrDOs)){
                    shopGoods.setGoodsPic(goodsAttrDOs.get(0).getAttrPic());
                }
                String categoryNames = convenientGoodsCategoryDAO.selectCategoryScopeByGoodsId(shopGoods.getId());
                shopGoods.setCategoryName(categoryNames);
                shopGoods.setStock(stock);
                shopGoods.setSale(sale);
            });
        }
        return R.ok(comShopStoreVOIPage);

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

@@ -520,15 +520,33 @@
            }
        }
        //设置退款金额
        ComShopFlowerRefundOrderDO comShopFlowerRefundOrderDO = comShopFlowerRefundOrderDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerRefundOrderDO>().eq(ComShopFlowerRefundOrderDO::getOrderId, shopOrderDO.getOrderNo()));
        ComShopFlowerRefundOrderDO comShopFlowerRefundOrderDO = comShopFlowerRefundOrderDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerRefundOrderDO>().eq(ComShopFlowerRefundOrderDO::getOrderId, shopOrderDO.getId()));
        if (nonNull(comShopFlowerRefundOrderDO)) {
            orderVO.setRefundAmount(comShopFlowerRefundOrderDO.getRefundAmount());
            orderVO.setRefundTime(comShopFlowerRefundOrderDO.getRefundTime());
        }

        //如果状态时取消状态，更新时间为去取消时间
        if (shopOrderDO.getStatus() == ComShopFlowerOrderDO.status.yqx) {
            orderVO.setCancelTime(shopOrderDO.getUpdateAt());
        }
        //判断是否可以退款 订单是否已超过15天 是否已有退款订单
        int count = comShopFlowerRefundOrderDAO.selectCountRefundNowByOrderId(orderId);
        if (count > 0){
            orderVO.setRefundable(2);
        }else {
            if (null == orderVO.getReceivingTime()){
                orderVO.setRefundable(2);
            }else {
                //收货时间往前推15天和当前时间做比较
                Date date = DateUtils.addDay(orderVO.getReceivingTime(), 15);
                if(date.before(new Date())){
                    orderVO.setRefundable(2);
                }
            }
        }



        return R.ok(orderVO);
    }

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

@@ -36,6 +36,7 @@
        storeName,c.name,c.store_id,c.goods_pic,c.images,c.status,c.sale,c.original_price,c.price,c.unit,c.order,c.stock,c.details,c.remark,c.goods_describe,c.delivery_type,c.delete_status,c.create_at,c.update_at
        from com_shop_flower_goods c
        left join com_convenient_merchants ccm on c.store_id=ccm.id
        left join  com_convenient_goods_scope as cgs on cgs.goods_id = c.id
        where  c.delete_status = 1 and ccm.is_del = 0
            <if test='pageComShopFlowerGoodsDTO.storeName != null and pageComShopFlowerGoodsDTO.storeName.trim() != &quot;&quot;'>
                and ccm.name like concat('%',#{pageComShopFlowerGoodsDTO.storeName},'%')
@@ -49,6 +50,9 @@
            <if test='pageComShopFlowerGoodsDTO.status != null'>
                and c.status like concat('%',#{pageComShopFlowerGoodsDTO.status},'%')
            </if>
            <if test='pageComShopFlowerGoodsDTO.categoryIds != null '>
                AND cgs.goods_category_id = #{pageComShopFlowerGoodsDTO.categoryIds}
            </if>
        <if test='pageComShopFlowerGoodsDTO.userId != null'>
            and ccm.user_id = #{pageComShopFlowerGoodsDTO.userId}
        </if>