Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 d5169c9fa423292a1efc372b804b0a1eecad8dee

Merge branch 'local_20221104' into huacheng_test

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

@@ -28,4 +28,6 @@

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;
    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;
}

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

@@ -68,10 +68,6 @@
    @ApiModelProperty(value = "支付单号")
    private String payNo;

    @ApiModelProperty(value = "发货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date deliveryTime;

    @ApiModelProperty(value = "收货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date receivingTime;
@@ -121,4 +117,16 @@

    @ApiModelProperty(value = "商品规格图")
    private String goodsAttrPic;

    @ApiModelProperty(value = "取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date cancelTime;

    @ApiModelProperty(value = "配送时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date deliveryTime;

    @ApiModelProperty(value = "送达时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date serviceTime;
}

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

@@ -11103,4 +11103,12 @@
     * @return
     */
    @GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type")  Integer type,@RequestParam("tab")  Integer tab);

    /**
     * 统计上架的上下架商品数量
     * @param userId
     * @return
     */
    @GetMapping("/shopFlower/countSaleByUserId")
    R countSaleByUserId(@RequestParam("userId") Long userId);
}

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

@@ -58,6 +58,7 @@
    @ApiOperation(value = "分页查询商品", response = PageShopGoodsVO.class)
    @PostMapping("/goods/page")
    public R pageGoodsList(@RequestBody PageComShopFlowerGoodsDTO pageComShopGoodsDTO) {
        pageComShopGoodsDTO.setUserId(this.getUserId());
        return communityService.pageFlowerGoodsList(pageComShopGoodsDTO);
    }

@@ -183,4 +184,14 @@
        return communityService.selectOrderLineChart(storeId,type,tab);
    }

    /**
     * 统计上架的上下架商品数量
     * @return
     */
    @ApiOperation(value = "商家后台-上下架商品数量")
    @GetMapping("/countSale")
    public R countSale(){
        return communityService.countSaleByUserId(this.getUserId());
    }

}

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

@@ -567,5 +567,14 @@
        return comShopFlowerOrderService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO);
    }

    /**
     * 统计上架的上下架商品数量
     * @param userId
     * @return
     */
    @GetMapping("/countSaleByUserId")
    R countSaleByUserId(@RequestParam("userId") Long userId){
        return comShopFlowerGoodsService.countSaleByUserId(userId);
    }

}

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

@@ -7,10 +7,13 @@
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerStoreDTO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO;
import com.panzhihua.common.model.vos.shop.ComShopOrderStoreIdCountVO;
import com.panzhihua.common.model.vos.shop.PageShopFlowerGoodsVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @auther yh
@@ -25,7 +28,7 @@
    /**
     * 根据店铺id查询商品列表
     *
     * @param page                分页参数
     * @param page                      分页参数
     * @param pageComShopFlowerStoreDTO 请求参数
     * @return 分页商品列表
     */
@@ -34,7 +37,7 @@
    /**
     * 分页查询商品列表
     *
     * @param page            分页参数
     * @param page                  分页参数
     * @param comShopFlowerGoodsDTO 请求参数
     * @return 商品列表
     */
@@ -42,8 +45,11 @@

    /**
     * 商店内在售商品
     *
     * @param storeId
     * @return
     */
    Integer selectCountSaleByStoreId(@Param("storeId") Long storeId);

    List<ComShopOrderStoreIdCountVO> countSaleByUserId(@Param("userId") Long userId);
}

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

@@ -87,4 +87,11 @@
     */
    R incrGoodsView(Long goodsId);

    /**
     * 统计上架的上下架商品数量
     * @param userId
     * @return
     */
    R countSaleByUserId(Long userId);

}

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

@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static java.util.Objects.isNull;
@@ -341,4 +342,11 @@
        }
        return R.ok();
    }

    @Override
    public R countSaleByUserId(Long userId){
        List<ComShopOrderStoreIdCountVO> comShopOrderStoreIdCountVOS = this.baseMapper.countSaleByUserId(userId);
        Map<String, Integer> collect = comShopOrderStoreIdCountVOS.stream().collect(Collectors.toMap(ComShopOrderStoreIdCountVO::getCountName, ComShopOrderStoreIdCountVO::getCountNum));
        return R.ok(collect);
    }
}

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

@@ -477,6 +477,11 @@
            orderVO.setRefundAmount(comShopFlowerRefundOrderDO.getRefundAmount());
        }

        //如果状态时取消状态，更新时间为去取消时间
        if (shopOrderDO.getStatus() == ComShopFlowerOrderDO.status.yqx){
            orderVO.setCancelTime(shopOrderDO.getUpdateAt());
        }

        return R.ok(orderVO);
    }

@@ -641,7 +646,7 @@
        if (comShopOrderDO == null) {
            return R.fail("订单不存在");
        }
        if (!(comShopOrderDO.getStatus() == 1) || !(comShopOrderDO.getDeliveryStatus() == 1)) {
        if (!(comShopOrderDO.getStatus() == 8) || !(comShopOrderDO.getDeliveryStatus() == 1)) {
            return R.fail("订单发货失败,订单状态不允许发货");
        }


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

@@ -49,6 +49,9 @@
            <if test='pageComShopFlowerGoodsDTO.status != null'>
                and c.status like concat('%',#{pageComShopFlowerGoodsDTO.status},'%')
            </if>
        <if test='pageComShopFlowerGoodsDTO.userId != null'>
            and ccm.user_id = #{pageComShopFlowerGoodsDTO.userId}
        </if>

        order by c.create_at desc
    </select>
@@ -81,4 +84,10 @@
    </select>


    <select id="countSaleByUserId"
            resultType="com.panzhihua.common.model.vos.shop.ComShopOrderStoreIdCountVO">
        SELECT count(1) AS count_num, 'sale' AS count_name  FROM com_shop_flower_goods  g LEFT JOIN com_convenient_merchants m on g.store_id = m.id WHERE g.delete_status = 1 and m.user_id = #{userId}  and g.`status` = 1
        union all
        SELECT count(1) AS count_num, 'noSale' AS count_name  FROM com_shop_flower_goods  g LEFT JOIN com_convenient_merchants m on g.store_id = m.id WHERE g.delete_status = 1 and m.user_id =  #{userId}  and g.`status` = 2
    </select>
</mapper>