#feat 修复bug

yanghui

2022-12-02 b575038bb213fdf3b5383e881cb609d14d190252

#feat 修复bug

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

@@ -24,6 +24,9 @@
    @ApiModelProperty(value = "店铺id")
    private Long storeId;

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

    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;


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

@@ -84,4 +84,15 @@

    @ApiModelProperty("所属分类")
    private String categoryName;
    /**
     * 浏览量
     */
    @ApiModelProperty("浏览量")
    private Integer viewNum;

    /**
     * 规格名称
     */
    @ApiModelProperty("规格名称")
    private String goodsAttrName;
}

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

@@ -132,6 +132,7 @@
    @ApiOperation(value = "商家后台-退款订单 分页查询",response = ComShopFlowerRefundOrderVO.class)
    public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO){
        pageComOrderRefundDTO.setBackstageUserId(this.getUserId());
        pageComOrderRefundDTO.setStoreId(null);
        return communityService.pageRefundOrder(pageComOrderRefundDTO);
    }


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

@@ -139,6 +139,7 @@
                        shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().lambda()
                                .eq(ComShopFlowerGoodsAttrDO::getGoodsId, shopGoods.getId()));
                ArrayList<AddShopFlowerGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
                StringBuilder sbr = new StringBuilder();
                int stock = 0;
                int sale = 0;
                for (ComShopFlowerGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
@@ -148,11 +149,15 @@
                    goodsAttrVOList.add(goodsAttrVO);
                    sale = sale + oneGoodsAttrDO.getSale();
                    stock = stock +oneGoodsAttrDO.getStock();
                    sbr.append(oneGoodsAttrDO.getGoodsAttrName()).append(" ");
                }
                shopGoods.setGoodsAttrName(sbr.toString());
                shopGoods.setGoodsAttrs(goodsAttrVOList);
                if (CollUtil.isNotEmpty(goodsAttrDOs)){
                    shopGoods.setGoodsPic(goodsAttrDOs.get(0).getAttrPic());
                }
                //设置商品总浏览量
                shopGoods.setViewNum(comShopFlowerGoodsViewStatisticsDAO.selectTotalViewNum(shopGoods.getId()));
                String categoryNames = convenientGoodsCategoryDAO.selectCategoryScopeByGoodsId(shopGoods.getId());
                shopGoods.setCategoryName(categoryNames);
                shopGoods.setStock(stock);

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

@@ -145,14 +145,15 @@
            comShopFlowerRefundOrderVO.setOrderGoodsVOList(orderGoodsVOS);
            comShopFlowerRefundOrderVO.setGoodsName(sbr.toString());

            ConvenientMerchantVO shopStoreVO = new ConvenientMerchantVO();

            // 查询店铺信息
/*           ConvenientMerchantVO shopStoreVO = new ConvenientMerchantVO();
            ConvenientMerchantDO shopStoreDO = convenientMerchantDAO.selectById(comShopFlowerRefundOrderVO.getStoreId());
            if (shopStoreDO != null) {
                BeanUtils.copyProperties(shopStoreDO, shopStoreVO);
            }
            comShopFlowerRefundOrderVO.setConvenientMerchantVO(shopStoreVO);
            comShopFlowerRefundOrderVO.setStoreName(shopStoreVO.getName());
*/

        }
        return R.ok(pages);

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

@@ -31,7 +31,10 @@
    refund_time, handle_result, remark,cancel_time
  </sql>
    <select id="pageRefundOrder" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerRefundOrderVO">
      select ro.* from com_shop_flower_refund_order ro left join com_convenient_merchants cm on ro.store_id = cm.id   where  1=1
      select ro.*,cm.name as store_name from com_shop_flower_refund_order ro
      left join com_convenient_merchants cm on ro.store_id = cm.id
      left join com_shop_flower_order_goods g on g.order_id = ro.order_id
      where  1=1
      <if test="pageComOrderRefundDTO.status != null">
        and ro.status = #{pageComOrderRefundDTO.status}
      </if>
@@ -44,6 +47,13 @@
      <if test="pageComOrderRefundDTO.backstageUserId != null">
        and cm.user_id = #{pageComOrderRefundDTO.backstageUserId}
      </if>
      <if test="pageComOrderRefundDTO.keyWord != null">
        and (
        cm.`name` like concat(#{pageComOrderRefundDTO.keyWord}, '%' ) or
        ro.order_no like concat(#{pageComOrderRefundDTO.keyWord}, '%' ) or
        g.goods_attr_name like concat(#{pageComOrderRefundDTO.keyWord}, '%' )
        )
      </if>
      order by ro.create_at desc
    </select>
  <select id="selectCountByStoreId" resultType="java.lang.Integer">