lidongdong
2023-09-06 d546d22fdcbaa8291dcbf98020ba88d10b9ffed9
新增折扣模块   修改系统设置兑换时间bug
5个文件已修改
194 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCommunityConfigMapper.xml 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -527,6 +527,23 @@
    }
    /*******************************************************************************************************************
     *
     *
     *                         社区折扣
     *
     *
     ******************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/community/discount/getList")
    public R CommunityDiscountgetList(@RequestParam("communityId") String communityId)
    {
        return communityService.CommunityDiscountgetList(communityId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11787,6 +11787,38 @@
    /*******************************************************************************************************************
     *
     *
     *                         社区折扣
     *
     *
     ******************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerMerchant/community/discount/getList")
    public R CommunityDiscountgetList(@RequestParam("communityId") String communityId);
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/VolunteerMerchant/community/discount/insert")
    public R CommunityDiscountinsert(@RequestBody VolunteerCommunityDiscountVO item);
    @PostMapping("/VolunteerMerchant/community/discount/update")
    public R CommunityDiscountupdate(@RequestBody VolunteerCommunityDiscountVO item);
    @DeleteMapping("/VolunteerMerchant/community/discount/delete")
    public R CommunityDiscountdelete(@RequestParam("id") String id);
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java
@@ -2,6 +2,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerCommunityDiscountVO;
import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
import com.panzhihua.common.model.vos.community.VolunteerMerchantVO;
import com.panzhihua.common.model.vos.community.VolunteerMerchantWithdrawVO;
@@ -287,5 +288,49 @@
    }
    /*******************************************************************************************************************
     *
     *
     *                         社区折扣
     *
     *
     ******************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/community/discount/getList")
    public R CommunityDiscountgetList(@RequestParam("communityId") String communityId)
    {
        return vtService.CommunityDiscountgetList(communityId);
    }
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/community/discount/insert")
    public R CommunityDiscountinsert(@RequestBody VolunteerCommunityDiscountVO item)
    {
        return vtService.CommunityDiscountinsert(item);
    }
    @PostMapping("/community/discount/update")
    public R CommunityDiscountupdate(@RequestBody VolunteerCommunityDiscountVO item)
    {
        return vtService.CommunityDiscountupdate(item);
    }
    @DeleteMapping("/community/discount/delete")
    public R CommunityDiscountdelete(@RequestParam("id") String id)
    {
        return vtService.CommunityDiscountdelete(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java
@@ -1,21 +1,21 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerCommunityDiscountVO;
import com.panzhihua.common.model.vos.community.VolunteerMerchantEvaluateVO;
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;
import com.panzhihua.service_community.entity.VolunteerCommunityDiscount;
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@Slf4j
@RestController
@@ -276,4 +276,69 @@
            return vccService.update(item);
        }
    }
    /*******************************************************************************************************************
     *
     *
     *                         社区折扣
     *
     *
     ******************************************************************************************************************/
    @Resource
    private VolunteerCommunityDiscountService vcdService;
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/community/discount/getList")
    public R CommunityDiscountgetList(@RequestParam("communityId") String communityId)
    {
        return R.ok(vcdService.getList(communityId));
    }
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/community/discount/insert")
    public R CommunityDiscountinsert(@RequestBody VolunteerCommunityDiscountVO item)
    {
        int num=  vcdService.insert(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
    @PostMapping("/community/discount/update")
    public R CommunityDiscountupdate(@RequestBody VolunteerCommunityDiscountVO item)
    {
        int num=  vcdService.update(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
    @DeleteMapping("/community/discount/delete")
    public R CommunityDiscountdelete(@RequestParam("id") String id)
    {
        int num=  vcdService.delete(id);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCommunityConfigMapper.xml
@@ -61,6 +61,15 @@
            <if test="item.isOpneWithdraw != null">
                is_opne_withdraw,
            </if>
            <if test="item.businessEndTime != null">
                business_end_time,
            </if>
            <if test="item.businessStartTime != null">
                business_start_time,
            </if>
            <if test="item.businessType != null">
                business_type,
            </if>
            creation_time
        </trim>
        values
@@ -85,6 +94,15 @@
            </if>
            <if test="item.isOpneWithdraw != null">
                #{item.isOpneWithdraw},
            </if>
            <if test="item.businessEndTime != null">
                #{item.businessEndTime},
            </if>
            <if test="item.businessStartTime != null">
                #{item.businessStartTime},
            </if>
            <if test="item.businessType != null">
                #{item.businessType},
            </if>
            sysdate()
        </trim>
@@ -114,6 +132,15 @@
            <if test="item.isOpneWithdraw != null">
                is_opne_withdraw=#{item.isOpneWithdraw},
            </if>
            <if test="item.businessEndTime != null">
                business_end_time=#{item.businessEndTime},
            </if>
            <if test="item.businessStartTime != null">
                business_start_time=#{item.businessStartTime},
            </if>
            <if test="item.businessType != null">
                business_type=#{item.businessType},
            </if>
            update_time=sysdate()
        </set>
        where community_id=#{item.communityId}