Merge branch 'local_20221104' into haucheng_panzhihua

yanghui

2022-12-08 b0ed7e9b876732f695e6b48d505a5c655deb7641

Merge branch 'local_20221104' into haucheng_panzhihua

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

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

    /**
     * 商家 分页查询退款订单
     *
     * @param pageComOrderRefundDTO
     * @return
     */
    @PostMapping("pageRefundOrderStore")
    @ApiOperation(value = "退款订单分页查询 商家", response = ComShopFlowerRefundOrderVO.class)
    public R pageRefundOrderStore(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (null != loginUserInfo.getBackstageType() && 5 == loginUserInfo.getBackstageType()){
            pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId());
        }else {
            pageComOrderRefundDTO.setUserId(this.getUserId());
        }
        pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId());
        return communityService.pageRefundOrder(pageComOrderRefundDTO);
    }


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

@@ -40,7 +40,17 @@
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestParam("province") String province, @RequestParam("city") String city, @RequestParam("county")String country,@RequestParam("town")String town) {
        return this.bcRegionService.pageList(province,city,country,town);
        return this.bcRegionService.pageList(province, city, country, town);
    }
        /**
     * 关键字查询
     *
     * @param province 查询实体
     * @return 所有数据
     */
    @PostMapping("selectCommunityCodeByName")
    public R selectCommunityCodeByName( @RequestParam("city") String city, @RequestParam("county")String country,@RequestParam("town")String town,@RequestParam("villagetr") String villagetr) {
        return this.bcRegionService.selectCommunityCodeByName(city,country,town,villagetr);
    }
    @GetMapping("levelList")
    public R levelList(@RequestParam("level")Integer level,@RequestParam("code")String code){

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

@@ -29,6 +29,16 @@
     */
    String selectByName(@Param("province") String province,@Param("city") String city,@Param("county")String country,@Param("town")String town);

    /**
     * 通过名称查询社区编码
     * @param city
     * @param country
     * @param town
     * @param villagetr
     * @return
     */
    String selectCommunityCodeByName(@Param("city") String city,@Param("county")String country,@Param("town")String town,@Param("villagetr") String villagetr);

    List<ProvinceCityReturnVO> selectFirst();

    List<ProvinceCityReturnVO> selectSecond(String name);

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

@@ -21,6 +21,8 @@
     */
    R pageList(String province, String city, String country,String town);

    R selectCommunityCodeByName( String city, String country,String town,String villagetr);

    /**
     * 四级联动列表
     * @return

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

@@ -35,6 +35,11 @@
    }

    @Override
    public R selectCommunityCodeByName( String city, String country,String town,String villagetr) {
        return R.ok(this.baseMapper.selectCommunityCodeByName(city,country,town,villagetr));
    }

    @Override
    public R levelList(Integer level,String code) {
        if(level==1){
            List<ProvinceCityReturnVO> firstLevel=this.baseMapper.selectFirst();

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

@@ -199,9 +199,9 @@
        if (goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.deleteStatus.yes)) {
            return R.fail(403, "商品不存在");
        }
        if (!goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
            return R.fail(405, "商品已下架");
        }
//        if (!goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
//            return R.fail(405, "商品已下架");
//        }

        // 根据商品id查询商品规格信息
        List<ComShopFlowerGoodsAttrVO> goodsAttrList = new ArrayList<>();

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

@@ -35,6 +35,23 @@
        limit 1
    </select>

    <select id="selectCommunityCodeByName" resultType="string">
        SELECT distinct code FROM area_index_2022 where 1=1
        <if test="city !=null and city!=''">
            and city =#{city}
        </if>
        <if test="county !=null and county!=''">
            and county like concat(#{county},'%')
        </if>
        <if test="town !=null and town!=''">
            and town = #{town}
        </if>
        <if test="villagetr !=null and villagetr!=''">
            and villagetr like concat(#{villagetr},'%')
        </if>
        limit 1
    </select>

    <select id="selectFirst" resultType="com.panzhihua.common.model.vos.community.ProvinceCityReturnVO">
        select distinct  name,code from area_code_2022 where level=1
    </select>

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

@@ -29,7 +29,7 @@
    <select id="pageDelivery" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerOrderDeliveryVO">
        select * from com_shop_flower_order_delivery where 1=1
        <if test="pageComFlowerOrderDeliveryDTO.deliveryNo != null and pageComFlowerOrderDeliveryDTO.deliveryNo != ''">
            and delivery_no like concat(#{pageComFlowerOrderDeliveryDTO.deliveryNo}, '%' )
            and delivery_no like concat( '%',#{pageComFlowerOrderDeliveryDTO.deliveryNo}, '%' )
        </if>
        <if test="pageComFlowerOrderDeliveryDTO.deliveryStatus != null">
            and delivery_status = #{pageComFlowerOrderDeliveryDTO.deliveryStatus}