| | |
| | | import com.panzhihua.common.model.dtos.partybuilding.*; |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.common.model.vos.community.ComActMicroWishVO; |
| | | import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; |
| | | import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO; |
| | | import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO; |
| | | import com.panzhihua.common.model.vos.user.SysTemplateConfigVO; |
| | |
| | | return newStriveForFeign.selectMerchantById(merchantId); |
| | | } |
| | | |
| | | |
| | | |
| | | /***************************************************************************************************** |
| | | * |
| | | * 用户积分任务完成情况 |
| | | * |
| | | *******************************************************************************************************/ |
| | | /** |
| | | * 列表 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "用户积分任务列表", response = IntegratingTaskVO.class) |
| | | @GetMapping("/getTaskList") |
| | | public R getIntegratingTaskList() |
| | | { |
| | | return newStriveForFeign.getIntegratingTaskList(getUserId()+"", |
| | | getCommunityId()+""); |
| | | } |
| | | |
| | | /** |
| | | * 新增 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "用户积分任务去完成 只传 status ") |
| | | @PostMapping("/addIntegratingTaskData") |
| | | public R addIntegratingTaskData(@RequestBody IntegratingTaskVO item) |
| | | { |
| | | item.setIsDraw("1"); |
| | | item.setUserId(getUserId()+""); |
| | | item.setCommunityId(getCommunityId()+""); |
| | | return newStriveForFeign.addIntegratingTaskData(item); |
| | | } |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | } |
New file |
| | |
| | | package com.panzhihua.common.model.dtos.partybuilding; |
| | | |
| | | |
| | | import io.swagger.annotations.ApiModel; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | import lombok.Data; |
| | | |
| | | import javax.validation.constraints.Min; |
| | | import javax.validation.constraints.NotNull; |
| | | |
| | | @Data |
| | | @ApiModel("新双争双评积分参数") |
| | | public class NewFightIntegral |
| | | { |
| | | @ApiModelProperty(value = "用户id", required = true) |
| | | @Min(value = 1, message = "用户id不能为空") |
| | | @NotNull(message = "用户id不能为空") |
| | | private String userId; |
| | | |
| | | @ApiModelProperty(value = "社区id", required = true) |
| | | @Min(value = 1, message = "社区id不能为空") |
| | | @NotNull(message = "社区id不能为空") |
| | | private String communityId; |
| | | |
| | | |
| | | @ApiModelProperty(value = "增加还是减少 1增加 2减少") |
| | | private int addOrReduce=1; |
| | | |
| | | |
| | | @ApiModelProperty(value = "积分变动数量") |
| | | private String integralNum="0"; |
| | | |
| | | @ApiModelProperty(value = "变动备注") |
| | | private String remark; |
| | | |
| | | @ApiModelProperty(value = "业务类型 9商城积分兑换 10商家线下积分兑换 11花城登录 12 查看问题清单 " + |
| | | "13查看需求清单 14 查看报道服务活动 15查看微心愿 16 查看随手拍 17 每日签到 18 上传“随手拍”或“微心愿",required = true) |
| | | private String type="9"; |
| | | |
| | | @ApiModelProperty(value = "交易身份类型(1.居民 2.党员 3.志愿者)") |
| | | private String identityType="1"; |
| | | |
| | | @ApiModelProperty(value = "交易业务id") |
| | | private String serviceId="0"; |
| | | |
| | | @ApiModelProperty(value = "完成任务领取积分奖励的任务id") |
| | | private String taskId="0"; |
| | | |
| | | |
| | | } |
New file |
| | |
| | | package com.panzhihua.common.model.vos.community.building; |
| | | |
| | | |
| | | 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.util.Date; |
| | | |
| | | @Data |
| | | @Builder |
| | | @AllArgsConstructor |
| | | @NoArgsConstructor |
| | | @ApiModel("用户积分任务表") |
| | | public class IntegratingTaskVO |
| | | { |
| | | @ApiModelProperty(value = "主键") |
| | | private String id; |
| | | |
| | | @ApiModelProperty(value = "是否领取1未领取 2完成") |
| | | private String isDraw; |
| | | |
| | | @ApiModelProperty(value = "状态 11花城登录 12 查看问题清单 13查看需求清单 14 查看报道服务活动 15查看微心愿 16 查看随手拍 18 上传“随手拍”或“微心愿") |
| | | private String status; |
| | | |
| | | @ApiModelProperty(value = "用户id") |
| | | private String userId; |
| | | |
| | | @ApiModelProperty(value = "社区id") |
| | | private String communityId; |
| | | |
| | | @ApiModelProperty(value = "创建时间") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
| | | private Date creationTime; |
| | | |
| | | } |
| | |
| | | |
| | | import com.panzhihua.common.model.dtos.partybuilding.*; |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; |
| | | import com.panzhihua.common.model.vos.community.building.NewFightConfigVO; |
| | | import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO; |
| | | import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO; |
| | |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import javax.annotation.Resource; |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * |
| | |
| | | public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item); |
| | | |
| | | |
| | | /***************************************************************************************************** |
| | | * |
| | | * 用户积分任务完成情况 |
| | | * |
| | | *******************************************************************************************************/ |
| | | /** |
| | | * 列表 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @GetMapping("/IntegratingTask/getTaskList") |
| | | public R getIntegratingTaskList(@RequestParam("userId") String userId, |
| | | @RequestParam("communityId") String communityId); |
| | | |
| | | /** |
| | | * 新增 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @PostMapping("/IntegratingTask/addIntegratingTaskData") |
| | | public R addIntegratingTaskData(@RequestBody IntegratingTaskVO item); |
| | | |
| | | |
| | | } |
| | |
| | | * @param operator |
| | | * @return |
| | | */ |
| | | @DeleteMapping("/FightConvenient/deleteMerchantById") |
| | | @DeleteMapping("/deleteMerchantById") |
| | | public R deleteMerchantById(@RequestParam("communityId") String merchantId) { |
| | | return merchantService.deleteMerchantById(merchantId); |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.api; |
| | | |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; |
| | | import com.panzhihua.service_dangjian.entity.IntegratingTask; |
| | | import com.panzhihua.service_dangjian.service.NewFightConvenientMerchantService; |
| | | import com.panzhihua.service_dangjian.service.NewFightIntegratingTaskService; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import javax.annotation.Resource; |
| | | import java.util.List; |
| | | |
| | | @Slf4j |
| | | @RestController |
| | | @RequestMapping("/IntegratingTask") |
| | | public class NewFightIntegratingTaskApi |
| | | { |
| | | @Resource |
| | | private NewFightIntegratingTaskService taskService; |
| | | |
| | | /** |
| | | * 列表 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @GetMapping("/getTaskList") |
| | | public R<List<IntegratingTask>> getIntegratingTaskList(@RequestParam("userId") String userId, |
| | | @RequestParam("communityId") String communityId) |
| | | { |
| | | return R.ok(taskService.getList(userId,communityId)); |
| | | } |
| | | |
| | | /** |
| | | * 新增 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @PostMapping("/addIntegratingTaskData") |
| | | public R addIntegratingTaskData(@RequestBody IntegratingTaskVO item) |
| | | { |
| | | return taskService.addData(item); |
| | | } |
| | | |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.dao; |
| | | |
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUserChange; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | |
| | | /** |
| | | * @auther lyq |
| | | * @create 2021-07-28 16:03:05 |
| | | * @describe 用户积分账户变动记录mapper类 |
| | | */ |
| | | @Mapper |
| | | public interface ComActIntegralUserChangeDAO extends BaseMapper<ComActIntegralUserChange> { |
| | | |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.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.dtos.community.integral.ComActIntegralCommunityRankDTO; |
| | | import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCountDTO; |
| | | import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO; |
| | | import com.panzhihua.common.model.vos.community.integral.ComActIntegralCommunityTradeVO; |
| | | import com.panzhihua.common.model.vos.community.integral.IntegralTradeVO; |
| | | import com.panzhihua.common.model.vos.community.integral.admin.ComActIntegralUserTradeAdminVO; |
| | | import com.panzhihua.common.model.vos.community.integral.admin.IntegralUserVO; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUserTrade; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.apache.ibatis.annotations.Param; |
| | | |
| | | /** |
| | | * @auther lyq |
| | | * @create 2021-07-28 16:03:18 |
| | | * @describe 用户积分账户交易记录mapper类 |
| | | */ |
| | | @Mapper |
| | | public interface ComActIntegralUserTradeDAO extends BaseMapper<ComActIntegralUserTrade> { |
| | | |
| | | /** |
| | | * 查询用户某个时间段交易数量 |
| | | * |
| | | * @param integralCountDTO |
| | | * 请求参数 |
| | | * @return 交易数量 |
| | | */ |
| | | Integer getIntegralCount(@Param("integralCountDTO") ComActIntegralCountDTO integralCountDTO); |
| | | |
| | | /** |
| | | * 小程序-查询用户社区积分明细 |
| | | * |
| | | * @param communityTradeDTO |
| | | * 请求参数 |
| | | * @return 用户社区积分明细 |
| | | */ |
| | | IPage<ComActIntegralCommunityTradeVO> getIntegralCommunityTradeApplets(Page page, |
| | | @Param("communityTradeDTO") ComActIntegralCommunityRankDTO communityTradeDTO); |
| | | |
| | | /** |
| | | * 社区后台-分页查询社区下积分明细记录 |
| | | * |
| | | * @param integralRuleDTO |
| | | * 请求参数 |
| | | * @return 社区下积分明细记录 |
| | | */ |
| | | IPage<ComActIntegralUserTradeAdminVO> getIntegralTradeListAdmin(Page page, |
| | | @Param("integralRuleDTO") PageComActIntegralTradeDTO integralRuleDTO); |
| | | |
| | | IntegralUserVO getUserInfo(@Param("userId") Long userId); |
| | | |
| | | /** |
| | | * 获取积分详情 |
| | | * @param id |
| | | * @return |
| | | */ |
| | | IntegralTradeVO getUserIntegralDetail(@Param("id") Long id); |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.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.dtos.community.integral.ComActIntegralCommunityRankDTO; |
| | | import com.panzhihua.common.model.vos.community.integral.ComActIntegralCommunityRankVO; |
| | | import com.panzhihua.common.model.vos.community.integral.ComActIntegralUserListVO; |
| | | import com.panzhihua.common.model.vos.community.integral.ComActIntegralUserVO; |
| | | import com.panzhihua.common.model.vos.community.integral.IntegralUserRankVO; |
| | | import com.panzhihua.common.model.vos.community.integral.admin.ComActActivityPeopleVO; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUser; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.apache.ibatis.annotations.Param; |
| | | |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * @auther lyq |
| | | * @create 2021-07-28 16:02:57 |
| | | * @describe 用户积分账户表mapper类 |
| | | */ |
| | | @Mapper |
| | | public interface ComActIntegralUsersMapper extends BaseMapper<ComActIntegralUser> { |
| | | |
| | | /** |
| | | * 小程序-查询用户积分列表 |
| | | * |
| | | * @param userId |
| | | * 用户id |
| | | * @return 用户积分列表 |
| | | */ |
| | | List<ComActIntegralUserListVO> getIntegralUserListApplets(@Param("userId") Long userId); |
| | | |
| | | /** |
| | | * 小程序-查询用户在当前社区积分排名 |
| | | * |
| | | * @param userId |
| | | * 用户id |
| | | * @param communityId |
| | | * 社区id |
| | | * @return 用户在当前社区积分排名 |
| | | */ |
| | | IntegralUserRankVO getIntegralUserRank(@Param("communityId") Long communityId, @Param("userId") Long userId); |
| | | |
| | | /** |
| | | * 查询社区积分账户排行榜 |
| | | * |
| | | * @param communityRankDTO |
| | | * 请求参数 |
| | | * @return 社区积分账户排行榜 |
| | | */ |
| | | IPage<ComActIntegralCommunityRankVO> getIntegralCommunityRankApplets(Page page, |
| | | @Param("communityRankDTO") ComActIntegralCommunityRankDTO communityRankDTO); |
| | | |
| | | /** |
| | | * 根据社区活动id查询社区活动报名且未参与人员列表 |
| | | * |
| | | * @param activityId |
| | | * 活动id |
| | | * @return 社区活动报名且未参与人员列表 |
| | | */ |
| | | List<ComActActivityPeopleVO> getTaskActivityPeopleList(@Param("activityId") Long activityId); |
| | | |
| | | /** |
| | | * 积分统计 |
| | | * @param userId |
| | | * @param communityId |
| | | * @return |
| | | */ |
| | | ComActIntegralUserVO getUserIntegralStatistics(@Param("userId") Long userId, @Param("communityId") Long communityId); |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.dao; |
| | | |
| | | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| | | import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; |
| | | import com.panzhihua.service_dangjian.entity.IntegratingTask; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.apache.ibatis.annotations.Param; |
| | | |
| | | import java.util.List; |
| | | |
| | | @Mapper |
| | | public interface NewFightIntegratingTaskDao extends BaseMapper<IntegratingTask> |
| | | { |
| | | /** |
| | | * 列表 |
| | | * @param |
| | | * @return |
| | | */ |
| | | List<IntegratingTask> getList(@Param("userId") String userId, |
| | | @Param("communityId") String communityId); |
| | | |
| | | /** |
| | | * 新增 |
| | | * @param |
| | | * @return |
| | | */ |
| | | int addData(@Param("item") IntegratingTaskVO item); |
| | | |
| | | int editData(@Param("item") IntegratingTaskVO item); |
| | | |
| | | /** |
| | | * 删除 |
| | | * @param id |
| | | * @return |
| | | */ |
| | | int expurgateData(@Param("id") String id); |
| | | |
| | | int truncateData(); |
| | | |
| | | |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.entity; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.IdType; |
| | | import com.baomidou.mybatisplus.annotation.TableId; |
| | | import com.baomidou.mybatisplus.annotation.TableName; |
| | | import lombok.Data; |
| | | |
| | | import java.io.Serializable; |
| | | import java.util.Date; |
| | | |
| | | /** |
| | | * @auther lyq |
| | | * @create 2021-07-28 16:02:57 |
| | | * @describe 用户积分账户表实体类 |
| | | */ |
| | | |
| | | @Data |
| | | @TableName("com_act_integral_user") |
| | | public class ComActIntegralUser implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | /** |
| | | * 主键id |
| | | */ |
| | | @TableId(type = IdType.ASSIGN_ID) |
| | | private Long id; |
| | | |
| | | /** |
| | | * 用户id |
| | | */ |
| | | private Long userId; |
| | | |
| | | /** |
| | | * 社区id |
| | | */ |
| | | private Long communityId; |
| | | |
| | | /** |
| | | * 总积分数量 |
| | | */ |
| | | private Integer integralSum; |
| | | |
| | | /** |
| | | * 可用总积分数量 |
| | | */ |
| | | private Integer integralAvailableSum; |
| | | |
| | | /** |
| | | * 冻结总积分数量 |
| | | */ |
| | | private Integer integralFrozenSum; |
| | | |
| | | /** |
| | | * 党员积分数量 |
| | | */ |
| | | private Integer integralParty; |
| | | |
| | | /** |
| | | * 可用党员积分数量 |
| | | */ |
| | | private Integer integralAvailableParty; |
| | | |
| | | /** |
| | | * 冻结党员积分数量 |
| | | */ |
| | | private Integer integralFrozenParty; |
| | | |
| | | /** |
| | | * 志愿者积分数量 |
| | | */ |
| | | private Integer integralVolunteer; |
| | | |
| | | /** |
| | | * 可用志愿者积分数量 |
| | | */ |
| | | private Integer integralAvailableVolunteer; |
| | | |
| | | /** |
| | | * 冻结志愿者积分数量 |
| | | */ |
| | | private Integer integralFrozenVolunteer; |
| | | |
| | | /** |
| | | * 居民积分数量 |
| | | */ |
| | | private Integer integralResident; |
| | | |
| | | /** |
| | | * 可用居民积分数量 |
| | | */ |
| | | private Integer integralAvailableResident; |
| | | |
| | | /** |
| | | * 冻结居民积分数量 |
| | | */ |
| | | private Integer integralFrozenResident; |
| | | |
| | | /** |
| | | * 创建时间 |
| | | */ |
| | | private Date createAt; |
| | | |
| | | /** |
| | | * 上次积分变动时间 |
| | | */ |
| | | private Date updateAt; |
| | | |
| | | /** |
| | | * 状态(1.启用 2.禁用) |
| | | */ |
| | | private Integer status; |
| | | |
| | | private Integer integralPartyTime; |
| | | |
| | | @Override |
| | | public String toString() { |
| | | return "ComActIntegralUserDO{" + "id=" + id + ", userId=" + userId + ", communityId=" + communityId |
| | | + ", integralSum=" + integralSum + ", integralAvailableSum=" + integralAvailableSum + ", integralFrozenSum=" |
| | | + integralFrozenSum + ", integralParty=" + integralParty + ", integralAvailableParty=" |
| | | + integralAvailableParty + ", integralFrozenParty=" + integralFrozenParty + ", integralVolunteer=" |
| | | + integralVolunteer + ", integralAvailableVolunteer=" + integralAvailableVolunteer |
| | | + ", integralFrozenVolunteer=" + integralFrozenVolunteer + ", integralResident=" + integralResident |
| | | + ", integralAvailableResident=" + integralAvailableResident + ", integralFrozenResident=" |
| | | + integralFrozenResident + ", createAt=" + createAt + ", updateAt=" + updateAt + "}"; |
| | | } |
| | | |
| | | /** |
| | | * 状态(1.启用 2.禁用) |
| | | */ |
| | | public interface status { |
| | | int yes = 1; |
| | | int no = 2; |
| | | } |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.entity; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.IdType; |
| | | import com.baomidou.mybatisplus.annotation.TableId; |
| | | import com.baomidou.mybatisplus.annotation.TableName; |
| | | import lombok.Data; |
| | | |
| | | import java.io.Serializable; |
| | | import java.util.Date; |
| | | |
| | | /** |
| | | * @auther lyq |
| | | * @create 2021-07-28 16:03:05 |
| | | * @describe 用户积分账户变动记录实体类 |
| | | */ |
| | | |
| | | @Data |
| | | @TableName("com_act_integral_user_change") |
| | | public class ComActIntegralUserChange implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | /** |
| | | * 主键id |
| | | */ |
| | | @TableId(type = IdType.ASSIGN_ID) |
| | | private Long id; |
| | | |
| | | /** |
| | | * 用户id |
| | | */ |
| | | private Long userId; |
| | | |
| | | /** |
| | | * 积分账户id |
| | | */ |
| | | private Long integralId; |
| | | |
| | | /** |
| | | * 社区id |
| | | */ |
| | | private Long communityId; |
| | | |
| | | /** |
| | | * 总积分数量变动前 |
| | | */ |
| | | private Integer integralSumTop; |
| | | |
| | | /** |
| | | * 总积分数量变动后 |
| | | */ |
| | | private Integer integralSumBack; |
| | | |
| | | /** |
| | | * 可用总积分数量变动前 |
| | | */ |
| | | private Integer integralAvailableSumTop; |
| | | |
| | | /** |
| | | * 可用总积分数量变动后 |
| | | */ |
| | | private Integer integralAvailableSumBack; |
| | | |
| | | /** |
| | | * 冻结总积分数量变动前 |
| | | */ |
| | | private Integer integralFrozenSumTop; |
| | | |
| | | /** |
| | | * 冻结总积分数量变动后 |
| | | */ |
| | | private Integer integralFrozenSumBack; |
| | | |
| | | /** |
| | | * 党员积分数量变动前 |
| | | */ |
| | | private Integer integralPartyTop; |
| | | |
| | | /** |
| | | * 党员积分数量变动后 |
| | | */ |
| | | private Integer integralPartyBack; |
| | | |
| | | /** |
| | | * 可用党员积分数量变动前 |
| | | */ |
| | | private Integer integralAvailablePartyTop; |
| | | |
| | | /** |
| | | * 可用党员积分数量变动后 |
| | | */ |
| | | private Integer integralAvailablePartyBack; |
| | | |
| | | /** |
| | | * 冻结党员积分数量变动前 |
| | | */ |
| | | private Integer integralFrozenPartyTop; |
| | | |
| | | /** |
| | | * 冻结党员积分数量变动后 |
| | | */ |
| | | private Integer integralFrozenPartyBack; |
| | | |
| | | /** |
| | | * 志愿者积分数量变动前 |
| | | */ |
| | | private Integer integralVolunteerTop; |
| | | |
| | | /** |
| | | * 志愿者积分数量变动后 |
| | | */ |
| | | private Integer integralVolunteerBack; |
| | | |
| | | /** |
| | | * 可用志愿者积分数量变动前 |
| | | */ |
| | | private Integer integralAvailableVolunteerTop; |
| | | |
| | | /** |
| | | * 可用志愿者积分数量变动后 |
| | | */ |
| | | private Integer integralAvailableVolunteerBack; |
| | | |
| | | /** |
| | | * 冻结志愿者积分数量变动前 |
| | | */ |
| | | private Integer integralFrozenVolunteerTop; |
| | | |
| | | /** |
| | | * 冻结志愿者积分数量变动后 |
| | | */ |
| | | private Integer integralFrozenVolunteerBack; |
| | | |
| | | /** |
| | | * 居民积分数量变动前 |
| | | */ |
| | | private Integer integralResidentTop; |
| | | |
| | | /** |
| | | * 居民积分数量变动后 |
| | | */ |
| | | private Integer integralResidentBack; |
| | | |
| | | /** |
| | | * 可用居民积分数量变动前 |
| | | */ |
| | | private Integer integralAvailableResidentTop; |
| | | |
| | | /** |
| | | * 可用居民积分数量变动后 |
| | | */ |
| | | private Integer integralAvailableResidentBack; |
| | | |
| | | /** |
| | | * 冻结居民积分数量变动前 |
| | | */ |
| | | private Integer integralFrozenResidentTop; |
| | | |
| | | /** |
| | | * 冻结居民积分数量变动后 |
| | | */ |
| | | private Integer integralFrozenResidentBack; |
| | | |
| | | /** |
| | | * 交易记录id |
| | | */ |
| | | private Long serviceId; |
| | | |
| | | /** |
| | | * 变动时间 |
| | | */ |
| | | private Date createAt; |
| | | |
| | | @Override |
| | | public String toString() { |
| | | return "ComActIntegralUserChangeDO{" + "id=" + id + ", userId=" + userId + ", integralId=" + integralId |
| | | + ", communityId=" + communityId + ", integralSumTop=" + integralSumTop + ", integralSumBack=" |
| | | + integralSumBack + ", integralAvailableSumTop=" + integralAvailableSumTop + ", integralAvailableSumBack=" |
| | | + integralAvailableSumBack + ", integralFrozenSumTop=" + integralFrozenSumTop + ", integralFrozenSumBack=" |
| | | + integralFrozenSumBack + ", integralPartyTop=" + integralPartyTop + ", integralPartyBack=" |
| | | + integralPartyBack + ", integralAvailablePartyTop=" + integralAvailablePartyTop |
| | | + ", integralAvailablePartyBack=" + integralAvailablePartyBack + ", integralFrozenPartyTop=" |
| | | + integralFrozenPartyTop + ", integralFrozenPartyBack=" + integralFrozenPartyBack |
| | | + ", integralVolunteerTop=" + integralVolunteerTop + ", integralVolunteerBack=" + integralVolunteerBack |
| | | + ", integralAvailableVolunteerTop=" + integralAvailableVolunteerTop + ", integralAvailableVolunteerBack=" |
| | | + integralAvailableVolunteerBack + ", integralFrozenVolunteerTop=" + integralFrozenVolunteerTop |
| | | + ", integralFrozenVolunteerBack=" + integralFrozenVolunteerBack + ", integralResidentTop=" |
| | | + integralResidentTop + ", integralResidentBack=" + integralResidentBack + ", integralAvailableResidentTop=" |
| | | + integralAvailableResidentTop + ", integralAvailableResidentBack=" + integralAvailableResidentBack |
| | | + ", integralFrozenResidentTop=" + integralFrozenResidentTop + ", integralFrozenResidentBack=" |
| | | + integralFrozenResidentBack + ", serviceId=" + serviceId + ", createAt=" + createAt + "}"; |
| | | } |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.entity; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.IdType; |
| | | import com.baomidou.mybatisplus.annotation.TableId; |
| | | import com.baomidou.mybatisplus.annotation.TableName; |
| | | import lombok.Data; |
| | | |
| | | import java.io.Serializable; |
| | | import java.util.Date; |
| | | |
| | | /** |
| | | * @auther lyq |
| | | * @create 2021-07-28 16:03:18 |
| | | * @describe 用户积分账户交易记录实体类 |
| | | */ |
| | | |
| | | @Data |
| | | @TableName("com_act_integral_user_trade") |
| | | public class ComActIntegralUserTrade implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | /** |
| | | * 主键id |
| | | */ |
| | | @TableId(type = IdType.ASSIGN_ID) |
| | | private Long id; |
| | | |
| | | /** |
| | | * 用户id |
| | | */ |
| | | private Long userId; |
| | | |
| | | /** |
| | | * 积分账户id |
| | | */ |
| | | private Long integralId; |
| | | |
| | | /** |
| | | * 社区id |
| | | */ |
| | | private Long communityId; |
| | | |
| | | /** |
| | | * 交易业务id |
| | | */ |
| | | private Long serviceId; |
| | | |
| | | /** |
| | | * 交易业务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 " + |
| | | * "5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动) |
| | | */ |
| | | private Integer serviceType; |
| | | |
| | | /** |
| | | * 交易积分数量 |
| | | */ |
| | | private Integer amount; |
| | | |
| | | /** |
| | | * 变动类型(1.增加 2.减少) |
| | | */ |
| | | private Integer changeType; |
| | | |
| | | /** |
| | | * 交易备注 |
| | | */ |
| | | private String remark; |
| | | |
| | | /** |
| | | * 交易身份类型(1.居民 2.党员 3.志愿者) |
| | | */ |
| | | private Integer identityType; |
| | | |
| | | /** |
| | | * 交易时间 |
| | | */ |
| | | private Date createAt; |
| | | |
| | | /** |
| | | * 操作人id |
| | | */ |
| | | private Long createBy; |
| | | |
| | | @Override |
| | | public String toString() { |
| | | return "ComActIntegralUserTradeDO{" + "id=" + id + ", userId=" + userId + ", integralId=" + integralId |
| | | + ", communityId=" + communityId + ", serviceId=" + serviceId + ", serviceType=" + serviceType + ", amount=" |
| | | + amount + ", changeType=" + changeType + ", remark=" + remark + ", identityType=" + identityType |
| | | + ", createAt=" + createAt + ", createBy=" + createBy + "}"; |
| | | } |
| | | |
| | | /** |
| | | * 变动类型(1.增加 2.减少) |
| | | */ |
| | | public interface changeType { |
| | | int add = 1; |
| | | int reduce = 2; |
| | | } |
| | | |
| | | /** |
| | | * 交易身份类型(1.居民 2.党员 3.志愿者) |
| | | */ |
| | | public interface identityType { |
| | | int jm = 1; |
| | | int dy = 2; |
| | | int zyz = 3; |
| | | } |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.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.util.Date; |
| | | |
| | | @Data |
| | | @Builder |
| | | @AllArgsConstructor |
| | | @NoArgsConstructor |
| | | @ApiModel("用户积分任务表") |
| | | public class IntegratingTask |
| | | { |
| | | @ApiModelProperty(value = "主键") |
| | | private String id; |
| | | |
| | | @ApiModelProperty(value = "是否领取1未领取 2完成") |
| | | private String isDraw; |
| | | |
| | | @ApiModelProperty(value = "状态 11花城登录 12 查看问题清单 13查看需求清单 14 查看报道服务活动 15查看微心愿 16 查看随手拍 18 上传“随手拍”或“微心愿") |
| | | private String status; |
| | | |
| | | @ApiModelProperty(value = "用户id") |
| | | private String userId; |
| | | |
| | | @ApiModelProperty(value = "社区id") |
| | | private String communityId; |
| | | |
| | | @ApiModelProperty(value = "创建时间") |
| | | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
| | | private Date creationTime; |
| | | |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.service; |
| | | |
| | | import com.baomidou.mybatisplus.extension.service.IService; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUserChange; |
| | | |
| | | /** |
| | | * @auther lyq |
| | | * @create 2021-07-28 16:03:05 |
| | | * @describe 用户积分账户变动记录服务类 |
| | | */ |
| | | public interface ComActIntegralUserChangeDAOService extends IService<ComActIntegralUserChange> { |
| | | |
| | | /** |
| | | * 添加用户积分账户变动记录 |
| | | * |
| | | * @param userId |
| | | * 用户id |
| | | * @param integralId |
| | | * 积分账户id |
| | | * @param communityId |
| | | * 社区id |
| | | * @param integralSumTop |
| | | * 总积分数量变动前 |
| | | * @param integralSumBack |
| | | * 总积分数量变动后 |
| | | * @param integralAvailableSumTop |
| | | * 可用总积分数量变动前 |
| | | * @param integralAvailableSumBack |
| | | * 可用总积分数量变动后 |
| | | * @param integralFrozenSumTop |
| | | * 冻结总积分数量变动前 |
| | | * @param integralFrozenSumBack |
| | | * 冻结总积分数量变动后 |
| | | * @param integralPartyTop |
| | | * 党员积分数量变动前 |
| | | * @param integralPartyBack |
| | | * 党员积分数量变动后 |
| | | * @param integralAvailablePartyTop |
| | | * 可用党员积分数量变动前 |
| | | * @param integralAvailablePartyBack |
| | | * 可用党员积分数量变动后 |
| | | * @param integralFrozenPartyTop |
| | | * 冻结党员积分数量变动前 |
| | | * @param integralFrozenPartyBack |
| | | * 冻结党员积分数量变动后 |
| | | * @param integralVolunteerTop |
| | | * 志愿者积分数量变动前 |
| | | * @param integralVolunteerBack |
| | | * 志愿者积分数量变动后 |
| | | * @param integralAvailableVolunteerTop |
| | | * 可用志愿者积分数量变动前 |
| | | * @param integralAvailableVolunteerBack |
| | | * 可用志愿者积分数量变动后 |
| | | * @param integralFrozenVolunteerTop |
| | | * 冻结志愿者积分数量变动前 |
| | | * @param integralFrozenVolunteerBack |
| | | * 冻结志愿者积分数量变动后 |
| | | * @param integralResidentTop |
| | | * 居民积分数量变动前 |
| | | * @param integralResidentBack |
| | | * 居民积分数量变动后 |
| | | * @param integralAvailableResidentTop |
| | | * 可用居民积分数量变动前 |
| | | * @param integralAvailableResidentBack |
| | | * 可用居民积分数量变动后 |
| | | * @param integralFrozenResidentTop |
| | | * 冻结居民积分数量变动前 |
| | | * @param integralFrozenResidentBack |
| | | * 冻结居民积分数量变动后 |
| | | * @param serviceId |
| | | * 交易记录id |
| | | */ |
| | | void addIntegralUserChangeRecord(Long userId, Long integralId, Long communityId, Integer integralSumTop, |
| | | Integer integralSumBack, Integer integralAvailableSumTop, Integer integralAvailableSumBack, |
| | | Integer integralFrozenSumTop, Integer integralFrozenSumBack, Integer integralPartyTop, |
| | | Integer integralPartyBack, Integer integralAvailablePartyTop, Integer integralAvailablePartyBack, |
| | | Integer integralFrozenPartyTop, Integer integralFrozenPartyBack, Integer integralVolunteerTop, |
| | | Integer integralVolunteerBack, Integer integralAvailableVolunteerTop, Integer integralAvailableVolunteerBack, |
| | | Integer integralFrozenVolunteerTop, Integer integralFrozenVolunteerBack, Integer integralResidentTop, |
| | | Integer integralResidentBack, Integer integralAvailableResidentTop, Integer integralAvailableResidentBack, |
| | | Integer integralFrozenResidentTop, Integer integralFrozenResidentBack, Long serviceId); |
| | | |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.service; |
| | | |
| | | import com.baomidou.mybatisplus.extension.service.IService; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUserTrade; |
| | | |
| | | /** |
| | | * @auther lyq |
| | | * @create 2021-07-28 16:03:18 |
| | | * @describe 用户积分账户交易记录服务类 |
| | | */ |
| | | public interface ComActIntegralUserTradeDaoService extends IService<ComActIntegralUserTrade> { |
| | | |
| | | |
| | | /** |
| | | * 添加用户积分交易记录 |
| | | * |
| | | * @param userId |
| | | * 用户id |
| | | * @param integralId |
| | | * 积分账户id |
| | | * @param communityId |
| | | * 社区id |
| | | * @param serviceId |
| | | * 交易业务id |
| | | * @param serviceType |
| | | * 交易业务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 " + |
| | | * "5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动) |
| | | * @param amount |
| | | * 交易积分数量 |
| | | * @param changeType |
| | | * 变动类型(1.增加 2.减少) |
| | | * @param remark |
| | | * 交易备注 |
| | | * @param identityType |
| | | * 交易身份类型(1.居民 2.党员 3.志愿者) |
| | | * @param createBy |
| | | * 操作人id |
| | | */ |
| | | Long addIntegralTradeRecord(Long userId, Long integralId, Long communityId, Long serviceId, Integer serviceType, |
| | | Integer amount, Integer changeType, String remark, Integer identityType, Long createBy); |
| | | |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.service; |
| | | |
| | | import com.baomidou.mybatisplus.extension.service.IService; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightIntegral; |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUser; |
| | | |
| | | public interface ComActIntegralUsersService extends IService<ComActIntegralUser> |
| | | { |
| | | R upIntegral(NewFightIntegral item); |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.service; |
| | | |
| | | import com.baomidou.mybatisplus.core.metadata.IPage; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightResourceSharingDTO; |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; |
| | | import com.panzhihua.service_dangjian.entity.IntegratingTask; |
| | | import org.apache.ibatis.annotations.Param; |
| | | |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * @program: springcloud_k8s_panzhihuazhihuishequ |
| | | * @description: 党组织 |
| | | * @author: huang.hongfa weixin hhf9596 qq 959656820 |
| | | * @create: 2020-11-30 11:39 |
| | | **/ |
| | | public interface NewFightIntegratingTaskService |
| | | { |
| | | /** |
| | | * 列表 |
| | | * @param |
| | | * @return |
| | | */ |
| | | List<IntegratingTask> getList(String userId,String communityId); |
| | | |
| | | /** |
| | | * 新增 |
| | | * @param |
| | | * @return |
| | | */ |
| | | R addData(IntegratingTaskVO item); |
| | | |
| | | |
| | | R editData(IntegratingTaskVO item); |
| | | |
| | | /** |
| | | * 删除 |
| | | * @param id |
| | | * @return |
| | | */ |
| | | R expurgateData(String id); |
| | | |
| | | R truncateData(); |
| | | |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.panzhihua.common.utlis.Snowflake; |
| | | import com.panzhihua.service_dangjian.dao.ComActIntegralUserChangeDAO; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUserChange; |
| | | import com.panzhihua.service_dangjian.service.ComActIntegralUserChangeDAOService; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | import java.util.Date; |
| | | |
| | | /** |
| | | * @auther lyq |
| | | * @create 2021-07-28 16:03:05 |
| | | * @describe 用户积分账户变动记录服务实现类 |
| | | */ |
| | | @Slf4j |
| | | @Service |
| | | public class ComActIntegralUserChangeDAOServiceImpl extends |
| | | ServiceImpl<ComActIntegralUserChangeDAO, ComActIntegralUserChange> implements ComActIntegralUserChangeDAOService { |
| | | |
| | | /** |
| | | * 添加用户积分账户变动记录 |
| | | * |
| | | * @param userId |
| | | * 用户id |
| | | * @param integralId |
| | | * 积分账户id |
| | | * @param communityId |
| | | * 社区id |
| | | * @param integralSumTop |
| | | * 总积分数量变动前 |
| | | * @param integralSumBack |
| | | * 总积分数量变动后 |
| | | * @param integralAvailableSumTop |
| | | * 可用总积分数量变动前 |
| | | * @param integralAvailableSumBack |
| | | * 可用总积分数量变动后 |
| | | * @param integralFrozenSumTop |
| | | * 冻结总积分数量变动前 |
| | | * @param integralFrozenSumBack |
| | | * 冻结总积分数量变动后 |
| | | * @param integralPartyTop |
| | | * 党员积分数量变动前 |
| | | * @param integralPartyBack |
| | | * 党员积分数量变动后 |
| | | * @param integralAvailablePartyTop |
| | | * 可用党员积分数量变动前 |
| | | * @param integralAvailablePartyBack |
| | | * 可用党员积分数量变动后 |
| | | * @param integralFrozenPartyTop |
| | | * 冻结党员积分数量变动前 |
| | | * @param integralFrozenPartyBack |
| | | * 冻结党员积分数量变动后 |
| | | * @param integralVolunteerTop |
| | | * 志愿者积分数量变动前 |
| | | * @param integralVolunteerBack |
| | | * 志愿者积分数量变动后 |
| | | * @param integralAvailableVolunteerTop |
| | | * 可用志愿者积分数量变动前 |
| | | * @param integralAvailableVolunteerBack |
| | | * 可用志愿者积分数量变动后 |
| | | * @param integralFrozenVolunteerTop |
| | | * 冻结志愿者积分数量变动前 |
| | | * @param integralFrozenVolunteerBack |
| | | * 冻结志愿者积分数量变动后 |
| | | * @param integralResidentTop |
| | | * 居民积分数量变动前 |
| | | * @param integralResidentBack |
| | | * 居民积分数量变动后 |
| | | * @param integralAvailableResidentTop |
| | | * 可用居民积分数量变动前 |
| | | * @param integralAvailableResidentBack |
| | | * 可用居民积分数量变动后 |
| | | * @param integralFrozenResidentTop |
| | | * 冻结居民积分数量变动前 |
| | | * @param integralFrozenResidentBack |
| | | * 冻结居民积分数量变动后 |
| | | * @param serviceId |
| | | * 交易记录id |
| | | */ |
| | | @Override |
| | | public void addIntegralUserChangeRecord(Long userId, Long integralId, Long communityId, Integer integralSumTop, |
| | | Integer integralSumBack, Integer integralAvailableSumTop, Integer integralAvailableSumBack, |
| | | Integer integralFrozenSumTop, Integer integralFrozenSumBack, Integer integralPartyTop, |
| | | Integer integralPartyBack, Integer integralAvailablePartyTop, Integer integralAvailablePartyBack, |
| | | Integer integralFrozenPartyTop, Integer integralFrozenPartyBack, Integer integralVolunteerTop, |
| | | Integer integralVolunteerBack, Integer integralAvailableVolunteerTop, Integer integralAvailableVolunteerBack, |
| | | Integer integralFrozenVolunteerTop, Integer integralFrozenVolunteerBack, Integer integralResidentTop, |
| | | Integer integralResidentBack, Integer integralAvailableResidentTop, Integer integralAvailableResidentBack, |
| | | Integer integralFrozenResidentTop, Integer integralFrozenResidentBack, Long serviceId) { |
| | | |
| | | ComActIntegralUserChange integralUserChangeDO = new ComActIntegralUserChange(); |
| | | integralUserChangeDO.setId(Snowflake.getId()); |
| | | integralUserChangeDO.setUserId(userId); |
| | | integralUserChangeDO.setIntegralId(integralId); |
| | | integralUserChangeDO.setCommunityId(communityId); |
| | | integralUserChangeDO.setIntegralSumTop(integralSumTop); |
| | | integralUserChangeDO.setIntegralSumBack(integralSumBack); |
| | | integralUserChangeDO.setIntegralAvailableSumTop(integralAvailableSumTop); |
| | | integralUserChangeDO.setIntegralAvailableSumBack(integralAvailableSumBack); |
| | | integralUserChangeDO.setIntegralFrozenSumTop(integralFrozenSumTop); |
| | | integralUserChangeDO.setIntegralFrozenSumBack(integralFrozenSumBack); |
| | | integralUserChangeDO.setIntegralPartyTop(integralPartyTop); |
| | | integralUserChangeDO.setIntegralPartyBack(integralPartyBack); |
| | | integralUserChangeDO.setIntegralAvailablePartyTop(integralAvailablePartyTop); |
| | | integralUserChangeDO.setIntegralAvailablePartyBack(integralAvailablePartyBack); |
| | | integralUserChangeDO.setIntegralFrozenPartyTop(integralFrozenPartyTop); |
| | | integralUserChangeDO.setIntegralFrozenPartyBack(integralFrozenPartyBack); |
| | | integralUserChangeDO.setIntegralVolunteerTop(integralVolunteerTop); |
| | | integralUserChangeDO.setIntegralVolunteerBack(integralVolunteerBack); |
| | | integralUserChangeDO.setIntegralAvailableVolunteerTop(integralAvailableVolunteerTop); |
| | | integralUserChangeDO.setIntegralAvailableVolunteerBack(integralAvailableVolunteerBack); |
| | | integralUserChangeDO.setIntegralFrozenVolunteerTop(integralFrozenVolunteerTop); |
| | | integralUserChangeDO.setIntegralFrozenVolunteerBack(integralFrozenVolunteerBack); |
| | | integralUserChangeDO.setIntegralResidentTop(integralResidentTop); |
| | | integralUserChangeDO.setIntegralResidentBack(integralResidentBack); |
| | | integralUserChangeDO.setIntegralAvailableResidentTop(integralAvailableResidentTop); |
| | | integralUserChangeDO.setIntegralAvailableResidentBack(integralAvailableResidentBack); |
| | | integralUserChangeDO.setIntegralFrozenResidentTop(integralFrozenResidentTop); |
| | | integralUserChangeDO.setIntegralFrozenResidentBack(integralFrozenResidentBack); |
| | | integralUserChangeDO.setServiceId(serviceId); |
| | | integralUserChangeDO.setCreateAt(new Date()); |
| | | this.baseMapper.insert(integralUserChangeDO); |
| | | } |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.panzhihua.common.utlis.Snowflake; |
| | | import com.panzhihua.service_dangjian.dao.ComActIntegralUserTradeDAO; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUserTrade; |
| | | import com.panzhihua.service_dangjian.service.ComActIntegralUserTradeDaoService; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | import java.util.Date; |
| | | |
| | | /** |
| | | * @auther lyq |
| | | * @create 2021-07-28 16:03:18 |
| | | * @describe 用户积分账户交易记录服务实现类 |
| | | */ |
| | | @Slf4j |
| | | @Service |
| | | public class ComActIntegralUserTradeDaoServiceImpl extends |
| | | ServiceImpl<ComActIntegralUserTradeDAO, ComActIntegralUserTrade> implements ComActIntegralUserTradeDaoService { |
| | | |
| | | |
| | | |
| | | |
| | | /** |
| | | * 添加用户积分交易记录 |
| | | * |
| | | * @param userId |
| | | * 用户id |
| | | * @param integralId |
| | | * 积分账户id |
| | | * @param communityId |
| | | * 社区id |
| | | * @param serviceId |
| | | * 交易业务id |
| | | * @param serviceType |
| | | * 交易业务类型(1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 " + |
| | | * "5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动) |
| | | * @param amount |
| | | * 交易积分数量 |
| | | * @param changeType |
| | | * 变动类型(1.增加 2.减少) |
| | | * @param remark |
| | | * 交易备注 |
| | | * @param identityType |
| | | * 交易身份类型(1.居民 2.党员 3.志愿者) |
| | | * @param createBy |
| | | * 操作人id |
| | | */ |
| | | @Override |
| | | public Long addIntegralTradeRecord(Long userId, Long integralId, Long communityId, Long serviceId, |
| | | Integer serviceType, Integer amount, Integer changeType, String remark, Integer identityType, Long createBy) { |
| | | ComActIntegralUserTrade integralUserTradeDO = new ComActIntegralUserTrade(); |
| | | integralUserTradeDO.setId(Snowflake.getId()); |
| | | integralUserTradeDO.setUserId(userId); |
| | | integralUserTradeDO.setIntegralId(integralId); |
| | | integralUserTradeDO.setCommunityId(communityId); |
| | | integralUserTradeDO.setServiceId(serviceId); |
| | | integralUserTradeDO.setServiceType(serviceType); |
| | | integralUserTradeDO.setAmount(amount); |
| | | integralUserTradeDO.setChangeType(changeType); |
| | | integralUserTradeDO.setRemark(remark); |
| | | integralUserTradeDO.setIdentityType(identityType); |
| | | integralUserTradeDO.setCreateBy(createBy); |
| | | integralUserTradeDO.setCreateAt(new Date()); |
| | | this.baseMapper.insert(integralUserTradeDO); |
| | | return integralUserTradeDO.getId(); |
| | | } |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.panzhihua.common.model.dtos.partybuilding.NewFightIntegral; |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; |
| | | import com.panzhihua.common.utlis.StringUtils; |
| | | import com.panzhihua.service_dangjian.dao.ComActIntegralUsersMapper; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUser; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUserTrade; |
| | | import com.panzhihua.service_dangjian.service.ComActIntegralUserChangeDAOService; |
| | | import com.panzhihua.service_dangjian.service.ComActIntegralUserTradeDaoService; |
| | | import com.panzhihua.service_dangjian.service.ComActIntegralUsersService; |
| | | import com.panzhihua.service_dangjian.service.NewFightIntegratingTaskService; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | import javax.annotation.Resource; |
| | | import java.util.Date; |
| | | |
| | | |
| | | @Slf4j |
| | | @Service |
| | | public class ComActIntegralUsersServiceImpl extends ServiceImpl<ComActIntegralUsersMapper, |
| | | ComActIntegralUser> implements ComActIntegralUsersService |
| | | { |
| | | |
| | | |
| | | @Resource |
| | | private ComActIntegralUsersService integralUsersService; |
| | | |
| | | @Resource |
| | | private ComActIntegralUserTradeDaoService tradeDaoService; |
| | | |
| | | @Resource |
| | | private ComActIntegralUserChangeDAOService changeDAOService; |
| | | |
| | | |
| | | @Resource |
| | | private NewFightIntegratingTaskService taskService; |
| | | |
| | | @Override |
| | | public R upIntegral(NewFightIntegral item) |
| | | { |
| | | |
| | | // 需要给用户增加的积分数量 |
| | | Integer amount = 0; |
| | | // 查询用户积分账户 |
| | | ComActIntegralUser integralUserDO = |
| | | integralUsersService.getOne(new QueryWrapper<ComActIntegralUser>().lambda() |
| | | .eq(ComActIntegralUser::getUserId, item.getUserId()) |
| | | .eq(ComActIntegralUser::getCommunityId, item.getCommunityId())); |
| | | |
| | | if (integralUserDO == null) { |
| | | integralUserDO = new ComActIntegralUser(); |
| | | integralUserDO.setCommunityId(Long.valueOf(item.getCommunityId())); |
| | | integralUserDO.setUserId(Long.valueOf(item.getUserId())); |
| | | integralUserDO.setCreateAt(new Date()); |
| | | integralUserDO.setStatus(ComActIntegralUser.status.yes); |
| | | integralUserDO.setIntegralSum(0); |
| | | integralUserDO.setIntegralAvailableSum(0); |
| | | integralUserDO.setIntegralFrozenSum(0); |
| | | integralUserDO.setIntegralParty(0); |
| | | integralUserDO.setIntegralAvailableParty(0); |
| | | integralUserDO.setIntegralFrozenParty(0); |
| | | integralUserDO.setIntegralVolunteer(0); |
| | | integralUserDO.setIntegralAvailableVolunteer(0); |
| | | integralUserDO.setIntegralFrozenVolunteer(0); |
| | | integralUserDO.setIntegralResident(0); |
| | | integralUserDO.setIntegralAvailableResident(0); |
| | | integralUserDO.setIntegralFrozenResident(0); |
| | | integralUsersService.save(integralUserDO); |
| | | } |
| | | |
| | | |
| | | if (integralUserDO.getStatus().equals(ComActIntegralUser.status.no)) { |
| | | log.error("用户钱包已被禁用,记录积分失败,用户id:" + item.getUserId()); |
| | | return R.fail("用户钱包已被禁用,记录积分失败,用户id:" + item.getUserId()); |
| | | } |
| | | |
| | | Long integralId = integralUserDO.getId(); |
| | | // 记录变动前钱包金额 |
| | | Integer integralSum = integralUserDO.getIntegralSum(); |
| | | Integer integralAvailableSum = integralUserDO.getIntegralAvailableSum(); |
| | | Integer integralFrozenSum = integralUserDO.getIntegralFrozenSum(); |
| | | Integer integralParty = integralUserDO.getIntegralParty(); |
| | | Integer integralAvailableParty = integralUserDO.getIntegralAvailableParty(); |
| | | Integer integralFrozenParty = integralUserDO.getIntegralFrozenParty(); |
| | | Integer integralVolunteer = integralUserDO.getIntegralVolunteer(); |
| | | Integer integralAvailableVolunteer = integralUserDO.getIntegralAvailableVolunteer(); |
| | | Integer integralFrozenVolunteer = integralUserDO.getIntegralFrozenVolunteer(); |
| | | Integer integralResident = integralUserDO.getIntegralResident(); |
| | | Integer integralAvailableResident = integralUserDO.getIntegralAvailableResident(); |
| | | Integer integralFrozenResident = integralUserDO.getIntegralFrozenResident(); |
| | | |
| | | if(!StringUtils.isEmpty(item.getIntegralNum())) |
| | | { |
| | | amount=Integer.valueOf(item.getIntegralNum()); |
| | | } |
| | | |
| | | //业务类型 9商城积分兑换 10商家线下积分兑换 11花城登录 12 查看问题清单 " |
| | | // "13查看需求清单 14 查看报道服务活动 15查看微心愿 16 查看随手拍 17 每日签到 18 上传“随手拍”或“微心愿 |
| | | switch (item.getType()) |
| | | { |
| | | case "9": |
| | | //商城积分兑换 |
| | | item.setAddOrReduce(2); |
| | | break; |
| | | case "10": |
| | | //商家线下积分兑换 |
| | | item.setAddOrReduce(2); |
| | | break; |
| | | case "11": |
| | | //花城登录 |
| | | item.setAddOrReduce(1); |
| | | item.setIntegralNum("2"); |
| | | |
| | | IntegratingTaskVO taskVO=new IntegratingTaskVO(); |
| | | taskVO.setIsDraw("2"); |
| | | taskVO.setId(item.getTaskId()); |
| | | taskService.editData(taskVO); |
| | | break; |
| | | case "12": |
| | | // 查看问题清单 |
| | | case "13": |
| | | //13查看需求清单 |
| | | case "14": |
| | | //查看报道服务活动 |
| | | case "15": |
| | | //15查看微心愿 |
| | | case "16": |
| | | //查看随手拍 |
| | | item.setAddOrReduce(1); |
| | | item.setIntegralNum("1"); |
| | | |
| | | IntegratingTaskVO taskVO2=new IntegratingTaskVO(); |
| | | taskVO2.setIsDraw("2"); |
| | | taskVO2.setId(item.getTaskId()); |
| | | taskService.editData(taskVO2); |
| | | break; |
| | | case "17": |
| | | //每日签到 |
| | | item.setAddOrReduce(1); |
| | | item.setIntegralNum("1"); |
| | | break; |
| | | case "18": |
| | | //上传“随手拍”或“微心愿 |
| | | item.setAddOrReduce(1); |
| | | item.setIntegralNum("2"); |
| | | break; |
| | | } |
| | | |
| | | |
| | | |
| | | |
| | | // 根据不同身份,计算钱包金额 |
| | | // if (identityType.equals(ComActIntegralUserTrade.identityType.jm)) { |
| | | // int integralResidentNow = addIntegral(integralResident + amount); |
| | | // if (amount < 0) { |
| | | // reduceAmount = integralResident - integralResidentNow; |
| | | // } |
| | | // integralUserDO.setIntegralResident(integralResidentNow); |
| | | // integralUserDO.setIntegralAvailableResident(addIntegral(integralUserDO.getIntegralAvailableResident() + amount)); |
| | | // } else if (identityType.equals(ComActIntegralUserTradeDO.identityType.dy)) { |
| | | // int integralPartyNow = addIntegral(integralParty + amount); |
| | | // if (amount < 0) { |
| | | // reduceAmount = integralParty - integralPartyNow; |
| | | // } |
| | | // integralUserDO.setIntegralParty(integralPartyNow); |
| | | // integralUserDO.setIntegralAvailableParty(addIntegral(integralUserDO.getIntegralAvailableParty() + amount)); |
| | | // } else if (identityType.equals(ComActIntegralUserTradeDO.identityType.zyz)) { |
| | | // int integralVolunteerNow = addIntegral(integralVolunteer + amount); |
| | | // if (amount < 0) { |
| | | // reduceAmount = integralVolunteer - integralVolunteerNow; |
| | | // } |
| | | // integralUserDO.setIntegralVolunteer(integralVolunteerNow); |
| | | // integralUserDO.setIntegralAvailableVolunteer(addIntegral(integralUserDO.getIntegralAvailableVolunteer() + amount)); |
| | | // } |
| | | |
| | | |
| | | if (item.getAddOrReduce() == ComActIntegralUserTrade.changeType.reduce) |
| | | { |
| | | integralUserDO.setIntegralSum(addIntegral(integralSum - amount)); |
| | | integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum - amount)); |
| | | } |
| | | else { |
| | | integralUserDO.setIntegralSum(addIntegral(integralSum + amount)); |
| | | integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum + amount)); |
| | | } |
| | | integralUserDO.setUpdateAt(new Date()); |
| | | |
| | | // 更新钱包 |
| | | integralUsersService.updateById(integralUserDO); |
| | | |
| | | // 增加积分账户交易记录 |
| | | Long tradeId = tradeDaoService.addIntegralTradeRecord(Long.valueOf(item.getUserId()), integralId, Long.valueOf(item.getCommunityId()), |
| | | Long.valueOf(item.getServiceId()), Integer.valueOf(item.getType()), Integer.valueOf(item.getIntegralNum()), |
| | | item.getAddOrReduce(), item.getRemark(), Integer.valueOf(item.getIdentityType()), 2L); |
| | | |
| | | // 增加积分账户变更记录 |
| | | changeDAOService.addIntegralUserChangeRecord(Long.valueOf(item.getUserId()), integralId, |
| | | Long.valueOf(item.getCommunityId()), integralSum, |
| | | integralUserDO.getIntegralSum(), integralAvailableSum, integralUserDO.getIntegralAvailableSum(), |
| | | integralFrozenSum, integralUserDO.getIntegralFrozenSum(), integralParty, integralUserDO.getIntegralParty(), |
| | | integralAvailableParty, integralUserDO.getIntegralAvailableParty(), integralFrozenParty, |
| | | integralUserDO.getIntegralFrozenParty(), integralVolunteer, integralUserDO.getIntegralVolunteer(), |
| | | integralAvailableVolunteer, integralUserDO.getIntegralAvailableVolunteer(), integralFrozenVolunteer, |
| | | integralUserDO.getIntegralFrozenVolunteer(), integralResident, integralUserDO.getIntegralResident(), |
| | | integralAvailableResident, integralUserDO.getIntegralAvailableResident(), integralFrozenResident, |
| | | integralUserDO.getIntegralFrozenResident(), tradeId); |
| | | |
| | | return R.ok(); |
| | | } |
| | | |
| | | |
| | | |
| | | private int addIntegral(int integral) { |
| | | return integral > 0 ? integral : 0; |
| | | } |
| | | |
| | | } |
New file |
| | |
| | | package com.panzhihua.service_dangjian.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; |
| | | import com.panzhihua.service_dangjian.dao.NewFightIntegratingTaskDao; |
| | | import com.panzhihua.service_dangjian.entity.IntegratingTask; |
| | | import com.panzhihua.service_dangjian.service.NewFightIntegratingTaskService; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * @program: springcloud_k8s_panzhihuazhihuishequ |
| | | * @description: 党组织 |
| | | * @author: huang.hongfa weixin hhf9596 qq 959656820 |
| | | * @create: 2020-11-30 11:40 |
| | | **/ |
| | | @Service |
| | | public class NewFightIntegratingTaskServiceImpl extends ServiceImpl<NewFightIntegratingTaskDao, |
| | | IntegratingTask> implements NewFightIntegratingTaskService |
| | | { |
| | | |
| | | @Override |
| | | public List<IntegratingTask> getList(String userId, String communityId) |
| | | { |
| | | return baseMapper.getList(userId,communityId); |
| | | } |
| | | |
| | | |
| | | @Override |
| | | public R addData(IntegratingTaskVO item) |
| | | { |
| | | int num=baseMapper.addData(item); |
| | | if(num>0) |
| | | { |
| | | return R.ok(); |
| | | } |
| | | return R.fail("操作失败"); |
| | | } |
| | | |
| | | @Override |
| | | public R editData(IntegratingTaskVO item) { |
| | | int num=baseMapper.editData(item); |
| | | if(num>0) |
| | | { |
| | | return R.ok(); |
| | | } |
| | | return R.fail("操作失败"); |
| | | } |
| | | |
| | | |
| | | @Override |
| | | public R expurgateData(String id) |
| | | { |
| | | int num= baseMapper.expurgateData(id); |
| | | if(num>0) |
| | | { |
| | | return R.ok(); |
| | | } |
| | | return R.fail("操作失败"); |
| | | } |
| | | |
| | | @Override |
| | | public R truncateData() { |
| | | int num= baseMapper.truncateData(); |
| | | if(num>0) |
| | | { |
| | | return R.ok(); |
| | | } |
| | | return R.fail("操作失败"); |
| | | } |
| | | |
| | | |
| | | } |
| | |
| | | package com.panzhihua.service_dangjian.service.impl; |
| | | |
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| | | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
| | | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO; |
| | | import com.panzhihua.common.utlis.Snowflake; |
| | | import com.panzhihua.service_dangjian.dao.ComActIntegralUsersMapper; |
| | | import com.panzhihua.service_dangjian.dao.NewFightShoppingOrderDao; |
| | | import com.panzhihua.service_dangjian.entity.ComActIntegralUser; |
| | | import com.panzhihua.service_dangjian.entity.NewFightShopping; |
| | | import com.panzhihua.service_dangjian.entity.NewFightShoppingOrder; |
| | | import com.panzhihua.service_dangjian.service.NewFightShoppingOrderService; |
| | | import com.panzhihua.service_dangjian.service.NewFightShoppingService; |
| | | import com.panzhihua.service_dangjian.service.*; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.apache.commons.lang3.StringUtils; |
| | | import org.springframework.stereotype.Service; |
| | |
| | | |
| | | @Resource |
| | | private NewFightShoppingService shoppingService; |
| | | |
| | | |
| | | |
| | | @Override |
| | |
| | | public R addData(NewFightShoppingOrderVO item) |
| | | { |
| | | item.setOrderNumber(Snowflake.getId()+""); |
| | | // JinhuiCoinGeneralTable generalTable=tableService.getDetails(item.getUserId()); |
| | | // NewFightShopping goods=shoppingService.getDetails(item.getGoodsId()); |
| | | // |
| | | // int allMoney=0; |
| | | // int getMoney=Integer.valueOf(goods.getGoodPrice()); |
| | | // |
| | | // |
| | | NewFightShopping goods=shoppingService.getDetails(item.getGoodsId()); |
| | | |
| | | int allMoney=0; |
| | | int getMoney=Integer.valueOf(goods.getGoodPrice()); |
| | | |
| | | // if(generalTable==null) |
| | | // { |
| | | // return R.fail("金汇币不足!"); |
| | | // return R.fail("积分不足!"); |
| | | // } |
| | | // |
| | | // if(!StringUtils.isEmpty(generalTable.getGoldCoin())) |
| | | // { |
| | | // allMoney=Integer.valueOf(generalTable.getGoldCoin()); |
| | | // } |
| | | // if(getMoney>allMoney) |
| | | // { |
| | | // return R.fail("金汇币不足!"); |
| | | // } |
| | | if(getMoney>allMoney) |
| | | { |
| | | return R.fail("金汇币不足!"); |
| | | } |
| | | |
| | | item.setCancelType("0"); |
| | | // item.setPalyMoney(goods.getGoodPrice()); |
| | | item.setPalyMoney(goods.getGoodPrice()); |
| | | int num= baseMapper.addData(item); |
| | | if(num>0) |
| | | { |
| | | //修改个人金汇币总额 |
| | | //修改个人积分总额 |
| | | // allMoney=allMoney-getMoney; |
| | | // JinhuiCoinGeneralTableVO generalTableVO=new JinhuiCoinGeneralTableVO(); |
| | | // generalTableVO.setId(generalTable.getId()); |
New file |
| | |
| | | <?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.ComActIntegralUserChangeMapper"> |
| | | |
| | | <!-- 通用查询映射结果 --> |
| | | <resultMap id="BaseResultMap" type="com.panzhihua.service_dangjian.entity.ComActIntegralUserChange"> |
| | | <id column="id" property="id" /> |
| | | <result column="user_id" property="userId" /> |
| | | <result column="integral_id" property="integralId" /> |
| | | <result column="community_id" property="communityId" /> |
| | | <result column="integral_sum_top" property="integralSumTop" /> |
| | | <result column="integral_sum_back" property="integralSumBack" /> |
| | | <result column="integral_available_sum_top" property="integralAvailableSumTop" /> |
| | | <result column="integral_available_sum_back" property="integralAvailableSumBack" /> |
| | | <result column="integral_frozen_sum_top" property="integralFrozenSumTop" /> |
| | | <result column="integral_frozen_sum_back" property="integralFrozenSumBack" /> |
| | | <result column="integral_party_top" property="integralPartyTop" /> |
| | | <result column="integral_party_back" property="integralPartyBack" /> |
| | | <result column="integral_available_party_top" property="integralAvailablePartyTop" /> |
| | | <result column="integral_available_party_back" property="integralAvailablePartyBack" /> |
| | | <result column="integral_frozen_party_top" property="integralFrozenPartyTop" /> |
| | | <result column="integral_frozen_party_back" property="integralFrozenPartyBack" /> |
| | | <result column="integral_volunteer_top" property="integralVolunteerTop" /> |
| | | <result column="integral_volunteer_back" property="integralVolunteerBack" /> |
| | | <result column="integral_available_volunteer_top" property="integralAvailableVolunteerTop" /> |
| | | <result column="integral_available_volunteer_back" property="integralAvailableVolunteerBack" /> |
| | | <result column="integral_frozen_volunteer_top" property="integralFrozenVolunteerTop" /> |
| | | <result column="integral_frozen_volunteer_back" property="integralFrozenVolunteerBack" /> |
| | | <result column="integral_resident_top" property="integralResidentTop" /> |
| | | <result column="integral_resident_back" property="integralResidentBack" /> |
| | | <result column="integral_available_resident_top" property="integralAvailableResidentTop" /> |
| | | <result column="integral_available_resident_back" property="integralAvailableResidentBack" /> |
| | | <result column="integral_frozen_resident_top" property="integralFrozenResidentTop" /> |
| | | <result column="integral_frozen_resident_back" property="integralFrozenResidentBack" /> |
| | | <result column="service_id" property="serviceId" /> |
| | | <result column="create_at" property="createAt" /> |
| | | </resultMap> |
| | | |
| | | <!-- 通用查询结果列 --> |
| | | <sql id="Base_Column_List"> |
| | | id, user_id, integral_id, community_id, integral_sum_top, integral_sum_back, integral_available_sum_top, integral_available_sum_back, integral_frozen_sum_top, integral_frozen_sum_back, integral_party_top, integral_party_back, integral_available_party_top, integral_available_party_back, integral_frozen_party_top, integral_frozen_party_back, integral_volunteer_top, integral_volunteer_back, integral_available_volunteer_top, integral_available_volunteer_back, integral_frozen_volunteer_top, integral_frozen_volunteer_back, integral_resident_top, integral_resident_back, integral_available_resident_top, integral_available_resident_back, integral_frozen_resident_top, integral_frozen_resident_back, service_id, create_at |
| | | </sql> |
| | | |
| | | </mapper> |
New file |
| | |
| | | <?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_dangjian.dao.ComActIntegralUserTradeDAO"> |
| | | |
| | | <!-- 通用查询映射结果 --> |
| | | <resultMap id="BaseResultMap" type="com.panzhihua.service_dangjian.entity.ComActIntegralUserTrade"> |
| | | <id column="id" property="id" /> |
| | | <result column="user_id" property="userId" /> |
| | | <result column="integral_id" property="integralId" /> |
| | | <result column="community_id" property="communityId" /> |
| | | <result column="service_id" property="serviceId" /> |
| | | <result column="service_type" property="serviceType" /> |
| | | <result column="amount" property="amount" /> |
| | | <result column="change_type" property="changeType" /> |
| | | <result column="remark" property="remark" /> |
| | | <result column="identity_type" property="identityType" /> |
| | | <result column="create_at" property="createAt" /> |
| | | <result column="create_by" property="createBy" /> |
| | | </resultMap> |
| | | |
| | | |
| | | </mapper> |
New file |
| | |
| | | <?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_dangjian.dao.ComActIntegralUsersMapper"> |
| | | |
| | | <!-- 通用查询映射结果 --> |
| | | <resultMap id="BaseResultMap" type="com.panzhihua.service_dangjian.entity.ComActIntegralUser"> |
| | | <id column="id" property="id" /> |
| | | <result column="user_id" property="userId" /> |
| | | <result column="community_id" property="communityId" /> |
| | | <result column="integral_sum" property="integralSum" /> |
| | | <result column="integral_available_sum" property="integralAvailableSum" /> |
| | | <result column="integral_frozen_sum" property="integralFrozenSum" /> |
| | | <result column="integral_party" property="integralParty" /> |
| | | <result column="integral_available_party" property="integralAvailableParty" /> |
| | | <result column="integral_frozen_party" property="integralFrozenParty" /> |
| | | <result column="integral_volunteer" property="integralVolunteer" /> |
| | | <result column="integral_available_volunteer" property="integralAvailableVolunteer" /> |
| | | <result column="integral_frozen_volunteer" property="integralFrozenVolunteer" /> |
| | | <result column="integral_resident" property="integralResident" /> |
| | | <result column="integral_available_resident" property="integralAvailableResident" /> |
| | | <result column="integral_frozen_resident" property="integralFrozenResident" /> |
| | | <result column="create_at" property="createAt" /> |
| | | <result column="update_at" property="updateAt" /> |
| | | <result column="status" property="status" /> |
| | | </resultMap> |
| | | |
| | | |
| | | <!-- 通用查询结果列 --> |
| | | <sql id="Base_Column_List"> |
| | | id, user_id, community_id, integral_sum, integral_available_sum, integral_frozen_sum, integral_party, integral_available_party, integral_frozen_party, integral_volunteer, integral_available_volunteer, integral_frozen_volunteer, integral_resident, integral_available_resident, integral_frozen_resident, create_at, update_at |
| | | </sql> |
| | | |
| | | <select id="getIntegralUserListApplets" resultType="com.panzhihua.common.model.vos.community.integral.ComActIntegralUserListVO"> |
| | | SELECT |
| | | SUM(t.amount) AS amount, |
| | | t1.community_id, |
| | | t1.`name` AS communityName |
| | | FROM |
| | | com_act_integral_user_trade t |
| | | INNER JOIN com_act t1 ON t.community_id = t1.community_id |
| | | WHERE |
| | | t.change_type = 1 AND t.user_id = #{userId} |
| | | GROUP BY t1.community_id |
| | | ORDER BY amount DESC |
| | | </select> |
| | | |
| | | <select id="getIntegralUserRank" resultType="com.panzhihua.common.model.vos.community.integral.IntegralUserRankVO"> |
| | | SELECT |
| | | * |
| | | FROM |
| | | ( |
| | | SELECT |
| | | t1.user_id, |
| | | @rank := @rank + 1 AS rank |
| | | FROM |
| | | ( |
| | | SELECT |
| | | caiu.user_id, |
| | | caiu.integral_sum |
| | | FROM |
| | | com_act_integral_user as caiu |
| | | left join sys_user as su on su.user_id = caiu.user_id |
| | | WHERE |
| | | caiu.community_id = #{communityId} |
| | | ORDER BY |
| | | caiu.integral_sum DESC,su.create_at asc |
| | | ) AS t1, |
| | | ( SELECT @rank := 0 ) AS t2 |
| | | ) AS m |
| | | WHERE |
| | | user_id = #{userId} limit 1 |
| | | </select> |
| | | |
| | | <select id="getIntegralCommunityRankApplets" parameterType="com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO" |
| | | resultType="com.panzhihua.common.model.vos.community.integral.ComActIntegralCommunityRankVO"> |
| | | SELECT |
| | | su.nick_name, |
| | | su.image_url, |
| | | <if test="communityRankDTO.type == 1"> |
| | | SUM(caiu.integral_sum) as amount, |
| | | </if> |
| | | <if test="communityRankDTO.type == 2"> |
| | | SUM(caiu.integral_resident) as amount, |
| | | </if> |
| | | <if test="communityRankDTO.type == 3"> |
| | | SUM(caiu.integral_volunteer) as amount, |
| | | </if> |
| | | <if test="communityRankDTO.type == 4"> |
| | | SUM(caiu.integral_party) as amount, |
| | | </if> |
| | | su.is_partymember, |
| | | su.is_volunteer |
| | | FROM |
| | | com_act_integral_user AS caiu |
| | | LEFT JOIN sys_user AS su ON su.user_id = caiu.user_id |
| | | WHERE su.nick_name is not null |
| | | <if test="communityRankDTO.communityId != null"> |
| | | AND caiu.community_id = ${communityRankDTO.communityId} |
| | | </if> |
| | | <if test="communityRankDTO.type == 3"> |
| | | and su.is_volunteer = 1 |
| | | </if> |
| | | <if test="communityRankDTO.type == 4"> |
| | | and su.is_partymember = 1 |
| | | </if> |
| | | GROUP BY caiu.user_id |
| | | ORDER BY amount desc |
| | | </select> |
| | | |
| | | <select id="getTaskActivityPeopleList" resultType="com.panzhihua.common.model.vos.community.integral.admin.ComActActivityPeopleVO"> |
| | | select caas.user_id,caas.activity_id,caa.community_id,caas.sign_identity |
| | | from (SELECT * FROM com_act_act_sign WHERE `status` = 1) as caas |
| | | left join com_act_activity as caa on caa.id = caas.activity_id |
| | | left join com_act_act_regist AS caar ON caas.user_id = caar.user_id AND caas.activity_id = caar.activity_id |
| | | where caa.id = #{activityId} AND caar.id IS NULL |
| | | </select> |
| | | <select id="getUserIntegralStatistics" |
| | | resultType="com.panzhihua.common.model.vos.community.integral.ComActIntegralUserVO"> |
| | | SELECT |
| | | SUM(t.amount) AS amount, |
| | | SUM(IF(t.service_type IN(4,5,6),t.amount,0)) AS actAmount, |
| | | SUM(IF(t.service_type = 4,t.amount,0)) AS residentAmount, |
| | | SUM(IF(t.service_type = 5,t.amount,0)) AS partyMemberAmount, |
| | | SUM(IF(t.service_type = 6,t.amount,0)) AS volunteerAmount, |
| | | SUM(IF(t.service_type = 9,t.amount,0)) AS unitPartyMemberAmount |
| | | <if test="communityId != null"> |
| | | ,t1.community_id, |
| | | t1.`name` AS communityName |
| | | </if> |
| | | FROM |
| | | com_act_integral_user_trade t |
| | | INNER JOIN com_act t1 ON t.community_id = t1.community_id |
| | | WHERE |
| | | t.change_type = 1 AND t.user_id = #{userId} |
| | | <if test="communityId != null"> |
| | | AND t.community_id = #{communityId} |
| | | </if> |
| | | </select> |
| | | |
| | | </mapper> |
| | | |
| | |
| | | jso.paly_money |
| | | from new_fight_shopping_order as jso |
| | | LEFT JOIN sys_user su ON jso.user_id = su.user_id |
| | | LEFT JOIN jinhui_shopping js ON js.id = jso.goods_id |
| | | LEFT JOIN new_fight_shopping js ON js.id = jso.goods_id |
| | | LEFT JOIN new_fight_community_config as vcc ON vcc.community_id=jso.community_id |
| | | where |
| | | jso.id=#{id} |
| | |
| | | abolish_time=#{item.abolishTime}, |
| | | </if> |
| | | <if test="item.communityId !=null and item.communityId !='' "> |
| | | item.community_id=#{item.communityId} |
| | | community_id=#{item.communityId} |
| | | </if> |
| | | update_time=sysdate() |
| | | </set> |
New file |
| | |
| | | <?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_dangjian.dao.NewFightIntegratingTaskDao"> |
| | | |
| | | <resultMap type="com.panzhihua.service_dangjian.entity.IntegratingTask" id="itemMap"> |
| | | <result property="id" column="id" /> |
| | | <result property="isDraw" column="is_draw" /> |
| | | <result property="status" column="status" /> |
| | | <result property="userId" column="user_id" /> |
| | | <result property="communityId" column="community_id" /> |
| | | <result property="creationTime" column="creation_time" /> |
| | | </resultMap> |
| | | |
| | | |
| | | <!-- 分页查询 --> |
| | | <select id="getList" resultMap="itemMap"> |
| | | select |
| | | id, |
| | | is_draw, |
| | | status, |
| | | user_id, |
| | | community_id, |
| | | creation_time |
| | | from new_strive_integrating_task |
| | | <where> |
| | | 1=1 |
| | | <if test="communityId !=null and communityId !='' "> |
| | | and community_id=#{communityId} |
| | | </if> |
| | | <if test="userId !=null and userId !='' "> |
| | | and user_id=#{userId} |
| | | </if> |
| | | </where> |
| | | </select> |
| | | |
| | | |
| | | <insert id="addData"> |
| | | insert into new_strive_integrating_task |
| | | <trim prefix="(" suffix=")" suffixOverrides=","> |
| | | <if test="item.id != null and item.id != '' "> |
| | | id, |
| | | </if> |
| | | <if test="item.isDraw != null and item.isDraw != '' "> |
| | | is_draw, |
| | | </if> |
| | | <if test="item.status != null and item.status != '' "> |
| | | status, |
| | | </if> |
| | | <if test="item.userId != null and item.userId != '' "> |
| | | user_id, |
| | | </if> |
| | | <if test="item.communityId !=null and item.communityId !='' "> |
| | | community_id, |
| | | </if> |
| | | creation_time |
| | | </trim> |
| | | values |
| | | <trim prefix="(" suffix=")" suffixOverrides=","> |
| | | <if test="item.id != null and item.id != '' "> |
| | | #{item.id}, |
| | | </if> |
| | | <if test="item.isDraw != null and item.isDraw != '' "> |
| | | #{item.isDraw}, |
| | | </if> |
| | | <if test="item.status != null and item.status != '' "> |
| | | #{item.status}, |
| | | </if> |
| | | <if test="item.userId != null and item.userId != '' "> |
| | | #{item.userId}, |
| | | </if> |
| | | <if test="item.communityId !=null and item.communityId !='' "> |
| | | #{item.communityId}, |
| | | </if> |
| | | sysdate() |
| | | </trim> |
| | | </insert> |
| | | |
| | | |
| | | |
| | | <update id="editData"> |
| | | update new_fight_shopping_order |
| | | <set> |
| | | <if test="item.id != null and item.id != '' "> |
| | | id=#{item.id}, |
| | | </if> |
| | | <if test="item.isDraw != null and item.isDraw != '' "> |
| | | is_draw=#{item.isDraw}, |
| | | </if> |
| | | <if test="item.status != null and item.status != '' "> |
| | | status=#{item.status}, |
| | | </if> |
| | | <if test="item.userId != null and item.userId != '' "> |
| | | user_id=#{item.userId}, |
| | | </if> |
| | | <if test="item.communityId !=null and item.communityId !='' "> |
| | | community_id=#{item.communityId}, |
| | | </if> |
| | | update_time=sysdate() |
| | | </set> |
| | | where id = #{item.id} |
| | | </update> |
| | | |
| | | <delete id="expurgateData" parameterType="String"> |
| | | delete from new_strive_integrating_task where id=#{id} |
| | | </delete> |
| | | |
| | | |
| | | <delete id="truncateData"> |
| | | truncate new_strive_integrating_task |
| | | </delete> |
| | | |
| | | |
| | | </mapper> |