lidongdong
2023-09-06 29e6855302b602f8dc3fac25c5e123d2646cf552
新增社区商家模块系统配置
4个文件已修改
6个文件已添加
485 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCommunityConfigVO.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerCommunityConfigDao.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCommunityConfig.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerCommunityConfigService.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCommunityConfigServiceImpl.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCommunityConfigMapper.xml 126 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -508,4 +508,25 @@
        return communityService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId);
    }
    /***************************************************************************************************************
     *
     *                               路北社区系统配置   商家折扣      兑换地点信息
     *
     ****************************************************************************************************************/
    /**
     * 详情
     * @param
     * @return
     */
    @GetMapping("/Community/Config/getData")
    public R ConfiggetData(@RequestParam("communityId") String communityId)
    {
        return communityService.ConfiggetData(communityId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCommunityConfigVO.java
New file
@@ -0,0 +1,63 @@
package com.panzhihua.service_community.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("志愿者社区商家配置")
public class VolunteerCommunityConfigVO implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    @ApiModelProperty(value = "社区id")
    private String communityId;
    @ApiModelProperty(value = "折扣id")
    private String discountId;
    @ApiModelProperty(value = "兑换地址")
    private String address;
    @ApiModelProperty(value = "纬度")
    private String lat;
    @ApiModelProperty(value = "经度")
    private String lng;
    @ApiModelProperty(value = "是否开启提现 0不开  1开启")
    private String isOpneWithdraw;
    @ApiModelProperty(value = "兑换状态(1每天  2周一到周五   3周末)")
    private String businessType;
    @ApiModelProperty(value = "兑换开始时间")
    private String businessStartTime;
    @ApiModelProperty(value = "结束开始时间")
    private String businessEndTime;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -39,6 +39,7 @@
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.VolunteerCommunityConfigVO;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
@@ -11762,6 +11763,27 @@
    /***************************************************************************************************************
     *
     *                               路北社区系统配置   商家折扣      兑换地点信息
     *
     ****************************************************************************************************************/
    /**
     * 详情
     * @param
     * @return
     */
    @GetMapping("/VolunteerMerchant/Community/Config/getData")
    public R ConfiggetData(@RequestParam("communityId") String communityId);
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/VolunteerMerchant/Community/Config/insertvo")
    public R Configinsertvo(@RequestBody VolunteerCommunityConfigVO item);
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java
@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.community.VolunteerMerchantWithdrawVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.VolunteerCommunityConfigVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -257,4 +258,34 @@
    }
    /***************************************************************************************************************
     *
     *                               路北社区系统配置   商家折扣      兑换地点信息
     *
     ****************************************************************************************************************/
    /**
     * 详情
     * @param
     * @return
     */
    @GetMapping("/Community/Config/getData")
    public R ConfiggetData(@RequestParam("communityId") String communityId)
    {
        return vtService.ConfiggetData(communityId);
    }
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/Community/Config/insertvo")
    public R Configinsertvo(@RequestBody VolunteerCommunityConfigVO item)
    {
        return vtService.Configinsertvo(item);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java
@@ -5,6 +5,9 @@
import com.panzhihua.common.model.vos.community.VolunteerMerchantVO;
import com.panzhihua.common.model.vos.community.VolunteerMerchantWithdrawVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.VolunteerCommunityConfig;
import com.panzhihua.service_community.entity.VolunteerCommunityConfigVO;
import com.panzhihua.service_community.service.VolunteerCommunityConfigService;
import com.panzhihua.service_community.service.VolunteerMerchantEvaluateService;
import com.panzhihua.service_community.service.VolunteerMerchantService;
import com.panzhihua.service_community.service.VolunteerMerchantWithdrawService;
@@ -235,6 +238,42 @@
    /***************************************************************************************************************
     *
     *                               路北社区系统配置   商家折扣      兑换地点信息
     *
     ****************************************************************************************************************/
    @Resource
    private VolunteerCommunityConfigService vccService;
    /**
     * 详情
     * @param
     * @return
     */
    @GetMapping("/Community/Config/getData")
    public R ConfiggetData(@RequestParam("communityId") String communityId)
    {
        return vccService.getData(communityId);
    }
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/Community/Config/insertvo")
    public R Configinsertvo(@RequestBody VolunteerCommunityConfigVO item)
    {
        R<VolunteerCommunityConfig> voR=vccService.getData(item.getCommunityId());
        if(voR==null)
        {
            return vccService.insertvo(item);
        }
        else
        {
            return vccService.update(item);
        }
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerCommunityConfigDao.java
New file
@@ -0,0 +1,37 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.VolunteerTypeVO;
import com.panzhihua.service_community.entity.VolunteerCommunityConfig;
import com.panzhihua.service_community.entity.VolunteerCommunityConfigVO;
import com.panzhihua.service_community.entity.VolunteerType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface VolunteerCommunityConfigDao extends BaseMapper<VolunteerCommunityConfig>
{
    /**
     * 详情
     * @param
     * @return
     */
    VolunteerCommunityConfig getData(@Param("communityId") String communityId);
    /**
     * 新增
     * @param
     * @return
     */
    int insertvo(@Param("item") VolunteerCommunityConfigVO item);
    int update(@Param("item") VolunteerCommunityConfigVO item);
    int delete(@Param("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCommunityConfig.java
New file
@@ -0,0 +1,63 @@
package com.panzhihua.service_community.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("志愿者社区商家配置")
public class VolunteerCommunityConfig implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    @ApiModelProperty(value = "社区id")
    private String communityId;
    @ApiModelProperty(value = "折扣id")
    private String discountId;
    @ApiModelProperty(value = "兑换地址")
    private String address;
    @ApiModelProperty(value = "纬度")
    private String lat;
    @ApiModelProperty(value = "经度")
    private String lng;
    @ApiModelProperty(value = "是否开启提现 0不开  1开启")
    private String isOpneWithdraw;
    @ApiModelProperty(value = "兑换状态(1每天  2周一到周五   3周末)")
    private String businessType;
    @ApiModelProperty(value = "兑换开始时间")
    private String businessStartTime;
    @ApiModelProperty(value = "结束开始时间")
    private String businessEndTime;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerCommunityConfigService.java
New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.VolunteerCommunityConfig;
import com.panzhihua.service_community.entity.VolunteerCommunityConfigVO;
public interface VolunteerCommunityConfigService extends IService<VolunteerCommunityConfig>
{
    /**
     * 详情
     * @param
     * @return
     */
    R getData(String communityId);
    /**
     * 新增
     * @param
     * @return
     */
    R insertvo(VolunteerCommunityConfigVO item);
    R update(VolunteerCommunityConfigVO item);
    R delete(String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCommunityConfigServiceImpl.java
New file
@@ -0,0 +1,54 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.VolunteerCommunityConfigDao;
import com.panzhihua.service_community.entity.VolunteerCommunityConfig;
import com.panzhihua.service_community.entity.VolunteerCommunityConfigVO;
import com.panzhihua.service_community.service.VolunteerCommunityConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class VolunteerCommunityConfigServiceImpl extends ServiceImpl<VolunteerCommunityConfigDao,
        VolunteerCommunityConfig> implements VolunteerCommunityConfigService {
    @Override
    public R  getData(String communityId)
    {
        return R.ok(baseMapper.getData(communityId));
    }
    @Override
    public R  insertvo(VolunteerCommunityConfigVO item) {
        int num= baseMapper.insertvo(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
    @Override
    public R  update(VolunteerCommunityConfigVO item) {
        int num= baseMapper.update(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
    @Override
    public R  delete(String id) {
        int num= baseMapper.delete(id);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCommunityConfigMapper.xml
New file
@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.VolunteerCommunityConfigDao">
    <resultMap type="com.panzhihua.service_community.entity.VolunteerCommunityConfig" id="VolunteerCommunityConfigMap">
        <result property="id" column="id" />
        <result property="creationTime" column="creation_time" />
        <result property="updateTime" column="update_time" />
        <result property="communityId" column="community_id" />
        <result property="discountId" column="discount_id" />
        <result property="address" column="address" />
        <result property="lat" column="lat" />
        <result property="lng" column="lng" />
        <result property="isOpneWithdraw" column="is_opne_withdraw" />
        <result property="businessType" column="business_type" />
        <result property="businessStartTime" column="business_start_time" />
        <result property="businessEndTime" column="business_end_time" />
    </resultMap>
    <!-- 分页查询 -->
    <select id="getData" resultMap="VolunteerCommunityConfigMap">
        select
            id,
            community_id,
            discount_id,
            address,
            lat,
            lng,
            is_opne_withdraw,
            business_end_time,
            business_start_time,
            business_type,
            creation_time,
            update_time
        from volunteer_community_config
        where community_id=#{communityId}
    </select>
    <insert id="insertvo">
        insert into volunteer_community_config
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="item.id != null">
                id,
            </if>
            <if test="item.communityId != null">
                community_id,
            </if>
            <if test="item.discountId != null">
                discount_id,
            </if>
            <if test="item.address != null">
                address,
            </if>
            <if test="item.lat != null">
                lat,
            </if>
            <if test="item.lng != null">
                lng,
            </if>
            <if test="item.isOpneWithdraw != null">
                is_opne_withdraw,
            </if>
            creation_time
        </trim>
        values
        <trim prefix="("  suffix=")" suffixOverrides=",">
            <if test="item.id != null">
                #{item.id},
            </if>
            <if test="item.communityId != null">
                #{item.communityId},
            </if>
            <if test="item.discountId != null">
                #{item.discountId},
            </if>
            <if test="item.address != null">
                #{item.address},
            </if>
            <if test="item.lat != null">
                #{item.lat},
            </if>
            <if test="item.lng != null">
                #{item.lng},
            </if>
            <if test="item.isOpneWithdraw != null">
                #{item.isOpneWithdraw},
            </if>
            sysdate()
        </trim>
    </insert>
    <update id="update">
        update volunteer_community_config
        <set>
            <if test="item.id != null">
                id=#{item.id},
            </if>
            <if test="item.communityId != null">
                community_id=#{item.communityId},
            </if>
            <if test="item.discountId != null">
                discount_id=#{item.discountId},
            </if>
            <if test="item.address != null">
                address=#{item.address},
            </if>
            <if test="item.lat != null">
                lat=#{item.lat},
            </if>
            <if test="item.lng != null">
                lng=#{item.lng},
            </if>
            <if test="item.isOpneWithdraw != null">
                is_opne_withdraw=#{item.isOpneWithdraw},
            </if>
            update_time=sysdate()
        </set>
        where community_id=#{item.communityId}
    </update>
    <delete id="delete" parameterType="String">
        delete from volunteer_community_config where id=#{id}
    </delete>
</mapper>