diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserDrawProdAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserDrawProdAdminVo.java deleted file mode 100644 index 426f9e484..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserDrawProdAdminVo.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.accompany.admin.vo; - -import com.accompany.common.annotation.ReplaceAppDomain; - -/** - * Created by PaperCut on 2018/4/9. - */ -public class UserDrawProdAdminVo { - private Integer prodId; - - private Byte prodType; - - private String prodName; - - private Long prodValue; - - @ReplaceAppDomain - private String prodImage; - - private String prodDesc; - - private Integer drawType; - - private String drawName; - - private String drawId; - - private String monsterKindName; - - private Integer expireDays; - - public Integer getProdId() { - return prodId; - } - - public void setProdId(Integer prodId) { - this.prodId = prodId; - } - - public Byte getProdType() { - return prodType; - } - - public void setProdType(Byte prodType) { - this.prodType = prodType; - } - - public String getProdName() { - return prodName; - } - - public void setProdName(String prodName) { - this.prodName = prodName; - } - - public Long getProdValue() { - return prodValue; - } - - public void setProdValue(Long prodValue) { - this.prodValue = prodValue; - } - - public String getProdImage() { - return prodImage; - } - - public void setProdImage(String prodImage) { - this.prodImage = prodImage; - } - - public String getProdDesc() { - return prodDesc; - } - - public void setProdDesc(String prodDesc) { - this.prodDesc = prodDesc; - } - - public Integer getDrawType() { - return drawType; - } - - public void setDrawType(Integer drawType) { - this.drawType = drawType; - } - - public String getDrawName() { - return drawName; - } - - public void setDrawName(String drawName) { - this.drawName = drawName; - } - - public String getDrawId() { - return drawId; - } - - public void setDrawId(String drawId) { - this.drawId = drawId; - } - - public String getMonsterKindName() { - return monsterKindName; - } - - public void setMonsterKindName(String monsterKindName) { - this.monsterKindName = monsterKindName; - } - - public Integer getExpireDays() { - return expireDays; - } - - public void setExpireDays(Integer expireDays) { - this.expireDays = expireDays; - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/UserDrawRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/UserDrawRecordAdminService.java deleted file mode 100644 index 50c8f6709..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/UserDrawRecordAdminService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.accompany.admin.service.activity; - -import com.accompany.admin.service.base.BaseService; -import com.accompany.admin.vo.UsersVo; -import com.accompany.business.model.UserDrawRecord; -import com.accompany.business.model.UserDrawRecordExample; -import com.accompany.core.model.Users; -import com.accompany.business.mybatismapper.UserDrawRecordMapper; -import com.accompany.core.service.user.UsersBaseService; -import com.accompany.common.constant.Constant; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Service -public class UserDrawRecordAdminService extends BaseService { - @Autowired - private UserDrawRecordMapper userDrawRecordMapper; - @Autowired - private UsersBaseService usersBaseService; - - private static final Byte ALL = 0; - - public Map queryUserDrawList(Long erbanNo, Integer pageSize, Integer pageNum, Byte drawType){ - Map map = new HashMap<>(); - Users users = usersBaseService.getUsersByErBanNo(erbanNo); - Long uid = users.getUid(); - - UsersVo usersVo = new UsersVo(); - usersVo.setNick(users.getNick()); - usersVo.setAvatar(users.getAvatar()); - usersVo.setErbanNo(users.getErbanNo()); - - int offset = (pageNum - 1) * pageSize; - UserDrawRecordExample example = new UserDrawRecordExample(); - example.setOrderByClause("update_time desc"); - example.setLimit(pageSize); - example.setOffset(offset); - UserDrawRecordExample.Criteria criteria = example.createCriteria(); - criteria.andUidEqualTo(uid).andDrawStatusNotEqualTo(Constant.DrawStatus.create); - if(!ALL.equals(drawType)){ - criteria.andTypeEqualTo(drawType); - } - List list = userDrawRecordMapper.selectByExample(example); - Integer total = countRecord(uid,drawType); - map.put("list",list); - map.put("users",usersVo); - map.put("total",total); - return map; - } - - public Integer countRecord(Long uid,Byte drawType){ - UserDrawRecordExample example = new UserDrawRecordExample(); - UserDrawRecordExample.Criteria criteria = example.createCriteria(); - if(!ALL.equals(drawType)){ - criteria.andTypeEqualTo(drawType); - } - criteria.andUidEqualTo(uid); - return userDrawRecordMapper.countByExample(example); - } -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/RoomGiftSerialService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/RoomGiftSerialService.java index e432b0b55..9908b2a5b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/RoomGiftSerialService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/RoomGiftSerialService.java @@ -5,12 +5,10 @@ import com.accompany.admin.mapper.RoomGiftSerialMapper; import com.accompany.admin.model.RoomGiftSerial; import com.accompany.admin.vo.room.RoomGiftSerialDetailAdminVO; import com.accompany.admin.vo.room.RoomRevenueAdminVo; -import com.accompany.business.mybatismapper.RadishGiftSendRecordMapperMgr; import com.accompany.business.service.room.RoomRevenueExcelService; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; import com.accompany.core.util.DoubleUtil; -import com.accompany.business.vo.RoomRadishVo; import com.accompany.business.vo.RoomVo; import com.accompany.business.vo.room.RoomRevenueExcelVo; import com.accompany.common.constant.Constant; @@ -48,8 +46,6 @@ public class RoomGiftSerialService { @Autowired private UsersBaseService usersBaseService; @Autowired - private RadishGiftSendRecordMapperMgr radishGiftSendRecordMapperMgr; - @Autowired private RoomRevenueExcelService roomRevenueExcelService; @Autowired private RoomService roomService; @@ -194,18 +190,12 @@ public class RoomGiftSerialService { return Collections.emptyList(); } - stopWatch.start("radishGiftSendSerials"); - List uids = totals.stream().map(map -> Long.valueOf(Optional.ofNullable(map.get("room_uid")).orElse(0L).toString())).collect(Collectors.toList()); - List radishVos = radishGiftSendRecordMapperMgr.listRoomRadishSerial(uids, startTime, endTime); - Map radishMap = radishVos.stream().collect(Collectors.toMap(RoomRadishVo::getRoomUid, RoomRadishVo::getRadishAmount)); - stopWatch.stop(); - - List roomGiftSerials = buildRoomGiftSerials(totals, radishMap); + List roomGiftSerials = buildRoomGiftSerials(totals); logger.info("listSerials completed. {}", stopWatch.prettyPrint()); return roomGiftSerials; } - private List buildRoomGiftSerials(List> totals, Map radishMap) { + private List buildRoomGiftSerials(List> totals) { List serials = Lists.newArrayListWithCapacity(totals.size()); totals.forEach(serialMap -> { RoomGiftSerial serial = new RoomGiftSerial(); @@ -217,7 +207,7 @@ public class RoomGiftSerialService { serial.setTotalGold(Double.parseDouble(totalGold.toString())); serial.setNormalTotalGold(Double.parseDouble(normalTotalGold.toString())); serial.setBackpackTotalGold(Double.parseDouble(backpackTotalGold.toString())); - serial.setTotalRadish(radishMap.get(roomUid)); + serial.setTotalRadish(0L); serials.add(serial); }); return serials; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/radish/RadishGiftAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/radish/RadishGiftAdminService.java deleted file mode 100644 index 56015a487..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/radish/RadishGiftAdminService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.accompany.admin.service.radish; - -import com.accompany.admin.service.base.BaseService; -import com.accompany.business.mybatismapper.RadishGiftSendRecordMapperMgr; -import com.accompany.business.vo.RadishGiftSendStatisticsVo; -import com.google.common.collect.Maps; -import com.accompany.common.constant.Constant; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/4/30 17:01 - * 4 - */ -@Service -public class RadishGiftAdminService extends BaseService { - @Autowired - private RadishGiftSendRecordMapperMgr radishGiftSendRecordMapperMgr; - - public Map getRadishGiftStatistics(List erbanNoList, String beginDate, String endDate, Integer pageNum, Integer pageSize) { - Map data = Maps.newHashMap(); - pageNum = pageNum != null ? pageNum : Constant.DEFAULT_PAGE; - pageSize = pageSize != null ? pageSize : Constant.DEFAULT_PAGE_SIZE; - Integer start = (pageNum - 1) * pageSize; - List totalStatistic = radishGiftSendRecordMapperMgr.getRadishGiftStatistics(erbanNoList, beginDate, endDate, start, pageSize); - int count = radishGiftSendRecordMapperMgr.queryTotalCount(erbanNoList, beginDate, endDate); - data.put("rows", totalStatistic); - data.put("total", count); - return data; - } - - -} diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java index ed43269c7..73f33e576 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java @@ -96,8 +96,8 @@ public class OfficialGoldRecordService extends BaseService { case OFFICAL_DIAMOND: case COMPANY_ACCOUNT_DIAMOND: return giveDiamond(ernos, type.getValue(), num, optId, actualAmount, remark, busType); - case OFFICAL_RADISH: - return giveCrystal(ernos, type.getValue(), num, optId, remark, busType); + //case OFFICAL_RADISH: + // return giveCrystal(ernos, type.getValue(), num, optId, remark, busType); case OFFICAL_REDUCE_DIAMONDS: return reduceDiamondNum(ernos, type.getValue(), num, optId, remark, busType); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserDrawProdAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserDrawProdAdminService.java deleted file mode 100644 index b62e66db4..000000000 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserDrawProdAdminService.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.accompany.admin.service.user; - -import com.accompany.admin.base.AbstractCoreService; -import com.accompany.admin.vo.UserDrawProdAdminVo; -import com.accompany.business.model.UserDrawProd; -import com.accompany.business.model.UserDrawProdExample; -import com.accompany.business.mybatismapper.UserDrawProdMapper; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.base.BaseMapper; -import com.accompany.core.base.BeanMapper; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Created by PaperCut on 2018/3/31. - */ -@Service -public class UserDrawProdAdminService extends AbstractCoreService { - @Autowired - UserDrawProdMapper userDrawProdMapper; - - @Override - protected BaseMapper getMapper() { - return userDrawProdMapper; - } - - @Override - public Object getId(UserDrawProd entity) { - return entity.getProdId(); - } - - public PageInfo listByPage(String drawId, int size, int page) { - PageHelper.startPage(size, page); - UserDrawProdExample example = new UserDrawProdExample(); - example.setOrderByClause("prod_id desc"); - if(!StringUtils.isEmpty(drawId)) { - example.createCriteria().andDrawIdEqualTo(drawId); - } - return new PageInfo(userDrawProdMapper.selectByExample(example)); - } - - public PageInfo listVoByPage(String drawId, int size, int page) { - PageInfo pageInfo = listByPage(drawId, size, page); - List list = pageInfo.getList(); - List prodAdminVoList = BeanMapper.mapList(list, UserDrawProd.class, UserDrawProdAdminVo.class); - //// 批量获取怪兽 - //List monsterIds = prodAdminVoList.stream().map((prod) -> Long.parseLong(prod.getDrawId())).collect(Collectors.toList()); - //Map monsterMap = monsterAdminService.batchByIds(monsterIds); - // - //// 批量获取怪兽种类 - //List monsterKindIds = monsterMap.entrySet().stream().map((entry) -> entry.getValue().getMonsterKindId()).collect(Collectors.toList()); - //Map monsterKindMap = monsterKindAdminService.batchByIds(monsterKindIds); - //for(UserDrawProdAdminVo prodVo : prodAdminVoList) { - // Monster monster = monsterMap.get(Long.parseLong(prodVo.getDrawId())); - // if(monster != null) { - // MonsterKind monsterKind = monsterKindMap.get(monster.getMonsterKindId()); - // if(monsterKind != null) { - // prodVo.setMonsterKindName(monsterKind.getMonsterKindName()); - // } - // } - //} - pageInfo.setList(prodAdminVoList); - return pageInfo; - } - - @Override - public int save(UserDrawProd entity, boolean isEdit, boolean isSelective) { - return super.save(entity, isEdit, isSelective); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/UserDrawRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/UserDrawRecordAdminController.java deleted file mode 100644 index 34638a67a..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/UserDrawRecordAdminController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.admin.controller.activity; - -import com.alibaba.fastjson.JSONObject; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.activity.UserDrawRecordAdminService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -@RestController -@RequestMapping("/admin/userdraw") -public class UserDrawRecordAdminController extends BaseController { - @Autowired - private UserDrawRecordAdminService userDrawRecordAdminService; - - @RequestMapping("/list") - public void queryUserDrawList(Long erbanNo,Byte drawType){ - Map map = userDrawRecordAdminService.queryUserDrawList(erbanNo,getPageSize(),getPageNumber(),drawType); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("total",map.get("total")); - jsonObject.put("rows",map.get("list")); - jsonObject.put("users",map.get("users")); - writeJson(jsonObject.toJSONString()); - } -} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/radish/RadishGiftAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/radish/RadishGiftAdminController.java deleted file mode 100644 index f77597dfb..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/radish/RadishGiftAdminController.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.accompany.admin.controller.radish; - -import com.alibaba.fastjson.JSONObject; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.radish.RadishGiftAdminService; -import com.accompany.core.util.StringUtils; -import com.accompany.business.vo.RadishGiftSendStatisticsVo; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/4/30 11:29 - * 4 - */ -@RestController -@RequestMapping("/admin/radish/gift") -public class RadishGiftAdminController extends BaseController { - @Autowired - private RadishGiftAdminService radishGiftAdminService; - - @RequestMapping(value = "/statistics", method = RequestMethod.GET) - public void getRadishGiftStatistics(String erbanNos, String beginDate, String endDate, - @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "20") Integer pageSize) { - Map data = radishGiftAdminService.getRadishGiftStatistics(toErbanList(erbanNos), beginDate, endDate, pageNum, pageSize); - writeJson(JSONObject.toJSONString(data)); - - } - - @RequestMapping(value = "/export", method = RequestMethod.GET) - public void export(HttpServletResponse response, String erbanNos, String beginDate, String endDate) throws IOException { - Map data = radishGiftAdminService.getRadishGiftStatistics(toErbanList(erbanNos), beginDate, endDate, 1, - 5000); - List statisticsList = (List) data.get("rows"); - HSSFWorkbook workbook = this.buildExcel(statisticsList); - // 设置下载时客户端Excel的名称 - String filename = "statistics_radish_gift_list.xls"; - response.setContentType("application/vnd.ms-excel"); - response.setHeader("Content-disposition", "attachment;filename=" + filename); - response.setCharacterEncoding("UTF-8"); - OutputStream ouputStream = response.getOutputStream(); - workbook.write(ouputStream); - ouputStream.flush(); - ouputStream.close(); - } - - private HSSFWorkbook buildExcel(List statisticsList) { - HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFSheet sheet = workbook.createSheet("萝卜礼物统计数据"); - - String[] headers = {"UID", "平台号", "用户昵称", "礼物金额（萝卜）"}; - HSSFRow header = sheet.createRow(0); - for (int i = 0; i < headers.length; i++) { - header.createCell(i).setCellValue(headers[i]); - } - int rowNum = 1; - for (RadishGiftSendStatisticsVo item : statisticsList) { - HSSFRow row = sheet.createRow(rowNum++); - row.createCell(0).setCellValue(item.getUid()); - row.createCell(1).setCellValue(Optional.ofNullable(item.getErbanNo()).orElse(0L)); - row.createCell(2).setCellValue(item.getNick()); - row.createCell(3).setCellValue(item.getRadishAmount()); - } - return workbook; - } - - /** - * 将平台号(多个)转换为平台号集合 - * - * @param erbanNos - * @return - */ - private List toErbanList(String erbanNos) { - List erbanList = null; - if (StringUtils.isNotEmpty(erbanNos)) { - String[] erbanNoArr = erbanNos.split(","); - if (erbanNoArr.length > 0) { - erbanList = Stream.of(erbanNoArr).map((erbanNo) -> Long.valueOf(erbanNo.trim())).collect(Collectors.toList()); - return erbanList; - } - } - erbanList = Collections.emptyList(); - return erbanList; - } -} \ No newline at end of file diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserDrawProdAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserDrawProdAdminController.java deleted file mode 100644 index 9de213655..000000000 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/UserDrawProdAdminController.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.accompany.admin.controller.user; - -import com.alibaba.fastjson.JSONObject; -import com.accompany.admin.controller.BaseController; -import com.accompany.admin.service.user.UserDrawProdAdminService; -import com.accompany.admin.vo.UserDrawProdAdminVo; -import com.accompany.business.model.UserDrawProd; -import com.github.pagehelper.PageInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -/** - * Created by PaperCut on 2018/03/31. - * 奖励配置模块 - */ -@Controller -@RequestMapping("/admin/userDrawProd") -public class UserDrawProdAdminController extends BaseController { - private static final Logger logger = LoggerFactory.getLogger(UserDrawProdAdminController.class); - @Autowired - UserDrawProdAdminService userDrawProdAdminService; - - @RequestMapping(value = "getList", method = RequestMethod.GET) - @ResponseBody - public void getList(String drawId) { - JSONObject jsonObject = new JSONObject(); - PageInfo pageInfo = userDrawProdAdminService.listVoByPage(drawId, getPageNumber(), getPageSize()); - jsonObject.put("total", pageInfo.getTotal()); - jsonObject.put("rows", pageInfo.getList()); - writeJson(jsonObject.toJSONString()); - } - - @RequestMapping(value = "save", method = RequestMethod.POST) - @ResponseBody - public void save(UserDrawProd userDrawProd) { - try { - int result = userDrawProdAdminService.save(userDrawProd, userDrawProd.getProdId() != null); - if(result>0) { - writeJson(true, "保存成功"); - return; - } - } catch(Exception e) { - logger.error("Failed to save userDrawProd. Cause by {}", e.getCause().getMessage()); - } - writeJson(false, "保存失败"); - } - - @RequestMapping(value = "del") - @ResponseBody - public void del(HttpServletRequest request) { - List ids = getRequestArray(request, "ids", Integer.class); - if(CollectionUtils.isEmpty(ids)){ - writeJson(false, "参数有误"); - return; - } - try { - int result = userDrawProdAdminService.delete(ids.toArray(new Integer[]{})); - if(result>0) { - writeJson(true, "删除成功"); - return; - } - } catch (Exception e) { - logger.error("Failed to delete userDrawProd, Cause by {}", e.getCause().getMessage()); - } - writeJson(false, "删除失败"); - } - - @RequestMapping(value = "get", method = RequestMethod.GET) - @ResponseBody - public void get(@RequestParam("id")Integer id) { - JSONObject jsonObject = new JSONObject(); - UserDrawProd userDrawProd = userDrawProdAdminService.get(id); - if(userDrawProd != null) { - jsonObject.put("entity", userDrawProd); - } - writeJson(jsonObject.toJSONString()); - } -} diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java index e86e689a7..e6126d125 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java @@ -648,16 +648,6 @@ public class Constant { public static final String users_default_nick = "users_default_nick"; public static final String users_default_avatar = "users_default_avatar"; - /** - * 审核中的绿厅 - */ - public static final String audit_green_room = "audit_green_room"; - - /** - * 红包税率 - */ - public static final String redpacket_tax_rate = "redpacket_tax_rate"; - /** * IOS上线渠道 */ @@ -3290,26 +3280,6 @@ public class Constant { public static final Byte WHITE = 2;//白名单奖池 } - /** - * 萝卜礼物赠送 收入类型 - */ - public static class RadishGiftRecordType { - // 赠送 - public static final byte SEND = 1; - // 收入 - public static final byte RECEIVE = 2; - } - - /** - * 萝卜账单收入支出类型 - */ - public static class RadishBillPayType { - // 支出 - public static final byte PAY = 1; - // 收入 - public static final byte INCOME = 2; - } - /** * 礼物消费类型 */ diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java index 47f2f8035..fbc13d313 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/redis/RedisKey.java @@ -109,7 +109,6 @@ public enum RedisKey { mq_gift_status, // 礼物消息的状态 mq_prize_status, // 中奖消息的状态 mq_magic_gift_status, // 魔法表情的状态 - mq_radish_gift_status, // 萝卜礼物消息的状态 mq_pay_finish_status, // 支付完成消息的状态 config_home_random,// 首页列表用随机列表 act_rank, @@ -120,7 +119,6 @@ public enum RedisKey { user_level_charm, // 用户等级魅力 level_exper, // 等级经验资源列表 level_charm, // 等级魅力资源列表 - user_draw, erban_no, //平台号 pretty_number,//靓号 auti_banner, //审核中的Banner @@ -464,10 +462,6 @@ public enum RedisKey { fans_count,//粉丝数量 user_live_skill,//用户个人资料页101数据 - user_gift_draw_single_time, // 用户礼物促销活动日常次数 - user_gift_draw_device_limit, // 用户礼物促销活动设备限制 - user_gift_draw_radish_limit, // 用户礼物促销活动萝卜数额限制 - user_gift_draw_share_status, // 用户页面分享状态 0:未达到条件 1:已达到条件 2:已使用 // 全局封禁 IP global_block_ip, // 全局封禁 设备 @@ -479,9 +473,6 @@ public enum RedisKey { send_gold_list,//主播赠送金币列表 anchor_white_list,//主播白名单 - lock_user_currency, // 货币分布式锁 - lock_user_radish, // 萝卜分布式锁 - lock_user_wallet, //用户钱包分布式锁 lock_buy_headwear, //购买头饰分布式锁 lock_buy_car, //购买座驾分布式锁 user_wallet, diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/WebLocaleConfig.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/config/WebLocaleConfig.java index 600219ba2..a94d83109 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/WebLocaleConfig.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/config/WebLocaleConfig.java @@ -1,7 +1,5 @@ package com.accompany.core.config; -import com.google.common.collect.Maps; -import org.apache.tomcat.jni.Local; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.LocaleResolver; @@ -17,13 +15,10 @@ public class WebLocaleConfig implements WebMvcConfigurer { public static Locale English = Locale.ENGLISH; // 阿拉伯语 public static Locale Arabic = new Locale("ar"); - public static Locale Turkey = new Locale("tr"); - // 印尼语 - public static Locale Indonesia = new Locale("in"); - public static List locales = Arrays.asList(Chinese, English, Arabic, Turkey, Indonesia); + public static List locales = Arrays.asList(Chinese, English, Arabic); - public static List partitionLocales = Arrays.asList(Chinese, Arabic, Indonesia); + public static List partitionLocales = Arrays.asList(Chinese, Arabic); public static Map partitionLocaleMaps = new HashMap<>(); @@ -31,8 +26,6 @@ public class WebLocaleConfig implements WebMvcConfigurer { partitionLocaleMaps.put(Chinese, Chinese); partitionLocaleMaps.put(English, Chinese); partitionLocaleMaps.put(Arabic, Arabic); - partitionLocaleMaps.put(Turkey, Arabic); - partitionLocaleMaps.put(Indonesia, Indonesia); } /** @@ -41,7 +34,7 @@ public class WebLocaleConfig implements WebMvcConfigurer { @Bean public LocaleResolver localeResolver() { AcceptHeaderLocaleResolver localeResolver = new AcceptHeaderLocaleResolver(); - localeResolver.setDefaultLocale(Locale.CHINESE); + localeResolver.setDefaultLocale(Locale.ENGLISH); localeResolver.setSupportedLocales(locales); return localeResolver; } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/OfficalSendTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/OfficalSendTypeEnum.java index 184a3bea6..bc6df5823 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/OfficalSendTypeEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/OfficalSendTypeEnum.java @@ -19,10 +19,6 @@ public enum OfficalSendTypeEnum { COMPANY_ACCOUNT_DIAMOND(Constant.BillType.chargeByCompanyAccount, "公款充值钻石"), - OFFICAL_RADISH(RadishBillTypeEnum.OFFICIAL_GVE.getValue(), "官方赠送水晶"), - - ACTIVITY_RADISH(RadishBillTypeEnum.ACTIVITY_AWARD.getValue(), "活动奖励萝卜"), - CLEAR_USER_GOLD(Constant.BillType.clearUserGold, "后台清除金币"), OFFICAL_REDUCE_DIAMONDS(Constant.BillType.officalDiamondReduce,"官方钻石消除") diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/PrizeTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/PrizeTypeEnum.java index 90954680a..ac9cda3fc 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/PrizeTypeEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/PrizeTypeEnum.java @@ -36,10 +36,6 @@ public enum PrizeTypeEnum { key(10, "锤子"), - noble_title(11, "贵族爵位"), - - radish(12, "萝卜"), - greeting(13, "祝福语"), nameplate(14, "铭牌"), diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/RadishBillTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/RadishBillTypeEnum.java deleted file mode 100644 index 3dbea1f5a..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/RadishBillTypeEnum.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.accompany.business.constant; - - -import com.accompany.common.constant.Constant; - -import java.util.Arrays; -import java.util.Optional; - -/** - * 萝卜账单类型 - */ -public enum RadishBillTypeEnum { - - SIGN_AWARD((byte) 1, "签到奖励",Constant.RadishBillPayType.INCOME), - - MISSION_AWARD((byte) 2, "任务奖励",Constant.RadishBillPayType.INCOME), - - SEND_GIFT((byte) 3, "送礼物", Constant.RadishBillPayType.PAY), - - BUY_HEADWEAR((byte) 4, "买头饰", Constant.RadishBillPayType.PAY), - - BUY_CARGOODS((byte) 5, "买座驾", Constant.RadishBillPayType.PAY), - - OFFICIAL_GVE((byte) 6, "官方赠送水晶",Constant.RadishBillPayType.INCOME), - - ACTIVITY_AWARD((byte) 7, "活动奖励萝卜",Constant.RadishBillPayType.INCOME), - - GIVE_HEADWEAR((byte) 8, "赠送头饰", Constant.RadishBillPayType.PAY), - - GIVE_CARGOODS((byte) 9, "赠送座驾", Constant.RadishBillPayType.PAY), - - RADISH_DRAW((byte) 10, "促销活动获取萝卜",Constant.RadishBillPayType.INCOME), - - REPLENISH_SING((byte) 11, "补签", Constant.RadishBillPayType.PAY), - - PACK_GIVE((byte) 12, "礼包发放",Constant.RadishBillPayType.INCOME), - - Mid_YEAR_GIVE((byte) 13, "年中任务达人发放",Constant.RadishBillPayType.INCOME), - - voice_bottle_gift((byte) 14, "声音瓶子活动发放",Constant.RadishBillPayType.INCOME), - ; - - private byte value; - - private String desc; - - private byte payType;//收入支出类型 - - public byte getPayType() { - return payType; - } - - public void setPayType(byte payType) { - this.payType = payType; - } - - public byte getValue() { - return value; - } - - public void setValue(byte value) { - this.value = value; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - RadishBillTypeEnum(byte value, String desc,byte payType) { - this.value = value; - this.desc = desc; - this.payType = payType; - } - - public static RadishBillTypeEnum get(byte value) { - Optional result = Arrays.stream(RadishBillTypeEnum.values()).filter(RadishBillTypeEnum -> - RadishBillTypeEnum.value == value).findAny(); - return result.isPresent() ? result.get() : null; - } - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/RadishGiftMessage.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/RadishGiftMessage.java deleted file mode 100644 index 5da69a35a..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/message/RadishGiftMessage.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.accompany.business.message; - - -import com.accompany.mq.model.BaseMqMessage; - -import java.io.Serializable; - -/** - * 萝卜礼物消息 - */ -public class RadishGiftMessage extends BaseMqMessage { - private static final long serialVersionUID = 1L; - private String messId; // 消息唯一标识 - private Long messTime; // 消息创建时间 - private Long sendUid; // 发送者UID - private Long receiveUid; // 接收者UID - private Long roomUid; // 房间主UID - private Byte roomType; // 房间类型 - private Long radishNum; // 金币数量 - private Integer giftId; // 礼物标识 - private Integer giftNum; // 礼物数量 - private Byte sendType; // 赠送类型，如： 1对1送礼物，全麦送礼物 - private String msg; // 全服消息内容 - private Integer giftSource; //礼物来源，1:普通礼物，2:背包礼物 - - public String getMessId() { - return messId; - } - - public void setMessId(String messId) { - this.messId = messId; - } - - public Long getMessTime() { - return messTime; - } - - public void setMessTime(Long messTime) { - this.messTime = messTime; - } - - public Long getSendUid() { - return sendUid; - } - - public void setSendUid(Long sendUid) { - this.sendUid = sendUid; - } - - public Long getReceiveUid() { - return receiveUid; - } - - public void setReceiveUid(Long receiveUid) { - this.receiveUid = receiveUid; - } - - public Long getRoomUid() { - return roomUid; - } - - public void setRoomUid(Long roomUid) { - this.roomUid = roomUid; - } - - public Byte getRoomType() { - return roomType; - } - - public void setRoomType(Byte roomType) { - this.roomType = roomType; - } - - public Long getRadishNum() { - return radishNum; - } - - public void setRadishNum(Long radishNum) { - this.radishNum = radishNum; - } - - public Integer getGiftId() { - return giftId; - } - - public void setGiftId(Integer giftId) { - this.giftId = giftId; - } - - public Integer getGiftNum() { - return giftNum; - } - - public void setGiftNum(Integer giftNum) { - this.giftNum = giftNum; - } - - public Byte getSendType() { - return sendType; - } - - public void setSendType(Byte sendType) { - this.sendType = sendType; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public Integer getGiftSource() { - return giftSource; - } - - public void setGiftSource(Integer giftSource) { - this.giftSource = giftSource; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PacketWithdrawRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PacketWithdrawRecord.java deleted file mode 100644 index 75d39c8c2..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PacketWithdrawRecord.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class PacketWithdrawRecord { - private String recordId; - - private Long uid; - - private Integer packetProdCashId; - - private Double packetNum; - - private Double taxNum; - - private String billId; - - private String description; - - private String remark; - - private Byte recordStatus; - - private String payId; - - private String payStatus; - - private String payResult; - - private Date createTime; - - private Date updateTime; - - public String getRecordId() { - return recordId; - } - - public void setRecordId(String recordId) { - this.recordId = recordId == null ? null : recordId.trim(); - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Integer getPacketProdCashId() { - return packetProdCashId; - } - - public void setPacketProdCashId(Integer packetProdCashId) { - this.packetProdCashId = packetProdCashId; - } - - public Double getPacketNum() { - return packetNum; - } - - public void setPacketNum(Double packetNum) { - this.packetNum = packetNum; - } - - public Double getTaxNum() { - return taxNum; - } - - public void setTaxNum(Double taxNum) { - this.taxNum = taxNum; - } - - public String getBillId() { - return billId; - } - - public void setBillId(String billId) { - this.billId = billId == null ? null : billId.trim(); - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description == null ? null : description.trim(); - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } - - public Byte getRecordStatus() { - return recordStatus; - } - - public void setRecordStatus(Byte recordStatus) { - this.recordStatus = recordStatus; - } - - public String getPayId() { - return payId; - } - - public void setPayId(String payId) { - this.payId = payId == null ? null : payId.trim(); - } - - public String getPayStatus() { - return payStatus; - } - - public void setPayStatus(String payStatus) { - this.payStatus = payStatus == null ? null : payStatus.trim(); - } - - public String getPayResult() { - return payResult; - } - - public void setPayResult(String payResult) { - this.payResult = payResult == null ? null : payResult.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PacketWithdrawRecordExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PacketWithdrawRecordExample.java deleted file mode 100644 index ab0c7b3c3..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/PacketWithdrawRecordExample.java +++ /dev/null @@ -1,1131 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class PacketWithdrawRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public PacketWithdrawRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(String value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(String value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(String value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(String value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(String value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(String value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLike(String value) { - addCriterion("record_id like", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotLike(String value) { - addCriterion("record_id not like", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(String value1, String value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(String value1, String value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdIsNull() { - addCriterion("packet_prod_cash_id is null"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdIsNotNull() { - addCriterion("packet_prod_cash_id is not null"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdEqualTo(Integer value) { - addCriterion("packet_prod_cash_id =", value, "packetProdCashId"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdNotEqualTo(Integer value) { - addCriterion("packet_prod_cash_id <>", value, "packetProdCashId"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdGreaterThan(Integer value) { - addCriterion("packet_prod_cash_id >", value, "packetProdCashId"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdGreaterThanOrEqualTo(Integer value) { - addCriterion("packet_prod_cash_id >=", value, "packetProdCashId"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdLessThan(Integer value) { - addCriterion("packet_prod_cash_id <", value, "packetProdCashId"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdLessThanOrEqualTo(Integer value) { - addCriterion("packet_prod_cash_id <=", value, "packetProdCashId"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdIn(List values) { - addCriterion("packet_prod_cash_id in", values, "packetProdCashId"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdNotIn(List values) { - addCriterion("packet_prod_cash_id not in", values, "packetProdCashId"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdBetween(Integer value1, Integer value2) { - addCriterion("packet_prod_cash_id between", value1, value2, "packetProdCashId"); - return (Criteria) this; - } - - public Criteria andPacketProdCashIdNotBetween(Integer value1, Integer value2) { - addCriterion("packet_prod_cash_id not between", value1, value2, "packetProdCashId"); - return (Criteria) this; - } - - public Criteria andPacketNumIsNull() { - addCriterion("packet_num is null"); - return (Criteria) this; - } - - public Criteria andPacketNumIsNotNull() { - addCriterion("packet_num is not null"); - return (Criteria) this; - } - - public Criteria andPacketNumEqualTo(Double value) { - addCriterion("packet_num =", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotEqualTo(Double value) { - addCriterion("packet_num <>", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumGreaterThan(Double value) { - addCriterion("packet_num >", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumGreaterThanOrEqualTo(Double value) { - addCriterion("packet_num >=", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumLessThan(Double value) { - addCriterion("packet_num <", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumLessThanOrEqualTo(Double value) { - addCriterion("packet_num <=", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumIn(List values) { - addCriterion("packet_num in", values, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotIn(List values) { - addCriterion("packet_num not in", values, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumBetween(Double value1, Double value2) { - addCriterion("packet_num between", value1, value2, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotBetween(Double value1, Double value2) { - addCriterion("packet_num not between", value1, value2, "packetNum"); - return (Criteria) this; - } - - public Criteria andTaxNumIsNull() { - addCriterion("tax_num is null"); - return (Criteria) this; - } - - public Criteria andTaxNumIsNotNull() { - addCriterion("tax_num is not null"); - return (Criteria) this; - } - - public Criteria andTaxNumEqualTo(Double value) { - addCriterion("tax_num =", value, "taxNum"); - return (Criteria) this; - } - - public Criteria andTaxNumNotEqualTo(Double value) { - addCriterion("tax_num <>", value, "taxNum"); - return (Criteria) this; - } - - public Criteria andTaxNumGreaterThan(Double value) { - addCriterion("tax_num >", value, "taxNum"); - return (Criteria) this; - } - - public Criteria andTaxNumGreaterThanOrEqualTo(Double value) { - addCriterion("tax_num >=", value, "taxNum"); - return (Criteria) this; - } - - public Criteria andTaxNumLessThan(Double value) { - addCriterion("tax_num <", value, "taxNum"); - return (Criteria) this; - } - - public Criteria andTaxNumLessThanOrEqualTo(Double value) { - addCriterion("tax_num <=", value, "taxNum"); - return (Criteria) this; - } - - public Criteria andTaxNumIn(List values) { - addCriterion("tax_num in", values, "taxNum"); - return (Criteria) this; - } - - public Criteria andTaxNumNotIn(List values) { - addCriterion("tax_num not in", values, "taxNum"); - return (Criteria) this; - } - - public Criteria andTaxNumBetween(Double value1, Double value2) { - addCriterion("tax_num between", value1, value2, "taxNum"); - return (Criteria) this; - } - - public Criteria andTaxNumNotBetween(Double value1, Double value2) { - addCriterion("tax_num not between", value1, value2, "taxNum"); - return (Criteria) this; - } - - public Criteria andBillIdIsNull() { - addCriterion("bill_id is null"); - return (Criteria) this; - } - - public Criteria andBillIdIsNotNull() { - addCriterion("bill_id is not null"); - return (Criteria) this; - } - - public Criteria andBillIdEqualTo(String value) { - addCriterion("bill_id =", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdNotEqualTo(String value) { - addCriterion("bill_id <>", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdGreaterThan(String value) { - addCriterion("bill_id >", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdGreaterThanOrEqualTo(String value) { - addCriterion("bill_id >=", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdLessThan(String value) { - addCriterion("bill_id <", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdLessThanOrEqualTo(String value) { - addCriterion("bill_id <=", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdLike(String value) { - addCriterion("bill_id like", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdNotLike(String value) { - addCriterion("bill_id not like", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdIn(List values) { - addCriterion("bill_id in", values, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdNotIn(List values) { - addCriterion("bill_id not in", values, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdBetween(String value1, String value2) { - addCriterion("bill_id between", value1, value2, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdNotBetween(String value1, String value2) { - addCriterion("bill_id not between", value1, value2, "billId"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andRemarkIsNull() { - addCriterion("remark is null"); - return (Criteria) this; - } - - public Criteria andRemarkIsNotNull() { - addCriterion("remark is not null"); - return (Criteria) this; - } - - public Criteria andRemarkEqualTo(String value) { - addCriterion("remark =", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotEqualTo(String value) { - addCriterion("remark <>", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkGreaterThan(String value) { - addCriterion("remark >", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("remark >=", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLessThan(String value) { - addCriterion("remark <", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("remark <=", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLike(String value) { - addCriterion("remark like", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotLike(String value) { - addCriterion("remark not like", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkIn(List values) { - addCriterion("remark in", values, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotIn(List values) { - addCriterion("remark not in", values, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("remark between", value1, value2, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("remark not between", value1, value2, "remark"); - return (Criteria) this; - } - - public Criteria andRecordStatusIsNull() { - addCriterion("record_status is null"); - return (Criteria) this; - } - - public Criteria andRecordStatusIsNotNull() { - addCriterion("record_status is not null"); - return (Criteria) this; - } - - public Criteria andRecordStatusEqualTo(Byte value) { - addCriterion("record_status =", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusNotEqualTo(Byte value) { - addCriterion("record_status <>", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusGreaterThan(Byte value) { - addCriterion("record_status >", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("record_status >=", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusLessThan(Byte value) { - addCriterion("record_status <", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusLessThanOrEqualTo(Byte value) { - addCriterion("record_status <=", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusIn(List values) { - addCriterion("record_status in", values, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusNotIn(List values) { - addCriterion("record_status not in", values, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusBetween(Byte value1, Byte value2) { - addCriterion("record_status between", value1, value2, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusNotBetween(Byte value1, Byte value2) { - addCriterion("record_status not between", value1, value2, "recordStatus"); - return (Criteria) this; - } - - public Criteria andPayIdIsNull() { - addCriterion("pay_id is null"); - return (Criteria) this; - } - - public Criteria andPayIdIsNotNull() { - addCriterion("pay_id is not null"); - return (Criteria) this; - } - - public Criteria andPayIdEqualTo(String value) { - addCriterion("pay_id =", value, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdNotEqualTo(String value) { - addCriterion("pay_id <>", value, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdGreaterThan(String value) { - addCriterion("pay_id >", value, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdGreaterThanOrEqualTo(String value) { - addCriterion("pay_id >=", value, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdLessThan(String value) { - addCriterion("pay_id <", value, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdLessThanOrEqualTo(String value) { - addCriterion("pay_id <=", value, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdLike(String value) { - addCriterion("pay_id like", value, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdNotLike(String value) { - addCriterion("pay_id not like", value, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdIn(List values) { - addCriterion("pay_id in", values, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdNotIn(List values) { - addCriterion("pay_id not in", values, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdBetween(String value1, String value2) { - addCriterion("pay_id between", value1, value2, "payId"); - return (Criteria) this; - } - - public Criteria andPayIdNotBetween(String value1, String value2) { - addCriterion("pay_id not between", value1, value2, "payId"); - return (Criteria) this; - } - - public Criteria andPayStatusIsNull() { - addCriterion("pay_status is null"); - return (Criteria) this; - } - - public Criteria andPayStatusIsNotNull() { - addCriterion("pay_status is not null"); - return (Criteria) this; - } - - public Criteria andPayStatusEqualTo(String value) { - addCriterion("pay_status =", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusNotEqualTo(String value) { - addCriterion("pay_status <>", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusGreaterThan(String value) { - addCriterion("pay_status >", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusGreaterThanOrEqualTo(String value) { - addCriterion("pay_status >=", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusLessThan(String value) { - addCriterion("pay_status <", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusLessThanOrEqualTo(String value) { - addCriterion("pay_status <=", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusLike(String value) { - addCriterion("pay_status like", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusNotLike(String value) { - addCriterion("pay_status not like", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusIn(List values) { - addCriterion("pay_status in", values, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusNotIn(List values) { - addCriterion("pay_status not in", values, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusBetween(String value1, String value2) { - addCriterion("pay_status between", value1, value2, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusNotBetween(String value1, String value2) { - addCriterion("pay_status not between", value1, value2, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayResultIsNull() { - addCriterion("pay_result is null"); - return (Criteria) this; - } - - public Criteria andPayResultIsNotNull() { - addCriterion("pay_result is not null"); - return (Criteria) this; - } - - public Criteria andPayResultEqualTo(String value) { - addCriterion("pay_result =", value, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultNotEqualTo(String value) { - addCriterion("pay_result <>", value, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultGreaterThan(String value) { - addCriterion("pay_result >", value, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultGreaterThanOrEqualTo(String value) { - addCriterion("pay_result >=", value, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultLessThan(String value) { - addCriterion("pay_result <", value, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultLessThanOrEqualTo(String value) { - addCriterion("pay_result <=", value, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultLike(String value) { - addCriterion("pay_result like", value, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultNotLike(String value) { - addCriterion("pay_result not like", value, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultIn(List values) { - addCriterion("pay_result in", values, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultNotIn(List values) { - addCriterion("pay_result not in", values, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultBetween(String value1, String value2) { - addCriterion("pay_result between", value1, value2, "payResult"); - return (Criteria) this; - } - - public Criteria andPayResultNotBetween(String value1, String value2) { - addCriterion("pay_result not between", value1, value2, "payResult"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishBill.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishBill.java deleted file mode 100644 index 376b9ffe7..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishBill.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class RadishBill { - private String billId; - - private Long uid; - - private Long targetUid; - - private Long roomUid; - - private Byte billType; - - private Long amount; - - private Byte currencyType; - - private Integer giftId; - - private Integer giftNum; - - private String objId; - - private Boolean deleted; - - private Date createTime; - - private Date updateTime; - - public String getBillId() { - return billId; - } - - public void setBillId(String billId) { - this.billId = billId == null ? null : billId.trim(); - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getTargetUid() { - return targetUid; - } - - public void setTargetUid(Long targetUid) { - this.targetUid = targetUid; - } - - public Long getRoomUid() { - return roomUid; - } - - public void setRoomUid(Long roomUid) { - this.roomUid = roomUid; - } - - public Byte getBillType() { - return billType; - } - - public void setBillType(Byte billType) { - this.billType = billType; - } - - public Long getAmount() { - return amount; - } - - public void setAmount(Long amount) { - this.amount = amount; - } - - public Byte getCurrencyType() { - return currencyType; - } - - public void setCurrencyType(Byte currencyType) { - this.currencyType = currencyType; - } - - public Integer getGiftId() { - return giftId; - } - - public void setGiftId(Integer giftId) { - this.giftId = giftId; - } - - public Integer getGiftNum() { - return giftNum; - } - - public void setGiftNum(Integer giftNum) { - this.giftNum = giftNum; - } - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId == null ? null : objId.trim(); - } - - public Boolean getDeleted() { - return deleted; - } - - public void setDeleted(Boolean deleted) { - this.deleted = deleted; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishBillExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishBillExample.java deleted file mode 100644 index f810a406b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishBillExample.java +++ /dev/null @@ -1,1021 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class RadishBillExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public RadishBillExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andBillIdIsNull() { - addCriterion("bill_id is null"); - return (Criteria) this; - } - - public Criteria andBillIdIsNotNull() { - addCriterion("bill_id is not null"); - return (Criteria) this; - } - - public Criteria andBillIdEqualTo(String value) { - addCriterion("bill_id =", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdNotEqualTo(String value) { - addCriterion("bill_id <>", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdGreaterThan(String value) { - addCriterion("bill_id >", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdGreaterThanOrEqualTo(String value) { - addCriterion("bill_id >=", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdLessThan(String value) { - addCriterion("bill_id <", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdLessThanOrEqualTo(String value) { - addCriterion("bill_id <=", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdLike(String value) { - addCriterion("bill_id like", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdNotLike(String value) { - addCriterion("bill_id not like", value, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdIn(List values) { - addCriterion("bill_id in", values, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdNotIn(List values) { - addCriterion("bill_id not in", values, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdBetween(String value1, String value2) { - addCriterion("bill_id between", value1, value2, "billId"); - return (Criteria) this; - } - - public Criteria andBillIdNotBetween(String value1, String value2) { - addCriterion("bill_id not between", value1, value2, "billId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andTargetUidIsNull() { - addCriterion("target_uid is null"); - return (Criteria) this; - } - - public Criteria andTargetUidIsNotNull() { - addCriterion("target_uid is not null"); - return (Criteria) this; - } - - public Criteria andTargetUidEqualTo(Long value) { - addCriterion("target_uid =", value, "targetUid"); - return (Criteria) this; - } - - public Criteria andTargetUidNotEqualTo(Long value) { - addCriterion("target_uid <>", value, "targetUid"); - return (Criteria) this; - } - - public Criteria andTargetUidGreaterThan(Long value) { - addCriterion("target_uid >", value, "targetUid"); - return (Criteria) this; - } - - public Criteria andTargetUidGreaterThanOrEqualTo(Long value) { - addCriterion("target_uid >=", value, "targetUid"); - return (Criteria) this; - } - - public Criteria andTargetUidLessThan(Long value) { - addCriterion("target_uid <", value, "targetUid"); - return (Criteria) this; - } - - public Criteria andTargetUidLessThanOrEqualTo(Long value) { - addCriterion("target_uid <=", value, "targetUid"); - return (Criteria) this; - } - - public Criteria andTargetUidIn(List values) { - addCriterion("target_uid in", values, "targetUid"); - return (Criteria) this; - } - - public Criteria andTargetUidNotIn(List values) { - addCriterion("target_uid not in", values, "targetUid"); - return (Criteria) this; - } - - public Criteria andTargetUidBetween(Long value1, Long value2) { - addCriterion("target_uid between", value1, value2, "targetUid"); - return (Criteria) this; - } - - public Criteria andTargetUidNotBetween(Long value1, Long value2) { - addCriterion("target_uid not between", value1, value2, "targetUid"); - return (Criteria) this; - } - - public Criteria andRoomUidIsNull() { - addCriterion("room_uid is null"); - return (Criteria) this; - } - - public Criteria andRoomUidIsNotNull() { - addCriterion("room_uid is not null"); - return (Criteria) this; - } - - public Criteria andRoomUidEqualTo(Long value) { - addCriterion("room_uid =", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidNotEqualTo(Long value) { - addCriterion("room_uid <>", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidGreaterThan(Long value) { - addCriterion("room_uid >", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidGreaterThanOrEqualTo(Long value) { - addCriterion("room_uid >=", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidLessThan(Long value) { - addCriterion("room_uid <", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidLessThanOrEqualTo(Long value) { - addCriterion("room_uid <=", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidIn(List values) { - addCriterion("room_uid in", values, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidNotIn(List values) { - addCriterion("room_uid not in", values, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidBetween(Long value1, Long value2) { - addCriterion("room_uid between", value1, value2, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidNotBetween(Long value1, Long value2) { - addCriterion("room_uid not between", value1, value2, "roomUid"); - return (Criteria) this; - } - - public Criteria andBillTypeIsNull() { - addCriterion("bill_type is null"); - return (Criteria) this; - } - - public Criteria andBillTypeIsNotNull() { - addCriterion("bill_type is not null"); - return (Criteria) this; - } - - public Criteria andBillTypeEqualTo(Byte value) { - addCriterion("bill_type =", value, "billType"); - return (Criteria) this; - } - - public Criteria andBillTypeNotEqualTo(Byte value) { - addCriterion("bill_type <>", value, "billType"); - return (Criteria) this; - } - - public Criteria andBillTypeGreaterThan(Byte value) { - addCriterion("bill_type >", value, "billType"); - return (Criteria) this; - } - - public Criteria andBillTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("bill_type >=", value, "billType"); - return (Criteria) this; - } - - public Criteria andBillTypeLessThan(Byte value) { - addCriterion("bill_type <", value, "billType"); - return (Criteria) this; - } - - public Criteria andBillTypeLessThanOrEqualTo(Byte value) { - addCriterion("bill_type <=", value, "billType"); - return (Criteria) this; - } - - public Criteria andBillTypeIn(List values) { - addCriterion("bill_type in", values, "billType"); - return (Criteria) this; - } - - public Criteria andBillTypeNotIn(List values) { - addCriterion("bill_type not in", values, "billType"); - return (Criteria) this; - } - - public Criteria andBillTypeBetween(Byte value1, Byte value2) { - addCriterion("bill_type between", value1, value2, "billType"); - return (Criteria) this; - } - - public Criteria andBillTypeNotBetween(Byte value1, Byte value2) { - addCriterion("bill_type not between", value1, value2, "billType"); - return (Criteria) this; - } - - public Criteria andAmountIsNull() { - addCriterion("amount is null"); - return (Criteria) this; - } - - public Criteria andAmountIsNotNull() { - addCriterion("amount is not null"); - return (Criteria) this; - } - - public Criteria andAmountEqualTo(Long value) { - addCriterion("amount =", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountNotEqualTo(Long value) { - addCriterion("amount <>", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountGreaterThan(Long value) { - addCriterion("amount >", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountGreaterThanOrEqualTo(Long value) { - addCriterion("amount >=", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountLessThan(Long value) { - addCriterion("amount <", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountLessThanOrEqualTo(Long value) { - addCriterion("amount <=", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountIn(List values) { - addCriterion("amount in", values, "amount"); - return (Criteria) this; - } - - public Criteria andAmountNotIn(List values) { - addCriterion("amount not in", values, "amount"); - return (Criteria) this; - } - - public Criteria andAmountBetween(Long value1, Long value2) { - addCriterion("amount between", value1, value2, "amount"); - return (Criteria) this; - } - - public Criteria andAmountNotBetween(Long value1, Long value2) { - addCriterion("amount not between", value1, value2, "amount"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeIsNull() { - addCriterion("currency_type is null"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeIsNotNull() { - addCriterion("currency_type is not null"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeEqualTo(Byte value) { - addCriterion("currency_type =", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeNotEqualTo(Byte value) { - addCriterion("currency_type <>", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeGreaterThan(Byte value) { - addCriterion("currency_type >", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("currency_type >=", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeLessThan(Byte value) { - addCriterion("currency_type <", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeLessThanOrEqualTo(Byte value) { - addCriterion("currency_type <=", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeIn(List values) { - addCriterion("currency_type in", values, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeNotIn(List values) { - addCriterion("currency_type not in", values, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeBetween(Byte value1, Byte value2) { - addCriterion("currency_type between", value1, value2, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeNotBetween(Byte value1, Byte value2) { - addCriterion("currency_type not between", value1, value2, "currencyType"); - return (Criteria) this; - } - - public Criteria andGiftIdIsNull() { - addCriterion("gift_id is null"); - return (Criteria) this; - } - - public Criteria andGiftIdIsNotNull() { - addCriterion("gift_id is not null"); - return (Criteria) this; - } - - public Criteria andGiftIdEqualTo(Integer value) { - addCriterion("gift_id =", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdNotEqualTo(Integer value) { - addCriterion("gift_id <>", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdGreaterThan(Integer value) { - addCriterion("gift_id >", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdGreaterThanOrEqualTo(Integer value) { - addCriterion("gift_id >=", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdLessThan(Integer value) { - addCriterion("gift_id <", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdLessThanOrEqualTo(Integer value) { - addCriterion("gift_id <=", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdIn(List values) { - addCriterion("gift_id in", values, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdNotIn(List values) { - addCriterion("gift_id not in", values, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdBetween(Integer value1, Integer value2) { - addCriterion("gift_id between", value1, value2, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdNotBetween(Integer value1, Integer value2) { - addCriterion("gift_id not between", value1, value2, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftNumIsNull() { - addCriterion("gift_num is null"); - return (Criteria) this; - } - - public Criteria andGiftNumIsNotNull() { - addCriterion("gift_num is not null"); - return (Criteria) this; - } - - public Criteria andGiftNumEqualTo(Integer value) { - addCriterion("gift_num =", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumNotEqualTo(Integer value) { - addCriterion("gift_num <>", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumGreaterThan(Integer value) { - addCriterion("gift_num >", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumGreaterThanOrEqualTo(Integer value) { - addCriterion("gift_num >=", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumLessThan(Integer value) { - addCriterion("gift_num <", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumLessThanOrEqualTo(Integer value) { - addCriterion("gift_num <=", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumIn(List values) { - addCriterion("gift_num in", values, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumNotIn(List values) { - addCriterion("gift_num not in", values, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumBetween(Integer value1, Integer value2) { - addCriterion("gift_num between", value1, value2, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumNotBetween(Integer value1, Integer value2) { - addCriterion("gift_num not between", value1, value2, "giftNum"); - return (Criteria) this; - } - - public Criteria andObjIdIsNull() { - addCriterion("obj_id is null"); - return (Criteria) this; - } - - public Criteria andObjIdIsNotNull() { - addCriterion("obj_id is not null"); - return (Criteria) this; - } - - public Criteria andObjIdEqualTo(String value) { - addCriterion("obj_id =", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdNotEqualTo(String value) { - addCriterion("obj_id <>", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdGreaterThan(String value) { - addCriterion("obj_id >", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdGreaterThanOrEqualTo(String value) { - addCriterion("obj_id >=", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdLessThan(String value) { - addCriterion("obj_id <", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdLessThanOrEqualTo(String value) { - addCriterion("obj_id <=", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdLike(String value) { - addCriterion("obj_id like", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdNotLike(String value) { - addCriterion("obj_id not like", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdIn(List values) { - addCriterion("obj_id in", values, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdNotIn(List values) { - addCriterion("obj_id not in", values, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdBetween(String value1, String value2) { - addCriterion("obj_id between", value1, value2, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdNotBetween(String value1, String value2) { - addCriterion("obj_id not between", value1, value2, "objId"); - return (Criteria) this; - } - - public Criteria andDeletedIsNull() { - addCriterion("deleted is null"); - return (Criteria) this; - } - - public Criteria andDeletedIsNotNull() { - addCriterion("deleted is not null"); - return (Criteria) this; - } - - public Criteria andDeletedEqualTo(Boolean value) { - addCriterion("deleted =", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotEqualTo(Boolean value) { - addCriterion("deleted <>", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThan(Boolean value) { - addCriterion("deleted >", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) { - addCriterion("deleted >=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThan(Boolean value) { - addCriterion("deleted <", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThanOrEqualTo(Boolean value) { - addCriterion("deleted <=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedIn(List values) { - addCriterion("deleted in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotIn(List values) { - addCriterion("deleted not in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedBetween(Boolean value1, Boolean value2) { - addCriterion("deleted between", value1, value2, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) { - addCriterion("deleted not between", value1, value2, "deleted"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishGiftSendRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishGiftSendRecord.java deleted file mode 100644 index 6eaa5e107..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishGiftSendRecord.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class RadishGiftSendRecord { - private Long recordId; - - private Long uid; - - private Long receiveUid; - - private Long roomUid; - - private Integer giftId; - - private Integer giftNum; - - private Integer radishAmount; - - private Byte roomType; - - private Byte giftSource; - - private Byte sendEnv; - - private Boolean deleted; - - private Date createTime; - - private Date updateTime; - - public Long getRecordId() { - return recordId; - } - - public void setRecordId(Long recordId) { - this.recordId = recordId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getReceiveUid() { - return receiveUid; - } - - public void setReceiveUid(Long receiveUid) { - this.receiveUid = receiveUid; - } - - public Long getRoomUid() { - return roomUid; - } - - public void setRoomUid(Long roomUid) { - this.roomUid = roomUid; - } - - public Integer getGiftId() { - return giftId; - } - - public void setGiftId(Integer giftId) { - this.giftId = giftId; - } - - public Integer getGiftNum() { - return giftNum; - } - - public void setGiftNum(Integer giftNum) { - this.giftNum = giftNum; - } - - public Integer getRadishAmount() { - return radishAmount; - } - - public void setRadishAmount(Integer radishAmount) { - this.radishAmount = radishAmount; - } - - public Byte getRoomType() { - return roomType; - } - - public void setRoomType(Byte roomType) { - this.roomType = roomType; - } - - public Byte getGiftSource() { - return giftSource; - } - - public void setGiftSource(Byte giftSource) { - this.giftSource = giftSource; - } - - public Byte getSendEnv() { - return sendEnv; - } - - public void setSendEnv(Byte sendEnv) { - this.sendEnv = sendEnv; - } - - public Boolean getDeleted() { - return deleted; - } - - public void setDeleted(Boolean deleted) { - this.deleted = deleted; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishGiftSendRecordExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishGiftSendRecordExample.java deleted file mode 100644 index 93a4c90c8..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/RadishGiftSendRecordExample.java +++ /dev/null @@ -1,1001 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class RadishGiftSendRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public RadishGiftSendRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(Long value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(Long value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(Long value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(Long value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(Long value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(Long value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(Long value1, Long value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(Long value1, Long value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andReceiveUidIsNull() { - addCriterion("receive_uid is null"); - return (Criteria) this; - } - - public Criteria andReceiveUidIsNotNull() { - addCriterion("receive_uid is not null"); - return (Criteria) this; - } - - public Criteria andReceiveUidEqualTo(Long value) { - addCriterion("receive_uid =", value, "receiveUid"); - return (Criteria) this; - } - - public Criteria andReceiveUidNotEqualTo(Long value) { - addCriterion("receive_uid <>", value, "receiveUid"); - return (Criteria) this; - } - - public Criteria andReceiveUidGreaterThan(Long value) { - addCriterion("receive_uid >", value, "receiveUid"); - return (Criteria) this; - } - - public Criteria andReceiveUidGreaterThanOrEqualTo(Long value) { - addCriterion("receive_uid >=", value, "receiveUid"); - return (Criteria) this; - } - - public Criteria andReceiveUidLessThan(Long value) { - addCriterion("receive_uid <", value, "receiveUid"); - return (Criteria) this; - } - - public Criteria andReceiveUidLessThanOrEqualTo(Long value) { - addCriterion("receive_uid <=", value, "receiveUid"); - return (Criteria) this; - } - - public Criteria andReceiveUidIn(List values) { - addCriterion("receive_uid in", values, "receiveUid"); - return (Criteria) this; - } - - public Criteria andReceiveUidNotIn(List values) { - addCriterion("receive_uid not in", values, "receiveUid"); - return (Criteria) this; - } - - public Criteria andReceiveUidBetween(Long value1, Long value2) { - addCriterion("receive_uid between", value1, value2, "receiveUid"); - return (Criteria) this; - } - - public Criteria andReceiveUidNotBetween(Long value1, Long value2) { - addCriterion("receive_uid not between", value1, value2, "receiveUid"); - return (Criteria) this; - } - - public Criteria andRoomUidIsNull() { - addCriterion("room_uid is null"); - return (Criteria) this; - } - - public Criteria andRoomUidIsNotNull() { - addCriterion("room_uid is not null"); - return (Criteria) this; - } - - public Criteria andRoomUidEqualTo(Long value) { - addCriterion("room_uid =", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidNotEqualTo(Long value) { - addCriterion("room_uid <>", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidGreaterThan(Long value) { - addCriterion("room_uid >", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidGreaterThanOrEqualTo(Long value) { - addCriterion("room_uid >=", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidLessThan(Long value) { - addCriterion("room_uid <", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidLessThanOrEqualTo(Long value) { - addCriterion("room_uid <=", value, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidIn(List values) { - addCriterion("room_uid in", values, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidNotIn(List values) { - addCriterion("room_uid not in", values, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidBetween(Long value1, Long value2) { - addCriterion("room_uid between", value1, value2, "roomUid"); - return (Criteria) this; - } - - public Criteria andRoomUidNotBetween(Long value1, Long value2) { - addCriterion("room_uid not between", value1, value2, "roomUid"); - return (Criteria) this; - } - - public Criteria andGiftIdIsNull() { - addCriterion("gift_id is null"); - return (Criteria) this; - } - - public Criteria andGiftIdIsNotNull() { - addCriterion("gift_id is not null"); - return (Criteria) this; - } - - public Criteria andGiftIdEqualTo(Integer value) { - addCriterion("gift_id =", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdNotEqualTo(Integer value) { - addCriterion("gift_id <>", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdGreaterThan(Integer value) { - addCriterion("gift_id >", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdGreaterThanOrEqualTo(Integer value) { - addCriterion("gift_id >=", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdLessThan(Integer value) { - addCriterion("gift_id <", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdLessThanOrEqualTo(Integer value) { - addCriterion("gift_id <=", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdIn(List values) { - addCriterion("gift_id in", values, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdNotIn(List values) { - addCriterion("gift_id not in", values, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdBetween(Integer value1, Integer value2) { - addCriterion("gift_id between", value1, value2, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdNotBetween(Integer value1, Integer value2) { - addCriterion("gift_id not between", value1, value2, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftNumIsNull() { - addCriterion("gift_num is null"); - return (Criteria) this; - } - - public Criteria andGiftNumIsNotNull() { - addCriterion("gift_num is not null"); - return (Criteria) this; - } - - public Criteria andGiftNumEqualTo(Integer value) { - addCriterion("gift_num =", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumNotEqualTo(Integer value) { - addCriterion("gift_num <>", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumGreaterThan(Integer value) { - addCriterion("gift_num >", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumGreaterThanOrEqualTo(Integer value) { - addCriterion("gift_num >=", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumLessThan(Integer value) { - addCriterion("gift_num <", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumLessThanOrEqualTo(Integer value) { - addCriterion("gift_num <=", value, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumIn(List values) { - addCriterion("gift_num in", values, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumNotIn(List values) { - addCriterion("gift_num not in", values, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumBetween(Integer value1, Integer value2) { - addCriterion("gift_num between", value1, value2, "giftNum"); - return (Criteria) this; - } - - public Criteria andGiftNumNotBetween(Integer value1, Integer value2) { - addCriterion("gift_num not between", value1, value2, "giftNum"); - return (Criteria) this; - } - - public Criteria andRadishAmountIsNull() { - addCriterion("radish_amount is null"); - return (Criteria) this; - } - - public Criteria andRadishAmountIsNotNull() { - addCriterion("radish_amount is not null"); - return (Criteria) this; - } - - public Criteria andRadishAmountEqualTo(Integer value) { - addCriterion("radish_amount =", value, "radishAmount"); - return (Criteria) this; - } - - public Criteria andRadishAmountNotEqualTo(Integer value) { - addCriterion("radish_amount <>", value, "radishAmount"); - return (Criteria) this; - } - - public Criteria andRadishAmountGreaterThan(Integer value) { - addCriterion("radish_amount >", value, "radishAmount"); - return (Criteria) this; - } - - public Criteria andRadishAmountGreaterThanOrEqualTo(Integer value) { - addCriterion("radish_amount >=", value, "radishAmount"); - return (Criteria) this; - } - - public Criteria andRadishAmountLessThan(Integer value) { - addCriterion("radish_amount <", value, "radishAmount"); - return (Criteria) this; - } - - public Criteria andRadishAmountLessThanOrEqualTo(Integer value) { - addCriterion("radish_amount <=", value, "radishAmount"); - return (Criteria) this; - } - - public Criteria andRadishAmountIn(List values) { - addCriterion("radish_amount in", values, "radishAmount"); - return (Criteria) this; - } - - public Criteria andRadishAmountNotIn(List values) { - addCriterion("radish_amount not in", values, "radishAmount"); - return (Criteria) this; - } - - public Criteria andRadishAmountBetween(Integer value1, Integer value2) { - addCriterion("radish_amount between", value1, value2, "radishAmount"); - return (Criteria) this; - } - - public Criteria andRadishAmountNotBetween(Integer value1, Integer value2) { - addCriterion("radish_amount not between", value1, value2, "radishAmount"); - return (Criteria) this; - } - - public Criteria andRoomTypeIsNull() { - addCriterion("room_type is null"); - return (Criteria) this; - } - - public Criteria andRoomTypeIsNotNull() { - addCriterion("room_type is not null"); - return (Criteria) this; - } - - public Criteria andRoomTypeEqualTo(Byte value) { - addCriterion("room_type =", value, "roomType"); - return (Criteria) this; - } - - public Criteria andRoomTypeNotEqualTo(Byte value) { - addCriterion("room_type <>", value, "roomType"); - return (Criteria) this; - } - - public Criteria andRoomTypeGreaterThan(Byte value) { - addCriterion("room_type >", value, "roomType"); - return (Criteria) this; - } - - public Criteria andRoomTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("room_type >=", value, "roomType"); - return (Criteria) this; - } - - public Criteria andRoomTypeLessThan(Byte value) { - addCriterion("room_type <", value, "roomType"); - return (Criteria) this; - } - - public Criteria andRoomTypeLessThanOrEqualTo(Byte value) { - addCriterion("room_type <=", value, "roomType"); - return (Criteria) this; - } - - public Criteria andRoomTypeIn(List values) { - addCriterion("room_type in", values, "roomType"); - return (Criteria) this; - } - - public Criteria andRoomTypeNotIn(List values) { - addCriterion("room_type not in", values, "roomType"); - return (Criteria) this; - } - - public Criteria andRoomTypeBetween(Byte value1, Byte value2) { - addCriterion("room_type between", value1, value2, "roomType"); - return (Criteria) this; - } - - public Criteria andRoomTypeNotBetween(Byte value1, Byte value2) { - addCriterion("room_type not between", value1, value2, "roomType"); - return (Criteria) this; - } - - public Criteria andGiftSourceIsNull() { - addCriterion("gift_source is null"); - return (Criteria) this; - } - - public Criteria andGiftSourceIsNotNull() { - addCriterion("gift_source is not null"); - return (Criteria) this; - } - - public Criteria andGiftSourceEqualTo(Byte value) { - addCriterion("gift_source =", value, "giftSource"); - return (Criteria) this; - } - - public Criteria andGiftSourceNotEqualTo(Byte value) { - addCriterion("gift_source <>", value, "giftSource"); - return (Criteria) this; - } - - public Criteria andGiftSourceGreaterThan(Byte value) { - addCriterion("gift_source >", value, "giftSource"); - return (Criteria) this; - } - - public Criteria andGiftSourceGreaterThanOrEqualTo(Byte value) { - addCriterion("gift_source >=", value, "giftSource"); - return (Criteria) this; - } - - public Criteria andGiftSourceLessThan(Byte value) { - addCriterion("gift_source <", value, "giftSource"); - return (Criteria) this; - } - - public Criteria andGiftSourceLessThanOrEqualTo(Byte value) { - addCriterion("gift_source <=", value, "giftSource"); - return (Criteria) this; - } - - public Criteria andGiftSourceIn(List values) { - addCriterion("gift_source in", values, "giftSource"); - return (Criteria) this; - } - - public Criteria andGiftSourceNotIn(List values) { - addCriterion("gift_source not in", values, "giftSource"); - return (Criteria) this; - } - - public Criteria andGiftSourceBetween(Byte value1, Byte value2) { - addCriterion("gift_source between", value1, value2, "giftSource"); - return (Criteria) this; - } - - public Criteria andGiftSourceNotBetween(Byte value1, Byte value2) { - addCriterion("gift_source not between", value1, value2, "giftSource"); - return (Criteria) this; - } - - public Criteria andSendEnvIsNull() { - addCriterion("send_env is null"); - return (Criteria) this; - } - - public Criteria andSendEnvIsNotNull() { - addCriterion("send_env is not null"); - return (Criteria) this; - } - - public Criteria andSendEnvEqualTo(Byte value) { - addCriterion("send_env =", value, "sendEnv"); - return (Criteria) this; - } - - public Criteria andSendEnvNotEqualTo(Byte value) { - addCriterion("send_env <>", value, "sendEnv"); - return (Criteria) this; - } - - public Criteria andSendEnvGreaterThan(Byte value) { - addCriterion("send_env >", value, "sendEnv"); - return (Criteria) this; - } - - public Criteria andSendEnvGreaterThanOrEqualTo(Byte value) { - addCriterion("send_env >=", value, "sendEnv"); - return (Criteria) this; - } - - public Criteria andSendEnvLessThan(Byte value) { - addCriterion("send_env <", value, "sendEnv"); - return (Criteria) this; - } - - public Criteria andSendEnvLessThanOrEqualTo(Byte value) { - addCriterion("send_env <=", value, "sendEnv"); - return (Criteria) this; - } - - public Criteria andSendEnvIn(List values) { - addCriterion("send_env in", values, "sendEnv"); - return (Criteria) this; - } - - public Criteria andSendEnvNotIn(List values) { - addCriterion("send_env not in", values, "sendEnv"); - return (Criteria) this; - } - - public Criteria andSendEnvBetween(Byte value1, Byte value2) { - addCriterion("send_env between", value1, value2, "sendEnv"); - return (Criteria) this; - } - - public Criteria andSendEnvNotBetween(Byte value1, Byte value2) { - addCriterion("send_env not between", value1, value2, "sendEnv"); - return (Criteria) this; - } - - public Criteria andDeletedIsNull() { - addCriterion("deleted is null"); - return (Criteria) this; - } - - public Criteria andDeletedIsNotNull() { - addCriterion("deleted is not null"); - return (Criteria) this; - } - - public Criteria andDeletedEqualTo(Boolean value) { - addCriterion("deleted =", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotEqualTo(Boolean value) { - addCriterion("deleted <>", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThan(Boolean value) { - addCriterion("deleted >", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) { - addCriterion("deleted >=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThan(Boolean value) { - addCriterion("deleted <", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThanOrEqualTo(Boolean value) { - addCriterion("deleted <=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedIn(List values) { - addCriterion("deleted in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotIn(List values) { - addCriterion("deleted not in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedBetween(Boolean value1, Boolean value2) { - addCriterion("deleted between", value1, value2, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) { - addCriterion("deleted not between", value1, value2, "deleted"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketActivity.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketActivity.java deleted file mode 100644 index 468934b86..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketActivity.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class StatPacketActivity { - private Long uid; - - private Integer shareCount; - - private Integer sharePacketCount; - - private Date latestShareDate; - - private Integer packetCount; - - private Integer registerCout; - - private Integer todayRegisterCount; - - private Date latestRegisterDate; - - private Double chargeBonus; - - private Double todayChargeBonus; - - private Date latestChargeBonusDate; - - private Date createTime; - - private Date updateTime; - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Integer getShareCount() { - return shareCount; - } - - public void setShareCount(Integer shareCount) { - this.shareCount = shareCount; - } - - public Integer getSharePacketCount() { - return sharePacketCount; - } - - public void setSharePacketCount(Integer sharePacketCount) { - this.sharePacketCount = sharePacketCount; - } - - public Date getLatestShareDate() { - return latestShareDate; - } - - public void setLatestShareDate(Date latestShareDate) { - this.latestShareDate = latestShareDate; - } - - public Integer getPacketCount() { - return packetCount; - } - - public void setPacketCount(Integer packetCount) { - this.packetCount = packetCount; - } - - public Integer getRegisterCout() { - return registerCout; - } - - public void setRegisterCout(Integer registerCout) { - this.registerCout = registerCout; - } - - public Integer getTodayRegisterCount() { - return todayRegisterCount; - } - - public void setTodayRegisterCount(Integer todayRegisterCount) { - this.todayRegisterCount = todayRegisterCount; - } - - public Date getLatestRegisterDate() { - return latestRegisterDate; - } - - public void setLatestRegisterDate(Date latestRegisterDate) { - this.latestRegisterDate = latestRegisterDate; - } - - public Double getChargeBonus() { - return chargeBonus; - } - - public void setChargeBonus(Double chargeBonus) { - this.chargeBonus = chargeBonus; - } - - public Double getTodayChargeBonus() { - return todayChargeBonus; - } - - public void setTodayChargeBonus(Double todayChargeBonus) { - this.todayChargeBonus = todayChargeBonus; - } - - public Date getLatestChargeBonusDate() { - return latestChargeBonusDate; - } - - public void setLatestChargeBonusDate(Date latestChargeBonusDate) { - this.latestChargeBonusDate = latestChargeBonusDate; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketActivityExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketActivityExample.java deleted file mode 100644 index 4c69f201a..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketActivityExample.java +++ /dev/null @@ -1,1008 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -public class StatPacketActivityExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public StatPacketActivityExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - protected void addCriterionForJDBCDate(String condition, Date value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - addCriterion(condition, new java.sql.Date(value.getTime()), property); - } - - protected void addCriterionForJDBCDate(String condition, List values, String property) { - if (values == null || values.size() == 0) { - throw new RuntimeException("Value list for " + property + " cannot be null or empty"); - } - List dateList = new ArrayList(); - Iterator iter = values.iterator(); - while (iter.hasNext()) { - dateList.add(new java.sql.Date(iter.next().getTime())); - } - addCriterion(condition, dateList, property); - } - - protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property); - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andShareCountIsNull() { - addCriterion("share_count is null"); - return (Criteria) this; - } - - public Criteria andShareCountIsNotNull() { - addCriterion("share_count is not null"); - return (Criteria) this; - } - - public Criteria andShareCountEqualTo(Integer value) { - addCriterion("share_count =", value, "shareCount"); - return (Criteria) this; - } - - public Criteria andShareCountNotEqualTo(Integer value) { - addCriterion("share_count <>", value, "shareCount"); - return (Criteria) this; - } - - public Criteria andShareCountGreaterThan(Integer value) { - addCriterion("share_count >", value, "shareCount"); - return (Criteria) this; - } - - public Criteria andShareCountGreaterThanOrEqualTo(Integer value) { - addCriterion("share_count >=", value, "shareCount"); - return (Criteria) this; - } - - public Criteria andShareCountLessThan(Integer value) { - addCriterion("share_count <", value, "shareCount"); - return (Criteria) this; - } - - public Criteria andShareCountLessThanOrEqualTo(Integer value) { - addCriterion("share_count <=", value, "shareCount"); - return (Criteria) this; - } - - public Criteria andShareCountIn(List values) { - addCriterion("share_count in", values, "shareCount"); - return (Criteria) this; - } - - public Criteria andShareCountNotIn(List values) { - addCriterion("share_count not in", values, "shareCount"); - return (Criteria) this; - } - - public Criteria andShareCountBetween(Integer value1, Integer value2) { - addCriterion("share_count between", value1, value2, "shareCount"); - return (Criteria) this; - } - - public Criteria andShareCountNotBetween(Integer value1, Integer value2) { - addCriterion("share_count not between", value1, value2, "shareCount"); - return (Criteria) this; - } - - public Criteria andSharePacketCountIsNull() { - addCriterion("share_packet_count is null"); - return (Criteria) this; - } - - public Criteria andSharePacketCountIsNotNull() { - addCriterion("share_packet_count is not null"); - return (Criteria) this; - } - - public Criteria andSharePacketCountEqualTo(Integer value) { - addCriterion("share_packet_count =", value, "sharePacketCount"); - return (Criteria) this; - } - - public Criteria andSharePacketCountNotEqualTo(Integer value) { - addCriterion("share_packet_count <>", value, "sharePacketCount"); - return (Criteria) this; - } - - public Criteria andSharePacketCountGreaterThan(Integer value) { - addCriterion("share_packet_count >", value, "sharePacketCount"); - return (Criteria) this; - } - - public Criteria andSharePacketCountGreaterThanOrEqualTo(Integer value) { - addCriterion("share_packet_count >=", value, "sharePacketCount"); - return (Criteria) this; - } - - public Criteria andSharePacketCountLessThan(Integer value) { - addCriterion("share_packet_count <", value, "sharePacketCount"); - return (Criteria) this; - } - - public Criteria andSharePacketCountLessThanOrEqualTo(Integer value) { - addCriterion("share_packet_count <=", value, "sharePacketCount"); - return (Criteria) this; - } - - public Criteria andSharePacketCountIn(List values) { - addCriterion("share_packet_count in", values, "sharePacketCount"); - return (Criteria) this; - } - - public Criteria andSharePacketCountNotIn(List values) { - addCriterion("share_packet_count not in", values, "sharePacketCount"); - return (Criteria) this; - } - - public Criteria andSharePacketCountBetween(Integer value1, Integer value2) { - addCriterion("share_packet_count between", value1, value2, "sharePacketCount"); - return (Criteria) this; - } - - public Criteria andSharePacketCountNotBetween(Integer value1, Integer value2) { - addCriterion("share_packet_count not between", value1, value2, "sharePacketCount"); - return (Criteria) this; - } - - public Criteria andLatestShareDateIsNull() { - addCriterion("latest_share_date is null"); - return (Criteria) this; - } - - public Criteria andLatestShareDateIsNotNull() { - addCriterion("latest_share_date is not null"); - return (Criteria) this; - } - - public Criteria andLatestShareDateEqualTo(Date value) { - addCriterionForJDBCDate("latest_share_date =", value, "latestShareDate"); - return (Criteria) this; - } - - public Criteria andLatestShareDateNotEqualTo(Date value) { - addCriterionForJDBCDate("latest_share_date <>", value, "latestShareDate"); - return (Criteria) this; - } - - public Criteria andLatestShareDateGreaterThan(Date value) { - addCriterionForJDBCDate("latest_share_date >", value, "latestShareDate"); - return (Criteria) this; - } - - public Criteria andLatestShareDateGreaterThanOrEqualTo(Date value) { - addCriterionForJDBCDate("latest_share_date >=", value, "latestShareDate"); - return (Criteria) this; - } - - public Criteria andLatestShareDateLessThan(Date value) { - addCriterionForJDBCDate("latest_share_date <", value, "latestShareDate"); - return (Criteria) this; - } - - public Criteria andLatestShareDateLessThanOrEqualTo(Date value) { - addCriterionForJDBCDate("latest_share_date <=", value, "latestShareDate"); - return (Criteria) this; - } - - public Criteria andLatestShareDateIn(List values) { - addCriterionForJDBCDate("latest_share_date in", values, "latestShareDate"); - return (Criteria) this; - } - - public Criteria andLatestShareDateNotIn(List values) { - addCriterionForJDBCDate("latest_share_date not in", values, "latestShareDate"); - return (Criteria) this; - } - - public Criteria andLatestShareDateBetween(Date value1, Date value2) { - addCriterionForJDBCDate("latest_share_date between", value1, value2, "latestShareDate"); - return (Criteria) this; - } - - public Criteria andLatestShareDateNotBetween(Date value1, Date value2) { - addCriterionForJDBCDate("latest_share_date not between", value1, value2, "latestShareDate"); - return (Criteria) this; - } - - public Criteria andPacketCountIsNull() { - addCriterion("packet_count is null"); - return (Criteria) this; - } - - public Criteria andPacketCountIsNotNull() { - addCriterion("packet_count is not null"); - return (Criteria) this; - } - - public Criteria andPacketCountEqualTo(Integer value) { - addCriterion("packet_count =", value, "packetCount"); - return (Criteria) this; - } - - public Criteria andPacketCountNotEqualTo(Integer value) { - addCriterion("packet_count <>", value, "packetCount"); - return (Criteria) this; - } - - public Criteria andPacketCountGreaterThan(Integer value) { - addCriterion("packet_count >", value, "packetCount"); - return (Criteria) this; - } - - public Criteria andPacketCountGreaterThanOrEqualTo(Integer value) { - addCriterion("packet_count >=", value, "packetCount"); - return (Criteria) this; - } - - public Criteria andPacketCountLessThan(Integer value) { - addCriterion("packet_count <", value, "packetCount"); - return (Criteria) this; - } - - public Criteria andPacketCountLessThanOrEqualTo(Integer value) { - addCriterion("packet_count <=", value, "packetCount"); - return (Criteria) this; - } - - public Criteria andPacketCountIn(List values) { - addCriterion("packet_count in", values, "packetCount"); - return (Criteria) this; - } - - public Criteria andPacketCountNotIn(List values) { - addCriterion("packet_count not in", values, "packetCount"); - return (Criteria) this; - } - - public Criteria andPacketCountBetween(Integer value1, Integer value2) { - addCriterion("packet_count between", value1, value2, "packetCount"); - return (Criteria) this; - } - - public Criteria andPacketCountNotBetween(Integer value1, Integer value2) { - addCriterion("packet_count not between", value1, value2, "packetCount"); - return (Criteria) this; - } - - public Criteria andRegisterCoutIsNull() { - addCriterion("register_cout is null"); - return (Criteria) this; - } - - public Criteria andRegisterCoutIsNotNull() { - addCriterion("register_cout is not null"); - return (Criteria) this; - } - - public Criteria andRegisterCoutEqualTo(Integer value) { - addCriterion("register_cout =", value, "registerCout"); - return (Criteria) this; - } - - public Criteria andRegisterCoutNotEqualTo(Integer value) { - addCriterion("register_cout <>", value, "registerCout"); - return (Criteria) this; - } - - public Criteria andRegisterCoutGreaterThan(Integer value) { - addCriterion("register_cout >", value, "registerCout"); - return (Criteria) this; - } - - public Criteria andRegisterCoutGreaterThanOrEqualTo(Integer value) { - addCriterion("register_cout >=", value, "registerCout"); - return (Criteria) this; - } - - public Criteria andRegisterCoutLessThan(Integer value) { - addCriterion("register_cout <", value, "registerCout"); - return (Criteria) this; - } - - public Criteria andRegisterCoutLessThanOrEqualTo(Integer value) { - addCriterion("register_cout <=", value, "registerCout"); - return (Criteria) this; - } - - public Criteria andRegisterCoutIn(List values) { - addCriterion("register_cout in", values, "registerCout"); - return (Criteria) this; - } - - public Criteria andRegisterCoutNotIn(List values) { - addCriterion("register_cout not in", values, "registerCout"); - return (Criteria) this; - } - - public Criteria andRegisterCoutBetween(Integer value1, Integer value2) { - addCriterion("register_cout between", value1, value2, "registerCout"); - return (Criteria) this; - } - - public Criteria andRegisterCoutNotBetween(Integer value1, Integer value2) { - addCriterion("register_cout not between", value1, value2, "registerCout"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountIsNull() { - addCriterion("today_register_count is null"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountIsNotNull() { - addCriterion("today_register_count is not null"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountEqualTo(Integer value) { - addCriterion("today_register_count =", value, "todayRegisterCount"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountNotEqualTo(Integer value) { - addCriterion("today_register_count <>", value, "todayRegisterCount"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountGreaterThan(Integer value) { - addCriterion("today_register_count >", value, "todayRegisterCount"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountGreaterThanOrEqualTo(Integer value) { - addCriterion("today_register_count >=", value, "todayRegisterCount"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountLessThan(Integer value) { - addCriterion("today_register_count <", value, "todayRegisterCount"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountLessThanOrEqualTo(Integer value) { - addCriterion("today_register_count <=", value, "todayRegisterCount"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountIn(List values) { - addCriterion("today_register_count in", values, "todayRegisterCount"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountNotIn(List values) { - addCriterion("today_register_count not in", values, "todayRegisterCount"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountBetween(Integer value1, Integer value2) { - addCriterion("today_register_count between", value1, value2, "todayRegisterCount"); - return (Criteria) this; - } - - public Criteria andTodayRegisterCountNotBetween(Integer value1, Integer value2) { - addCriterion("today_register_count not between", value1, value2, "todayRegisterCount"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateIsNull() { - addCriterion("latest_register_date is null"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateIsNotNull() { - addCriterion("latest_register_date is not null"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateEqualTo(Date value) { - addCriterionForJDBCDate("latest_register_date =", value, "latestRegisterDate"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateNotEqualTo(Date value) { - addCriterionForJDBCDate("latest_register_date <>", value, "latestRegisterDate"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateGreaterThan(Date value) { - addCriterionForJDBCDate("latest_register_date >", value, "latestRegisterDate"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateGreaterThanOrEqualTo(Date value) { - addCriterionForJDBCDate("latest_register_date >=", value, "latestRegisterDate"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateLessThan(Date value) { - addCriterionForJDBCDate("latest_register_date <", value, "latestRegisterDate"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateLessThanOrEqualTo(Date value) { - addCriterionForJDBCDate("latest_register_date <=", value, "latestRegisterDate"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateIn(List values) { - addCriterionForJDBCDate("latest_register_date in", values, "latestRegisterDate"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateNotIn(List values) { - addCriterionForJDBCDate("latest_register_date not in", values, "latestRegisterDate"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateBetween(Date value1, Date value2) { - addCriterionForJDBCDate("latest_register_date between", value1, value2, "latestRegisterDate"); - return (Criteria) this; - } - - public Criteria andLatestRegisterDateNotBetween(Date value1, Date value2) { - addCriterionForJDBCDate("latest_register_date not between", value1, value2, "latestRegisterDate"); - return (Criteria) this; - } - - public Criteria andChargeBonusIsNull() { - addCriterion("charge_bonus is null"); - return (Criteria) this; - } - - public Criteria andChargeBonusIsNotNull() { - addCriterion("charge_bonus is not null"); - return (Criteria) this; - } - - public Criteria andChargeBonusEqualTo(Double value) { - addCriterion("charge_bonus =", value, "chargeBonus"); - return (Criteria) this; - } - - public Criteria andChargeBonusNotEqualTo(Double value) { - addCriterion("charge_bonus <>", value, "chargeBonus"); - return (Criteria) this; - } - - public Criteria andChargeBonusGreaterThan(Double value) { - addCriterion("charge_bonus >", value, "chargeBonus"); - return (Criteria) this; - } - - public Criteria andChargeBonusGreaterThanOrEqualTo(Double value) { - addCriterion("charge_bonus >=", value, "chargeBonus"); - return (Criteria) this; - } - - public Criteria andChargeBonusLessThan(Double value) { - addCriterion("charge_bonus <", value, "chargeBonus"); - return (Criteria) this; - } - - public Criteria andChargeBonusLessThanOrEqualTo(Double value) { - addCriterion("charge_bonus <=", value, "chargeBonus"); - return (Criteria) this; - } - - public Criteria andChargeBonusIn(List values) { - addCriterion("charge_bonus in", values, "chargeBonus"); - return (Criteria) this; - } - - public Criteria andChargeBonusNotIn(List values) { - addCriterion("charge_bonus not in", values, "chargeBonus"); - return (Criteria) this; - } - - public Criteria andChargeBonusBetween(Double value1, Double value2) { - addCriterion("charge_bonus between", value1, value2, "chargeBonus"); - return (Criteria) this; - } - - public Criteria andChargeBonusNotBetween(Double value1, Double value2) { - addCriterion("charge_bonus not between", value1, value2, "chargeBonus"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusIsNull() { - addCriterion("today_charge_bonus is null"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusIsNotNull() { - addCriterion("today_charge_bonus is not null"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusEqualTo(Double value) { - addCriterion("today_charge_bonus =", value, "todayChargeBonus"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusNotEqualTo(Double value) { - addCriterion("today_charge_bonus <>", value, "todayChargeBonus"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusGreaterThan(Double value) { - addCriterion("today_charge_bonus >", value, "todayChargeBonus"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusGreaterThanOrEqualTo(Double value) { - addCriterion("today_charge_bonus >=", value, "todayChargeBonus"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusLessThan(Double value) { - addCriterion("today_charge_bonus <", value, "todayChargeBonus"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusLessThanOrEqualTo(Double value) { - addCriterion("today_charge_bonus <=", value, "todayChargeBonus"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusIn(List values) { - addCriterion("today_charge_bonus in", values, "todayChargeBonus"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusNotIn(List values) { - addCriterion("today_charge_bonus not in", values, "todayChargeBonus"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusBetween(Double value1, Double value2) { - addCriterion("today_charge_bonus between", value1, value2, "todayChargeBonus"); - return (Criteria) this; - } - - public Criteria andTodayChargeBonusNotBetween(Double value1, Double value2) { - addCriterion("today_charge_bonus not between", value1, value2, "todayChargeBonus"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateIsNull() { - addCriterion("latest_charge_bonus_date is null"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateIsNotNull() { - addCriterion("latest_charge_bonus_date is not null"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateEqualTo(Date value) { - addCriterionForJDBCDate("latest_charge_bonus_date =", value, "latestChargeBonusDate"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateNotEqualTo(Date value) { - addCriterionForJDBCDate("latest_charge_bonus_date <>", value, "latestChargeBonusDate"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateGreaterThan(Date value) { - addCriterionForJDBCDate("latest_charge_bonus_date >", value, "latestChargeBonusDate"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateGreaterThanOrEqualTo(Date value) { - addCriterionForJDBCDate("latest_charge_bonus_date >=", value, "latestChargeBonusDate"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateLessThan(Date value) { - addCriterionForJDBCDate("latest_charge_bonus_date <", value, "latestChargeBonusDate"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateLessThanOrEqualTo(Date value) { - addCriterionForJDBCDate("latest_charge_bonus_date <=", value, "latestChargeBonusDate"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateIn(List values) { - addCriterionForJDBCDate("latest_charge_bonus_date in", values, "latestChargeBonusDate"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateNotIn(List values) { - addCriterionForJDBCDate("latest_charge_bonus_date not in", values, "latestChargeBonusDate"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateBetween(Date value1, Date value2) { - addCriterionForJDBCDate("latest_charge_bonus_date between", value1, value2, "latestChargeBonusDate"); - return (Criteria) this; - } - - public Criteria andLatestChargeBonusDateNotBetween(Date value1, Date value2) { - addCriterionForJDBCDate("latest_charge_bonus_date not between", value1, value2, "latestChargeBonusDate"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketBouns.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketBouns.java deleted file mode 100644 index 29c32ebad..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketBouns.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class StatPacketBouns { - private String bounsId; - - private Long uid; - - private String chargeRecordId; - - private Long amount; - - private Double packetNum; - - private Date createTime; - - public String getBounsId() { - return bounsId; - } - - public void setBounsId(String bounsId) { - this.bounsId = bounsId == null ? null : bounsId.trim(); - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public String getChargeRecordId() { - return chargeRecordId; - } - - public void setChargeRecordId(String chargeRecordId) { - this.chargeRecordId = chargeRecordId == null ? null : chargeRecordId.trim(); - } - - public Long getAmount() { - return amount; - } - - public void setAmount(Long amount) { - this.amount = amount; - } - - public Double getPacketNum() { - return packetNum; - } - - public void setPacketNum(Double packetNum) { - this.packetNum = packetNum; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketBounsExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketBounsExample.java deleted file mode 100644 index f91c00664..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketBounsExample.java +++ /dev/null @@ -1,581 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class StatPacketBounsExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public StatPacketBounsExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andBounsIdIsNull() { - addCriterion("bouns_id is null"); - return (Criteria) this; - } - - public Criteria andBounsIdIsNotNull() { - addCriterion("bouns_id is not null"); - return (Criteria) this; - } - - public Criteria andBounsIdEqualTo(String value) { - addCriterion("bouns_id =", value, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdNotEqualTo(String value) { - addCriterion("bouns_id <>", value, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdGreaterThan(String value) { - addCriterion("bouns_id >", value, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdGreaterThanOrEqualTo(String value) { - addCriterion("bouns_id >=", value, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdLessThan(String value) { - addCriterion("bouns_id <", value, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdLessThanOrEqualTo(String value) { - addCriterion("bouns_id <=", value, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdLike(String value) { - addCriterion("bouns_id like", value, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdNotLike(String value) { - addCriterion("bouns_id not like", value, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdIn(List values) { - addCriterion("bouns_id in", values, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdNotIn(List values) { - addCriterion("bouns_id not in", values, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdBetween(String value1, String value2) { - addCriterion("bouns_id between", value1, value2, "bounsId"); - return (Criteria) this; - } - - public Criteria andBounsIdNotBetween(String value1, String value2) { - addCriterion("bouns_id not between", value1, value2, "bounsId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdIsNull() { - addCriterion("charge_record_id is null"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdIsNotNull() { - addCriterion("charge_record_id is not null"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdEqualTo(String value) { - addCriterion("charge_record_id =", value, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdNotEqualTo(String value) { - addCriterion("charge_record_id <>", value, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdGreaterThan(String value) { - addCriterion("charge_record_id >", value, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdGreaterThanOrEqualTo(String value) { - addCriterion("charge_record_id >=", value, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdLessThan(String value) { - addCriterion("charge_record_id <", value, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdLessThanOrEqualTo(String value) { - addCriterion("charge_record_id <=", value, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdLike(String value) { - addCriterion("charge_record_id like", value, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdNotLike(String value) { - addCriterion("charge_record_id not like", value, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdIn(List values) { - addCriterion("charge_record_id in", values, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdNotIn(List values) { - addCriterion("charge_record_id not in", values, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdBetween(String value1, String value2) { - addCriterion("charge_record_id between", value1, value2, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andChargeRecordIdNotBetween(String value1, String value2) { - addCriterion("charge_record_id not between", value1, value2, "chargeRecordId"); - return (Criteria) this; - } - - public Criteria andAmountIsNull() { - addCriterion("amount is null"); - return (Criteria) this; - } - - public Criteria andAmountIsNotNull() { - addCriterion("amount is not null"); - return (Criteria) this; - } - - public Criteria andAmountEqualTo(Long value) { - addCriterion("amount =", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountNotEqualTo(Long value) { - addCriterion("amount <>", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountGreaterThan(Long value) { - addCriterion("amount >", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountGreaterThanOrEqualTo(Long value) { - addCriterion("amount >=", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountLessThan(Long value) { - addCriterion("amount <", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountLessThanOrEqualTo(Long value) { - addCriterion("amount <=", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountIn(List values) { - addCriterion("amount in", values, "amount"); - return (Criteria) this; - } - - public Criteria andAmountNotIn(List values) { - addCriterion("amount not in", values, "amount"); - return (Criteria) this; - } - - public Criteria andAmountBetween(Long value1, Long value2) { - addCriterion("amount between", value1, value2, "amount"); - return (Criteria) this; - } - - public Criteria andAmountNotBetween(Long value1, Long value2) { - addCriterion("amount not between", value1, value2, "amount"); - return (Criteria) this; - } - - public Criteria andPacketNumIsNull() { - addCriterion("packet_num is null"); - return (Criteria) this; - } - - public Criteria andPacketNumIsNotNull() { - addCriterion("packet_num is not null"); - return (Criteria) this; - } - - public Criteria andPacketNumEqualTo(Double value) { - addCriterion("packet_num =", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotEqualTo(Double value) { - addCriterion("packet_num <>", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumGreaterThan(Double value) { - addCriterion("packet_num >", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumGreaterThanOrEqualTo(Double value) { - addCriterion("packet_num >=", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumLessThan(Double value) { - addCriterion("packet_num <", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumLessThanOrEqualTo(Double value) { - addCriterion("packet_num <=", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumIn(List values) { - addCriterion("packet_num in", values, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotIn(List values) { - addCriterion("packet_num not in", values, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumBetween(Double value1, Double value2) { - addCriterion("packet_num between", value1, value2, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotBetween(Double value1, Double value2) { - addCriterion("packet_num not between", value1, value2, "packetNum"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketRegister.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketRegister.java deleted file mode 100644 index 9f370eb9f..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketRegister.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class StatPacketRegister { - private String registerId; - - private Long uid; - - private Long registerUid; - - private Date createTime; - - public String getRegisterId() { - return registerId; - } - - public void setRegisterId(String registerId) { - this.registerId = registerId == null ? null : registerId.trim(); - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getRegisterUid() { - return registerUid; - } - - public void setRegisterUid(Long registerUid) { - this.registerUid = registerUid; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketRegisterExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketRegisterExample.java deleted file mode 100644 index d7ca9b98b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/StatPacketRegisterExample.java +++ /dev/null @@ -1,451 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class StatPacketRegisterExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public StatPacketRegisterExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andRegisterIdIsNull() { - addCriterion("register_id is null"); - return (Criteria) this; - } - - public Criteria andRegisterIdIsNotNull() { - addCriterion("register_id is not null"); - return (Criteria) this; - } - - public Criteria andRegisterIdEqualTo(String value) { - addCriterion("register_id =", value, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdNotEqualTo(String value) { - addCriterion("register_id <>", value, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdGreaterThan(String value) { - addCriterion("register_id >", value, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdGreaterThanOrEqualTo(String value) { - addCriterion("register_id >=", value, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdLessThan(String value) { - addCriterion("register_id <", value, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdLessThanOrEqualTo(String value) { - addCriterion("register_id <=", value, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdLike(String value) { - addCriterion("register_id like", value, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdNotLike(String value) { - addCriterion("register_id not like", value, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdIn(List values) { - addCriterion("register_id in", values, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdNotIn(List values) { - addCriterion("register_id not in", values, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdBetween(String value1, String value2) { - addCriterion("register_id between", value1, value2, "registerId"); - return (Criteria) this; - } - - public Criteria andRegisterIdNotBetween(String value1, String value2) { - addCriterion("register_id not between", value1, value2, "registerId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andRegisterUidIsNull() { - addCriterion("register_uid is null"); - return (Criteria) this; - } - - public Criteria andRegisterUidIsNotNull() { - addCriterion("register_uid is not null"); - return (Criteria) this; - } - - public Criteria andRegisterUidEqualTo(Long value) { - addCriterion("register_uid =", value, "registerUid"); - return (Criteria) this; - } - - public Criteria andRegisterUidNotEqualTo(Long value) { - addCriterion("register_uid <>", value, "registerUid"); - return (Criteria) this; - } - - public Criteria andRegisterUidGreaterThan(Long value) { - addCriterion("register_uid >", value, "registerUid"); - return (Criteria) this; - } - - public Criteria andRegisterUidGreaterThanOrEqualTo(Long value) { - addCriterion("register_uid >=", value, "registerUid"); - return (Criteria) this; - } - - public Criteria andRegisterUidLessThan(Long value) { - addCriterion("register_uid <", value, "registerUid"); - return (Criteria) this; - } - - public Criteria andRegisterUidLessThanOrEqualTo(Long value) { - addCriterion("register_uid <=", value, "registerUid"); - return (Criteria) this; - } - - public Criteria andRegisterUidIn(List values) { - addCriterion("register_uid in", values, "registerUid"); - return (Criteria) this; - } - - public Criteria andRegisterUidNotIn(List values) { - addCriterion("register_uid not in", values, "registerUid"); - return (Criteria) this; - } - - public Criteria andRegisterUidBetween(Long value1, Long value2) { - addCriterion("register_uid between", value1, value2, "registerUid"); - return (Criteria) this; - } - - public Criteria andRegisterUidNotBetween(Long value1, Long value2) { - addCriterion("register_uid not between", value1, value2, "registerUid"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDraw.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDraw.java deleted file mode 100644 index fdf085dc6..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDraw.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class UserDraw { - private Long uid; - - private Integer leftDrawNum; - - private Integer totalDrawNum; - - private Integer totalWinDrawNum; - - private Boolean isFirstShare; - - private Byte giftDrawShareChance; - - private Date createTime; - - private Date updateTime; - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Integer getLeftDrawNum() { - return leftDrawNum; - } - - public void setLeftDrawNum(Integer leftDrawNum) { - this.leftDrawNum = leftDrawNum; - } - - public Integer getTotalDrawNum() { - return totalDrawNum; - } - - public void setTotalDrawNum(Integer totalDrawNum) { - this.totalDrawNum = totalDrawNum; - } - - public Integer getTotalWinDrawNum() { - return totalWinDrawNum; - } - - public void setTotalWinDrawNum(Integer totalWinDrawNum) { - this.totalWinDrawNum = totalWinDrawNum; - } - - public Boolean getIsFirstShare() { - return isFirstShare; - } - - public void setIsFirstShare(Boolean isFirstShare) { - this.isFirstShare = isFirstShare; - } - - public Byte getGiftDrawShareChance() { - return giftDrawShareChance; - } - - public void setGiftDrawShareChance(Byte giftDrawShareChance) { - this.giftDrawShareChance = giftDrawShareChance; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawExample.java deleted file mode 100644 index e740d61e6..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawExample.java +++ /dev/null @@ -1,701 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class UserDrawExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public UserDrawExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumIsNull() { - addCriterion("left_draw_num is null"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumIsNotNull() { - addCriterion("left_draw_num is not null"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumEqualTo(Integer value) { - addCriterion("left_draw_num =", value, "leftDrawNum"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumNotEqualTo(Integer value) { - addCriterion("left_draw_num <>", value, "leftDrawNum"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumGreaterThan(Integer value) { - addCriterion("left_draw_num >", value, "leftDrawNum"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumGreaterThanOrEqualTo(Integer value) { - addCriterion("left_draw_num >=", value, "leftDrawNum"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumLessThan(Integer value) { - addCriterion("left_draw_num <", value, "leftDrawNum"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumLessThanOrEqualTo(Integer value) { - addCriterion("left_draw_num <=", value, "leftDrawNum"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumIn(List values) { - addCriterion("left_draw_num in", values, "leftDrawNum"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumNotIn(List values) { - addCriterion("left_draw_num not in", values, "leftDrawNum"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumBetween(Integer value1, Integer value2) { - addCriterion("left_draw_num between", value1, value2, "leftDrawNum"); - return (Criteria) this; - } - - public Criteria andLeftDrawNumNotBetween(Integer value1, Integer value2) { - addCriterion("left_draw_num not between", value1, value2, "leftDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumIsNull() { - addCriterion("total_draw_num is null"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumIsNotNull() { - addCriterion("total_draw_num is not null"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumEqualTo(Integer value) { - addCriterion("total_draw_num =", value, "totalDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumNotEqualTo(Integer value) { - addCriterion("total_draw_num <>", value, "totalDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumGreaterThan(Integer value) { - addCriterion("total_draw_num >", value, "totalDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumGreaterThanOrEqualTo(Integer value) { - addCriterion("total_draw_num >=", value, "totalDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumLessThan(Integer value) { - addCriterion("total_draw_num <", value, "totalDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumLessThanOrEqualTo(Integer value) { - addCriterion("total_draw_num <=", value, "totalDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumIn(List values) { - addCriterion("total_draw_num in", values, "totalDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumNotIn(List values) { - addCriterion("total_draw_num not in", values, "totalDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumBetween(Integer value1, Integer value2) { - addCriterion("total_draw_num between", value1, value2, "totalDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalDrawNumNotBetween(Integer value1, Integer value2) { - addCriterion("total_draw_num not between", value1, value2, "totalDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumIsNull() { - addCriterion("total_win_draw_num is null"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumIsNotNull() { - addCriterion("total_win_draw_num is not null"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumEqualTo(Integer value) { - addCriterion("total_win_draw_num =", value, "totalWinDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumNotEqualTo(Integer value) { - addCriterion("total_win_draw_num <>", value, "totalWinDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumGreaterThan(Integer value) { - addCriterion("total_win_draw_num >", value, "totalWinDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumGreaterThanOrEqualTo(Integer value) { - addCriterion("total_win_draw_num >=", value, "totalWinDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumLessThan(Integer value) { - addCriterion("total_win_draw_num <", value, "totalWinDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumLessThanOrEqualTo(Integer value) { - addCriterion("total_win_draw_num <=", value, "totalWinDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumIn(List values) { - addCriterion("total_win_draw_num in", values, "totalWinDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumNotIn(List values) { - addCriterion("total_win_draw_num not in", values, "totalWinDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumBetween(Integer value1, Integer value2) { - addCriterion("total_win_draw_num between", value1, value2, "totalWinDrawNum"); - return (Criteria) this; - } - - public Criteria andTotalWinDrawNumNotBetween(Integer value1, Integer value2) { - addCriterion("total_win_draw_num not between", value1, value2, "totalWinDrawNum"); - return (Criteria) this; - } - - public Criteria andIsFirstShareIsNull() { - addCriterion("is_first_share is null"); - return (Criteria) this; - } - - public Criteria andIsFirstShareIsNotNull() { - addCriterion("is_first_share is not null"); - return (Criteria) this; - } - - public Criteria andIsFirstShareEqualTo(Boolean value) { - addCriterion("is_first_share =", value, "isFirstShare"); - return (Criteria) this; - } - - public Criteria andIsFirstShareNotEqualTo(Boolean value) { - addCriterion("is_first_share <>", value, "isFirstShare"); - return (Criteria) this; - } - - public Criteria andIsFirstShareGreaterThan(Boolean value) { - addCriterion("is_first_share >", value, "isFirstShare"); - return (Criteria) this; - } - - public Criteria andIsFirstShareGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_first_share >=", value, "isFirstShare"); - return (Criteria) this; - } - - public Criteria andIsFirstShareLessThan(Boolean value) { - addCriterion("is_first_share <", value, "isFirstShare"); - return (Criteria) this; - } - - public Criteria andIsFirstShareLessThanOrEqualTo(Boolean value) { - addCriterion("is_first_share <=", value, "isFirstShare"); - return (Criteria) this; - } - - public Criteria andIsFirstShareIn(List values) { - addCriterion("is_first_share in", values, "isFirstShare"); - return (Criteria) this; - } - - public Criteria andIsFirstShareNotIn(List values) { - addCriterion("is_first_share not in", values, "isFirstShare"); - return (Criteria) this; - } - - public Criteria andIsFirstShareBetween(Boolean value1, Boolean value2) { - addCriterion("is_first_share between", value1, value2, "isFirstShare"); - return (Criteria) this; - } - - public Criteria andIsFirstShareNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_first_share not between", value1, value2, "isFirstShare"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceIsNull() { - addCriterion("gift_draw_share_chance is null"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceIsNotNull() { - addCriterion("gift_draw_share_chance is not null"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceEqualTo(Byte value) { - addCriterion("gift_draw_share_chance =", value, "giftDrawShareChance"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceNotEqualTo(Byte value) { - addCriterion("gift_draw_share_chance <>", value, "giftDrawShareChance"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceGreaterThan(Byte value) { - addCriterion("gift_draw_share_chance >", value, "giftDrawShareChance"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceGreaterThanOrEqualTo(Byte value) { - addCriterion("gift_draw_share_chance >=", value, "giftDrawShareChance"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceLessThan(Byte value) { - addCriterion("gift_draw_share_chance <", value, "giftDrawShareChance"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceLessThanOrEqualTo(Byte value) { - addCriterion("gift_draw_share_chance <=", value, "giftDrawShareChance"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceIn(List values) { - addCriterion("gift_draw_share_chance in", values, "giftDrawShareChance"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceNotIn(List values) { - addCriterion("gift_draw_share_chance not in", values, "giftDrawShareChance"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceBetween(Byte value1, Byte value2) { - addCriterion("gift_draw_share_chance between", value1, value2, "giftDrawShareChance"); - return (Criteria) this; - } - - public Criteria andGiftDrawShareChanceNotBetween(Byte value1, Byte value2) { - addCriterion("gift_draw_share_chance not between", value1, value2, "giftDrawShareChance"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawPrettyErbanNo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawPrettyErbanNo.java deleted file mode 100644 index 5499c3581..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawPrettyErbanNo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class UserDrawPrettyErbanNo { - private Long prettyErbanNo; - - private Byte type; - - private Byte useStatus; - - private Date createTime; - - public Long getPrettyErbanNo() { - return prettyErbanNo; - } - - public void setPrettyErbanNo(Long prettyErbanNo) { - this.prettyErbanNo = prettyErbanNo; - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public Byte getUseStatus() { - return useStatus; - } - - public void setUseStatus(Byte useStatus) { - this.useStatus = useStatus; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawPrettyErbanNoExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawPrettyErbanNoExample.java deleted file mode 100644 index 13a2887f6..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawPrettyErbanNoExample.java +++ /dev/null @@ -1,441 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class UserDrawPrettyErbanNoExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public UserDrawPrettyErbanNoExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andPrettyErbanNoIsNull() { - addCriterion("pretty_erban_no is null"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoIsNotNull() { - addCriterion("pretty_erban_no is not null"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoEqualTo(Long value) { - addCriterion("pretty_erban_no =", value, "prettyErbanNo"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoNotEqualTo(Long value) { - addCriterion("pretty_erban_no <>", value, "prettyErbanNo"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoGreaterThan(Long value) { - addCriterion("pretty_erban_no >", value, "prettyErbanNo"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoGreaterThanOrEqualTo(Long value) { - addCriterion("pretty_erban_no >=", value, "prettyErbanNo"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoLessThan(Long value) { - addCriterion("pretty_erban_no <", value, "prettyErbanNo"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoLessThanOrEqualTo(Long value) { - addCriterion("pretty_erban_no <=", value, "prettyErbanNo"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoIn(List values) { - addCriterion("pretty_erban_no in", values, "prettyErbanNo"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoNotIn(List values) { - addCriterion("pretty_erban_no not in", values, "prettyErbanNo"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoBetween(Long value1, Long value2) { - addCriterion("pretty_erban_no between", value1, value2, "prettyErbanNo"); - return (Criteria) this; - } - - public Criteria andPrettyErbanNoNotBetween(Long value1, Long value2) { - addCriterion("pretty_erban_no not between", value1, value2, "prettyErbanNo"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Byte value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Byte value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Byte value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Byte value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Byte value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Byte value1, Byte value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Byte value1, Byte value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andUseStatusIsNull() { - addCriterion("use_status is null"); - return (Criteria) this; - } - - public Criteria andUseStatusIsNotNull() { - addCriterion("use_status is not null"); - return (Criteria) this; - } - - public Criteria andUseStatusEqualTo(Byte value) { - addCriterion("use_status =", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusNotEqualTo(Byte value) { - addCriterion("use_status <>", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusGreaterThan(Byte value) { - addCriterion("use_status >", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("use_status >=", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusLessThan(Byte value) { - addCriterion("use_status <", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusLessThanOrEqualTo(Byte value) { - addCriterion("use_status <=", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusIn(List values) { - addCriterion("use_status in", values, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusNotIn(List values) { - addCriterion("use_status not in", values, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusBetween(Byte value1, Byte value2) { - addCriterion("use_status between", value1, value2, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusNotBetween(Byte value1, Byte value2) { - addCriterion("use_status not between", value1, value2, "useStatus"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawProd.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawProd.java deleted file mode 100644 index 423fb4c88..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawProd.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.accompany.business.model; - -public class UserDrawProd { - private Integer prodId; - - private Byte prodType; - - private String prodName; - - private Long prodValue; - - private String prodImage; - - private String prodDesc; - - private Integer drawType; - - private String drawName; - - private String drawId; - - private Integer expireDays; - - public Integer getProdId() { - return prodId; - } - - public void setProdId(Integer prodId) { - this.prodId = prodId; - } - - public Byte getProdType() { - return prodType; - } - - public void setProdType(Byte prodType) { - this.prodType = prodType; - } - - public String getProdName() { - return prodName; - } - - public void setProdName(String prodName) { - this.prodName = prodName == null ? null : prodName.trim(); - } - - public Long getProdValue() { - return prodValue; - } - - public void setProdValue(Long prodValue) { - this.prodValue = prodValue; - } - - public String getProdImage() { - return prodImage; - } - - public void setProdImage(String prodImage) { - this.prodImage = prodImage == null ? null : prodImage.trim(); - } - - public String getProdDesc() { - return prodDesc; - } - - public void setProdDesc(String prodDesc) { - this.prodDesc = prodDesc == null ? null : prodDesc.trim(); - } - - public Integer getDrawType() { - return drawType; - } - - public void setDrawType(Integer drawType) { - this.drawType = drawType; - } - - public String getDrawName() { - return drawName; - } - - public void setDrawName(String drawName) { - this.drawName = drawName == null ? null : drawName.trim(); - } - - public String getDrawId() { - return drawId; - } - - public void setDrawId(String drawId) { - this.drawId = drawId == null ? null : drawId.trim(); - } - - public Integer getExpireDays() { - return expireDays; - } - - public void setExpireDays(Integer expireDays) { - this.expireDays = expireDays; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawProdExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawProdExample.java deleted file mode 100644 index 5a471f246..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawProdExample.java +++ /dev/null @@ -1,850 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.List; - -public class UserDrawProdExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public UserDrawProdExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andProdIdIsNull() { - addCriterion("prod_id is null"); - return (Criteria) this; - } - - public Criteria andProdIdIsNotNull() { - addCriterion("prod_id is not null"); - return (Criteria) this; - } - - public Criteria andProdIdEqualTo(Integer value) { - addCriterion("prod_id =", value, "prodId"); - return (Criteria) this; - } - - public Criteria andProdIdNotEqualTo(Integer value) { - addCriterion("prod_id <>", value, "prodId"); - return (Criteria) this; - } - - public Criteria andProdIdGreaterThan(Integer value) { - addCriterion("prod_id >", value, "prodId"); - return (Criteria) this; - } - - public Criteria andProdIdGreaterThanOrEqualTo(Integer value) { - addCriterion("prod_id >=", value, "prodId"); - return (Criteria) this; - } - - public Criteria andProdIdLessThan(Integer value) { - addCriterion("prod_id <", value, "prodId"); - return (Criteria) this; - } - - public Criteria andProdIdLessThanOrEqualTo(Integer value) { - addCriterion("prod_id <=", value, "prodId"); - return (Criteria) this; - } - - public Criteria andProdIdIn(List values) { - addCriterion("prod_id in", values, "prodId"); - return (Criteria) this; - } - - public Criteria andProdIdNotIn(List values) { - addCriterion("prod_id not in", values, "prodId"); - return (Criteria) this; - } - - public Criteria andProdIdBetween(Integer value1, Integer value2) { - addCriterion("prod_id between", value1, value2, "prodId"); - return (Criteria) this; - } - - public Criteria andProdIdNotBetween(Integer value1, Integer value2) { - addCriterion("prod_id not between", value1, value2, "prodId"); - return (Criteria) this; - } - - public Criteria andProdTypeIsNull() { - addCriterion("prod_type is null"); - return (Criteria) this; - } - - public Criteria andProdTypeIsNotNull() { - addCriterion("prod_type is not null"); - return (Criteria) this; - } - - public Criteria andProdTypeEqualTo(Byte value) { - addCriterion("prod_type =", value, "prodType"); - return (Criteria) this; - } - - public Criteria andProdTypeNotEqualTo(Byte value) { - addCriterion("prod_type <>", value, "prodType"); - return (Criteria) this; - } - - public Criteria andProdTypeGreaterThan(Byte value) { - addCriterion("prod_type >", value, "prodType"); - return (Criteria) this; - } - - public Criteria andProdTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("prod_type >=", value, "prodType"); - return (Criteria) this; - } - - public Criteria andProdTypeLessThan(Byte value) { - addCriterion("prod_type <", value, "prodType"); - return (Criteria) this; - } - - public Criteria andProdTypeLessThanOrEqualTo(Byte value) { - addCriterion("prod_type <=", value, "prodType"); - return (Criteria) this; - } - - public Criteria andProdTypeIn(List values) { - addCriterion("prod_type in", values, "prodType"); - return (Criteria) this; - } - - public Criteria andProdTypeNotIn(List values) { - addCriterion("prod_type not in", values, "prodType"); - return (Criteria) this; - } - - public Criteria andProdTypeBetween(Byte value1, Byte value2) { - addCriterion("prod_type between", value1, value2, "prodType"); - return (Criteria) this; - } - - public Criteria andProdTypeNotBetween(Byte value1, Byte value2) { - addCriterion("prod_type not between", value1, value2, "prodType"); - return (Criteria) this; - } - - public Criteria andProdNameIsNull() { - addCriterion("prod_name is null"); - return (Criteria) this; - } - - public Criteria andProdNameIsNotNull() { - addCriterion("prod_name is not null"); - return (Criteria) this; - } - - public Criteria andProdNameEqualTo(String value) { - addCriterion("prod_name =", value, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameNotEqualTo(String value) { - addCriterion("prod_name <>", value, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameGreaterThan(String value) { - addCriterion("prod_name >", value, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameGreaterThanOrEqualTo(String value) { - addCriterion("prod_name >=", value, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameLessThan(String value) { - addCriterion("prod_name <", value, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameLessThanOrEqualTo(String value) { - addCriterion("prod_name <=", value, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameLike(String value) { - addCriterion("prod_name like", value, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameNotLike(String value) { - addCriterion("prod_name not like", value, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameIn(List values) { - addCriterion("prod_name in", values, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameNotIn(List values) { - addCriterion("prod_name not in", values, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameBetween(String value1, String value2) { - addCriterion("prod_name between", value1, value2, "prodName"); - return (Criteria) this; - } - - public Criteria andProdNameNotBetween(String value1, String value2) { - addCriterion("prod_name not between", value1, value2, "prodName"); - return (Criteria) this; - } - - public Criteria andProdValueIsNull() { - addCriterion("prod_value is null"); - return (Criteria) this; - } - - public Criteria andProdValueIsNotNull() { - addCriterion("prod_value is not null"); - return (Criteria) this; - } - - public Criteria andProdValueEqualTo(Long value) { - addCriterion("prod_value =", value, "prodValue"); - return (Criteria) this; - } - - public Criteria andProdValueNotEqualTo(Long value) { - addCriterion("prod_value <>", value, "prodValue"); - return (Criteria) this; - } - - public Criteria andProdValueGreaterThan(Long value) { - addCriterion("prod_value >", value, "prodValue"); - return (Criteria) this; - } - - public Criteria andProdValueGreaterThanOrEqualTo(Long value) { - addCriterion("prod_value >=", value, "prodValue"); - return (Criteria) this; - } - - public Criteria andProdValueLessThan(Long value) { - addCriterion("prod_value <", value, "prodValue"); - return (Criteria) this; - } - - public Criteria andProdValueLessThanOrEqualTo(Long value) { - addCriterion("prod_value <=", value, "prodValue"); - return (Criteria) this; - } - - public Criteria andProdValueIn(List values) { - addCriterion("prod_value in", values, "prodValue"); - return (Criteria) this; - } - - public Criteria andProdValueNotIn(List values) { - addCriterion("prod_value not in", values, "prodValue"); - return (Criteria) this; - } - - public Criteria andProdValueBetween(Long value1, Long value2) { - addCriterion("prod_value between", value1, value2, "prodValue"); - return (Criteria) this; - } - - public Criteria andProdValueNotBetween(Long value1, Long value2) { - addCriterion("prod_value not between", value1, value2, "prodValue"); - return (Criteria) this; - } - - public Criteria andProdImageIsNull() { - addCriterion("prod_image is null"); - return (Criteria) this; - } - - public Criteria andProdImageIsNotNull() { - addCriterion("prod_image is not null"); - return (Criteria) this; - } - - public Criteria andProdImageEqualTo(String value) { - addCriterion("prod_image =", value, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageNotEqualTo(String value) { - addCriterion("prod_image <>", value, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageGreaterThan(String value) { - addCriterion("prod_image >", value, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageGreaterThanOrEqualTo(String value) { - addCriterion("prod_image >=", value, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageLessThan(String value) { - addCriterion("prod_image <", value, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageLessThanOrEqualTo(String value) { - addCriterion("prod_image <=", value, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageLike(String value) { - addCriterion("prod_image like", value, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageNotLike(String value) { - addCriterion("prod_image not like", value, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageIn(List values) { - addCriterion("prod_image in", values, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageNotIn(List values) { - addCriterion("prod_image not in", values, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageBetween(String value1, String value2) { - addCriterion("prod_image between", value1, value2, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdImageNotBetween(String value1, String value2) { - addCriterion("prod_image not between", value1, value2, "prodImage"); - return (Criteria) this; - } - - public Criteria andProdDescIsNull() { - addCriterion("prod_desc is null"); - return (Criteria) this; - } - - public Criteria andProdDescIsNotNull() { - addCriterion("prod_desc is not null"); - return (Criteria) this; - } - - public Criteria andProdDescEqualTo(String value) { - addCriterion("prod_desc =", value, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescNotEqualTo(String value) { - addCriterion("prod_desc <>", value, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescGreaterThan(String value) { - addCriterion("prod_desc >", value, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescGreaterThanOrEqualTo(String value) { - addCriterion("prod_desc >=", value, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescLessThan(String value) { - addCriterion("prod_desc <", value, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescLessThanOrEqualTo(String value) { - addCriterion("prod_desc <=", value, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescLike(String value) { - addCriterion("prod_desc like", value, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescNotLike(String value) { - addCriterion("prod_desc not like", value, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescIn(List values) { - addCriterion("prod_desc in", values, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescNotIn(List values) { - addCriterion("prod_desc not in", values, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescBetween(String value1, String value2) { - addCriterion("prod_desc between", value1, value2, "prodDesc"); - return (Criteria) this; - } - - public Criteria andProdDescNotBetween(String value1, String value2) { - addCriterion("prod_desc not between", value1, value2, "prodDesc"); - return (Criteria) this; - } - - public Criteria andDrawTypeIsNull() { - addCriterion("draw_type is null"); - return (Criteria) this; - } - - public Criteria andDrawTypeIsNotNull() { - addCriterion("draw_type is not null"); - return (Criteria) this; - } - - public Criteria andDrawTypeEqualTo(Integer value) { - addCriterion("draw_type =", value, "drawType"); - return (Criteria) this; - } - - public Criteria andDrawTypeNotEqualTo(Integer value) { - addCriterion("draw_type <>", value, "drawType"); - return (Criteria) this; - } - - public Criteria andDrawTypeGreaterThan(Integer value) { - addCriterion("draw_type >", value, "drawType"); - return (Criteria) this; - } - - public Criteria andDrawTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("draw_type >=", value, "drawType"); - return (Criteria) this; - } - - public Criteria andDrawTypeLessThan(Integer value) { - addCriterion("draw_type <", value, "drawType"); - return (Criteria) this; - } - - public Criteria andDrawTypeLessThanOrEqualTo(Integer value) { - addCriterion("draw_type <=", value, "drawType"); - return (Criteria) this; - } - - public Criteria andDrawTypeIn(List values) { - addCriterion("draw_type in", values, "drawType"); - return (Criteria) this; - } - - public Criteria andDrawTypeNotIn(List values) { - addCriterion("draw_type not in", values, "drawType"); - return (Criteria) this; - } - - public Criteria andDrawTypeBetween(Integer value1, Integer value2) { - addCriterion("draw_type between", value1, value2, "drawType"); - return (Criteria) this; - } - - public Criteria andDrawTypeNotBetween(Integer value1, Integer value2) { - addCriterion("draw_type not between", value1, value2, "drawType"); - return (Criteria) this; - } - - public Criteria andDrawNameIsNull() { - addCriterion("draw_name is null"); - return (Criteria) this; - } - - public Criteria andDrawNameIsNotNull() { - addCriterion("draw_name is not null"); - return (Criteria) this; - } - - public Criteria andDrawNameEqualTo(String value) { - addCriterion("draw_name =", value, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameNotEqualTo(String value) { - addCriterion("draw_name <>", value, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameGreaterThan(String value) { - addCriterion("draw_name >", value, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameGreaterThanOrEqualTo(String value) { - addCriterion("draw_name >=", value, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameLessThan(String value) { - addCriterion("draw_name <", value, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameLessThanOrEqualTo(String value) { - addCriterion("draw_name <=", value, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameLike(String value) { - addCriterion("draw_name like", value, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameNotLike(String value) { - addCriterion("draw_name not like", value, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameIn(List values) { - addCriterion("draw_name in", values, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameNotIn(List values) { - addCriterion("draw_name not in", values, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameBetween(String value1, String value2) { - addCriterion("draw_name between", value1, value2, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawNameNotBetween(String value1, String value2) { - addCriterion("draw_name not between", value1, value2, "drawName"); - return (Criteria) this; - } - - public Criteria andDrawIdIsNull() { - addCriterion("draw_id is null"); - return (Criteria) this; - } - - public Criteria andDrawIdIsNotNull() { - addCriterion("draw_id is not null"); - return (Criteria) this; - } - - public Criteria andDrawIdEqualTo(String value) { - addCriterion("draw_id =", value, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdNotEqualTo(String value) { - addCriterion("draw_id <>", value, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdGreaterThan(String value) { - addCriterion("draw_id >", value, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdGreaterThanOrEqualTo(String value) { - addCriterion("draw_id >=", value, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdLessThan(String value) { - addCriterion("draw_id <", value, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdLessThanOrEqualTo(String value) { - addCriterion("draw_id <=", value, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdLike(String value) { - addCriterion("draw_id like", value, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdNotLike(String value) { - addCriterion("draw_id not like", value, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdIn(List values) { - addCriterion("draw_id in", values, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdNotIn(List values) { - addCriterion("draw_id not in", values, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdBetween(String value1, String value2) { - addCriterion("draw_id between", value1, value2, "drawId"); - return (Criteria) this; - } - - public Criteria andDrawIdNotBetween(String value1, String value2) { - addCriterion("draw_id not between", value1, value2, "drawId"); - return (Criteria) this; - } - - public Criteria andExpireDaysIsNull() { - addCriterion("expire_days is null"); - return (Criteria) this; - } - - public Criteria andExpireDaysIsNotNull() { - addCriterion("expire_days is not null"); - return (Criteria) this; - } - - public Criteria andExpireDaysEqualTo(Integer value) { - addCriterion("expire_days =", value, "expireDays"); - return (Criteria) this; - } - - public Criteria andExpireDaysNotEqualTo(Integer value) { - addCriterion("expire_days <>", value, "expireDays"); - return (Criteria) this; - } - - public Criteria andExpireDaysGreaterThan(Integer value) { - addCriterion("expire_days >", value, "expireDays"); - return (Criteria) this; - } - - public Criteria andExpireDaysGreaterThanOrEqualTo(Integer value) { - addCriterion("expire_days >=", value, "expireDays"); - return (Criteria) this; - } - - public Criteria andExpireDaysLessThan(Integer value) { - addCriterion("expire_days <", value, "expireDays"); - return (Criteria) this; - } - - public Criteria andExpireDaysLessThanOrEqualTo(Integer value) { - addCriterion("expire_days <=", value, "expireDays"); - return (Criteria) this; - } - - public Criteria andExpireDaysIn(List values) { - addCriterion("expire_days in", values, "expireDays"); - return (Criteria) this; - } - - public Criteria andExpireDaysNotIn(List values) { - addCriterion("expire_days not in", values, "expireDays"); - return (Criteria) this; - } - - public Criteria andExpireDaysBetween(Integer value1, Integer value2) { - addCriterion("expire_days between", value1, value2, "expireDays"); - return (Criteria) this; - } - - public Criteria andExpireDaysNotBetween(Integer value1, Integer value2) { - addCriterion("expire_days not between", value1, value2, "expireDays"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawRecord.java deleted file mode 100644 index 32fdda124..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawRecord.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class UserDrawRecord { - private Integer recordId; - - private Long uid; - - private Byte drawStatus; - - private Byte type; - - private String srcObjId; - - private String srcObjName; - - private Long srcObjAmount; - - private Integer drawPrizeId; - - private String drawPrizeName; - - private Byte drawPrizePutout; - - private String recordDesc; - - private Date createTime; - - private Date updateTime; - - public Integer getRecordId() { - return recordId; - } - - public void setRecordId(Integer recordId) { - this.recordId = recordId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Byte getDrawStatus() { - return drawStatus; - } - - public void setDrawStatus(Byte drawStatus) { - this.drawStatus = drawStatus; - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public String getSrcObjId() { - return srcObjId; - } - - public void setSrcObjId(String srcObjId) { - this.srcObjId = srcObjId == null ? null : srcObjId.trim(); - } - - public String getSrcObjName() { - return srcObjName; - } - - public void setSrcObjName(String srcObjName) { - this.srcObjName = srcObjName == null ? null : srcObjName.trim(); - } - - public Long getSrcObjAmount() { - return srcObjAmount; - } - - public void setSrcObjAmount(Long srcObjAmount) { - this.srcObjAmount = srcObjAmount; - } - - public Integer getDrawPrizeId() { - return drawPrizeId; - } - - public void setDrawPrizeId(Integer drawPrizeId) { - this.drawPrizeId = drawPrizeId; - } - - public String getDrawPrizeName() { - return drawPrizeName; - } - - public void setDrawPrizeName(String drawPrizeName) { - this.drawPrizeName = drawPrizeName == null ? null : drawPrizeName.trim(); - } - - public Byte getDrawPrizePutout() { - return drawPrizePutout; - } - - public void setDrawPrizePutout(Byte drawPrizePutout) { - this.drawPrizePutout = drawPrizePutout; - } - - public String getRecordDesc() { - return recordDesc; - } - - public void setRecordDesc(String recordDesc) { - this.recordDesc = recordDesc == null ? null : recordDesc.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawRecordExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawRecordExample.java deleted file mode 100644 index df88c61c6..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawRecordExample.java +++ /dev/null @@ -1,1041 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class UserDrawRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public UserDrawRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(Integer value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(Integer value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(Integer value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(Integer value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(Integer value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(Integer value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(Integer value1, Integer value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(Integer value1, Integer value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andDrawStatusIsNull() { - addCriterion("draw_status is null"); - return (Criteria) this; - } - - public Criteria andDrawStatusIsNotNull() { - addCriterion("draw_status is not null"); - return (Criteria) this; - } - - public Criteria andDrawStatusEqualTo(Byte value) { - addCriterion("draw_status =", value, "drawStatus"); - return (Criteria) this; - } - - public Criteria andDrawStatusNotEqualTo(Byte value) { - addCriterion("draw_status <>", value, "drawStatus"); - return (Criteria) this; - } - - public Criteria andDrawStatusGreaterThan(Byte value) { - addCriterion("draw_status >", value, "drawStatus"); - return (Criteria) this; - } - - public Criteria andDrawStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("draw_status >=", value, "drawStatus"); - return (Criteria) this; - } - - public Criteria andDrawStatusLessThan(Byte value) { - addCriterion("draw_status <", value, "drawStatus"); - return (Criteria) this; - } - - public Criteria andDrawStatusLessThanOrEqualTo(Byte value) { - addCriterion("draw_status <=", value, "drawStatus"); - return (Criteria) this; - } - - public Criteria andDrawStatusIn(List values) { - addCriterion("draw_status in", values, "drawStatus"); - return (Criteria) this; - } - - public Criteria andDrawStatusNotIn(List values) { - addCriterion("draw_status not in", values, "drawStatus"); - return (Criteria) this; - } - - public Criteria andDrawStatusBetween(Byte value1, Byte value2) { - addCriterion("draw_status between", value1, value2, "drawStatus"); - return (Criteria) this; - } - - public Criteria andDrawStatusNotBetween(Byte value1, Byte value2) { - addCriterion("draw_status not between", value1, value2, "drawStatus"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Byte value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Byte value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Byte value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Byte value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Byte value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Byte value1, Byte value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Byte value1, Byte value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andSrcObjIdIsNull() { - addCriterion("src_obj_id is null"); - return (Criteria) this; - } - - public Criteria andSrcObjIdIsNotNull() { - addCriterion("src_obj_id is not null"); - return (Criteria) this; - } - - public Criteria andSrcObjIdEqualTo(String value) { - addCriterion("src_obj_id =", value, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdNotEqualTo(String value) { - addCriterion("src_obj_id <>", value, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdGreaterThan(String value) { - addCriterion("src_obj_id >", value, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdGreaterThanOrEqualTo(String value) { - addCriterion("src_obj_id >=", value, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdLessThan(String value) { - addCriterion("src_obj_id <", value, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdLessThanOrEqualTo(String value) { - addCriterion("src_obj_id <=", value, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdLike(String value) { - addCriterion("src_obj_id like", value, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdNotLike(String value) { - addCriterion("src_obj_id not like", value, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdIn(List values) { - addCriterion("src_obj_id in", values, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdNotIn(List values) { - addCriterion("src_obj_id not in", values, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdBetween(String value1, String value2) { - addCriterion("src_obj_id between", value1, value2, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjIdNotBetween(String value1, String value2) { - addCriterion("src_obj_id not between", value1, value2, "srcObjId"); - return (Criteria) this; - } - - public Criteria andSrcObjNameIsNull() { - addCriterion("src_obj_name is null"); - return (Criteria) this; - } - - public Criteria andSrcObjNameIsNotNull() { - addCriterion("src_obj_name is not null"); - return (Criteria) this; - } - - public Criteria andSrcObjNameEqualTo(String value) { - addCriterion("src_obj_name =", value, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameNotEqualTo(String value) { - addCriterion("src_obj_name <>", value, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameGreaterThan(String value) { - addCriterion("src_obj_name >", value, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameGreaterThanOrEqualTo(String value) { - addCriterion("src_obj_name >=", value, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameLessThan(String value) { - addCriterion("src_obj_name <", value, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameLessThanOrEqualTo(String value) { - addCriterion("src_obj_name <=", value, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameLike(String value) { - addCriterion("src_obj_name like", value, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameNotLike(String value) { - addCriterion("src_obj_name not like", value, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameIn(List values) { - addCriterion("src_obj_name in", values, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameNotIn(List values) { - addCriterion("src_obj_name not in", values, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameBetween(String value1, String value2) { - addCriterion("src_obj_name between", value1, value2, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjNameNotBetween(String value1, String value2) { - addCriterion("src_obj_name not between", value1, value2, "srcObjName"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountIsNull() { - addCriterion("src_obj_amount is null"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountIsNotNull() { - addCriterion("src_obj_amount is not null"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountEqualTo(Long value) { - addCriterion("src_obj_amount =", value, "srcObjAmount"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountNotEqualTo(Long value) { - addCriterion("src_obj_amount <>", value, "srcObjAmount"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountGreaterThan(Long value) { - addCriterion("src_obj_amount >", value, "srcObjAmount"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountGreaterThanOrEqualTo(Long value) { - addCriterion("src_obj_amount >=", value, "srcObjAmount"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountLessThan(Long value) { - addCriterion("src_obj_amount <", value, "srcObjAmount"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountLessThanOrEqualTo(Long value) { - addCriterion("src_obj_amount <=", value, "srcObjAmount"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountIn(List values) { - addCriterion("src_obj_amount in", values, "srcObjAmount"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountNotIn(List values) { - addCriterion("src_obj_amount not in", values, "srcObjAmount"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountBetween(Long value1, Long value2) { - addCriterion("src_obj_amount between", value1, value2, "srcObjAmount"); - return (Criteria) this; - } - - public Criteria andSrcObjAmountNotBetween(Long value1, Long value2) { - addCriterion("src_obj_amount not between", value1, value2, "srcObjAmount"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdIsNull() { - addCriterion("draw_prize_id is null"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdIsNotNull() { - addCriterion("draw_prize_id is not null"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdEqualTo(Integer value) { - addCriterion("draw_prize_id =", value, "drawPrizeId"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdNotEqualTo(Integer value) { - addCriterion("draw_prize_id <>", value, "drawPrizeId"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdGreaterThan(Integer value) { - addCriterion("draw_prize_id >", value, "drawPrizeId"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdGreaterThanOrEqualTo(Integer value) { - addCriterion("draw_prize_id >=", value, "drawPrizeId"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdLessThan(Integer value) { - addCriterion("draw_prize_id <", value, "drawPrizeId"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdLessThanOrEqualTo(Integer value) { - addCriterion("draw_prize_id <=", value, "drawPrizeId"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdIn(List values) { - addCriterion("draw_prize_id in", values, "drawPrizeId"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdNotIn(List values) { - addCriterion("draw_prize_id not in", values, "drawPrizeId"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdBetween(Integer value1, Integer value2) { - addCriterion("draw_prize_id between", value1, value2, "drawPrizeId"); - return (Criteria) this; - } - - public Criteria andDrawPrizeIdNotBetween(Integer value1, Integer value2) { - addCriterion("draw_prize_id not between", value1, value2, "drawPrizeId"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameIsNull() { - addCriterion("draw_prize_name is null"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameIsNotNull() { - addCriterion("draw_prize_name is not null"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameEqualTo(String value) { - addCriterion("draw_prize_name =", value, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameNotEqualTo(String value) { - addCriterion("draw_prize_name <>", value, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameGreaterThan(String value) { - addCriterion("draw_prize_name >", value, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameGreaterThanOrEqualTo(String value) { - addCriterion("draw_prize_name >=", value, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameLessThan(String value) { - addCriterion("draw_prize_name <", value, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameLessThanOrEqualTo(String value) { - addCriterion("draw_prize_name <=", value, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameLike(String value) { - addCriterion("draw_prize_name like", value, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameNotLike(String value) { - addCriterion("draw_prize_name not like", value, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameIn(List values) { - addCriterion("draw_prize_name in", values, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameNotIn(List values) { - addCriterion("draw_prize_name not in", values, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameBetween(String value1, String value2) { - addCriterion("draw_prize_name between", value1, value2, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizeNameNotBetween(String value1, String value2) { - addCriterion("draw_prize_name not between", value1, value2, "drawPrizeName"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutIsNull() { - addCriterion("draw_prize_putout is null"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutIsNotNull() { - addCriterion("draw_prize_putout is not null"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutEqualTo(Byte value) { - addCriterion("draw_prize_putout =", value, "drawPrizePutout"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutNotEqualTo(Byte value) { - addCriterion("draw_prize_putout <>", value, "drawPrizePutout"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutGreaterThan(Byte value) { - addCriterion("draw_prize_putout >", value, "drawPrizePutout"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutGreaterThanOrEqualTo(Byte value) { - addCriterion("draw_prize_putout >=", value, "drawPrizePutout"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutLessThan(Byte value) { - addCriterion("draw_prize_putout <", value, "drawPrizePutout"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutLessThanOrEqualTo(Byte value) { - addCriterion("draw_prize_putout <=", value, "drawPrizePutout"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutIn(List values) { - addCriterion("draw_prize_putout in", values, "drawPrizePutout"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutNotIn(List values) { - addCriterion("draw_prize_putout not in", values, "drawPrizePutout"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutBetween(Byte value1, Byte value2) { - addCriterion("draw_prize_putout between", value1, value2, "drawPrizePutout"); - return (Criteria) this; - } - - public Criteria andDrawPrizePutoutNotBetween(Byte value1, Byte value2) { - addCriterion("draw_prize_putout not between", value1, value2, "drawPrizePutout"); - return (Criteria) this; - } - - public Criteria andRecordDescIsNull() { - addCriterion("record_desc is null"); - return (Criteria) this; - } - - public Criteria andRecordDescIsNotNull() { - addCriterion("record_desc is not null"); - return (Criteria) this; - } - - public Criteria andRecordDescEqualTo(String value) { - addCriterion("record_desc =", value, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescNotEqualTo(String value) { - addCriterion("record_desc <>", value, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescGreaterThan(String value) { - addCriterion("record_desc >", value, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescGreaterThanOrEqualTo(String value) { - addCriterion("record_desc >=", value, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescLessThan(String value) { - addCriterion("record_desc <", value, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescLessThanOrEqualTo(String value) { - addCriterion("record_desc <=", value, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescLike(String value) { - addCriterion("record_desc like", value, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescNotLike(String value) { - addCriterion("record_desc not like", value, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescIn(List values) { - addCriterion("record_desc in", values, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescNotIn(List values) { - addCriterion("record_desc not in", values, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescBetween(String value1, String value2) { - addCriterion("record_desc between", value1, value2, "recordDesc"); - return (Criteria) this; - } - - public Criteria andRecordDescNotBetween(String value1, String value2) { - addCriterion("record_desc not between", value1, value2, "recordDesc"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawStatis.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawStatis.java deleted file mode 100644 index d85833da0..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawStatis.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.accompany.business.model; - -public class UserDrawStatis { - private Long uid; - - private Long erbanNo; - - private String nick; - - private Integer drawNum; - - private Integer drawGoldNum; - - private Integer signNum; - - private Integer shareNum; - - private Integer whiteNum; - - private Integer whiteStatus; - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getErbanNo() { - return erbanNo; - } - - public void setErbanNo(Long erbanNo) { - this.erbanNo = erbanNo; - } - - public String getNick() { - return nick; - } - - public void setNick(String nick) { - this.nick = nick == null ? null : nick.trim(); - } - - public Integer getDrawNum() { - return drawNum; - } - - public void setDrawNum(Integer drawNum) { - this.drawNum = drawNum; - } - - public Integer getDrawGoldNum() { - return drawGoldNum; - } - - public void setDrawGoldNum(Integer drawGoldNum) { - this.drawGoldNum = drawGoldNum; - } - - public Integer getSignNum() { - return signNum; - } - - public void setSignNum(Integer signNum) { - this.signNum = signNum; - } - - public Integer getShareNum() { - return shareNum; - } - - public void setShareNum(Integer shareNum) { - this.shareNum = shareNum; - } - - public Integer getWhiteNum() { - return whiteNum; - } - - public void setWhiteNum(Integer whiteNum) { - this.whiteNum = whiteNum; - } - - public Integer getWhiteStatus() { - return whiteStatus; - } - - public void setWhiteStatus(Integer whiteStatus) { - this.whiteStatus = whiteStatus; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawStatisExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawStatisExample.java deleted file mode 100644 index a5d3413c7..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserDrawStatisExample.java +++ /dev/null @@ -1,770 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.List; - -public class UserDrawStatisExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public UserDrawStatisExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andErbanNoIsNull() { - addCriterion("erban_no is null"); - return (Criteria) this; - } - - public Criteria andErbanNoIsNotNull() { - addCriterion("erban_no is not null"); - return (Criteria) this; - } - - public Criteria andErbanNoEqualTo(Long value) { - addCriterion("erban_no =", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoNotEqualTo(Long value) { - addCriterion("erban_no <>", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoGreaterThan(Long value) { - addCriterion("erban_no >", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoGreaterThanOrEqualTo(Long value) { - addCriterion("erban_no >=", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoLessThan(Long value) { - addCriterion("erban_no <", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoLessThanOrEqualTo(Long value) { - addCriterion("erban_no <=", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoIn(List values) { - addCriterion("erban_no in", values, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoNotIn(List values) { - addCriterion("erban_no not in", values, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoBetween(Long value1, Long value2) { - addCriterion("erban_no between", value1, value2, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoNotBetween(Long value1, Long value2) { - addCriterion("erban_no not between", value1, value2, "erbanNo"); - return (Criteria) this; - } - - public Criteria andNickIsNull() { - addCriterion("nick is null"); - return (Criteria) this; - } - - public Criteria andNickIsNotNull() { - addCriterion("nick is not null"); - return (Criteria) this; - } - - public Criteria andNickEqualTo(String value) { - addCriterion("nick =", value, "nick"); - return (Criteria) this; - } - - public Criteria andNickNotEqualTo(String value) { - addCriterion("nick <>", value, "nick"); - return (Criteria) this; - } - - public Criteria andNickGreaterThan(String value) { - addCriterion("nick >", value, "nick"); - return (Criteria) this; - } - - public Criteria andNickGreaterThanOrEqualTo(String value) { - addCriterion("nick >=", value, "nick"); - return (Criteria) this; - } - - public Criteria andNickLessThan(String value) { - addCriterion("nick <", value, "nick"); - return (Criteria) this; - } - - public Criteria andNickLessThanOrEqualTo(String value) { - addCriterion("nick <=", value, "nick"); - return (Criteria) this; - } - - public Criteria andNickLike(String value) { - addCriterion("nick like", value, "nick"); - return (Criteria) this; - } - - public Criteria andNickNotLike(String value) { - addCriterion("nick not like", value, "nick"); - return (Criteria) this; - } - - public Criteria andNickIn(List values) { - addCriterion("nick in", values, "nick"); - return (Criteria) this; - } - - public Criteria andNickNotIn(List values) { - addCriterion("nick not in", values, "nick"); - return (Criteria) this; - } - - public Criteria andNickBetween(String value1, String value2) { - addCriterion("nick between", value1, value2, "nick"); - return (Criteria) this; - } - - public Criteria andNickNotBetween(String value1, String value2) { - addCriterion("nick not between", value1, value2, "nick"); - return (Criteria) this; - } - - public Criteria andDrawNumIsNull() { - addCriterion("draw_num is null"); - return (Criteria) this; - } - - public Criteria andDrawNumIsNotNull() { - addCriterion("draw_num is not null"); - return (Criteria) this; - } - - public Criteria andDrawNumEqualTo(Integer value) { - addCriterion("draw_num =", value, "drawNum"); - return (Criteria) this; - } - - public Criteria andDrawNumNotEqualTo(Integer value) { - addCriterion("draw_num <>", value, "drawNum"); - return (Criteria) this; - } - - public Criteria andDrawNumGreaterThan(Integer value) { - addCriterion("draw_num >", value, "drawNum"); - return (Criteria) this; - } - - public Criteria andDrawNumGreaterThanOrEqualTo(Integer value) { - addCriterion("draw_num >=", value, "drawNum"); - return (Criteria) this; - } - - public Criteria andDrawNumLessThan(Integer value) { - addCriterion("draw_num <", value, "drawNum"); - return (Criteria) this; - } - - public Criteria andDrawNumLessThanOrEqualTo(Integer value) { - addCriterion("draw_num <=", value, "drawNum"); - return (Criteria) this; - } - - public Criteria andDrawNumIn(List values) { - addCriterion("draw_num in", values, "drawNum"); - return (Criteria) this; - } - - public Criteria andDrawNumNotIn(List values) { - addCriterion("draw_num not in", values, "drawNum"); - return (Criteria) this; - } - - public Criteria andDrawNumBetween(Integer value1, Integer value2) { - addCriterion("draw_num between", value1, value2, "drawNum"); - return (Criteria) this; - } - - public Criteria andDrawNumNotBetween(Integer value1, Integer value2) { - addCriterion("draw_num not between", value1, value2, "drawNum"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumIsNull() { - addCriterion("draw_gold_num is null"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumIsNotNull() { - addCriterion("draw_gold_num is not null"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumEqualTo(Integer value) { - addCriterion("draw_gold_num =", value, "drawGoldNum"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumNotEqualTo(Integer value) { - addCriterion("draw_gold_num <>", value, "drawGoldNum"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumGreaterThan(Integer value) { - addCriterion("draw_gold_num >", value, "drawGoldNum"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumGreaterThanOrEqualTo(Integer value) { - addCriterion("draw_gold_num >=", value, "drawGoldNum"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumLessThan(Integer value) { - addCriterion("draw_gold_num <", value, "drawGoldNum"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumLessThanOrEqualTo(Integer value) { - addCriterion("draw_gold_num <=", value, "drawGoldNum"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumIn(List values) { - addCriterion("draw_gold_num in", values, "drawGoldNum"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumNotIn(List values) { - addCriterion("draw_gold_num not in", values, "drawGoldNum"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumBetween(Integer value1, Integer value2) { - addCriterion("draw_gold_num between", value1, value2, "drawGoldNum"); - return (Criteria) this; - } - - public Criteria andDrawGoldNumNotBetween(Integer value1, Integer value2) { - addCriterion("draw_gold_num not between", value1, value2, "drawGoldNum"); - return (Criteria) this; - } - - public Criteria andSignNumIsNull() { - addCriterion("sign_num is null"); - return (Criteria) this; - } - - public Criteria andSignNumIsNotNull() { - addCriterion("sign_num is not null"); - return (Criteria) this; - } - - public Criteria andSignNumEqualTo(Integer value) { - addCriterion("sign_num =", value, "signNum"); - return (Criteria) this; - } - - public Criteria andSignNumNotEqualTo(Integer value) { - addCriterion("sign_num <>", value, "signNum"); - return (Criteria) this; - } - - public Criteria andSignNumGreaterThan(Integer value) { - addCriterion("sign_num >", value, "signNum"); - return (Criteria) this; - } - - public Criteria andSignNumGreaterThanOrEqualTo(Integer value) { - addCriterion("sign_num >=", value, "signNum"); - return (Criteria) this; - } - - public Criteria andSignNumLessThan(Integer value) { - addCriterion("sign_num <", value, "signNum"); - return (Criteria) this; - } - - public Criteria andSignNumLessThanOrEqualTo(Integer value) { - addCriterion("sign_num <=", value, "signNum"); - return (Criteria) this; - } - - public Criteria andSignNumIn(List values) { - addCriterion("sign_num in", values, "signNum"); - return (Criteria) this; - } - - public Criteria andSignNumNotIn(List values) { - addCriterion("sign_num not in", values, "signNum"); - return (Criteria) this; - } - - public Criteria andSignNumBetween(Integer value1, Integer value2) { - addCriterion("sign_num between", value1, value2, "signNum"); - return (Criteria) this; - } - - public Criteria andSignNumNotBetween(Integer value1, Integer value2) { - addCriterion("sign_num not between", value1, value2, "signNum"); - return (Criteria) this; - } - - public Criteria andShareNumIsNull() { - addCriterion("share_num is null"); - return (Criteria) this; - } - - public Criteria andShareNumIsNotNull() { - addCriterion("share_num is not null"); - return (Criteria) this; - } - - public Criteria andShareNumEqualTo(Integer value) { - addCriterion("share_num =", value, "shareNum"); - return (Criteria) this; - } - - public Criteria andShareNumNotEqualTo(Integer value) { - addCriterion("share_num <>", value, "shareNum"); - return (Criteria) this; - } - - public Criteria andShareNumGreaterThan(Integer value) { - addCriterion("share_num >", value, "shareNum"); - return (Criteria) this; - } - - public Criteria andShareNumGreaterThanOrEqualTo(Integer value) { - addCriterion("share_num >=", value, "shareNum"); - return (Criteria) this; - } - - public Criteria andShareNumLessThan(Integer value) { - addCriterion("share_num <", value, "shareNum"); - return (Criteria) this; - } - - public Criteria andShareNumLessThanOrEqualTo(Integer value) { - addCriterion("share_num <=", value, "shareNum"); - return (Criteria) this; - } - - public Criteria andShareNumIn(List values) { - addCriterion("share_num in", values, "shareNum"); - return (Criteria) this; - } - - public Criteria andShareNumNotIn(List values) { - addCriterion("share_num not in", values, "shareNum"); - return (Criteria) this; - } - - public Criteria andShareNumBetween(Integer value1, Integer value2) { - addCriterion("share_num between", value1, value2, "shareNum"); - return (Criteria) this; - } - - public Criteria andShareNumNotBetween(Integer value1, Integer value2) { - addCriterion("share_num not between", value1, value2, "shareNum"); - return (Criteria) this; - } - - public Criteria andWhiteNumIsNull() { - addCriterion("white_num is null"); - return (Criteria) this; - } - - public Criteria andWhiteNumIsNotNull() { - addCriterion("white_num is not null"); - return (Criteria) this; - } - - public Criteria andWhiteNumEqualTo(Integer value) { - addCriterion("white_num =", value, "whiteNum"); - return (Criteria) this; - } - - public Criteria andWhiteNumNotEqualTo(Integer value) { - addCriterion("white_num <>", value, "whiteNum"); - return (Criteria) this; - } - - public Criteria andWhiteNumGreaterThan(Integer value) { - addCriterion("white_num >", value, "whiteNum"); - return (Criteria) this; - } - - public Criteria andWhiteNumGreaterThanOrEqualTo(Integer value) { - addCriterion("white_num >=", value, "whiteNum"); - return (Criteria) this; - } - - public Criteria andWhiteNumLessThan(Integer value) { - addCriterion("white_num <", value, "whiteNum"); - return (Criteria) this; - } - - public Criteria andWhiteNumLessThanOrEqualTo(Integer value) { - addCriterion("white_num <=", value, "whiteNum"); - return (Criteria) this; - } - - public Criteria andWhiteNumIn(List values) { - addCriterion("white_num in", values, "whiteNum"); - return (Criteria) this; - } - - public Criteria andWhiteNumNotIn(List values) { - addCriterion("white_num not in", values, "whiteNum"); - return (Criteria) this; - } - - public Criteria andWhiteNumBetween(Integer value1, Integer value2) { - addCriterion("white_num between", value1, value2, "whiteNum"); - return (Criteria) this; - } - - public Criteria andWhiteNumNotBetween(Integer value1, Integer value2) { - addCriterion("white_num not between", value1, value2, "whiteNum"); - return (Criteria) this; - } - - public Criteria andWhiteStatusIsNull() { - addCriterion("white_status is null"); - return (Criteria) this; - } - - public Criteria andWhiteStatusIsNotNull() { - addCriterion("white_status is not null"); - return (Criteria) this; - } - - public Criteria andWhiteStatusEqualTo(Integer value) { - addCriterion("white_status =", value, "whiteStatus"); - return (Criteria) this; - } - - public Criteria andWhiteStatusNotEqualTo(Integer value) { - addCriterion("white_status <>", value, "whiteStatus"); - return (Criteria) this; - } - - public Criteria andWhiteStatusGreaterThan(Integer value) { - addCriterion("white_status >", value, "whiteStatus"); - return (Criteria) this; - } - - public Criteria andWhiteStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("white_status >=", value, "whiteStatus"); - return (Criteria) this; - } - - public Criteria andWhiteStatusLessThan(Integer value) { - addCriterion("white_status <", value, "whiteStatus"); - return (Criteria) this; - } - - public Criteria andWhiteStatusLessThanOrEqualTo(Integer value) { - addCriterion("white_status <=", value, "whiteStatus"); - return (Criteria) this; - } - - public Criteria andWhiteStatusIn(List values) { - addCriterion("white_status in", values, "whiteStatus"); - return (Criteria) this; - } - - public Criteria andWhiteStatusNotIn(List values) { - addCriterion("white_status not in", values, "whiteStatus"); - return (Criteria) this; - } - - public Criteria andWhiteStatusBetween(Integer value1, Integer value2) { - addCriterion("white_status between", value1, value2, "whiteStatus"); - return (Criteria) this; - } - - public Criteria andWhiteStatusNotBetween(Integer value1, Integer value2) { - addCriterion("white_status not between", value1, value2, "whiteStatus"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacket.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacket.java deleted file mode 100644 index c263b025a..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacket.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class UserPacket { - private Long uid; - - private Double packetNum; - - private Double histPacketNum; - - private Date firstGetTime; - - private Date createTime; - - private Date updateTime; - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Double getPacketNum() { - return packetNum; - } - - public void setPacketNum(Double packetNum) { - this.packetNum = packetNum; - } - - public Double getHistPacketNum() { - return histPacketNum; - } - - public void setHistPacketNum(Double histPacketNum) { - this.histPacketNum = histPacketNum; - } - - public Date getFirstGetTime() { - return firstGetTime; - } - - public void setFirstGetTime(Date firstGetTime) { - this.firstGetTime = firstGetTime; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketExample.java deleted file mode 100644 index d255be5ed..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketExample.java +++ /dev/null @@ -1,561 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class UserPacketExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public UserPacketExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andPacketNumIsNull() { - addCriterion("packet_num is null"); - return (Criteria) this; - } - - public Criteria andPacketNumIsNotNull() { - addCriterion("packet_num is not null"); - return (Criteria) this; - } - - public Criteria andPacketNumEqualTo(Double value) { - addCriterion("packet_num =", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotEqualTo(Double value) { - addCriterion("packet_num <>", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumGreaterThan(Double value) { - addCriterion("packet_num >", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumGreaterThanOrEqualTo(Double value) { - addCriterion("packet_num >=", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumLessThan(Double value) { - addCriterion("packet_num <", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumLessThanOrEqualTo(Double value) { - addCriterion("packet_num <=", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumIn(List values) { - addCriterion("packet_num in", values, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotIn(List values) { - addCriterion("packet_num not in", values, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumBetween(Double value1, Double value2) { - addCriterion("packet_num between", value1, value2, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotBetween(Double value1, Double value2) { - addCriterion("packet_num not between", value1, value2, "packetNum"); - return (Criteria) this; - } - - public Criteria andHistPacketNumIsNull() { - addCriterion("hist_packet_num is null"); - return (Criteria) this; - } - - public Criteria andHistPacketNumIsNotNull() { - addCriterion("hist_packet_num is not null"); - return (Criteria) this; - } - - public Criteria andHistPacketNumEqualTo(Double value) { - addCriterion("hist_packet_num =", value, "histPacketNum"); - return (Criteria) this; - } - - public Criteria andHistPacketNumNotEqualTo(Double value) { - addCriterion("hist_packet_num <>", value, "histPacketNum"); - return (Criteria) this; - } - - public Criteria andHistPacketNumGreaterThan(Double value) { - addCriterion("hist_packet_num >", value, "histPacketNum"); - return (Criteria) this; - } - - public Criteria andHistPacketNumGreaterThanOrEqualTo(Double value) { - addCriterion("hist_packet_num >=", value, "histPacketNum"); - return (Criteria) this; - } - - public Criteria andHistPacketNumLessThan(Double value) { - addCriterion("hist_packet_num <", value, "histPacketNum"); - return (Criteria) this; - } - - public Criteria andHistPacketNumLessThanOrEqualTo(Double value) { - addCriterion("hist_packet_num <=", value, "histPacketNum"); - return (Criteria) this; - } - - public Criteria andHistPacketNumIn(List values) { - addCriterion("hist_packet_num in", values, "histPacketNum"); - return (Criteria) this; - } - - public Criteria andHistPacketNumNotIn(List values) { - addCriterion("hist_packet_num not in", values, "histPacketNum"); - return (Criteria) this; - } - - public Criteria andHistPacketNumBetween(Double value1, Double value2) { - addCriterion("hist_packet_num between", value1, value2, "histPacketNum"); - return (Criteria) this; - } - - public Criteria andHistPacketNumNotBetween(Double value1, Double value2) { - addCriterion("hist_packet_num not between", value1, value2, "histPacketNum"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeIsNull() { - addCriterion("first_get_time is null"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeIsNotNull() { - addCriterion("first_get_time is not null"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeEqualTo(Date value) { - addCriterion("first_get_time =", value, "firstGetTime"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeNotEqualTo(Date value) { - addCriterion("first_get_time <>", value, "firstGetTime"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeGreaterThan(Date value) { - addCriterion("first_get_time >", value, "firstGetTime"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeGreaterThanOrEqualTo(Date value) { - addCriterion("first_get_time >=", value, "firstGetTime"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeLessThan(Date value) { - addCriterion("first_get_time <", value, "firstGetTime"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeLessThanOrEqualTo(Date value) { - addCriterion("first_get_time <=", value, "firstGetTime"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeIn(List values) { - addCriterion("first_get_time in", values, "firstGetTime"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeNotIn(List values) { - addCriterion("first_get_time not in", values, "firstGetTime"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeBetween(Date value1, Date value2) { - addCriterion("first_get_time between", value1, value2, "firstGetTime"); - return (Criteria) this; - } - - public Criteria andFirstGetTimeNotBetween(Date value1, Date value2) { - addCriterion("first_get_time not between", value1, value2, "firstGetTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketRecord.java deleted file mode 100644 index 84ffa688a..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketRecord.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class UserPacketRecord { - private String packetId; - - private Long uid; - - private Double packetNum; - - private Long srcUid; - - private Byte type; - - private String objId; - - private Boolean hasUnpack; - - private Byte packetStatus; - - private Date createTime; - - private Date updateTime; - - public String getPacketId() { - return packetId; - } - - public void setPacketId(String packetId) { - this.packetId = packetId == null ? null : packetId.trim(); - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Double getPacketNum() { - return packetNum; - } - - public void setPacketNum(Double packetNum) { - this.packetNum = packetNum; - } - - public Long getSrcUid() { - return srcUid; - } - - public void setSrcUid(Long srcUid) { - this.srcUid = srcUid; - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId == null ? null : objId.trim(); - } - - public Boolean getHasUnpack() { - return hasUnpack; - } - - public void setHasUnpack(Boolean hasUnpack) { - this.hasUnpack = hasUnpack; - } - - public Byte getPacketStatus() { - return packetStatus; - } - - public void setPacketStatus(Byte packetStatus) { - this.packetStatus = packetStatus; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketRecordExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketRecordExample.java deleted file mode 100644 index a410e542e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketRecordExample.java +++ /dev/null @@ -1,821 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class UserPacketRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public UserPacketRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andPacketIdIsNull() { - addCriterion("packet_id is null"); - return (Criteria) this; - } - - public Criteria andPacketIdIsNotNull() { - addCriterion("packet_id is not null"); - return (Criteria) this; - } - - public Criteria andPacketIdEqualTo(String value) { - addCriterion("packet_id =", value, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdNotEqualTo(String value) { - addCriterion("packet_id <>", value, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdGreaterThan(String value) { - addCriterion("packet_id >", value, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdGreaterThanOrEqualTo(String value) { - addCriterion("packet_id >=", value, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdLessThan(String value) { - addCriterion("packet_id <", value, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdLessThanOrEqualTo(String value) { - addCriterion("packet_id <=", value, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdLike(String value) { - addCriterion("packet_id like", value, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdNotLike(String value) { - addCriterion("packet_id not like", value, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdIn(List values) { - addCriterion("packet_id in", values, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdNotIn(List values) { - addCriterion("packet_id not in", values, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdBetween(String value1, String value2) { - addCriterion("packet_id between", value1, value2, "packetId"); - return (Criteria) this; - } - - public Criteria andPacketIdNotBetween(String value1, String value2) { - addCriterion("packet_id not between", value1, value2, "packetId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andPacketNumIsNull() { - addCriterion("packet_num is null"); - return (Criteria) this; - } - - public Criteria andPacketNumIsNotNull() { - addCriterion("packet_num is not null"); - return (Criteria) this; - } - - public Criteria andPacketNumEqualTo(Double value) { - addCriterion("packet_num =", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotEqualTo(Double value) { - addCriterion("packet_num <>", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumGreaterThan(Double value) { - addCriterion("packet_num >", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumGreaterThanOrEqualTo(Double value) { - addCriterion("packet_num >=", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumLessThan(Double value) { - addCriterion("packet_num <", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumLessThanOrEqualTo(Double value) { - addCriterion("packet_num <=", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumIn(List values) { - addCriterion("packet_num in", values, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotIn(List values) { - addCriterion("packet_num not in", values, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumBetween(Double value1, Double value2) { - addCriterion("packet_num between", value1, value2, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotBetween(Double value1, Double value2) { - addCriterion("packet_num not between", value1, value2, "packetNum"); - return (Criteria) this; - } - - public Criteria andSrcUidIsNull() { - addCriterion("src_uid is null"); - return (Criteria) this; - } - - public Criteria andSrcUidIsNotNull() { - addCriterion("src_uid is not null"); - return (Criteria) this; - } - - public Criteria andSrcUidEqualTo(Long value) { - addCriterion("src_uid =", value, "srcUid"); - return (Criteria) this; - } - - public Criteria andSrcUidNotEqualTo(Long value) { - addCriterion("src_uid <>", value, "srcUid"); - return (Criteria) this; - } - - public Criteria andSrcUidGreaterThan(Long value) { - addCriterion("src_uid >", value, "srcUid"); - return (Criteria) this; - } - - public Criteria andSrcUidGreaterThanOrEqualTo(Long value) { - addCriterion("src_uid >=", value, "srcUid"); - return (Criteria) this; - } - - public Criteria andSrcUidLessThan(Long value) { - addCriterion("src_uid <", value, "srcUid"); - return (Criteria) this; - } - - public Criteria andSrcUidLessThanOrEqualTo(Long value) { - addCriterion("src_uid <=", value, "srcUid"); - return (Criteria) this; - } - - public Criteria andSrcUidIn(List values) { - addCriterion("src_uid in", values, "srcUid"); - return (Criteria) this; - } - - public Criteria andSrcUidNotIn(List values) { - addCriterion("src_uid not in", values, "srcUid"); - return (Criteria) this; - } - - public Criteria andSrcUidBetween(Long value1, Long value2) { - addCriterion("src_uid between", value1, value2, "srcUid"); - return (Criteria) this; - } - - public Criteria andSrcUidNotBetween(Long value1, Long value2) { - addCriterion("src_uid not between", value1, value2, "srcUid"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(Byte value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(Byte value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(Byte value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(Byte value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(Byte value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(Byte value1, Byte value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(Byte value1, Byte value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andObjIdIsNull() { - addCriterion("obj_id is null"); - return (Criteria) this; - } - - public Criteria andObjIdIsNotNull() { - addCriterion("obj_id is not null"); - return (Criteria) this; - } - - public Criteria andObjIdEqualTo(String value) { - addCriterion("obj_id =", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdNotEqualTo(String value) { - addCriterion("obj_id <>", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdGreaterThan(String value) { - addCriterion("obj_id >", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdGreaterThanOrEqualTo(String value) { - addCriterion("obj_id >=", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdLessThan(String value) { - addCriterion("obj_id <", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdLessThanOrEqualTo(String value) { - addCriterion("obj_id <=", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdLike(String value) { - addCriterion("obj_id like", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdNotLike(String value) { - addCriterion("obj_id not like", value, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdIn(List values) { - addCriterion("obj_id in", values, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdNotIn(List values) { - addCriterion("obj_id not in", values, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdBetween(String value1, String value2) { - addCriterion("obj_id between", value1, value2, "objId"); - return (Criteria) this; - } - - public Criteria andObjIdNotBetween(String value1, String value2) { - addCriterion("obj_id not between", value1, value2, "objId"); - return (Criteria) this; - } - - public Criteria andHasUnpackIsNull() { - addCriterion("has_unpack is null"); - return (Criteria) this; - } - - public Criteria andHasUnpackIsNotNull() { - addCriterion("has_unpack is not null"); - return (Criteria) this; - } - - public Criteria andHasUnpackEqualTo(Boolean value) { - addCriterion("has_unpack =", value, "hasUnpack"); - return (Criteria) this; - } - - public Criteria andHasUnpackNotEqualTo(Boolean value) { - addCriterion("has_unpack <>", value, "hasUnpack"); - return (Criteria) this; - } - - public Criteria andHasUnpackGreaterThan(Boolean value) { - addCriterion("has_unpack >", value, "hasUnpack"); - return (Criteria) this; - } - - public Criteria andHasUnpackGreaterThanOrEqualTo(Boolean value) { - addCriterion("has_unpack >=", value, "hasUnpack"); - return (Criteria) this; - } - - public Criteria andHasUnpackLessThan(Boolean value) { - addCriterion("has_unpack <", value, "hasUnpack"); - return (Criteria) this; - } - - public Criteria andHasUnpackLessThanOrEqualTo(Boolean value) { - addCriterion("has_unpack <=", value, "hasUnpack"); - return (Criteria) this; - } - - public Criteria andHasUnpackIn(List values) { - addCriterion("has_unpack in", values, "hasUnpack"); - return (Criteria) this; - } - - public Criteria andHasUnpackNotIn(List values) { - addCriterion("has_unpack not in", values, "hasUnpack"); - return (Criteria) this; - } - - public Criteria andHasUnpackBetween(Boolean value1, Boolean value2) { - addCriterion("has_unpack between", value1, value2, "hasUnpack"); - return (Criteria) this; - } - - public Criteria andHasUnpackNotBetween(Boolean value1, Boolean value2) { - addCriterion("has_unpack not between", value1, value2, "hasUnpack"); - return (Criteria) this; - } - - public Criteria andPacketStatusIsNull() { - addCriterion("packet_status is null"); - return (Criteria) this; - } - - public Criteria andPacketStatusIsNotNull() { - addCriterion("packet_status is not null"); - return (Criteria) this; - } - - public Criteria andPacketStatusEqualTo(Byte value) { - addCriterion("packet_status =", value, "packetStatus"); - return (Criteria) this; - } - - public Criteria andPacketStatusNotEqualTo(Byte value) { - addCriterion("packet_status <>", value, "packetStatus"); - return (Criteria) this; - } - - public Criteria andPacketStatusGreaterThan(Byte value) { - addCriterion("packet_status >", value, "packetStatus"); - return (Criteria) this; - } - - public Criteria andPacketStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("packet_status >=", value, "packetStatus"); - return (Criteria) this; - } - - public Criteria andPacketStatusLessThan(Byte value) { - addCriterion("packet_status <", value, "packetStatus"); - return (Criteria) this; - } - - public Criteria andPacketStatusLessThanOrEqualTo(Byte value) { - addCriterion("packet_status <=", value, "packetStatus"); - return (Criteria) this; - } - - public Criteria andPacketStatusIn(List values) { - addCriterion("packet_status in", values, "packetStatus"); - return (Criteria) this; - } - - public Criteria andPacketStatusNotIn(List values) { - addCriterion("packet_status not in", values, "packetStatus"); - return (Criteria) this; - } - - public Criteria andPacketStatusBetween(Byte value1, Byte value2) { - addCriterion("packet_status between", value1, value2, "packetStatus"); - return (Criteria) this; - } - - public Criteria andPacketStatusNotBetween(Byte value1, Byte value2) { - addCriterion("packet_status not between", value1, value2, "packetStatus"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketWithdrawRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketWithdrawRecord.java deleted file mode 100644 index 01f7d4311..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketWithdrawRecord.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class UserPacketWithdrawRecord { - private String recordId; - - private Long uid; - - private Double packetNum; - - private Byte recordStatus; - - private Date createTime; - - public String getRecordId() { - return recordId; - } - - public void setRecordId(String recordId) { - this.recordId = recordId == null ? null : recordId.trim(); - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Double getPacketNum() { - return packetNum; - } - - public void setPacketNum(Double packetNum) { - this.packetNum = packetNum; - } - - public Byte getRecordStatus() { - return recordStatus; - } - - public void setRecordStatus(Byte recordStatus) { - this.recordStatus = recordStatus; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketWithdrawRecordExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketWithdrawRecordExample.java deleted file mode 100644 index 3c01dbb01..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserPacketWithdrawRecordExample.java +++ /dev/null @@ -1,511 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class UserPacketWithdrawRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public UserPacketWithdrawRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(String value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(String value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(String value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(String value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(String value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(String value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLike(String value) { - addCriterion("record_id like", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotLike(String value) { - addCriterion("record_id not like", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(String value1, String value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(String value1, String value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andPacketNumIsNull() { - addCriterion("packet_num is null"); - return (Criteria) this; - } - - public Criteria andPacketNumIsNotNull() { - addCriterion("packet_num is not null"); - return (Criteria) this; - } - - public Criteria andPacketNumEqualTo(Double value) { - addCriterion("packet_num =", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotEqualTo(Double value) { - addCriterion("packet_num <>", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumGreaterThan(Double value) { - addCriterion("packet_num >", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumGreaterThanOrEqualTo(Double value) { - addCriterion("packet_num >=", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumLessThan(Double value) { - addCriterion("packet_num <", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumLessThanOrEqualTo(Double value) { - addCriterion("packet_num <=", value, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumIn(List values) { - addCriterion("packet_num in", values, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotIn(List values) { - addCriterion("packet_num not in", values, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumBetween(Double value1, Double value2) { - addCriterion("packet_num between", value1, value2, "packetNum"); - return (Criteria) this; - } - - public Criteria andPacketNumNotBetween(Double value1, Double value2) { - addCriterion("packet_num not between", value1, value2, "packetNum"); - return (Criteria) this; - } - - public Criteria andRecordStatusIsNull() { - addCriterion("record_status is null"); - return (Criteria) this; - } - - public Criteria andRecordStatusIsNotNull() { - addCriterion("record_status is not null"); - return (Criteria) this; - } - - public Criteria andRecordStatusEqualTo(Byte value) { - addCriterion("record_status =", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusNotEqualTo(Byte value) { - addCriterion("record_status <>", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusGreaterThan(Byte value) { - addCriterion("record_status >", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("record_status >=", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusLessThan(Byte value) { - addCriterion("record_status <", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusLessThanOrEqualTo(Byte value) { - addCriterion("record_status <=", value, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusIn(List values) { - addCriterion("record_status in", values, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusNotIn(List values) { - addCriterion("record_status not in", values, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusBetween(Byte value1, Byte value2) { - addCriterion("record_status between", value1, value2, "recordStatus"); - return (Criteria) this; - } - - public Criteria andRecordStatusNotBetween(Byte value1, Byte value2) { - addCriterion("record_status not between", value1, value2, "recordStatus"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserRadishGiftWall.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserRadishGiftWall.java deleted file mode 100644 index 9c449aba8..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserRadishGiftWall.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class UserRadishGiftWall { - private Long wallId; - - private Long uid; - - private Integer giftId; - - private Integer receiveCount; - - private Date createTime; - - private Date updateTime; - - public Long getWallId() { - return wallId; - } - - public void setWallId(Long wallId) { - this.wallId = wallId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Integer getGiftId() { - return giftId; - } - - public void setGiftId(Integer giftId) { - this.giftId = giftId; - } - - public Integer getReceiveCount() { - return receiveCount; - } - - public void setReceiveCount(Integer receiveCount) { - this.receiveCount = receiveCount; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserRadishGiftWallExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserRadishGiftWallExample.java deleted file mode 100644 index e3affb0cf..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserRadishGiftWallExample.java +++ /dev/null @@ -1,581 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class UserRadishGiftWallExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public UserRadishGiftWallExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andWallIdIsNull() { - addCriterion("wall_id is null"); - return (Criteria) this; - } - - public Criteria andWallIdIsNotNull() { - addCriterion("wall_id is not null"); - return (Criteria) this; - } - - public Criteria andWallIdEqualTo(Long value) { - addCriterion("wall_id =", value, "wallId"); - return (Criteria) this; - } - - public Criteria andWallIdNotEqualTo(Long value) { - addCriterion("wall_id <>", value, "wallId"); - return (Criteria) this; - } - - public Criteria andWallIdGreaterThan(Long value) { - addCriterion("wall_id >", value, "wallId"); - return (Criteria) this; - } - - public Criteria andWallIdGreaterThanOrEqualTo(Long value) { - addCriterion("wall_id >=", value, "wallId"); - return (Criteria) this; - } - - public Criteria andWallIdLessThan(Long value) { - addCriterion("wall_id <", value, "wallId"); - return (Criteria) this; - } - - public Criteria andWallIdLessThanOrEqualTo(Long value) { - addCriterion("wall_id <=", value, "wallId"); - return (Criteria) this; - } - - public Criteria andWallIdIn(List values) { - addCriterion("wall_id in", values, "wallId"); - return (Criteria) this; - } - - public Criteria andWallIdNotIn(List values) { - addCriterion("wall_id not in", values, "wallId"); - return (Criteria) this; - } - - public Criteria andWallIdBetween(Long value1, Long value2) { - addCriterion("wall_id between", value1, value2, "wallId"); - return (Criteria) this; - } - - public Criteria andWallIdNotBetween(Long value1, Long value2) { - addCriterion("wall_id not between", value1, value2, "wallId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andGiftIdIsNull() { - addCriterion("gift_id is null"); - return (Criteria) this; - } - - public Criteria andGiftIdIsNotNull() { - addCriterion("gift_id is not null"); - return (Criteria) this; - } - - public Criteria andGiftIdEqualTo(Integer value) { - addCriterion("gift_id =", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdNotEqualTo(Integer value) { - addCriterion("gift_id <>", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdGreaterThan(Integer value) { - addCriterion("gift_id >", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdGreaterThanOrEqualTo(Integer value) { - addCriterion("gift_id >=", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdLessThan(Integer value) { - addCriterion("gift_id <", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdLessThanOrEqualTo(Integer value) { - addCriterion("gift_id <=", value, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdIn(List values) { - addCriterion("gift_id in", values, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdNotIn(List values) { - addCriterion("gift_id not in", values, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdBetween(Integer value1, Integer value2) { - addCriterion("gift_id between", value1, value2, "giftId"); - return (Criteria) this; - } - - public Criteria andGiftIdNotBetween(Integer value1, Integer value2) { - addCriterion("gift_id not between", value1, value2, "giftId"); - return (Criteria) this; - } - - public Criteria andReceiveCountIsNull() { - addCriterion("receive_count is null"); - return (Criteria) this; - } - - public Criteria andReceiveCountIsNotNull() { - addCriterion("receive_count is not null"); - return (Criteria) this; - } - - public Criteria andReceiveCountEqualTo(Integer value) { - addCriterion("receive_count =", value, "receiveCount"); - return (Criteria) this; - } - - public Criteria andReceiveCountNotEqualTo(Integer value) { - addCriterion("receive_count <>", value, "receiveCount"); - return (Criteria) this; - } - - public Criteria andReceiveCountGreaterThan(Integer value) { - addCriterion("receive_count >", value, "receiveCount"); - return (Criteria) this; - } - - public Criteria andReceiveCountGreaterThanOrEqualTo(Integer value) { - addCriterion("receive_count >=", value, "receiveCount"); - return (Criteria) this; - } - - public Criteria andReceiveCountLessThan(Integer value) { - addCriterion("receive_count <", value, "receiveCount"); - return (Criteria) this; - } - - public Criteria andReceiveCountLessThanOrEqualTo(Integer value) { - addCriterion("receive_count <=", value, "receiveCount"); - return (Criteria) this; - } - - public Criteria andReceiveCountIn(List values) { - addCriterion("receive_count in", values, "receiveCount"); - return (Criteria) this; - } - - public Criteria andReceiveCountNotIn(List values) { - addCriterion("receive_count not in", values, "receiveCount"); - return (Criteria) this; - } - - public Criteria andReceiveCountBetween(Integer value1, Integer value2) { - addCriterion("receive_count between", value1, value2, "receiveCount"); - return (Criteria) this; - } - - public Criteria andReceiveCountNotBetween(Integer value1, Integer value2) { - addCriterion("receive_count not between", value1, value2, "receiveCount"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserWallet.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserWallet.java deleted file mode 100644 index 967476455..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserWallet.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.accompany.business.model; - -import java.util.Date; - -public class UserWallet { - private Long walletId; - - private Long uid; - - private Long amount; - - private Byte currencyType; - - private Byte useStatus; - - private Boolean deleted; - - private Date createTime; - - private Date updateTime; - - public Long getWalletId() { - return walletId; - } - - public void setWalletId(Long walletId) { - this.walletId = walletId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getAmount() { - return amount; - } - - public void setAmount(Long amount) { - this.amount = amount; - } - - public Byte getCurrencyType() { - return currencyType; - } - - public void setCurrencyType(Byte currencyType) { - this.currencyType = currencyType; - } - - public Byte getUseStatus() { - return useStatus; - } - - public void setUseStatus(Byte useStatus) { - this.useStatus = useStatus; - } - - public Boolean getDeleted() { - return deleted; - } - - public void setDeleted(Boolean deleted) { - this.deleted = deleted; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserWalletExample.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserWalletExample.java deleted file mode 100644 index d50810aa4..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserWalletExample.java +++ /dev/null @@ -1,701 +0,0 @@ -package com.accompany.business.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class UserWalletExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public UserWalletExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andWalletIdIsNull() { - addCriterion("wallet_id is null"); - return (Criteria) this; - } - - public Criteria andWalletIdIsNotNull() { - addCriterion("wallet_id is not null"); - return (Criteria) this; - } - - public Criteria andWalletIdEqualTo(Long value) { - addCriterion("wallet_id =", value, "walletId"); - return (Criteria) this; - } - - public Criteria andWalletIdNotEqualTo(Long value) { - addCriterion("wallet_id <>", value, "walletId"); - return (Criteria) this; - } - - public Criteria andWalletIdGreaterThan(Long value) { - addCriterion("wallet_id >", value, "walletId"); - return (Criteria) this; - } - - public Criteria andWalletIdGreaterThanOrEqualTo(Long value) { - addCriterion("wallet_id >=", value, "walletId"); - return (Criteria) this; - } - - public Criteria andWalletIdLessThan(Long value) { - addCriterion("wallet_id <", value, "walletId"); - return (Criteria) this; - } - - public Criteria andWalletIdLessThanOrEqualTo(Long value) { - addCriterion("wallet_id <=", value, "walletId"); - return (Criteria) this; - } - - public Criteria andWalletIdIn(List values) { - addCriterion("wallet_id in", values, "walletId"); - return (Criteria) this; - } - - public Criteria andWalletIdNotIn(List values) { - addCriterion("wallet_id not in", values, "walletId"); - return (Criteria) this; - } - - public Criteria andWalletIdBetween(Long value1, Long value2) { - addCriterion("wallet_id between", value1, value2, "walletId"); - return (Criteria) this; - } - - public Criteria andWalletIdNotBetween(Long value1, Long value2) { - addCriterion("wallet_id not between", value1, value2, "walletId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("uid is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("uid is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("uid =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("uid <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("uid >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("uid >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("uid <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("uid <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("uid in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("uid not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("uid between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("uid not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andAmountIsNull() { - addCriterion("amount is null"); - return (Criteria) this; - } - - public Criteria andAmountIsNotNull() { - addCriterion("amount is not null"); - return (Criteria) this; - } - - public Criteria andAmountEqualTo(Long value) { - addCriterion("amount =", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountNotEqualTo(Long value) { - addCriterion("amount <>", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountGreaterThan(Long value) { - addCriterion("amount >", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountGreaterThanOrEqualTo(Long value) { - addCriterion("amount >=", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountLessThan(Long value) { - addCriterion("amount <", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountLessThanOrEqualTo(Long value) { - addCriterion("amount <=", value, "amount"); - return (Criteria) this; - } - - public Criteria andAmountIn(List values) { - addCriterion("amount in", values, "amount"); - return (Criteria) this; - } - - public Criteria andAmountNotIn(List values) { - addCriterion("amount not in", values, "amount"); - return (Criteria) this; - } - - public Criteria andAmountBetween(Long value1, Long value2) { - addCriterion("amount between", value1, value2, "amount"); - return (Criteria) this; - } - - public Criteria andAmountNotBetween(Long value1, Long value2) { - addCriterion("amount not between", value1, value2, "amount"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeIsNull() { - addCriterion("currency_type is null"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeIsNotNull() { - addCriterion("currency_type is not null"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeEqualTo(Byte value) { - addCriterion("currency_type =", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeNotEqualTo(Byte value) { - addCriterion("currency_type <>", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeGreaterThan(Byte value) { - addCriterion("currency_type >", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("currency_type >=", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeLessThan(Byte value) { - addCriterion("currency_type <", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeLessThanOrEqualTo(Byte value) { - addCriterion("currency_type <=", value, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeIn(List values) { - addCriterion("currency_type in", values, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeNotIn(List values) { - addCriterion("currency_type not in", values, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeBetween(Byte value1, Byte value2) { - addCriterion("currency_type between", value1, value2, "currencyType"); - return (Criteria) this; - } - - public Criteria andCurrencyTypeNotBetween(Byte value1, Byte value2) { - addCriterion("currency_type not between", value1, value2, "currencyType"); - return (Criteria) this; - } - - public Criteria andUseStatusIsNull() { - addCriterion("use_status is null"); - return (Criteria) this; - } - - public Criteria andUseStatusIsNotNull() { - addCriterion("use_status is not null"); - return (Criteria) this; - } - - public Criteria andUseStatusEqualTo(Byte value) { - addCriterion("use_status =", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusNotEqualTo(Byte value) { - addCriterion("use_status <>", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusGreaterThan(Byte value) { - addCriterion("use_status >", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("use_status >=", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusLessThan(Byte value) { - addCriterion("use_status <", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusLessThanOrEqualTo(Byte value) { - addCriterion("use_status <=", value, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusIn(List values) { - addCriterion("use_status in", values, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusNotIn(List values) { - addCriterion("use_status not in", values, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusBetween(Byte value1, Byte value2) { - addCriterion("use_status between", value1, value2, "useStatus"); - return (Criteria) this; - } - - public Criteria andUseStatusNotBetween(Byte value1, Byte value2) { - addCriterion("use_status not between", value1, value2, "useStatus"); - return (Criteria) this; - } - - public Criteria andDeletedIsNull() { - addCriterion("deleted is null"); - return (Criteria) this; - } - - public Criteria andDeletedIsNotNull() { - addCriterion("deleted is not null"); - return (Criteria) this; - } - - public Criteria andDeletedEqualTo(Boolean value) { - addCriterion("deleted =", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotEqualTo(Boolean value) { - addCriterion("deleted <>", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThan(Boolean value) { - addCriterion("deleted >", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) { - addCriterion("deleted >=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThan(Boolean value) { - addCriterion("deleted <", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThanOrEqualTo(Boolean value) { - addCriterion("deleted <=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedIn(List values) { - addCriterion("deleted in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotIn(List values) { - addCriterion("deleted not in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedBetween(Boolean value1, Boolean value2) { - addCriterion("deleted between", value1, value2, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) { - addCriterion("deleted not between", value1, value2, "deleted"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserWalletWater.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserWalletWater.java deleted file mode 100644 index 1cb6f6ec4..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/UserWalletWater.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.business.model; - -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; - -@Data -@TableName("user_wallet_water") -public class UserWalletWater implements Serializable { - - /** - * 主键 - */ - @TableId(type = IdType.AUTO) - private String recordId; - /** - * 用户uid - */ - private Long uid; - - private Long beforeAmount; - - private Long updateAmount; - - private Long afterAmount; - /** - * 货币类型 - */ - private Byte currencyType; - /** - * 账单记录id - */ - private String billId; - /** - * 更新类型：0.减少，1.增加 - */ - private Byte updateType; - /** - * 创建时间 - */ - private Date createTime; - - private Date updateTime; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/redis/UserOnlinePageInfo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/redis/UserOnlinePageInfo.java deleted file mode 100644 index ee3bb299f..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/redis/UserOnlinePageInfo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.accompany.business.model.redis; - -import lombok.Data; - -/** - * ｛这里添加描述｝ - * - * @author fangchengyan - * @date 2019-11-11 8:00 下午 - */ -@Data -public class UserOnlinePageInfo { - - /** - * 跳过的记录数（mongodb的分页） - */ - private Integer offset; - - /** - * 是否查询同城 - */ - private Boolean isSameCity; - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/PacketRecordVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/PacketRecordVo.java deleted file mode 100644 index 053010e8c..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/PacketRecordVo.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.vo; - -public class PacketRecordVo { - - private long uid; //账号 - private long date; //日期 - private long recordTime; //具体时间 - private String typeStr; //红包类型 - private Double packetNum; //红包数量 - - @Override - public String toString() { - return "PacketRecordVo{" + - "uid=" + uid + - ", date=" + date + - ", detailTime=" + recordTime + - ", typeStr='" + typeStr + '\'' + - ", packetNum=" + packetNum + - '}'; - } - - public long getUid() { - return uid; - } - - public void setUid(long uid) { - this.uid = uid; - } - - public long getDate() { - return date; - } - - public void setDate(long date) { - this.date = date; - } - - public long getRecordTime() { - return recordTime; - } - - public void setRecordTime(long recordTime) { - this.recordTime = recordTime; - } - - public String getTypeStr() { - return typeStr; - } - - public void setTypeStr(String typeStr) { - this.typeStr = typeStr; - } - - public Double getPacketNum() { - return packetNum; - } - - public void setPacketNum(Double packetNum) { - this.packetNum = packetNum; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/PacketWithDrawRecordVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/PacketWithDrawRecordVo.java deleted file mode 100644 index 27b0a5d14..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/PacketWithDrawRecordVo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.accompany.business.vo; - -import java.util.Date; - -/** - * Created by liuguofu on 2017/12/4. - */ -public class PacketWithDrawRecordVo extends UserBasicVo { - private String recordId; - - private Integer packetProdCashId; - - private Double packetNum; - - private Date createTime; - - public String getRecordId() { - return recordId; - } - - public void setRecordId(String recordId) { - this.recordId = recordId; - } - - - public Integer getPacketProdCashId() { - return packetProdCashId; - } - - public void setPacketProdCashId(Integer packetProdCashId) { - this.packetProdCashId = packetProdCashId; - } - - public Double getPacketNum() { - return packetNum; - } - - public void setPacketNum(Double packetNum) { - this.packetNum = packetNum; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/PacketWithdrawRecordAdminVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/PacketWithdrawRecordAdminVo.java deleted file mode 100644 index 19577e590..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/PacketWithdrawRecordAdminVo.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.accompany.business.vo; - -import java.util.Date; - -/** - * Created by liuguofu on 2017/12/4. - */ -public class PacketWithdrawRecordAdminVo { - private String recordId; - - private Long uid; - - private Long erbanNo; - - private String phone; - - private String account; - - private String accountName; - - private Integer packetProdCashId; - - private Double packetNum; - - private Double taxNum; - - private String remark; - - private Integer recordStatus; - - private String payId; - - private String payStatus; - - private String payResult; - - private Date createTime; - - private Date updateTime; - - public String getRecordId() { - return recordId; - } - - public void setRecordId(String recordId) { - this.recordId = recordId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getErbanNo() { - return erbanNo; - } - - public void setErbanNo(Long erbanNo) { - this.erbanNo = erbanNo; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getAccount() { - return account; - } - - public void setAccount(String account) { - this.account = account; - } - - public String getAccountName() { - return accountName; - } - - public void setAccountName(String accountName) { - this.accountName = accountName; - } - - public Integer getPacketProdCashId() { - return packetProdCashId; - } - - public void setPacketProdCashId(Integer packetProdCashId) { - this.packetProdCashId = packetProdCashId; - } - - public Double getPacketNum() { - return packetNum; - } - - public void setPacketNum(Double packetNum) { - this.packetNum = packetNum; - } - - public Double getTaxNum() { - return taxNum; - } - - public void setTaxNum(Double taxNum) { - this.taxNum = taxNum; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public Integer getRecordStatus() { - return recordStatus; - } - - public void setRecordStatus(Integer recordStatus) { - this.recordStatus = recordStatus; - } - - public String getPayId() { return payId; } - - public void setPayId(String payId) { this.payId = payId; } - - public String getPayStatus() { - return payStatus; - } - - public void setPayStatus(String payStatus) { - this.payStatus = payStatus; - } - - public String getPayResult() { - return payResult; - } - - public void setPayResult(String payResult) { - this.payResult = payResult; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RadishGiftSendStatisticsVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RadishGiftSendStatisticsVo.java deleted file mode 100644 index beb143b9f..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RadishGiftSendStatisticsVo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.accompany.business.vo; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/4/15 18:22 - * 4 - */ -public class RadishGiftSendStatisticsVo { - private Long uid; - private Long erbanNo; - private String nick; - private Long radishAmount; - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getErbanNo() { - return erbanNo; - } - - public void setErbanNo(Long erbanNo) { - this.erbanNo = erbanNo; - } - - public String getNick() { - return nick; - } - - public void setNick(String nick) { - this.nick = nick; - } - - public Long getRadishAmount() { - return radishAmount; - } - - public void setRadishAmount(Long radishAmount) { - this.radishAmount = radishAmount; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RoomRadishVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RoomRadishVo.java deleted file mode 100644 index ec921e68d..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/RoomRadishVo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.vo; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/4/15 18:22 - * 4 - */ -public class RoomRadishVo { - private Long roomUid; - private Long radishAmount; - - public Long getRoomUid() { - return roomUid; - } - - public void setRoomUid(Long roomUid) { - this.roomUid = roomUid; - } - - public Long getRadishAmount() { - return radishAmount; - } - - public void setRadishAmount(Long radishAmount) { - this.radishAmount = radishAmount; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/StatPacketBounsDetailParentVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/StatPacketBounsDetailParentVo.java index adb385679..7854fb796 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/StatPacketBounsDetailParentVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/StatPacketBounsDetailParentVo.java @@ -1,7 +1,5 @@ package com.accompany.business.vo; -import com.accompany.business.model.StatPacketBouns; - import java.util.List; /** diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/UserOnlineStatusVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/UserOnlineStatusVo.java deleted file mode 100644 index edd82126e..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/UserOnlineStatusVo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.accompany.business.vo; - - -/** - * Created by chucheng on 2019/1/15. - */ -public class UserOnlineStatusVo { - - private int status; - private Long timestamp; - - public int getStatus() { - return status; - } - - public void setStatus(int status) { - this.status = status; - } - - public Long getTimestamp() { - return timestamp; - } - - public void setTimestamp(Long timestamp) { - this.timestamp = timestamp; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/UserOnlineVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/UserOnlineVo.java deleted file mode 100644 index 9efdfa51a..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/UserOnlineVo.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.accompany.business.vo; - -import com.accompany.core.vo.UserLevelVo; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/5/31 17:23 - * 4 - */ -public class UserOnlineVo { - private Long uid; - private Long erbanNo; - private Double distance; - private Byte gender; - private Integer onlineNum; - private Byte statusType; - private String showInfo; - private String avatar; - private String nick; - private String skillTag;//101认证技能小图标 - private Integer nobleId; - private String nobleName; - - /** - * 等级信息 - */ - private UserLevelVo userLevelVo; - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getErbanNo() { - return erbanNo; - } - - public void setErbanNo(Long erbanNo) { - this.erbanNo = erbanNo; - } - - public Double getDistance() { - return distance; - } - - public void setDistance(Double distance) { - this.distance = distance; - } - - public Byte getGender() { - return gender; - } - - public void setGender(Byte gender) { - this.gender = gender; - } - - public Integer getOnlineNum() { - return onlineNum; - } - - public void setOnlineNum(Integer onlineNum) { - this.onlineNum = onlineNum; - } - - public Byte getStatusType() { - return statusType; - } - - public void setStatusType(Byte statusType) { - this.statusType = statusType; - } - - public String getShowInfo() { - return showInfo; - } - - public void setShowInfo(String showInfo) { - this.showInfo = showInfo; - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getNick() { - return nick; - } - - public void setNick(String nick) { - this.nick = nick; - } - - public String getSkillTag() { - return skillTag; - } - - public void setSkillTag(String skillTag) { - this.skillTag = skillTag; - } - - public Integer getNobleId() { - return nobleId; - } - - public void setNobleId(Integer nobleId) { - this.nobleId = nobleId; - } - - public String getNobleName() { - return nobleName; - } - - public void setNobleName(String nobleName) { - this.nobleName = nobleName; - } - - public UserLevelVo getUserLevelVo() { - return userLevelVo; - } - - public void setUserLevelVo(UserLevelVo userLevelVo) { - this.userLevelVo = userLevelVo; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/drawprize/UserDrawDoVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/drawprize/UserDrawDoVo.java deleted file mode 100644 index 215901429..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/drawprize/UserDrawDoVo.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.accompany.business.vo.drawprize; - -/** - * Created by liuguofu on 2017/12/15. - */ - -import com.accompany.core.vo.UserVo; - -/** - * 用户进行促销活动操作，返回结果 - * - */ -public class UserDrawDoVo { - - private UserVo userVo; - - private Integer leftDrawNum; - - private Integer totalDrawNum; - - private Integer totalWinDrawNum; - - private Byte drawStatus;//中奖纪录状态，1创建，2未中奖，3已中奖 - - private String srcObjName; - - private String drawPrizeName; - - private Integer drawPrizeId; - - private Integer giftDrawNum; - - /** - * 2019-4-17 记录H5分享获得的促销活动次数 - */ - private Byte shareDrawStatus; - - public Byte getShareDrawStatus() { - return shareDrawStatus; - } - - public void setShareDrawStatus(Byte shareDrawStatus) { - this.shareDrawStatus = shareDrawStatus; - } - - public Integer getGiftDrawNum() { - return giftDrawNum; - } - - public void setGiftDrawNum(Integer giftDrawNum) { - this.giftDrawNum = giftDrawNum; - } - - public Integer getDrawPrizeId() { - return drawPrizeId; - } - - public void setDrawPrizeId(Integer drawPrizeId) { - this.drawPrizeId = drawPrizeId; - } - - public UserVo getUserVo() { - return userVo; - } - - public void setUserVo(UserVo userVo) { - this.userVo = userVo; - } - - public Integer getLeftDrawNum() { - return leftDrawNum; - } - - public void setLeftDrawNum(Integer leftDrawNum) { - this.leftDrawNum = leftDrawNum; - } - - public Integer getTotalDrawNum() { - return totalDrawNum; - } - - public void setTotalDrawNum(Integer totalDrawNum) { - this.totalDrawNum = totalDrawNum; - } - - public Integer getTotalWinDrawNum() { - return totalWinDrawNum; - } - - public void setTotalWinDrawNum(Integer totalWinDrawNum) { - this.totalWinDrawNum = totalWinDrawNum; - } - - public Byte getDrawStatus() { - return drawStatus; - } - - public void setDrawStatus(Byte drawStatus) { - this.drawStatus = drawStatus; - } - - public String getSrcObjName() { - return srcObjName; - } - - public void setSrcObjName(String srcObjName) { - this.srcObjName = srcObjName; - } - - public String getDrawPrizeName() { - return drawPrizeName; - } - - public void setDrawPrizeName(String drawPrizeName) { - this.drawPrizeName = drawPrizeName; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/drawprize/UserDrawRecordVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/drawprize/UserDrawRecordVo.java deleted file mode 100644 index de698821b..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/drawprize/UserDrawRecordVo.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.accompany.business.vo.drawprize; - -import com.accompany.core.vo.UserVo; - - -/** - * Created by liuguofu on 2017/12/15. - */ -public class UserDrawRecordVo { - - private UserVo userVo; - - private Byte drawStatus;//中奖纪录状态，1创建，2未中奖，3已中奖 - - private Byte type; - - private String srcObjName; - - private String drawPrizeName; - - public UserVo getUserVo() { - return userVo; - } - - public void setUserVo(UserVo userVo) { - this.userVo = userVo; - } - - public Byte getDrawStatus() { - return drawStatus; - } - - public void setDrawStatus(Byte drawStatus) { - this.drawStatus = drawStatus; - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public String getSrcObjName() { - return srcObjName; - } - - public void setSrcObjName(String srcObjName) { - this.srcObjName = srcObjName; - } - - public String getDrawPrizeName() { - return drawPrizeName; - } - - public void setDrawPrizeName(String drawPrizeName) { - this.drawPrizeName = drawPrizeName; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/drawprize/UserDrawVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/drawprize/UserDrawVo.java deleted file mode 100644 index 57e7f8f42..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/drawprize/UserDrawVo.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.accompany.business.vo.drawprize; - -/** - * Created by liuguofu on 2017/12/15. - */ -public class UserDrawVo { - private Long uid; - - private Integer leftDrawNum; - - private Integer totalDrawNum; - - private Integer totalWinDrawNum; - - private Integer giftDrawNum; - - /** - * 2019-4-17 记录H5分享获得的促销活动次数 - */ - private Byte shareDrawStatus; - - public Byte getShareDrawStatus() { - return shareDrawStatus; - } - - public void setShareDrawStatus(Byte shareDrawStatus) { - this.shareDrawStatus = shareDrawStatus; - } - - public Integer getGiftDrawNum() { - return giftDrawNum; - } - - public void setGiftDrawNum(Integer giftDrawNum) { - this.giftDrawNum = giftDrawNum; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Integer getLeftDrawNum() { - return leftDrawNum; - } - - public void setLeftDrawNum(Integer leftDrawNum) { - this.leftDrawNum = leftDrawNum; - } - - public Integer getTotalDrawNum() { - return totalDrawNum; - } - - public void setTotalDrawNum(Integer totalDrawNum) { - this.totalDrawNum = totalDrawNum; - } - - public Integer getTotalWinDrawNum() { - return totalWinDrawNum; - } - - public void setTotalWinDrawNum(Integer totalWinDrawNum) { - this.totalWinDrawNum = totalWinDrawNum; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/RadishBillRecordVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/RadishBillRecordVo.java deleted file mode 100644 index d2b945cbb..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/RadishBillRecordVo.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.accompany.business.vo.radish; - -import java.util.Date; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/19 18:57 - * 4 - */ -public class RadishBillRecordVo { - private String amountStr;//数量字符串 - private String currencyStr;//货币单位字符串 - private String describeStr;//账单类型描述 - private Long createTime;//记录时间 - private Long date;//日期 - - public Long getCreateTime() { - return createTime; - } - - public void setCreateTime(Long createTime) { - this.createTime = createTime; - } - - public Long getDate() { - return date; - } - - public void setDate(Long date) { - this.date = date; - } - - - public String getAmountStr() { - return amountStr; - } - - public void setAmountStr(String amountStr) { - this.amountStr = amountStr; - } - - public String getCurrencyStr() { - return currencyStr; - } - - public void setCurrencyStr(String currencyStr) { - this.currencyStr = currencyStr; - } - - public String getDescribeStr() { - return describeStr; - } - - public void setDescribeStr(String describeStr) { - this.describeStr = describeStr; - } - - -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/RadishGiftRecordVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/RadishGiftRecordVo.java deleted file mode 100644 index 1dda82ccd..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/RadishGiftRecordVo.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.accompany.business.vo.radish; - -import com.accompany.common.annotation.ReplaceAppDomain; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/19 18:57 - * 4 - */ -public class RadishGiftRecordVo { - private Long recordId;//记录id - private Integer giftId;//礼物id - private Integer giftNum;//礼物数量 - private String giftName;//礼物名称 - @ReplaceAppDomain - private String giftPicUrl;//礼物图片 - private String amountStr;//数量字符串 - private String currencyStr;//货币单位字符串 - private String describeStr;//赠送者、接收者的信息 - private Long createTime;//记录时间 - private Long date;//日期 - - public Long getCreateTime() { - return createTime; - } - - public void setCreateTime(Long createTime) { - this.createTime = createTime; - } - - public Long getDate() { - return date; - } - - public void setDate(Long date) { - this.date = date; - } - - public String getGiftName() { - return giftName; - } - - public void setGiftName(String giftName) { - this.giftName = giftName; - } - - public Long getRecordId() { - return recordId; - } - - public void setRecordId(Long recordId) { - this.recordId = recordId; - } - - public Integer getGiftId() { - return giftId; - } - - public void setGiftId(Integer giftId) { - this.giftId = giftId; - } - - public Integer getGiftNum() { - return giftNum; - } - - public void setGiftNum(Integer giftNum) { - this.giftNum = giftNum; - } - - public String getGiftPicUrl() { - return giftPicUrl; - } - - public void setGiftPicUrl(String giftPicUrl) { - this.giftPicUrl = giftPicUrl; - } - - public String getAmountStr() { - return amountStr; - } - - public void setAmountStr(String amountStr) { - this.amountStr = amountStr; - } - - public String getCurrencyStr() { - return currencyStr; - } - - public void setCurrencyStr(String currencyStr) { - this.currencyStr = currencyStr; - } - - public String getDescribeStr() { - return describeStr; - } - - public void setDescribeStr(String describeStr) { - this.describeStr = describeStr; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/RadishGiftSendVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/RadishGiftSendVo.java deleted file mode 100644 index 33c2118df..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/RadishGiftSendVo.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.accompany.business.vo.radish; - -import com.accompany.business.vo.GiftVo; -import com.accompany.business.vo.user.BasicUserVo; -import com.accompany.common.annotation.ReplaceAppDomain; - -import java.util.List; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/21 16:45 - * 4 - */ -public class RadishGiftSendVo { - private Long uid; - @ReplaceAppDomain - private String avatar; - private String nick; - private List targetUsers; - private Integer giftId; - private GiftVo gift; - private int giftNum; - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getNick() { - return nick; - } - - public void setNick(String nick) { - this.nick = nick; - } - - public List getTargetUsers() { - return targetUsers; - } - - public void setTargetUsers(List targetUsers) { - this.targetUsers = targetUsers; - } - - public Integer getGiftId() { - return giftId; - } - - public void setGiftId(Integer giftId) { - this.giftId = giftId; - } - - public GiftVo getGift() { - return gift; - } - - public void setGift(GiftVo gift) { - this.gift = gift; - } - - public int getGiftNum() { - return giftNum; - } - - public void setGiftNum(int giftNum) { - this.giftNum = giftNum; - } -} diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/UserRadishGiftWallVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/UserRadishGiftWallVo.java deleted file mode 100644 index 1bdfadbc5..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/radish/UserRadishGiftWallVo.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.accompany.business.vo.radish; - -import com.accompany.common.annotation.ReplaceAppDomain; -import com.accompany.core.annotation.I18nPartition; - -public class UserRadishGiftWallVo { - - private Long uid; - - private Integer giftId; - - @I18nPartition(className = "Gift") - private String giftName; - - @ReplaceAppDomain - private String picUrl; - - private Integer receiveCount; - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Integer getGiftId() { - return giftId; - } - - public void setGiftId(Integer giftId) { - this.giftId = giftId; - } - - public String getGiftName() { - return giftName; - } - - public void setGiftName(String giftName) { - this.giftName = giftName; - } - - public String getPicUrl() { - return picUrl; - } - - public void setPicUrl(String picUrl) { - this.picUrl = picUrl; - } - - public Integer getReceiveCount() { - return receiveCount; - } - - public void setReceiveCount(Integer receiveCount) { - this.receiveCount = receiveCount; - } -} \ No newline at end of file diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserWalletVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserWalletVo.java deleted file mode 100644 index 800040e23..000000000 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/user/UserWalletVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.accompany.business.vo.user; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/21 10:48 - * 4 - */ -public class UserWalletVo { - private Long uid; - - private Long amount; - - private Byte currencyType; - - private Byte useStatus; - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getAmount() { - return amount; - } - - public void setAmount(Long amount) { - this.amount = amount; - } - - public Byte getCurrencyType() { - return currencyType; - } - - public void setCurrencyType(Byte currencyType) { - this.currencyType = currencyType; - } - - public Byte getUseStatus() { - return useStatus; - } - - public void setUseStatus(Byte useStatus) { - this.useStatus = useStatus; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PacketWithdrawRecordExpandMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PacketWithdrawRecordExpandMapper.java deleted file mode 100644 index 24a5d902d..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PacketWithdrawRecordExpandMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.vo.PacketWithdrawRecordAdminVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -public interface PacketWithdrawRecordExpandMapper { - - List queryPacketWithdrowList(@Param("record") Map record,@Param("start") Integer start,@Param("pageSize") Integer pageSize); - - int queryPacketWithdrowCount(@Param("record") Map record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PacketWithdrawRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PacketWithdrawRecordMapper.java deleted file mode 100644 index a6b2cf839..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/PacketWithdrawRecordMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.PacketWithdrawRecord; -import com.accompany.business.model.PacketWithdrawRecordExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface PacketWithdrawRecordMapper { - int countByExample(PacketWithdrawRecordExample example); - - int deleteByPrimaryKey(String recordId); - - int insert(PacketWithdrawRecord record); - - int insertSelective(PacketWithdrawRecord record); - - List selectByExample(PacketWithdrawRecordExample example); - - PacketWithdrawRecord selectByPrimaryKey(String recordId); - - int updateByExampleSelective(@Param("record") PacketWithdrawRecord record, @Param("example") PacketWithdrawRecordExample example); - - int updateByExample(@Param("record") PacketWithdrawRecord record, @Param("example") PacketWithdrawRecordExample example); - - int updateByPrimaryKeySelective(PacketWithdrawRecord record); - - int updateByPrimaryKey(PacketWithdrawRecord record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RadishBillMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RadishBillMapper.java deleted file mode 100644 index b502f7c36..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RadishBillMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.RadishBill; -import com.accompany.business.model.RadishBillExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface RadishBillMapper { - int countByExample(RadishBillExample example); - - int deleteByExample(RadishBillExample example); - - int deleteByPrimaryKey(String billId); - - int insert(RadishBill record); - - int insertSelective(RadishBill record); - - List selectByExample(RadishBillExample example); - - RadishBill selectByPrimaryKey(String billId); - - int updateByExampleSelective(@Param("record") RadishBill record, @Param("example") RadishBillExample example); - - int updateByExample(@Param("record") RadishBill record, @Param("example") RadishBillExample example); - - int updateByPrimaryKeySelective(RadishBill record); - - int updateByPrimaryKey(RadishBill record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RadishGiftSendRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RadishGiftSendRecordMapper.java deleted file mode 100644 index 97976047f..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RadishGiftSendRecordMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.RadishGiftSendRecord; -import com.accompany.business.model.RadishGiftSendRecordExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface RadishGiftSendRecordMapper { - int countByExample(RadishGiftSendRecordExample example); - - int deleteByExample(RadishGiftSendRecordExample example); - - int deleteByPrimaryKey(Long recordId); - - int insert(RadishGiftSendRecord record); - - int insertSelective(RadishGiftSendRecord record); - - List selectByExample(RadishGiftSendRecordExample example); - - RadishGiftSendRecord selectByPrimaryKey(Long recordId); - - int updateByExampleSelective(@Param("record") RadishGiftSendRecord record, @Param("example") RadishGiftSendRecordExample example); - - int updateByExample(@Param("record") RadishGiftSendRecord record, @Param("example") RadishGiftSendRecordExample example); - - int updateByPrimaryKeySelective(RadishGiftSendRecord record); - - int updateByPrimaryKey(RadishGiftSendRecord record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RadishGiftSendRecordMapperMgr.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RadishGiftSendRecordMapperMgr.java deleted file mode 100644 index b10affae2..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RadishGiftSendRecordMapperMgr.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.vo.RadishGiftSendStatisticsVo; -import com.accompany.business.vo.RoomRadishVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface RadishGiftSendRecordMapperMgr { - List listRoomRadishSerial(@Param("uidList") List uidList, @Param("startTime") String startTime, - @Param("endTime") String endTime); - - List getRadishGiftStatistics(@Param("erbanNoList") List erbanNoList, @Param("beginDate") String beginDate, - @Param("endDate") String endDate, @Param("start") Integer start, - @Param("pageSize") Integer pageSize); - - int queryTotalCount(@Param("erbanNoList") List erbanNoList, @Param("beginDate") String beginDate, - @Param("endDate") String endDate); - -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/StatPacketActivityMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/StatPacketActivityMapper.java deleted file mode 100644 index 321253fc4..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/StatPacketActivityMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.StatPacketActivity; -import com.accompany.business.model.StatPacketActivityExample; -import java.util.List; - -public interface StatPacketActivityMapper { - int deleteByPrimaryKey(Long uid); - - int insert(StatPacketActivity record); - - int insertSelective(StatPacketActivity record); - - List selectByExample(StatPacketActivityExample example); - - StatPacketActivity selectByPrimaryKey(Long uid); - - int updateByPrimaryKeySelective(StatPacketActivity record); - - int updateByPrimaryKey(StatPacketActivity record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/StatPacketBounsMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/StatPacketBounsMapper.java deleted file mode 100644 index 1adfe77ab..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/StatPacketBounsMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.StatPacketBouns; -import com.accompany.business.model.StatPacketBounsExample; -import java.util.List; - -public interface StatPacketBounsMapper { - int insert(StatPacketBouns record); - - int insertSelective(StatPacketBouns record); - - List selectByExample(StatPacketBounsExample example); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/StatPacketRegisterMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/StatPacketRegisterMapper.java deleted file mode 100644 index f9864d941..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/StatPacketRegisterMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.StatPacketRegister; -import com.accompany.business.model.StatPacketRegisterExample; -import java.util.List; - -public interface StatPacketRegisterMapper { - int deleteByPrimaryKey(String registerId); - - int insert(StatPacketRegister record); - - int insertSelective(StatPacketRegister record); - - List selectByExample(StatPacketRegisterExample example); - - StatPacketRegister selectByPrimaryKey(String registerId); - - int updateByPrimaryKeySelective(StatPacketRegister record); - - int updateByPrimaryKey(StatPacketRegister record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawMapper.java deleted file mode 100644 index 68af20b91..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserDraw; -import com.accompany.business.model.UserDrawExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface UserDrawMapper { - int countByExample(UserDrawExample example); - - int deleteByExample(UserDrawExample example); - - int deleteByPrimaryKey(Long uid); - - int insert(UserDraw record); - - int insertSelective(UserDraw record); - - List selectByExample(UserDrawExample example); - - UserDraw selectByPrimaryKey(Long uid); - - int updateByExampleSelective(@Param("record") UserDraw record, @Param("example") UserDrawExample example); - - int updateByExample(@Param("record") UserDraw record, @Param("example") UserDrawExample example); - - int updateByPrimaryKeySelective(UserDraw record); - - int updateByPrimaryKey(UserDraw record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawMapperMgr.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawMapperMgr.java deleted file mode 100644 index 8e8f40d40..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawMapperMgr.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserDraw; -import com.accompany.business.model.UserDrawExample; -import com.accompany.business.model.UserDrawRecord; -import com.accompany.business.model.UserDrawRecordExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface UserDrawMapperMgr { - List getUserDrawRecordListByStatus(); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawPrettyErbanNoMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawPrettyErbanNoMapper.java deleted file mode 100644 index 5e429550c..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawPrettyErbanNoMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserDrawPrettyErbanNo; -import com.accompany.business.model.UserDrawPrettyErbanNoExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface UserDrawPrettyErbanNoMapper { - int countByExample(UserDrawPrettyErbanNoExample example); - - int deleteByExample(UserDrawPrettyErbanNoExample example); - - int deleteByPrimaryKey(Long prettyErbanNo); - - int insert(UserDrawPrettyErbanNo record); - - int insertSelective(UserDrawPrettyErbanNo record); - - List selectByExample(UserDrawPrettyErbanNoExample example); - - UserDrawPrettyErbanNo selectByPrimaryKey(Long prettyErbanNo); - - int updateByExampleSelective(@Param("record") UserDrawPrettyErbanNo record, @Param("example") UserDrawPrettyErbanNoExample example); - - int updateByExample(@Param("record") UserDrawPrettyErbanNo record, @Param("example") UserDrawPrettyErbanNoExample example); - - int updateByPrimaryKeySelective(UserDrawPrettyErbanNo record); - - int updateByPrimaryKey(UserDrawPrettyErbanNo record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawProdMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawProdMapper.java deleted file mode 100644 index a2ee803f5..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawProdMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.core.base.BaseMapper; -import com.accompany.business.model.UserDrawProd; -import com.accompany.business.model.UserDrawProdExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface UserDrawProdMapper extends BaseMapper { - int countByExample(UserDrawProdExample example); - - int deleteByPrimaryKey(Integer prodId); - - int insert(UserDrawProd record); - - int insertSelective(UserDrawProd record); - - List selectByExample(UserDrawProdExample example); - - UserDrawProd selectByPrimaryKey(Integer prodId); - - int updateByExampleSelective(@Param("record") UserDrawProd record, @Param("example") UserDrawProdExample example); - - int updateByExample(@Param("record") UserDrawProd record, @Param("example") UserDrawProdExample example); - - int updateByPrimaryKeySelective(UserDrawProd record); - - int updateByPrimaryKey(UserDrawProd record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawRecordMapper.java deleted file mode 100644 index ab9570342..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserDrawRecordMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserDrawRecord; -import com.accompany.business.model.UserDrawRecordExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface UserDrawRecordMapper { - int countByExample(UserDrawRecordExample example); - - int deleteByPrimaryKey(Integer recordId); - - int insert(UserDrawRecord record); - - int insertSelective(UserDrawRecord record); - - List selectByExample(UserDrawRecordExample example); - - UserDrawRecord selectByPrimaryKey(Integer recordId); - - int updateByExampleSelective(@Param("record") UserDrawRecord record, @Param("example") UserDrawRecordExample example); - - int updateByExample(@Param("record") UserDrawRecord record, @Param("example") UserDrawRecordExample example); - - int updateByPrimaryKeySelective(UserDrawRecord record); - - int updateByPrimaryKey(UserDrawRecord record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketMapper.java deleted file mode 100644 index 9429627bd..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserPacket; -import com.accompany.business.model.UserPacketExample; -import java.util.List; - -public interface UserPacketMapper { - int deleteByPrimaryKey(Long uid); - - int insert(UserPacket record); - - int insertSelective(UserPacket record); - - List selectByExample(UserPacketExample example); - - UserPacket selectByPrimaryKey(Long uid); - - int updateByPrimaryKeySelective(UserPacket record); - - int updateByPrimaryKey(UserPacket record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketMapperMgr.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketMapperMgr.java deleted file mode 100644 index 9514d2e3a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketMapperMgr.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserPacket; -import com.accompany.business.vo.StatPacketBounsListVo; -import com.accompany.business.vo.StatPacketInviteRegisterListVo; - -import java.util.List; - -public interface UserPacketMapperMgr { - - public void addUserPacketNumTransactional(UserPacket userPacket); - - public int getStatPacketRankSeqNoByPacketNum(double packetNum); - - public List queryUserPacketListBy(); - - public List queryStatPacketInviteRegisterMapList(Long uid); - - public List queryInviteBonusList(Long uid); - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketRecordExpand.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketRecordExpand.java deleted file mode 100644 index 40dd4bf5e..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketRecordExpand.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserPacketRecord; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -public interface UserPacketRecordExpand { - - Integer getRecordCountByDate(@Param("uid") Long uid, @Param("startTime") Date startTime, @Param("timesnights") Date timesnights); - - List getRecordByDateList(@Param("uid") Long uid, @Param("startTime") Date startTime, @Param("timesnights") Date timesnights, @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize); - - Integer getRecordCount(@Param("uid") Long uid); - - List getRecordAllList(@Param("uid") Long uid, @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize); - - List getRecordByDate(@Param("uid") Long uid, @Param("date") Date date, @Param("page") Integer page, @Param("size") Integer size); - - List getDepositRecordByDate(@Param("uid") Long uid, @Param("date") Date date, @Param("page") Integer page, @Param("size") Integer size); - - Double getTotalBonusRedPacket(@Param("uid") Long uid); - - Double getTotalRedPacket(@Param("uid") Long uid); -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketRecordMapper.java deleted file mode 100644 index 28defcf1b..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketRecordMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserPacketRecord; -import com.accompany.business.model.UserPacketRecordExample; -import java.util.List; - -public interface UserPacketRecordMapper { - int deleteByPrimaryKey(String packetId); - - int insert(UserPacketRecord record); - - int insertSelective(UserPacketRecord record); - - List selectByExample(UserPacketRecordExample example); - - UserPacketRecord selectByPrimaryKey(String packetId); - - int updateByPrimaryKeySelective(UserPacketRecord record); - - int updateByPrimaryKey(UserPacketRecord record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketWithdrawRecordMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketWithdrawRecordMapper.java deleted file mode 100644 index 1d8f982c6..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserPacketWithdrawRecordMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserPacketWithdrawRecord; -import com.accompany.business.model.UserPacketWithdrawRecordExample; -import java.util.List; - -public interface UserPacketWithdrawRecordMapper { - int deleteByPrimaryKey(String recordId); - - int insert(UserPacketWithdrawRecord record); - - int insertSelective(UserPacketWithdrawRecord record); - - List selectByExample(UserPacketWithdrawRecordExample example); - - UserPacketWithdrawRecord selectByPrimaryKey(String recordId); - - int updateByPrimaryKeySelective(UserPacketWithdrawRecord record); - - int updateByPrimaryKey(UserPacketWithdrawRecord record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserRadishGiftWallMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserRadishGiftWallMapper.java deleted file mode 100644 index e618209dc..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserRadishGiftWallMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserRadishGiftWall; -import com.accompany.business.model.UserRadishGiftWallExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface UserRadishGiftWallMapper { - int countByExample(UserRadishGiftWallExample example); - - int deleteByExample(UserRadishGiftWallExample example); - - int deleteByPrimaryKey(Long wallId); - - int insert(UserRadishGiftWall record); - - int insertSelective(UserRadishGiftWall record); - - List selectByExample(UserRadishGiftWallExample example); - - UserRadishGiftWall selectByPrimaryKey(Long wallId); - - int updateByExampleSelective(@Param("record") UserRadishGiftWall record, @Param("example") UserRadishGiftWallExample example); - - int updateByExample(@Param("record") UserRadishGiftWall record, @Param("example") UserRadishGiftWallExample example); - - int updateByPrimaryKeySelective(UserRadishGiftWall record); - - int updateByPrimaryKey(UserRadishGiftWall record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserRadishGiftWallMapperMgr.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserRadishGiftWallMapperMgr.java deleted file mode 100644 index f1b99ba0a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserRadishGiftWallMapperMgr.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserRadishGiftWall; -import com.accompany.business.vo.radish.UserRadishGiftWallVo; - -import java.util.List; - -public interface UserRadishGiftWallMapperMgr { - - int updateRadishGiftWallCount(UserRadishGiftWall userRadishGiftWall); - - List getUserRadishWallListByUid(Long uid); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserWalletMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserWalletMapper.java deleted file mode 100644 index 28a26b9e5..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserWalletMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserWallet; -import com.accompany.business.model.UserWalletExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface UserWalletMapper { - int countByExample(UserWalletExample example); - - int deleteByExample(UserWalletExample example); - - int deleteByPrimaryKey(Long walletId); - - int insert(UserWallet record); - - int insertSelective(UserWallet record); - - List selectByExample(UserWalletExample example); - - UserWallet selectByPrimaryKey(Long walletId); - - int updateByExampleSelective(@Param("record") UserWallet record, @Param("example") UserWalletExample example); - - int updateByExample(@Param("record") UserWallet record, @Param("example") UserWalletExample example); - - int updateByPrimaryKeySelective(UserWallet record); - - int updateByPrimaryKey(UserWallet record); -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserWalletMapperMgr.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserWalletMapperMgr.java deleted file mode 100644 index c86944de0..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserWalletMapperMgr.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.accompany.business.mybatismapper; - -import org.apache.ibatis.annotations.Param; - -public interface UserWalletMapperMgr { - int updateUserWallet(@Param("uid")Long uid, @Param("amount")Long amount,@Param("currencyType")Byte currencyType); - -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserWalletWaterMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserWalletWaterMapper.java deleted file mode 100644 index ac8373bed..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/UserWalletWaterMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.mybatismapper; - -import com.accompany.business.model.UserWalletWater; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface UserWalletWaterMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PacketWithDrawRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PacketWithDrawRecordService.java deleted file mode 100644 index f27bd21df..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PacketWithDrawRecordService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.accompany.business.service; - -import com.accompany.business.model.PacketWithdrawRecord; -import com.accompany.business.mybatismapper.PacketWithdrawRecordMapper; -import com.accompany.business.service.user.UsersService; -import com.accompany.common.constant.Constant; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.UUIDUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.accompany.core.util.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Calendar; -import java.util.Date; - -@Service -public class PacketWithDrawRecordService { - - @Autowired - private PacketWithdrawRecordMapper packetWithdrawRecordMapper; - - @Autowired - private SysConfService sysConfService; - - @Autowired - private UsersService usersService; - - public void insertInPacketWithDrawRecord(Long uid, Integer packetId,String billId, Double money, Byte create) { - Users user = usersService.getUsersByUid(uid); - if(user==null){ - throw new ServiceException(BusiStatus.USERNOTEXISTS); - } - PacketWithdrawRecord packetWithdrawRecord = new PacketWithdrawRecord(); - packetWithdrawRecord.setRecordId(UUIDUtil.get()); - packetWithdrawRecord.setCreateTime(new Date()); - packetWithdrawRecord.setUid(uid); - packetWithdrawRecord.setPacketProdCashId(packetId); - packetWithdrawRecord.setPacketNum(money); - packetWithdrawRecord.setRecordStatus(create); - packetWithdrawRecord.setBillId(billId); - packetWithdrawRecord.setDescription(user.getAlipayAccountName()+DateTimeUtil.convertDate(Calendar.getInstance().getTime(), DateTimeUtil.SIMPLE_MONTH_DATE_PATTERN)+money+"红包提现款"); - //设置税率 - Double taxRate = getTaxRate(); - Double taxNum = money*taxRate; - packetWithdrawRecord.setTaxNum(taxNum); - packetWithdrawRecord.setUpdateTime(new Date()); - packetWithdrawRecordMapper.insert(packetWithdrawRecord); - } - - public Double getTaxRate(){ - String value = this.sysConfService.getSysConfValueById(Constant.SysConfId.redpacket_tax_rate); - Double taxRate = 0D; - if(StringUtils.isNotBlank(value)){ - taxRate = Double.valueOf(value); - } - return taxRate; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackMessageService.java index 66578db8a..358044ea8 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackMessageService.java @@ -1,26 +1,20 @@ package com.accompany.business.service.activity; import com.accompany.business.constant.PrizeTypeEnum; -import com.accompany.business.constant.RadishBillTypeEnum; import com.accompany.business.constant.activities.ActivitesPackTypeEnum; import com.accompany.business.message.ActivityPackMessage; import com.accompany.business.message.BoxPrizeEntity; import com.accompany.business.model.ActivityPack; -import com.accompany.business.model.UserActivityPackRecord; -import com.accompany.business.mybatismapper.UserActivityPackRecordMapper; import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.activities.ActivitiesDrawService; import com.accompany.business.service.activities.luckySea.ActivitiesLuckySeaService; import com.accompany.business.service.box.BoxPrizeContext; import com.accompany.business.service.box.BoxPrizeStrategyFactory; -import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.user.UserActPropertyInfoV2Service; import com.accompany.business.vo.activity.ActivityPackAwardItem; import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.ActivityConf; import com.accompany.common.redis.RedisKey; -import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; @@ -33,7 +27,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.concurrent.Executor; @@ -159,8 +152,7 @@ public class ActivityPackMessageService { BoxPrizeEntity entity = new BoxPrizeEntity(); entity.setPrizeType(item.getType()); //金币要另作处理 - if (item.getType().intValue() == PrizeTypeEnum.coins.getValue() - || item.getType().intValue() == PrizeTypeEnum.radish.getValue()) { + if (item.getType().intValue() == PrizeTypeEnum.coins.getValue()) { entity.setPrizeValue(item.getNum()); entity.setPrizeNum(packNum); } else { @@ -168,12 +160,7 @@ public class ActivityPackMessageService { entity.setPrizeNum(item.getNum() * packNum); } entity.setPrizeName(item.getName()); - //萝卜时，prizeRefValue为记账类型 - if (item.getType().intValue() == PrizeTypeEnum.radish.getValue()) { - entity.setPrizeRefValue(new Integer(RadishBillTypeEnum.PACK_GIVE.getValue())); - } else { - entity.setPrizeRefValue(item.getReferenceValue().intValue()); - } + entity.setPrizeRefValue(item.getReferenceValue().intValue()); final BoxPrizeContext context = new BoxPrizeContext.Builder() .setUid(uid) .setEntity(entity) diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeStrategyFactory.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeStrategyFactory.java index 75775b5a9..777a680ca 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeStrategyFactory.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeStrategyFactory.java @@ -60,8 +60,6 @@ public class BoxPrizeStrategyFactory implements BeanFactoryAware{ return DefaultStrategy.class; } else if(prizeType == PrizeTypeEnum.key.getValue()) { return KeyPrizeStrategy.class; - }else if(prizeType == PrizeTypeEnum.radish.getValue()) { - return RadishPrizeStrategy.class; }else if(prizeType == PrizeTypeEnum.nameplate.getValue()){ return NameplateStrategy.class; }else if(prizeType == PrizeTypeEnum.virtual_currency.getValue()){ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/strategy/RadishPrizeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/strategy/RadishPrizeStrategy.java deleted file mode 100644 index 855b568e3..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/strategy/RadishPrizeStrategy.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.accompany.business.service.box.strategy; - -import com.accompany.business.constant.RadishBillTypeEnum; -import com.accompany.business.message.BoxPrizeEntity; -import com.accompany.business.service.box.BoxPrizeContext; -import com.accompany.business.service.purse.UserWalletService; -import com.accompany.common.constant.Constant; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - - -/** - * 萝卜奖励策略 - * 注：部分账单类型不适用此策略 - * @author chucheng - * @date 2019/3/12 17:24 - */ -@Service -public class RadishPrizeStrategy implements BoxPrizeStrategy { - - private static final Logger logger = LoggerFactory.getLogger(RadishPrizeStrategy.class); - - @Autowired - private UserWalletService userWalletService; - - @Override - public void execute(BoxPrizeContext context) throws Exception { - BoxPrizeEntity entity = context.getEntity(); - Long uid = context.getUid(); - Long radishNum = Long.parseLong(entity.getPrizeValue().toString()); - RadishBillTypeEnum radishBillType = RadishBillTypeEnum.get(entity.getPrizeRefValue().byteValue()); - String objId = entity.getRecordId()!=null?entity.getRecordId().toString():null; - for(int i=0;i userDrawPrettyErbanNoList=userDrawPrettyErbanNoMapper.selectByExample(userDrawPrettyErbanNoExample); - if(CollectionUtils.isEmpty(userDrawPrettyErbanNoList)){ - return new UserDrawPrettyErbanNo(); - }else{ - UserDrawPrettyErbanNo userDrawPrettyErbanNo = userDrawPrettyErbanNoList.get(0); - userDrawPrettyErbanNo.setUseStatus((byte)2); - userDrawPrettyErbanNoMapper.updateByPrimaryKeySelective(userDrawPrettyErbanNo); - return userDrawPrettyErbanNo; - } - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawProdService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawProdService.java deleted file mode 100644 index 57b74f5f6..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawProdService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.accompany.business.service.drawprize; - -import com.accompany.business.model.UserDrawProd; -import com.accompany.business.model.UserDrawProdExample; -import com.accompany.business.mybatismapper.UserDrawProdMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author yangziwen - * @description - * @date 2018/4/2 18:18 - */ -@Service -public class UserDrawProdService { - - @Autowired - private UserDrawProdMapper userDrawProdMapper; - - public List getUserDrawProdsByDrawId(Long drawId){ - UserDrawProdExample example = new UserDrawProdExample(); - example.createCriteria().andDrawIdEqualTo(String.valueOf(drawId)); - - return this.userDrawProdMapper.selectByExample(example); - } - - public UserDrawProd getUserDrawProd(Integer prodId){ - - return this.userDrawProdMapper.selectByPrimaryKey(prodId); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawRecordService.java deleted file mode 100644 index 0ac4a57c1..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawRecordService.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.accompany.business.service.drawprize; - -import com.accompany.business.model.UserDrawRecord; -import com.accompany.business.model.UserDrawRecordExample; -import com.accompany.business.mybatismapper.UserDrawRecordMapper; -import com.accompany.core.service.base.BaseService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.Date; -import java.util.List; - -/** - * Created by liuguofu on 2017/12/20. - */ -@Service -public class UserDrawRecordService extends BaseService{ - - @Autowired - private UserDrawRecordMapper userDrawRecordMapper; - - /** - * 生成促销活动机会，分享，只能有一次促销活动；每次充值，都生成一次促销活动机会 - * @param uid - * @param type - * @param srcObjAmount - * @param srcObjId - * @param srcObjName - */ - public UserDrawRecord genUserDrawRecord(Long uid,Byte type,Long srcObjAmount ,String srcObjId,String srcObjName,Byte drawStatus){ - UserDrawRecord userDrawRecord=new UserDrawRecord(); - userDrawRecord.setUid(uid); - userDrawRecord.setType(type); - userDrawRecord.setSrcObjAmount(srcObjAmount); - userDrawRecord.setDrawStatus(drawStatus); - userDrawRecord.setSrcObjId(srcObjId); - userDrawRecord.setSrcObjName(srcObjName); - Date date=new Date(); - userDrawRecord.setCreateTime(date); - userDrawRecordMapper.insertSelective(userDrawRecord); - return userDrawRecord; - } - - /** - * 获取用户未使用的促销活动机会，用于促销活动 - * @param uid - * @return - */ - public UserDrawRecord getUserDrawRecordByUidOfCreate(Long uid){ - UserDrawRecordExample userDrawRecordExample=new UserDrawRecordExample(); - userDrawRecordExample.createCriteria().andUidEqualTo(uid).andDrawStatusEqualTo(Constant.DrawStatus.create); - List userDrawRecordList=userDrawRecordMapper.selectByExample(userDrawRecordExample); - if(CollectionUtils.isEmpty(userDrawRecordList)){ - return null; - }else{ - return userDrawRecordList.get(0); - } - - } - - public void updateUserDrawRrecord(UserDrawRecord userDrawRecord){ - userDrawRecordMapper.updateByPrimaryKeySelective(userDrawRecord); - } - - public void saveUserDrawRecord(UserDrawRecord record){ - this.userDrawRecordMapper.insertSelective(record); - } - - public List getUserDrawRecords(String srcObjId){ - UserDrawRecordExample example = new UserDrawRecordExample(); - example.createCriteria().andSrcObjIdEqualTo(srcObjId); - - return this.userDrawRecordMapper.selectByExample(example); - } - - public UserDrawRecord insertUserGiftDrawRecord(Long uid,Byte type,Long srcObjAmount ,String srcObjId,String srcObjName,Byte drawStatus,Integer prizeId,String prizeName){ - UserDrawRecord userDrawRecord=new UserDrawRecord(); - userDrawRecord.setUid(uid); - userDrawRecord.setType(type); - userDrawRecord.setSrcObjAmount(srcObjAmount); - userDrawRecord.setDrawStatus(drawStatus); - userDrawRecord.setSrcObjId(srcObjId); - userDrawRecord.setSrcObjName(srcObjName); - userDrawRecord.setDrawPrizeId(prizeId); - userDrawRecord.setDrawPrizeName(prizeName); - Date date=new Date(); - userDrawRecord.setCreateTime(date); - userDrawRecordMapper.insertSelective(userDrawRecord); - return userDrawRecord; - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawService.java deleted file mode 100644 index 2c8fdb009..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawService.java +++ /dev/null @@ -1,829 +0,0 @@ -package com.accompany.business.service.drawprize; - -import com.accompany.business.constant.PrizeTypeEnum; -import com.accompany.business.constant.RadishBillTypeEnum; -import com.accompany.business.message.BoxPrizeEntity; -import com.accompany.business.model.UserDraw; -import com.accompany.business.model.UserDrawRecord; -import com.accompany.business.mybatismapper.UserDrawMapper; -import com.accompany.business.mybatismapper.UserDrawMapperMgr; -import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.business.param.neteasepush.Payload; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.activity.ActivityConfigService; -import com.accompany.business.service.box.BoxPrizeContext; -import com.accompany.business.service.box.BoxPrizeStrategyFactory; -import com.accompany.business.service.car.CarPayService; -import com.accompany.business.service.headwear.HeadwearService; -import com.accompany.business.service.record.BillRecordService; -import com.accompany.business.service.purse.UserPurseService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.drawprize.UserDrawDoVo; -import com.accompany.business.vo.drawprize.UserDrawRecordVo; -import com.accompany.business.vo.drawprize.UserDrawVo; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.ActivityConf; -import com.accompany.common.constant.Attach; -import com.accompany.common.constant.Constant; -import com.accompany.common.exception.ApiException; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.BlankUtil; -import com.accompany.common.utils.CommonUtil; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.enumeration.BillObjTypeEnum; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import com.accompany.core.mybatismapper.UsersMapper; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.common.JedisLockService; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.vo.UserVo; -import com.google.common.collect.Lists; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.text.DecimalFormat; -import java.util.*; - -/** - * Created by liuguofu on 2017/12/14. - */ -@Slf4j -@Service -public class UserDrawService { - @Autowired - private UserDrawMapper userDrawMapper; - @Autowired - private UserDrawMapperMgr userDrawMapperMgr; - @Autowired - private UsersService usersService; - @Autowired - private JedisService jedisService; - @Autowired - private SendSysMsgService sendSysMsgService; - @Autowired - private UserDrawRecordService userDrawRecordService; - @Autowired - private UserPurseService userPurseService; - @Autowired - private BillRecordService billRecordService; - @Autowired - private JedisLockService jedisLockService; - @Autowired - private SysConfService sysConfService; - @Autowired - private HeadwearService headwearService; - @Autowired - private CarPayService carPayService; - @Autowired - private BoxPrizeStrategyFactory factory; - @Autowired - private UsersMapper usersMapper; - @Autowired - private ActivityConfigService activityConfigService; - - - private Gson gson=new Gson(); - private static DecimalFormat doubleFormat = new DecimalFormat("0.0000"); - public static int sharePageId=888; - - - public BusiResult getUserDrawByUid(Long uid){ - UserDraw userDraw=getUserDrawBeanByUid(uid); - UserDrawVo userDrawVo=convertUserDrawToVo(userDraw); - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - busiResult.setData(userDrawVo); - return busiResult; - } - - public UserDrawVo getUserGiftDrawByUid(Long uid){ - String curDate = DateTimeUtil.getTodayStr(); - Long expireTime = DateTimeUtil.getNextDay(new Date(),7).getTime(); - //UserDraw userDraw = getUserDrawBeanByUid(uid); - UserDrawVo userDrawVo = new UserDrawVo(); - // 从缓存中获取分享状态 - //Byte chance = userDraw.getGiftDrawShareChance(); - Users users = this.getUsersByUid(uid); - Byte chance = this.getShareStatus(uid); - Integer shareTimes = 0; - Integer singleTimes = 0; - // 如果满足是分享过礼物促销活动h5的条件 - if(chance.equals(Constant.GiftDrawShareChance.ACCORD)){ - shareTimes = 1; - } - - Double score = this.jedisService.zscore(RedisKey.user_gift_draw_single_time.getKey(curDate),uid.toString()); - // 如果今天的促销活动次数是为空则说明今天有机会 - if( score == null ){ - score = this.jedisService.zincrby(RedisKey.user_gift_draw_single_time.getKey(curDate),1.0,uid.toString()); - } - singleTimes = score.intValue(); - jedisService.pexpireAt(RedisKey.user_gift_draw_single_time.getKey(curDate),expireTime); - Integer totalTimes = singleTimes + shareTimes; - userDrawVo.setGiftDrawNum(totalTimes); - userDrawVo.setUid(uid); - //2019-4-17 增加返回H5分享的状态 - userDrawVo.setShareDrawStatus(chance); - return userDrawVo; - } - - public UserDraw getUserDrawBeanByUid(Long uid){ - UserDraw userDraw=getUserDrawCache(uid); - if(userDraw == null || userDraw.getGiftDrawShareChance() == null){ - userDraw=querUserDraw(uid); - if(userDraw==null){ - userDraw=createUserDraw(uid,0); - } - } - return userDraw; - } - - - private static double genDoubleNumber(){ - Random ra =new Random(); - double dd=ra.nextDouble(); - double number=new Double(doubleFormat.format(dd)); - return number; - } - - public static void business(String args[]){ - int xiaoyu01=0; - for(int i=0;i<1000;i++){ - double number=genDoubleNumber(); - if(number<0.1){ - xiaoyu01++; - } - System.out.println(number); - } - System.out.println(xiaoyu01); - } - - - - public void genUserDrawChanceByCharge(Long uid,Long amount,String objId){ - String value=sysConfService.getSysConfValueById(Constant.SysConfId.draw_act_switch); - if(!Constant.DrawSwitch.open.equals(value)){//开关关闭，不生成促销活动机会 - return; - } - UserDraw userDraw=getUserDrawBeanByUid(uid); - String srcObjName="充值"+amount/100+"元"; - updateUserDrawAndRecordByGen(userDraw,Constant.DrawRecordType.charge, amount, objId, srcObjName); - sendPush(uid,convertUserDrawToVo(userDraw)); - } - public void genUserDrawChanceByShare(Long uid,String objId){ - String value=sysConfService.getSysConfValueById(Constant.SysConfId.draw_act_switch); - if(!Constant.DrawSwitch.open.equals(value)){//开关关闭，不生成促销活动机会 - return; - } - UserDraw userDraw=getUserDrawBeanByUid(uid); - if(userDraw.getIsFirstShare()){ - return; - } - userDraw.setIsFirstShare(true); - String srcObjName="首次分享"; - updateUserDrawAndRecordByGen(userDraw,Constant.DrawRecordType.share, null, objId, srcObjName); - sendPush(uid,convertUserDrawToVo(userDraw)); - } - - public void genUserGiftDrawChanceByShare(Long uid,String deviceId) { - /*UserDraw userDraw = this.getUserDrawBeanByUid(uid); - Byte chance = userDraw.getGiftDrawShareChance(); - if (chance.equals(Constant.GiftDrawShareChance.NOT_ACCORD)) { - // 只有当礼物促销活动状态为未领取状态下才允许修改状态，而且更新db与缓存 - userDraw.setGiftDrawShareChance(Constant.GiftDrawShareChance.ACCORD); - this.updateUserDraw(userDraw); - }*/ - //将分享状态保存到缓存中,不走数据库 - Long limitTime = DateTimeUtil.getNextDay(new Date(),14).getTime(); - Byte chance = this.getShareStatus(uid); - log.info("The share status is: {}" , chance); - if(chance != null && chance.equals(Constant.GiftDrawShareChance.NOT_ACCORD)){ - jedisService.hset(RedisKey.user_gift_draw_share_status.getKey(),uid.toString(),String.valueOf(Constant.GiftDrawShareChance.ACCORD)); - jedisService.expireAt(RedisKey.user_gift_draw_share_status.getKey(),limitTime); - } - } - - - private void sendPush(Long uid,UserDrawVo userDrawVo){ - NeteaseSendMsgParam neteaseSendMsgParam = new NeteaseSendMsgParam(); - neteaseSendMsgParam.setFrom(SystemConfig.secretaryUid); - neteaseSendMsgParam.setTo(uid.toString()); - neteaseSendMsgParam.setType(100); - neteaseSendMsgParam.setPushcontent("您獲得了一次促銷活動機會，快去拿獎吧！"); - Attach attach = new Attach(); - attach.setFirst(Constant.DefMsgType.Draw); - attach.setSecond(Constant.DefMsgType.DrawChance); - attach.setData(userDrawVo); - neteaseSendMsgParam.setAttach(attach); - Payload payload = new Payload(); - neteaseSendMsgParam.setPayload(payload); - sendSysMsgService.sendMsg(neteaseSendMsgParam); - } - - public UserDraw createUserDraw(Long uid,int leftDrawNum){ - Date date=new Date(); - UserDraw userDraw=new UserDraw(); - userDraw.setUid(uid); - userDraw.setLeftDrawNum(leftDrawNum); - userDraw.setTotalDrawNum(leftDrawNum); - userDraw.setIsFirstShare(false); - userDraw.setTotalWinDrawNum(0); - userDraw.setGiftDrawShareChance(Constant.GiftDrawShareChance.NOT_ACCORD); - userDraw.setCreateTime(date); - userDraw.setUpdateTime(date); - userDrawMapper.insert(userDraw); - saveUserDrawCache(userDraw); - return userDraw; - } - private UserDrawVo convertUserDrawToVo(UserDraw userDraw){ - UserDrawVo userDrawVo=new UserDrawVo(); - if(userDraw==null){ - return userDrawVo; - } - userDrawVo.setUid(userDraw.getUid()); - userDrawVo.setTotalDrawNum(userDraw.getTotalDrawNum()); - userDrawVo.setTotalWinDrawNum(userDraw.getTotalWinDrawNum()); - userDrawVo.setLeftDrawNum(userDraw.getLeftDrawNum()); - return userDrawVo; - } - - private UserDraw querUserDraw(Long uid){ - UserDraw userDraw=userDrawMapper.selectByPrimaryKey(uid); - return userDraw; - } - - private void saveUserDrawCache(UserDraw userDraw){ - if(userDraw==null){ - return; - } - Long uid=userDraw.getUid(); - jedisService.hwrite(RedisKey.user_draw.getKey(),uid.toString(),gson.toJson(userDraw)); - } - private UserDraw getUserDrawCache(Long uid){ - String userDrawStr=jedisService.hget(RedisKey.user_draw.getKey(),uid.toString()); - if(StringUtils.isEmpty(userDrawStr)){ - return null; - } - UserDraw userDraw=gson.fromJson(userDrawStr,UserDraw.class); - return userDraw; - } - - - public BusiResult doUserDraw(Long uid) throws Exception { - String lockVal = null; - UserDrawDoVo userDrawDoVo = null; - try { - lockVal = jedisLockService.lock(RedisKey.user_draw_lock.getKey(uid.toString()), 10 * 1000); - if (BlankUtil.isBlank(lockVal)) { - log.error("Failed to doUserDraw, Could not get user_draw_lock. uid=[{}]", uid); - throw new ServiceException(BusiStatus.USER_DRAW_TO_MORE); - } - - UserDraw userDraw = getUserDrawBeanByUid(uid); - if (userDraw.getLeftDrawNum() == 0) { - return new BusiResult(BusiStatus.NOMORECHANCE); - } - UserDrawRecord userDrawRecord = userDrawRecordService.getUserDrawRecordByUidOfCreate(uid); - if (userDrawRecord == null) { - return new BusiResult(BusiStatus.NOMORECHANCE); - } - - userDrawRecord = getDrawPrizeProd(userDrawRecord); - userDraw = updateUserDrawByDoDraw(userDraw, userDrawRecord); - userDrawDoVo = convertUserDrawDoToVo(userDraw, userDrawRecord); - }finally { - jedisLockService.unlock(RedisKey.user_draw_lock.getKey(uid.toString()), lockVal); - } - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - busiResult.setData(userDrawDoVo); - return busiResult; - } - - public UserDrawDoVo doUserGiftDraw(Long uid,String deviceId) throws Exception { - String lockVal = null; - UserDrawDoVo userDrawDoVo = new UserDrawDoVo(); - String curDate = DateTimeUtil.getTodayStr(); - Long limitTime = DateTimeUtil.getNextDay(new Date(),7).getTime(); - try{ - lockVal = jedisLockService.lock(RedisKey.user_draw_lock.getKey(uid.toString()), 10 * 1000); - if (BlankUtil.isBlank(lockVal)) { - log.error("Failed to doUserDraw, Could not get user_draw_lock. uid=[{}]", uid); - throw new ServiceException(BusiStatus.USER_DRAW_TO_MORE); - } - // 对活动资格进行校验 - this.checkRadishDraw(uid); - - /*Boolean checkSignTimeBol = this.checkSignTime(uid); - if(!checkSignTimeBol){ - throw new ApiException(BusiStatus.ACT_AWARD_NOT_ACCORD); - }*/ - Byte shareStatus = this.getShareStatus(uid); - // 获取用户促销活动次数 - Map userGiftDrawMap = this.getUserGiftDrawMap(uid,deviceId); - if(userGiftDrawMap.get("total") <= 0){ - throw new ApiException(BusiStatus.NOMORECHANCE); - } - // 设备id次数限制 - Double deviceLimit = jedisService.zincrby(RedisKey.user_gift_draw_device_limit.getKey(curDate),1.0,deviceId); - jedisService.pexpireAt(RedisKey.user_gift_draw_device_limit.getKey(curDate),limitTime); - if (deviceLimit > 2){ - throw new ApiException(BusiStatus.SAME_IP_DEVICE); - } - - Integer specialTime = userGiftDrawMap.get("special"); - Integer singleTime = userGiftDrawMap.get("single"); - String srcObjName = null; - Byte drawType = null; - Integer prizeId = this.getGiftDrawPrizeProd(); - - // 累计送出的萝卜数,存放于缓存中,判断是否超额并预警 - Double radishCount = jedisService.zincrby(RedisKey.user_gift_draw_radish_limit.getKey(), prizeId.doubleValue(),curDate); - jedisService.expireAt(RedisKey.user_gift_draw_radish_limit.getKey(),limitTime); - log.info("The number of raffling radish: {}" , radishCount); - - /*Gift gift = this.giftService.getEachGiftById(prizeId); - if(gift == null){ - throw new ApiException(BusiStatus.GIFT_IS_NOT_EXIST); - }*/ - if(specialTime > 0){ - //将分享状态更新到缓存中 不保存数据库 - jedisService.hset(RedisKey.user_gift_draw_share_status.getKey(),uid.toString(),String.valueOf(Constant.GiftDrawShareChance.USED)); - //userDraw.setGiftDrawShareChance(Constant.GiftDrawShareChance.USED); - specialTime = 0; - // this.updateUserDraw(userDraw); - srcObjName = "分享礼物促销活动"; - drawType = Constant.DrawRecordType.share_gift_draw; - - }else{ - Double score = this.reduceTimes(RedisKey.user_gift_draw_single_time.getKey(curDate),-1.0,uid); - srcObjName = "日常礼物促销活动"; - drawType = Constant.DrawRecordType.single_gift_draw; - singleTime = score.intValue(); - } - UserDrawRecord record = this.userDrawRecordService.insertUserGiftDrawRecord(uid,drawType,null, - null,srcObjName, Constant.DrawStatus.hasPrize,prizeId,prizeId + "萝卜"); - // 2019-4-17 增加萝卜币金额参数 - BoxPrizeContext context = this.buildPrizeContext(prizeId,1,uid, - record == null ? null : Integer.valueOf(record.getRecordId()).longValue()); - factory.getStrategy(context.getEntity().getPrizeType()).execute(context); - - Integer total = specialTime + singleTime; - userDrawDoVo.setGiftDrawNum(total); - userDrawDoVo.setDrawPrizeId(prizeId); - userDrawDoVo.setDrawPrizeName(prizeId + "萝卜"); - //获取促销活动页面分享状态 - userDrawDoVo.setShareDrawStatus(shareStatus); - }finally { - jedisLockService.unlock(RedisKey.user_draw_lock.getKey(uid.toString()), lockVal); - } - - return userDrawDoVo; - } - - /** - * 萝卜促销活动活动限制条件校验 - * @param uid - */ - public void checkRadishDraw(Long uid){ - // 活动时间限制 - if(!activityConfigService.isInActivityRange(new Date(),ActivityConf.RADISH_DRAW_STAR,ActivityConf.RADISH_DRAW_END)){ - throw new ApiException(BusiStatus.DRAW_LIMIT_TIME); - } - - // 设备id匹配校验 - Users users = this.getUsersByUid(uid); - if (users !=null){ - //如果手机号码为空,或者手机号码为平台号 - if(StringUtils.isEmpty(users.getPhone()) || !CommonUtil.checkPhoneFormat(users.getPhoneAreaCode(),users.getPhone())) { - throw new ApiException(BusiStatus.RADISH_DRAW_PHONE_BIND); - } - } - //预警判断 - //IsRadishExceeded(); - } - - - private UserDraw updateUserDrawDb(UserDraw userDraw){ - userDraw.setUpdateTime(new Date()); - userDrawMapper.updateByPrimaryKeySelective(userDraw); - return userDraw; - } - - /** - * 更新促销活动记录 - * @param userDraw - * @param userDrawRecord - * @return - */ - private UserDraw updateUserDrawByDoDraw(UserDraw userDraw,UserDrawRecord userDrawRecord) throws Exception { - int leftDrawNum=userDraw.getLeftDrawNum(); - leftDrawNum--; - userDraw.setLeftDrawNum(leftDrawNum); - int totalWinDrawNum=userDraw.getTotalWinDrawNum(); - Integer drawPrizeId = userDrawRecord.getDrawPrizeId(); - if(Constant.DrawStatus.hasPrize.equals(userDrawRecord.getDrawStatus())){//判断有没有中奖，如果有中奖，判断是加金币还是靓号 - totalWinDrawNum++; - if(userDrawRecord.getDrawPrizeId()<= Constant.DrawProd.gold8888){//金币充值，增加金币账单 - doUserPurseAndBillRecord(userDraw.getUid(),Long.valueOf(userDrawRecord.getDrawPrizeId()),userDrawRecord.getRecordId().toString()); - }else if(Constant.DrawProd.headwearCat.equals(drawPrizeId)){ - this.headwearService.officialSendHeadWearSingle(90,userDraw.getUid(),7); - }else if(Constant.DrawProd.headwearLove.equals(drawPrizeId)){ - this.headwearService.officialSendHeadWearSingle(104,userDraw.getUid(),7); - }else if(Constant.DrawProd.headwearDemon.equals(drawPrizeId)){ - this.headwearService.officialSendHeadWearSingle(129,userDraw.getUid(),7); - }else if(Constant.DrawProd.headwear520.equals(drawPrizeId)){ - this.headwearService.officialSendHeadWearSingle(51,userDraw.getUid(),7); - }else if(Constant.DrawProd.headwear1314.equals(drawPrizeId)){ - this.headwearService.officialSendHeadWearSingle(52,userDraw.getUid(),7); - }else if(Constant.DrawProd.carChicken.equals(drawPrizeId)){ - this.carPayService.experCarByOfficial(userDraw.getUid(),31,7,"转盘促销活动7天体验",true); - }else if(Constant.DrawProd.carPorsche.equals(drawPrizeId)){ - this.carPayService.experCarByOfficial(userDraw.getUid(),22,7,"转盘促销活动7天体验",true); - }else if(Constant.DrawProd.carHorse.equals(drawPrizeId)){ - this.carPayService.experCarByOfficial(userDraw.getUid(),26,7,"转盘促销活动7天体验",true); - }else if(Constant.DrawProd.carShining.equals(drawPrizeId)){ - this.carPayService.experCarByOfficial(userDraw.getUid(),35,7,"转盘促销活动7天体验",true); - } - } - userDraw.setTotalWinDrawNum(totalWinDrawNum); - updateUserDraw(userDraw); - userDrawRecordService.updateUserDrawRrecord(userDrawRecord); - return userDraw; - } - public void doUserPurseAndBillRecord(Long uid,Long goldNum,String objId){ - try { - userPurseService.addDiamond(uid,goldNum.doubleValue(), null,BillObjTypeEnum.DRAW.getDesc()); - userPurseService.sendSysMsgByModifyGold(userPurseService.queryUserPurse(uid)); - } catch (Exception e) { - log.error("sendSysMsgByModifyGold error, uid:"+uid+", goldNum:"+goldNum+", objId:"+objId, e); - } - billRecordService.insertGeneralBillRecord( uid, null, objId, BillObjTypeEnum.DRAW, goldNum.doubleValue()); - } - - private UserDraw updateUserDrawAndRecordByGen(UserDraw userDraw,Byte type,Long amount,String srcObjId,String srcObjName){ - int leftDrawNum=userDraw.getLeftDrawNum(); - leftDrawNum++; - userDraw.setLeftDrawNum(leftDrawNum); - int totalDrawNum=userDraw.getTotalDrawNum(); - totalDrawNum++; - userDraw.setTotalDrawNum(totalDrawNum); - updateUserDraw(userDraw); - - Long uid=userDraw.getUid(); - - userDrawRecordService.genUserDrawRecord(uid,type,amount ,srcObjId, srcObjName,Constant.DrawStatus.create); - return userDraw; - } - private UserDraw updateUserDraw(UserDraw userDraw){ - updateUserDrawDb(userDraw); - saveUserDrawCache(userDraw); - return userDraw; - } - - /** - * 获取已经中奖的记录20条，用于滚屏 - * @return - */ - public BusiResult > getUserDrawRecordListByStatus() { - List userDrawRecordList= userDrawMapperMgr.getUserDrawRecordListByStatus(); - List userDrawRecordVoList=convertUserDrawRecordToVo(userDrawRecordList); - BusiResult busResuslt=new BusiResult(BusiStatus.SUCCESS); - busResuslt.setData(userDrawRecordVoList); - return busResuslt; - } - private List convertUserDrawRecordToVo(List userDrawRecordList){ - if(CollectionUtils.isEmpty(userDrawRecordList)){ - return Lists.newArrayList(); - } - - List userDrawRecordVoList= Lists.newArrayList(); - for(UserDrawRecord userDrawRecord:userDrawRecordList){ - UserDrawRecordVo userDrawRecordVo=new UserDrawRecordVo(); - Long uid=userDrawRecord.getUid(); - UserVo userVo=usersService.getUserVoByUid(uid); - userDrawRecordVo.setUserVo(userVo); - userDrawRecordVo.setDrawPrizeName(userDrawRecord.getDrawPrizeName()); - userDrawRecordVo.setType(userDrawRecord.getType()); - userDrawRecordVo.setDrawStatus(userDrawRecord.getDrawStatus()); - userDrawRecordVo.setSrcObjName(userDrawRecord.getSrcObjName()); - userDrawRecordVoList.add(userDrawRecordVo); - } - return userDrawRecordVoList; - } - - private UserDrawDoVo convertUserDrawDoToVo(UserDraw userDraw,UserDrawRecord userDrawRecord){ - if(userDraw==null){ - return new UserDrawDoVo(); - } - UserDrawDoVo userDrawDoVo=new UserDrawDoVo(); - userDrawDoVo.setTotalDrawNum(userDraw.getTotalDrawNum()); - userDrawDoVo.setLeftDrawNum(userDraw.getLeftDrawNum()); - userDrawDoVo.setDrawStatus(userDrawRecord.getDrawStatus()); - userDrawDoVo.setDrawPrizeName(userDrawRecord.getDrawPrizeName()); - userDrawDoVo.setSrcObjName(userDrawRecord.getSrcObjName()); - userDrawDoVo.setTotalWinDrawNum(userDraw.getTotalWinDrawNum()); - userDrawDoVo.setDrawPrizeId(userDrawRecord.getDrawPrizeId()); - userDrawDoVo.setUserVo(usersService.getUserVoByUid2(userDraw.getUid())); - return userDrawDoVo; - } - private UserDrawRecord getDrawPrizeProd(UserDrawRecord userDrawRecord){ - Integer amount=800; - if(userDrawRecord.getType().equals((byte)2)){ - amount=800; - }else{ - amount=userDrawRecord.getSrcObjAmount().intValue(); - } - double drawPrize[]=null; - double randomNumber=genDoubleNumber(); - if (amount < 4800) { - drawPrize=Constant.DrawRange.shareOr8;//中奖机会：不中/猫咪头饰 - if(randomNumber>drawPrize[0]&&randomNumber<=drawPrize[1]){ - userDrawRecord.setDrawPrizeId(null); - userDrawRecord.setDrawPrizeName("谢谢参与，继续努力！"); - userDrawRecord.setDrawStatus(Constant.DrawStatus.nonePrize); - }else if(randomNumber>drawPrize[1]&&randomNumber<=drawPrize[2]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwearCat); - userDrawRecord.setDrawPrizeName("猫咪头饰7天"); - } - } else if (amount < 9800 && amount >= 4800) { - drawPrize= Constant.DrawRange.charge48;//中奖机会：5/30/100金币 - if(randomNumber>drawPrize[0]&&randomNumber<=drawPrize[1]){ - userDrawRecord.setDrawPrizeId(null); - userDrawRecord.setDrawPrizeName("谢谢参与，继续努力！"); - userDrawRecord.setDrawStatus(Constant.DrawStatus.nonePrize); - }else if(randomNumber>drawPrize[1]&&randomNumber<=drawPrize[2]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwearCat); - userDrawRecord.setDrawPrizeName("猫咪头饰7天"); - } - } else if (amount < 19800 && amount >= 9800) { - drawPrize=Constant.DrawRange.charge98;//中奖机会：5/30/100/300金币 - if(randomNumber>drawPrize[0]&&randomNumber<=drawPrize[1]){ - userDrawRecord.setDrawPrizeId(null); - userDrawRecord.setDrawPrizeName("谢谢参与，继续努力！"); - userDrawRecord.setDrawStatus(Constant.DrawStatus.nonePrize); - }else if(randomNumber>drawPrize[1]&&randomNumber<=drawPrize[2]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwearCat); - userDrawRecord.setDrawPrizeName("猫咪头饰7天"); - }else if(randomNumber>drawPrize[2]&&randomNumber<=drawPrize[3]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwearLove); - userDrawRecord.setDrawPrizeName("缤纷爱心头饰7天"); - } - } else if (amount < 49800 && amount >= 19800) { - drawPrize=Constant.DrawRange.charge198; - if(randomNumber>drawPrize[0]&&randomNumber<=drawPrize[1]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwearCat); - userDrawRecord.setDrawPrizeName("猫咪头饰7天"); - }else if(randomNumber>drawPrize[1]&&randomNumber<=drawPrize[2]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwearLove); - userDrawRecord.setDrawPrizeName("缤纷爱心头饰7天"); - }else if(randomNumber>drawPrize[2]&&randomNumber<=drawPrize[3]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carChicken); - userDrawRecord.setDrawPrizeName("小飞鸡座驾7天"); - } - } else if (amount < 99800 && amount >= 49800) { - drawPrize=Constant.DrawRange.charge498;//中奖机会：30/100/300/1000/3000金币 - if(randomNumber>drawPrize[0]&&randomNumber<=drawPrize[1]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwearCat); - userDrawRecord.setDrawPrizeName("猫咪头饰7天"); - }else if(randomNumber>drawPrize[1]&&randomNumber<=drawPrize[2]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwearDemon); - userDrawRecord.setDrawPrizeName("小恶魔头饰7天"); - }else if(randomNumber>drawPrize[2]&&randomNumber<=drawPrize[3]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carChicken); - userDrawRecord.setDrawPrizeName("小飞鸡座驾7天"); - }else if(randomNumber>drawPrize[3]&&randomNumber<=drawPrize[4]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carPorsche); - userDrawRecord.setDrawPrizeName("粉红保时捷座驾7天"); - } - } else if (amount < 499800 && amount >= 99800) { - drawPrize=Constant.DrawRange.charge998;//中奖机会：100/300/1000/3000/8888金币 - if(randomNumber>drawPrize[0]&&randomNumber<=drawPrize[1]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwearDemon); - userDrawRecord.setDrawPrizeName("小恶魔头饰7天"); - }else if(randomNumber>drawPrize[1]&&randomNumber<=drawPrize[2]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carChicken); - userDrawRecord.setDrawPrizeName("小飞鸡座驾7天"); - }else if(randomNumber>drawPrize[2]&&randomNumber<=drawPrize[3]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carPorsche); - userDrawRecord.setDrawPrizeName("粉红保时捷座驾7天"); - }else if(randomNumber>drawPrize[3]&&randomNumber<=drawPrize[4]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwear520); - userDrawRecord.setDrawPrizeName("520头饰7天"); - } - } else if (amount < 999900 && amount >= 499800) { - drawPrize=Constant.DrawRange.charge4998;//中奖机会：/300/1000/3000/8888/10000(靓号)金币 - if(randomNumber>drawPrize[0]&&randomNumber<=drawPrize[1]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carChicken); - userDrawRecord.setDrawPrizeName("小飞鸡座驾7天"); - }else if(randomNumber>drawPrize[1]&&randomNumber<=drawPrize[2]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carPorsche); - userDrawRecord.setDrawPrizeName("粉红保时捷座驾7天"); - }else if(randomNumber>drawPrize[2]&&randomNumber<=drawPrize[3]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwear520); - userDrawRecord.setDrawPrizeName("520头饰7天"); - }else if(randomNumber>drawPrize[3]&&randomNumber<=drawPrize[4]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwear1314); - userDrawRecord.setDrawPrizeName("1314头饰7天"); - } - } else if (amount < 3000000 && amount >= 999900) { - drawPrize=Constant.DrawRange.charge9999;//中奖机会：/1000/3000/8888/10000/15000/中奖机会：/300/1000/3000/8888/10000/15000(靓号)金币/15000(靓号)金币 - if(randomNumber>drawPrize[0]&&randomNumber<=drawPrize[1]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carPorsche); - userDrawRecord.setDrawPrizeName("粉红保时捷座驾7天"); - }else if(randomNumber>drawPrize[1]&&randomNumber<=drawPrize[2]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwear520); - userDrawRecord.setDrawPrizeName("520头饰7天"); - }else if(randomNumber>drawPrize[2]&&randomNumber<=drawPrize[3]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwear1314); - userDrawRecord.setDrawPrizeName("1314头饰7天"); - }else if(randomNumber>drawPrize[3]&&randomNumber<=drawPrize[4]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carHorse); - userDrawRecord.setDrawPrizeName("天马座驾7天"); - } - } else if (amount < 6000000 && amount >= 3000000) { - drawPrize = Constant.DrawRange.charge30000; // 中奖机会：8888金币，10000(6位靓号)，150000(4位靓号) - if(randomNumber>drawPrize[0]&&randomNumber<=drawPrize[1]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carHorse); - userDrawRecord.setDrawPrizeName("天马座驾7天"); - }else if(randomNumber>drawPrize[1]&&randomNumber<=drawPrize[2]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwear520); - userDrawRecord.setDrawPrizeName("520头饰7天"); - }else if(randomNumber>drawPrize[2]&&randomNumber<=drawPrize[3]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carShining); - userDrawRecord.setDrawPrizeName("赤耀辉光座驾7天"); - } - } else { - drawPrize = Constant.DrawRange.charge60000; // 中奖机会：10000(6位靓号)，150000(4位靓号) - if(randomNumber>drawPrize[0]&&randomNumber<=drawPrize[1]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.headwear520); - userDrawRecord.setDrawPrizeName("520头饰7天"); - }else if(randomNumber>drawPrize[1]&&randomNumber<=drawPrize[2]){ - userDrawRecord.setDrawPrizeId(Constant.DrawProd.carShining); - userDrawRecord.setDrawPrizeName("赤耀辉光座驾7天"); - } - } - - if(!Constant.DrawStatus.nonePrize.equals(userDrawRecord.getDrawStatus())){ - userDrawRecord.setDrawStatus(Constant.DrawStatus.hasPrize); - } - userDrawRecord.setUpdateTime(new Date()); - return userDrawRecord; - } - - public Integer getGiftDrawPrizeProd(){ - double randomNumber=genDoubleNumber(); - double drawPrize[]= Constant.DrawRange.giftDrawRange; - Integer prizeIndex = 0; - - for(int i = 0;i < drawPrize.length;i++){ - Double range1 = drawPrize[i]; - Double range2 = drawPrize[i+1]; - - if(randomNumber > range1 && randomNumber <= range2){ - prizeIndex = i; - break; - } - } - Integer prizeId = Constant.GIFT_DRAW_PROD[prizeIndex]; - return prizeId; - } - - private Map getUserGiftDrawMap(Long uid,String deviceId){ - String curDate = DateTimeUtil.getTodayStr(); - Map map = new HashMap<>(); - - Double singleScore = jedisService.zscore(RedisKey.user_gift_draw_single_time.getKey(curDate),uid.toString()); - map.put("single",singleScore == null ? 0 : singleScore.intValue()); - -// if(userDraw.getGiftDrawShareChance().equals(Constant.GiftDrawShareChance.ACCORD)){ -// map.put("special",1); -// }else{ -// map.put("special",0); -// } - // 从缓存中获取分享状态 - Byte chance = this.getShareStatus(uid); - if(chance != null && chance.equals(Constant.GiftDrawShareChance.ACCORD)){ - map.put("special",1); - }else{ - map.put("special",0); - } - Integer total = map.get("single") + map.get("special"); - map.put("total",total); - return map; - } - - private Double reduceTimes(String key,Double score,Long uid){ - return jedisService.zincrby(key,score,uid.toString()); - } - - private Boolean checkSignTime(Long uid){ - Users users = usersService.getUsersByUid(uid); - Date signTime = users.getCreateTime(); - Date limitTime = DateTimeUtil.convertStrToDate("2019-04-05 00:00:00"); - if(signTime.getTime() > limitTime.getTime()){ - return false; - } - return true; - } - - public void addTestchance(Long uid,Double score){ - String curDate = DateTimeUtil.getTodayStr(); - jedisService.zincrby(RedisKey.user_gift_draw_single_time.getKey(curDate),score,uid.toString()); - } - - /** - * 2019-4-17 增加萝卜币金额参数 - */ - private BoxPrizeContext buildPrizeContext(Integer radishValue, Integer giftNum, Long uid, Long recordId) { - BoxPrizeEntity entity = new BoxPrizeEntity(); - entity.setPrizeType((byte) PrizeTypeEnum.radish.getValue()); - //萝卜币金额 - entity.setPrizeValue(radishValue); - entity.setPrizeNum(giftNum); - //获取萝卜类型 - entity.setPrizeRefValue(Integer.valueOf(RadishBillTypeEnum.RADISH_DRAW.getValue())); - //促销活动记录id - entity.setRecordId(recordId); - final BoxPrizeContext context = new BoxPrizeContext.Builder() - .setUid(uid) - .setEntity(entity) - .build(); - return context; - } - - /** - * 根据uid获取用户信息 - * @param uid - * @return - */ - public Users getUsersByUid(Long uid){ - String usersStr = jedisService.hget(RedisKey.user.getKey(), uid.toString()); - Users users = null; - if(StringUtils.isEmpty(usersStr)){ - users = usersMapper.selectByPrimaryKey(uid); - }else{ - users = gson.fromJson(usersStr, Users.class); - } - return users; - } - - /** - * 判断萝卜送出数是否超出预算值 - * @return - */ - public void IsRadishExceeded(){ - String curDate = DateTimeUtil.getTodayStr(); - Integer limitTotal = Integer.valueOf(activityConfigService.getSingleConf(ActivityConf.RADISH_DRAW_LIMIT_TOTAL)); // 每天萝卜送出预算值 - Double total = jedisService.zscore(RedisKey.user_gift_draw_radish_limit.getKey(),curDate); // 获取当天累计送出萝卜 - if(total != null) { - if (total > (limitTotal * 1.5)) { - sendRadishExceeded(Constant.RadishDrawExceedLevel.levelTwo,limitTotal,total.intValue()); - throw new ApiException(BusiStatus.RADISH_DRAW_STATUS); - }else if (total > limitTotal) { - sendRadishExceeded(Constant.RadishDrawExceedLevel.levelOne,limitTotal,total.intValue()); - } - } - } - - /** - * 从缓存中获取页面分享状态 - * @param uid - * @return - */ - public Byte getShareStatus(Long uid){ - String chance = jedisService.hget(RedisKey.user_gift_draw_share_status.getKey(),uid.toString()); - if(chance != null && !StringUtils.isEmpty(chance)){ - return Byte.valueOf(chance); - } - return 0; - } - - /** - * 发送微信预警 - * @param level - * @param limitTotal - * @param radishTotal - */ - public void sendRadishExceeded(String level, Integer limitTotal, Integer radishTotal){ - log.error("Failed to doUserDraw, the number of radishes exceeded . limitTotal=[{}], CurrentTotal=[{}]", limitTotal, radishTotal); - //String openId = WxConfig.alertAdminUser; - String first = "警报警报！"; - String keyword1 = "萝卜促销活动活动异常警报"; - String keyword2 = "萝卜预算值为：" + limitTotal + "，当前累计送出萝卜为：" + radishTotal; - String keyword3 = DateTimeUtil.convertDate(new Date(),"yyyy-MM-dd hh:mm:ss"); - String keyword4 = "当前预报等级为" + level + "，已超过" + level + "异常值，数据异常请马上排查！"; - String remark = ""; - if(Constant.RadishDrawExceedLevel.levelOne.equals(level)){ - remark = "业务正常处理，排查数据无误后请忽略该警报！"; - }else if (Constant.RadishDrawExceedLevel.levelTwo.equals(level)){ - remark = "当天萝卜促销活动活动业务已停止，请立即排查数据！"; - } - //wxPubService.sendAlertMsg(openId,first,keyword1,keyword2,keyword3,keyword4,remark); - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java index 1eebf78b6..a8a29974d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java @@ -83,9 +83,6 @@ public class GiftSendService extends BaseService { @Autowired private RoomGiftValueService roomGiftValueService; @Autowired - @Lazy - private RadishSendService radishSendService; - @Autowired private LuckyBagPoolService luckyBagPoolService; @Autowired private LuckyBagLinearPoolService luckyBagLinearPoolService; @@ -424,9 +421,6 @@ public class GiftSendService extends BaseService { case Constant.GiftConsumeType.ROOM_FREE_GIFT: result = sendGiftV4(sendUid, receiveUids, roomUid, gift, giftNum, msg, giftSource, sendType); break; - case Constant.GiftConsumeType.RADISH_GIFT: - result = radishSendService.sendRadishGift(sendUid, receiveUids, roomUid, giftId, giftNum, msg, giftSource, sendType); - break; default: throw new ServiceException(BusiStatus.GIFTDOWNORNOTEXISTS); } @@ -465,9 +459,6 @@ public class GiftSendService extends BaseService { case Constant.GiftConsumeType.ROOM_FREE_GIFT: result = sendGiftV5(sendUid, receiveUids, roomUid, gift, giftNum, msg, giftSource, sendType); break; - case Constant.GiftConsumeType.RADISH_GIFT: - result = radishSendService.sendRadishGift(sendUid, receiveUids, roomUid, giftId, giftNum, msg, giftSource, sendType); - break; default: throw new ServiceException(BusiStatus.GIFTDOWNORNOTEXISTS); } @@ -504,9 +495,6 @@ public class GiftSendService extends BaseService { case Constant.GiftConsumeType.GOLD_GIFT: result = sendGiftV4(sendUid, receiveUids, roomUid, gift, giftNum, msg, giftSource, sendType); break; - case Constant.GiftConsumeType.RADISH_GIFT: - result = radishSendService.sendRadishGift(sendUid, receiveUids, roomUid, giftId, giftNum, msg, giftSource, sendType); - break; default: throw new ServiceException(BusiStatus.GIFTDOWNORNOTEXISTS); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/RadishGiftMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/RadishGiftMessageService.java deleted file mode 100644 index 9ce8f1b7a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/RadishGiftMessageService.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.accompany.business.service.gift; - -import com.accompany.business.constant.RadishBillTypeEnum; -import com.accompany.business.event.RadishGiftMessageEvent; -import com.accompany.business.message.RadishGiftMessage; -import com.accompany.business.model.RadishBill; -import com.accompany.business.model.UserWallet; -import com.accompany.core.service.base.BaseService; -import com.accompany.business.service.purse.UserWalletService; -import com.accompany.business.service.radish.RadishBillService; -import com.accompany.business.service.radish.RadishGiftSendRecordService; -import com.accompany.business.service.radish.UserRadishGiftWallService; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Objects; - - -@Service -public class RadishGiftMessageService extends BaseService { - @Autowired - private UserWalletService userWalletService; - @Autowired - private RadishBillService radishBillService; - @Autowired - private RadishGiftSendRecordService radishGiftSendRecordService; - @Autowired - private UserRadishGiftWallService userRadishGiftWallService; - @Autowired - private ApplicationContext applicationContext; - - - @Transactional(rollbackFor = Exception.class) - public void handleRadishGiftMessage(RadishGiftMessage giftMessage) { - // 防止消息被重复消费 - if (!jedisLockService.isExist(RedisKey.lock_gift_message.getKey(giftMessage.getMessId()), 30)) { - logger.warn("handleRadishGiftMessage giftMessage had handle, mess: " + gson.toJson(giftMessage)); - return; - } - logger.info("handleRadishGiftMessage giftMessage: {}", gson.toJson(giftMessage)); - Long sendUid = giftMessage.getSendUid(); - Long receiveUid = giftMessage.getReceiveUid(); - Long roomUid = giftMessage.getRoomUid(); - Long radishNum = giftMessage.getRadishNum(); - Integer giftId = giftMessage.getGiftId(); - Integer giftNum = giftMessage.getGiftNum(); - String messId = giftMessage.getMessId(); - Byte roomType = giftMessage.getRoomType(); - Byte sendType = giftMessage.getSendType(); - Integer giftSource = giftMessage.getGiftSource(); - Long beforeAmount = null; - if (Objects.equals(giftSource,Constant.GiftSource.COMMON)){ - UserWallet userWalletFromDB = userWalletService.getUserWalletByCurrencyTypeFromDb(sendUid, Constant.WalletCurrencyType.radish); - beforeAmount = userWalletFromDB.getAmount(); - //扣减db用户钱包 - this.updateCurrencyFromDB(sendUid, receiveUid, roomUid, radishNum, giftId, giftNum); - } - - //萝卜赠送记录 - Long giftSendRecordId = radishGiftSendRecordService.insertRadishGiftSendRecord(sendUid, receiveUid, roomUid, giftId, - giftNum, radishNum.intValue(), roomType, giftSource.byteValue(), sendType); - //新增萝卜账单 - RadishBill radishBill = radishBillService.insertRadishBillRecord(sendUid, receiveUid, roomUid, - RadishBillTypeEnum.SEND_GIFT.getValue(), -radishNum, Constant.WalletCurrencyType.radish, giftId, - giftNum, giftSendRecordId + ""); - - if (Objects.equals(giftSource,Constant.GiftSource.COMMON)){ - // 新增钱包流水 - userWalletService.saveUserWalletWater(sendUid, Constant.WalletCurrencyType.radish, beforeAmount, - -radishNum, beforeAmount - radishNum, radishBill.getBillId(), - Constant.WalletUpdateType.reduce); - } - - //萝卜礼物墙 - userRadishGiftWallService.updateRadishGiftWallCount(receiveUid, giftId, giftNum); - - //更新魅力值 - this.updateLevelCharm(receiveUid, radishNum); - // 删除该标识，表示消息已经消费过 - jedisService.hdel(RedisKey.mq_radish_gift_status.getKey(), messId); - - //发布事件 - applicationContext.publishEvent(new RadishGiftMessageEvent(giftMessage)); - } - - /** - * 扣减db用户钱包 - * - * @param sendUid - * @param receiveUid - * @param roomUid - * @param radishNum - * @param giftId - * @param giftNum - */ - private void updateCurrencyFromDB(Long sendUid, Long receiveUid, Long roomUid, Long radishNum, Integer giftId, Integer giftNum) { - boolean result = userWalletService.updateCurrencyFromDB(sendUid, -radishNum, Constant.WalletCurrencyType.radish); - if (!result) { - UserWallet userWalletFromDB = userWalletService.getUserWalletByCurrencyTypeFromDb(sendUid, Constant.WalletCurrencyType.radish); - UserWallet userWalletFromCache = userWalletService.getUserWalletCachByCurrencyType(sendUid, Constant.WalletCurrencyType.radish); - logger.warn("updateCurrencyFromDB error, sendUid=" + sendUid + ", receiveUid=" + receiveUid + ", roomUid=" - + roomUid + ", giftId=" + giftId + ", giftNum=" + giftNum - + ", cacheAmount=" + userWalletFromCache.getAmount() + ", DBAmount=" + userWalletFromDB.getAmount()); - } - - } - - /** - * 更新用户魅力值 - * - * @param uid - * @param num - */ - private void updateLevelCharm(Long uid, Long num) { - jedisService.hincrBy(RedisKey.user_level_charm.getKey(), uid.toString(), num); - jedisService.hdel(RedisKey.user_summary.getKey(), uid.toString()); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/RadishSendService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/RadishSendService.java deleted file mode 100644 index a7ff86795..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/RadishSendService.java +++ /dev/null @@ -1,165 +0,0 @@ -package com.accompany.business.service.gift; - -import com.accompany.business.message.RadishGiftMessage; -import com.accompany.business.model.Gift; -import com.accompany.business.service.mq.RocketMQService; -import com.accompany.business.service.purse.UserWalletService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.service.user.UserBackpackService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.radish.RadishGiftSendVo; -import com.accompany.business.vo.user.BasicUserVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.UUIDUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.base.BaseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/21 15:50 - * 4 - */ -@Service -public class RadishSendService extends BaseService { - @Autowired - private RoomService roomService; - @Autowired - private GiftService giftService; - @Autowired - private UserWalletService userWalletService; - @Autowired - private RocketMQService rocketMQService; - @Autowired - private UsersService usersService; - @Autowired - private UserBackpackService userBackpackService; - @Autowired - private GiftSendService giftSendService; - - public RadishGiftSendVo sendRadishGift(long sendUid, Long[] receiveUids, Long roomUid, int giftId, int giftNum, String msg, int giftSource, byte sendType) { - - Users users = usersService.getUsersByUid(sendUid); - if(users == null){ - throw new ServiceException(BusiStatus.USERNOTEXISTS); - } - // 房间内送礼物，获取当前房间的信息，若不存在则返回 - Byte roomType = null; - if (roomUid != null) { - Room room = roomService.getRoomByUid(roomUid); - if (room == null) { - logger.error("sendRadishGift room is null,roomUid={}", roomUid); - throw new ServiceException(BusiStatus.ROOMNOTEXIST); - } - roomType = room.getType(); - } - - Gift gift = giftSendService.getValidGiftById(giftId,giftSource); - if (gift == null || gift.getConsumeType() != Constant.GiftConsumeType.RADISH_GIFT) { - throw new ServiceException(BusiStatus.GIFTDOWNORNOTEXISTS); - } - - if (gift.getGiftType() != null && gift.getGiftType() == Constant.GiftType.CARDS) { - throw new ServiceException(BusiStatus.GIFT_IS_NOT_ALLOWED_TO_BE_SENT); - } - long radishPrice = gift.getGoldPrice();//萝卜价格 - long everyRadishNum = Math.abs(radishPrice * giftNum); // 礼物萝卜总数，相对于每一次发送者 - long totalRadishNum = Math.abs(everyRadishNum * receiveUids.length); // 礼物萝卜总数， - // 扣减库存 - reduceStock(sendUid,gift.getGiftId(),totalRadishNum,giftNum * receiveUids.length,giftSource); - - // 循环发送礼物消息到MQ处理 - for (int i = 0; i < receiveUids.length; i++) { - sendGiftMessageMQ(sendUid, receiveUids[i], roomUid, giftId, giftNum, everyRadishNum, - sendType, roomType, msg, giftSource); - } - return this.buildRadishGiftSendVo(sendUid, receiveUids, giftId, gift, giftNum); - } - - /** - * 扣减库存 - * @param sendUid - * @param giftId - * @param totalRadishNum - * @param totalGiftNum - * @param giftSource - */ - private void reduceStock(long sendUid, int giftId, Long totalRadishNum, int totalGiftNum, int giftSource){ - switch (giftSource){ - case Constant.GiftSource.COMMON : - userWalletService.updateCurrencyFromCache(sendUid, -totalRadishNum, Constant.WalletCurrencyType.radish);//扣减钱包 - break; - case Constant.GiftSource.BACKPACK : - userBackpackService.reduceBackpackGift(sendUid, giftId, totalGiftNum); - break; - default: throw new ServiceException(BusiStatus.PARAMETERILLEGAL); - } - } - - /** - * 发送礼物消息到MQ处理 - */ - private void sendGiftMessageMQ(long sendUid, long receiveUid, Long roomUid, int giftId, int giftNum, Long radishNum, - byte sendType, Byte roomType, String msg, int giftSource) { - RadishGiftMessage message = buildRadishGiftMessage(sendUid, receiveUid, roomUid, giftId, giftNum, radishNum, - sendType, roomType, msg, giftSource); - // 缓存消息的消费状态，便于队列消息做幂等处理 - jedisService.hwrite(RedisKey.mq_radish_gift_status.getKey(), message.getMessId(), gson.toJson(message)); - rocketMQService.sendRadishGiftMessage(message); - } - - private RadishGiftMessage buildRadishGiftMessage(Long sendUid, Long receiveUid, Long roomUid, Integer giftId, Integer giftNum, - Long radishNum, Byte sendType, Byte roomType, String msg, Integer giftSource) { - RadishGiftMessage message = new RadishGiftMessage(); - message.setSendUid(sendUid); - message.setReceiveUid(receiveUid); - message.setRoomUid(roomUid); - message.setRadishNum(radishNum); - message.setGiftId(giftId); - message.setGiftNum(giftNum); - message.setRoomType(roomType); - message.setSendType(sendType); - message.setMessId(UUIDUtil.get()); - message.setMessTime(System.currentTimeMillis()); - message.setMsg(msg); - message.setGiftSource(giftSource); - return message; - } - - private RadishGiftSendVo buildRadishGiftSendVo(long sendUid, Long[] receiveUids, int giftId, Gift gift, int giftNum) { - RadishGiftSendVo sendVo = new RadishGiftSendVo(); - Users users = usersService.getUsersByUid(sendUid); - if (users != null) { - sendVo.setNick(users.getNick()); - sendVo.setAvatar(users.getAvatar()); - } - sendVo.setUid(sendUid); - sendVo.setGiftId(giftId); - if (gift != null) { - sendVo.setGift(giftService.getGiftVoByGift(gift)); - } - sendVo.setGiftNum(giftNum); - List targetUsers = new ArrayList<>(); - for (Long uid : receiveUids) { - Users user = this.usersService.getUsersByUid(uid); - BasicUserVo userVo = new BasicUserVo(); - if (user != null) { - userVo.setUid(user.getUid()); - userVo.setNick(user.getNick()); - userVo.setAvatar(user.getAvatar()); - targetUsers.add(userVo); - } - } - sendVo.setTargetUsers(targetUsers); - return sendVo; - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mq/RocketMQService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mq/RocketMQService.java index d32c59918..16cdbdb4c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mq/RocketMQService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mq/RocketMQService.java @@ -72,18 +72,6 @@ public class RocketMQService { }); } - /** - * 发送萝卜礼物消息 - * - * @param message - */ - public void sendRadishGiftMessage(RadishGiftMessage message) { - mqMessageProducer.send(MqConstant.RADISH_GIFT_TOPIC, message, sendResult -> log.info("sendRadishGiftMessage success message: {}", JSON.toJSONString(message)), throwable -> { - log.error("sendRadishGiftMessage fail message: {}", JSON.toJSONString(message), throwable); - //SpringContextHolder.getBean(RadishGiftMessageMQListener.class).onMessage(message); - }); - } - /** * 支付完成的消息，发送到MQ * diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserWalletService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserWalletService.java deleted file mode 100644 index 33ba9f15e..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserWalletService.java +++ /dev/null @@ -1,299 +0,0 @@ -package com.accompany.business.service.purse; - -import com.accompany.business.model.RadishBill; -import com.accompany.business.model.UserWallet; -import com.accompany.business.model.UserWalletExample; -import com.accompany.business.model.UserWalletWater; -import com.accompany.business.mybatismapper.UserWalletMapper; -import com.accompany.business.mybatismapper.UserWalletMapperMgr; -import com.accompany.business.mybatismapper.UserWalletWaterMapper; -import com.accompany.business.service.radish.RadishBillService; -import com.accompany.business.vo.user.UserWalletVo; -import com.accompany.common.annotation.Frozen; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.BlankUtil; -import com.accompany.common.utils.UUIDUtil; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisLockService; -import com.accompany.core.util.StringUtils; -import com.alibaba.fastjson.JSON; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.Date; -import java.util.List; - - -@Service -public class UserWalletService extends BaseService { - - @Autowired - private UserWalletMapper userWalletMapper; - @Autowired - private JedisLockService jedisLockService; - @Autowired - private RadishBillService radishBillService; - @Autowired - private UserWalletMapperMgr userWalletMapperMgr; - @Autowired - private UserWalletWaterMapper userWalletWaterMapper; - - /** - * 更新某货币钱包 - * - * @param uid 用户uid - * @param targetUid - * @param roomUid - * @param billType - ** @param amount 正数增加，负数扣减 - * @param currencyType 货币类型 - * @param giftId - * @param giftNum - * @param objId - * @return 账单记录 - * @throws Exception - */ - @Transactional(rollbackFor = Exception.class) - public RadishBill updateCurrencyDbAndCache(Long uid, Long targetUid, Long roomUid, byte billType, Long amount, - byte currencyType, Integer giftId, Integer giftNum, String objId) throws Exception { - String lockVal = null; - lockVal = jedisLockService.lock(RedisKey.lock_user_currency.getKey(uid.toString()), 10 * 1000); - if (BlankUtil.isBlank(lockVal)) { - throw new ServiceException(BusiStatus.SERVER_BUSY); - } - logger.info("updateCurrencyDbAndCache in : uid = {},targetUid = {},roomUid = {},billType = {}," + - "amount = {},currencyType = {},giftId = {},giftNum = {},objId= {}", - uid, targetUid, roomUid, billType, amount, currencyType, giftId, giftNum, objId); - // 当前钱包 用于回滚 - UserWallet beforeWallet = getWalletIfNullInit(uid, currencyType); - // 钱包缓存 - UserWallet userWallet = getWalletIfNullInit(uid, currencyType); - logger.info("updateCurrencyDbAndCache uid:{}, amount:{},currencyType:{},useStatus:{}；request parameters: amount:{}, currencyType:{}", uid - , userWallet.getAmount(), userWallet.getCurrencyType(), userWallet.getUseStatus(), amount, currencyType); - try { - Long beforeAmount = userWallet.getAmount(); - // 更新钱包 - updateWallet(userWallet,beforeAmount,amount); - // 增加账单 - RadishBill radishBill = this.radishBillService.insertRadishBillRecord(uid,targetUid, roomUid,billType,amount, - currencyType,giftId,giftNum,objId); - // 新增钱包流水 - saveUserWalletWater(uid, currencyType,beforeAmount, amount, userWallet.getAmount(),radishBill.getBillId(), - amount >= 0 ? Constant.WalletUpdateType.increase : Constant.WalletUpdateType.reduce); - return radishBill; - } catch (Exception e) { - logger.error("updateCurrencyDbAndCache error: uid = {},targetUid = {},roomUid = {},billType = {}," + - "amount = {},currencyType = {},giftId = {},giftNum = {},objId= {}", - uid, targetUid, roomUid, billType, amount, currencyType, giftId, giftNum, objId, e); - rollbackWallet(beforeWallet); - throw e; - } finally { - jedisLockService.unlock(RedisKey.lock_user_currency.getKey(uid.toString()), lockVal); - } - } - - private void updateWallet(UserWallet userWallet,Long beforeAmount,Long amount){ - // 更新钱包 - if (beforeAmount + amount < 0) { - throw new ServiceException(BusiStatus.WALLET_AMOUNT_NOT_ENOUGH); - } - userWallet.setAmount(beforeAmount + amount); - userWallet.setUpdateTime(new Date()); - if(userWallet.getWalletId() == null){ - // 新增钱包记录 - updateUserWallet(userWallet); - return; - } - // 更新钱包DB - boolean flag = updateCurrencyFromDB(userWallet.getUid(), amount, userWallet.getCurrencyType()); - if(flag){ - logger.info("updateWallet userWallet={},beforeAmount={},amount={}",userWallet,beforeAmount,amount); - saveUserWalletCache(userWallet); - }else{ - UserWallet userWalletFromDB = getUserWalletByCurrencyTypeFromDb(userWallet.getUid(), userWallet.getCurrencyType()); - UserWallet userWalletFromCache = getUserWalletCachByCurrencyType(userWallet.getUid(),userWallet.getCurrencyType()); - logger.error("updateCurrencyFromDB error, uid=" + userWallet.getUid() + ", amount=" + amount + ", currencyType=" - + userWallet.getCurrencyType() + ", cache=" + JSON.toJSONString(userWalletFromCache) - + ", DB=" + JSON.toJSONString(userWalletFromDB)); - if(userWalletFromDB !=null && userWalletFromDB.getAmount() + amount < 0){ - throw new ServiceException(BusiStatus.WALLET_AMOUNT_NOT_ENOUGH); - } - throw new ServiceException(BusiStatus.WALLET_ERROR); - } - - } - - /** - * 获取用户钱包缓存，如果不存在，初始化一个钱包，注：未更新DB - * - * @param uid - * @return - */ - private UserWallet getWalletIfNullInit(Long uid, byte currencyType) { - UserWallet userWallet = getUserWalletCachByCurrencyType(uid, currencyType); - if (userWallet == null) { - userWallet = getUserWalletByCurrencyTypeFromDb(uid, currencyType); - if (userWallet == null) { - userWallet = new UserWallet(); - userWallet.setUid(uid); - userWallet.setAmount(0L); - userWallet.setCurrencyType(currencyType); - userWallet.setUseStatus(Constant.WalletStatus.normal); - userWallet.setCreateTime(new Date()); - userWallet.setUpdateTime(userWallet.getCreateTime()); - } - } - return userWallet; - } - - public UserWallet getUserWalletCachByCurrencyType(Long uid, Byte currencyType) { - String walletStr = jedisService.hget(RedisKey.user_wallet.getKey(currencyType.toString()), uid.toString()); - logger.info("getUserWalletCachByCurrencyType,uid={},currencyType={},wallet={}",uid,currencyType,walletStr); - if (StringUtils.isEmpty(walletStr)) { - return null; - } - return gson.fromJson(walletStr, UserWallet.class); - } - - public UserWallet getUserWalletByCurrencyTypeFromDb(Long uid, byte currencyType) { - UserWalletExample example = new UserWalletExample(); - example.createCriteria() - .andUidEqualTo(uid) - .andCurrencyTypeEqualTo(currencyType) - .andDeletedEqualTo(Boolean.FALSE); - List userWalletList = userWalletMapper.selectByExample(example); - UserWallet userWallet = CollectionUtils.isEmpty(userWalletList) ? null : userWalletList.get(0); - logger.info("getUserWalletByCurrencyTypeFromDb,uid={},currencyType={},wallet={}",uid,currencyType,gson.toJson(userWallet)); - return userWallet; - } - - - public void updateUserWallet(UserWallet userWallet) { - if(userWallet.getWalletId() == null){ - userWalletMapper.insertSelective(userWallet); - }else{ - userWalletMapper.updateByPrimaryKeySelective(userWallet); - } - saveUserWalletCache(userWallet); - } - - public void saveUserWalletCache(UserWallet userWallet) { - if (userWallet == null) { - return; - } - jedisService.hset(RedisKey.user_wallet.getKey(userWallet.getCurrencyType().toString()), - userWallet.getUid().toString(), - gson.toJson(userWallet)); - logger.info("saveUserWalletCache,userWallet={}",gson.toJson(userWallet)); - - } - - /** - * 保存钱包流水 mongo - * - * @param uid - * @param currencyType - * @param beforeAmount - * @param updateAmount - * @param afterAmount - */ - public void saveUserWalletWater(Long uid, byte currencyType, Long beforeAmount, - Long updateAmount, Long afterAmount, String billId, byte updateType) { - Date now = new Date(); - UserWalletWater walletWater = new UserWalletWater(); - walletWater.setRecordId(UUIDUtil.get()); - walletWater.setUid(uid); - walletWater.setCurrencyType(currencyType); - walletWater.setBeforeAmount(beforeAmount); - walletWater.setUpdateAmount(updateAmount); - walletWater.setAfterAmount(afterAmount); - walletWater.setBillId(billId); - walletWater.setUpdateType(updateType); - walletWater.setCreateTime(now); - walletWater.setUpdateTime(now); - userWalletWaterMapper.insert(walletWater); - logger.info("saveUserWalletWater,uid={},currencyType={},beforeAmount={},updateAmount={},afterAmount={},billId={},updateType={}", - uid, currencyType, beforeAmount,updateAmount, afterAmount, billId, updateType); - } - - public UserWalletVo getUserWalletVo(Long uid, byte currencyType) { - UserWallet userWallet = this.getWalletIfNullInit(uid, currencyType); - updateUserWallet(userWallet); - return buildUserWalletVo(userWallet); - } - - private UserWalletVo buildUserWalletVo(UserWallet userWallet) { - UserWalletVo vo = null; - if (userWallet != null) { - vo = new UserWalletVo(); - vo.setUid(userWallet.getUid()); - vo.setAmount(userWallet.getAmount()); - vo.setCurrencyType(userWallet.getCurrencyType()); - vo.setUseStatus(userWallet.getUseStatus()); - } - return vo; - } - - @Frozen - public void updateCurrencyFromCache(Long uid, Long amount, byte currencyType) { - String lockVal = null; - lockVal = jedisLockService.lock(RedisKey.lock_user_currency.getKey(uid.toString()), 8*1000,10 * 1000); - if (BlankUtil.isBlank(lockVal)) { - throw new ServiceException(BusiStatus.SERVER_BUSY); - } - try { - UserWallet userWallet = getWalletIfNullInit(uid, currencyType); - logger.info("updateCurrencyFromCache before uid:{}, amount:{},currencyType:{},useStatus:{},request parameters: amount:{}, currencyType:{}", uid - , userWallet.getAmount(), userWallet.getCurrencyType(), userWallet.getUseStatus(), amount, currencyType); - - // 更新钱包 - Long beforeAmount = userWallet.getAmount(); - if (userWallet.getWalletId() == null || beforeAmount + amount < 0) { - logger.error("updateCurrencyFromCache error.code:{}, uid:{}, amount:{},currencyType:{},useStatus:{},request parameters: amount:{}, currencyType:{}", - BusiStatus.WALLET_AMOUNT_NOT_ENOUGH.value(), uid, userWallet.getAmount(), userWallet.getCurrencyType(), - userWallet.getUseStatus(), amount, currencyType); - throw new ServiceException(BusiStatus.WALLET_AMOUNT_NOT_ENOUGH); - } - userWallet.setAmount(beforeAmount + amount); - userWallet.setUpdateTime(new Date()); - this.saveUserWalletCache(userWallet); - logger.info("updateCurrencyFromCache after : {}",gson.toJson(getWalletIfNullInit(uid, currencyType))); - } catch (Exception e) { - logger.error("updateCurrencyFromCache uid:" + uid + ", amount: " + amount, e); - throw e; - } finally { - jedisLockService.unlock(RedisKey.lock_user_currency.getKey(uid.toString()), lockVal); - } - } - - public boolean updateCurrencyFromDB(Long uid, Long amount, byte currencyType) { - logger.info("updateCurrencyFromDB uid:{}, amount:{},currencyType:{}", uid, amount, currencyType); - return userWalletMapperMgr.updateUserWallet(uid,amount,currencyType) > 0; - } - - /** - * 回滚钱包缓存 - * @param beforeWallet - */ - private void rollbackWallet(UserWallet beforeWallet){ - if(beforeWallet == null ){ - return; - } - UserWallet afterWallet = getWalletIfNullInit(beforeWallet.getUid(), beforeWallet.getCurrencyType()); - if(beforeWallet.getAmount().equals(afterWallet.getAmount())){ - return; - } - if(beforeWallet.getWalletId()==null && afterWallet.getWalletId()!=null){ - this.jedisService.hdel(RedisKey.user_wallet.getKey(beforeWallet.getCurrencyType().toString()), - beforeWallet.getUid().toString()); - }else if(beforeWallet.getWalletId()!=null){ - beforeWallet.setUpdateTime(new Date()); - saveUserWalletCache(beforeWallet); - } - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/radish/RadishBillService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/radish/RadishBillService.java deleted file mode 100644 index 6a2957c02..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/radish/RadishBillService.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.accompany.business.service.radish; - -import com.accompany.business.constant.RadishBillTypeEnum; -import com.accompany.business.model.RadishBill; -import com.accompany.business.model.RadishBillExample; -import com.accompany.business.mybatismapper.RadishBillMapper; -import com.accompany.core.service.base.BaseService; -import com.accompany.business.vo.radish.RadishBillRecordVo; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.accompany.common.utils.UUIDUtil; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/19 18:35 - * 4 - */ -@Service -public class RadishBillService extends BaseService { - @Autowired - private RadishBillMapper radishBillMapper; - - - private List getRecordList(Long uid, Integer page, Integer pageSize, Date date, List billType) { - RadishBillExample example = new RadishBillExample(); - example.setOffset((page - 1) * pageSize); - example.setLimit(pageSize); - example.setOrderByClause("create_time desc"); - RadishBillExample.Criteria criteria = example.createCriteria(); - criteria.andDeletedEqualTo(false); - if (uid != null) { - criteria.andUidEqualTo(uid); - } - if (CollectionUtils.isNotEmpty(billType)) { - criteria.andBillTypeIn(billType); - } - if (date != null) { - criteria.andCreateTimeLessThan(date); - } - return radishBillMapper.selectByExample(example); - } - - public List>> getRadishBillRecordVoList(Long uid, Integer page, Integer pageSize, Long date, Byte type) { - Date nextDate = DateTimeUtil.getNextDay(new Date(date), 1); - List billType = getBillType(type); - page = page == null || page < 1 ? Constant.DEFAULT_PAGE : page; - pageSize = pageSize == null || pageSize < 1 ? Constant.DEFAULT_PAGE_SIZE : pageSize; - List billList = this.getRecordList(uid, page, pageSize, nextDate, billType); - return this.buildRadishBillRecordVo(billList, type); - - } - - private List getBillType(Byte type) { - List billType = Lists.newArrayList(); - for(RadishBillTypeEnum billTypeEnum:RadishBillTypeEnum.values()){ - if (billTypeEnum.getPayType() == type) { - billType.add(billTypeEnum.getValue()); - } - } - return billType; - } - - private List>> buildRadishBillRecordVo(List recordList, Byte type) { - if (CollectionUtils.isEmpty(recordList)) { - return Collections.EMPTY_LIST; - } - LinkedHashMap> voMap = Maps.newLinkedHashMap(); - String amountStr = Constant.RadishBillPayType.PAY == type ? "" : "+"; - for (RadishBill record : recordList) { - Date date1 = DateTimeUtil.getDate(record.getCreateTime()); - List voList = voMap.get(date1.getTime()); - if (CollectionUtils.isEmpty(voList)) { - voList = Lists.newArrayList(); - voMap.put(date1.getTime(), voList); - } - RadishBillRecordVo vo = new RadishBillRecordVo(); - vo.setAmountStr(amountStr + record.getAmount()); - vo.setCurrencyStr("萝卜"); - vo.setCreateTime(record.getCreateTime().getTime()); - vo.setDate(date1.getTime()); - RadishBillTypeEnum billTypeEnum = RadishBillTypeEnum.get(record.getBillType()); - vo.setDescribeStr(billTypeEnum == null ? "" : billTypeEnum.getDesc()); - voList.add(vo); - } - List>> reList = Lists.newArrayList(); - Set keySet = voMap.keySet(); - for (Long key : keySet) { - LinkedHashMap> map = Maps.newLinkedHashMap(); - map.put(key, voMap.get(key)); - reList.add(map); - } - return reList; - } - - /** - * 账单记录 - * - * @param uid - * @param targetUid - * @param roomUid - * @param objId - * @param billType - * @param currencyType - * @param giftId - * @param giftNum - * @param amount - * @return - */ - public RadishBill insertRadishBillRecord(Long uid, Long targetUid, Long roomUid, byte billType, Long amount, - byte currencyType, Integer giftId, Integer giftNum, String objId) { - RadishBill radishBill = new RadishBill(); - radishBill.setBillId(UUIDUtil.get()); - radishBill.setUid(uid); - radishBill.setTargetUid(targetUid); - radishBill.setRoomUid(roomUid); - radishBill.setBillType(billType); - radishBill.setAmount(amount); - radishBill.setCurrencyType(currencyType); - radishBill.setGiftId(giftId); - radishBill.setGiftNum(giftNum); - radishBill.setObjId(objId); - radishBill.setCreateTime(new Date()); - radishBill.setUpdateTime(new Date()); - radishBillMapper.insertSelective(radishBill); - return radishBill; - } - - public int updateRadishBillRecord(RadishBill radishBill){ - if(radishBill.getBillId() == null){ - radishBill.setCreateTime(new Date()); - return radishBillMapper.insertSelective(radishBill); - }else{ - radishBill.setUpdateTime(new Date()); - return radishBillMapper.updateByPrimaryKeySelective(radishBill); - } - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/radish/RadishGiftSendRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/radish/RadishGiftSendRecordService.java deleted file mode 100644 index 5df8d4a02..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/radish/RadishGiftSendRecordService.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.accompany.business.service.radish; - -import com.accompany.business.model.Gift; -import com.accompany.business.model.RadishGiftSendRecord; -import com.accompany.business.model.RadishGiftSendRecordExample; -import com.accompany.business.mybatismapper.RadishGiftSendRecordMapper; -import com.accompany.business.service.gift.GiftService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.radish.RadishGiftRecordVo; -import com.accompany.common.constant.Constant; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; -import com.accompany.core.service.base.BaseService; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/19 18:35 - * 4 - */ -@Service -public class RadishGiftSendRecordService extends BaseService { - @Autowired - private RadishGiftSendRecordMapper giftSendRecordMapper; - @Autowired - private GiftService giftService; - @Autowired - private UsersService usersService; - - private List getRecordList(Long uid, Long receiveUid, Integer page, Integer pageSize, Date date) { - RadishGiftSendRecordExample example = new RadishGiftSendRecordExample(); - example.setOffset((page - 1) * pageSize); - example.setLimit(pageSize); - example.setOrderByClause("create_time desc"); - RadishGiftSendRecordExample.Criteria criteria = example.createCriteria(); - criteria.andDeletedEqualTo(false); - if (uid != null) { - criteria.andUidEqualTo(uid); - } - if (receiveUid != null) { - criteria.andReceiveUidEqualTo(receiveUid); - } - - if (date != null) { - criteria.andCreateTimeLessThan(date); - } - return giftSendRecordMapper.selectByExample(example); - } - - public List>> getRadishGiftRecordVoList(Long uid, Integer page, Integer pageSize, Long date, Byte type) { - Date nextDate = DateTimeUtil.getNextDay(new Date(date), 1); - List recordList = new ArrayList<>(); - page = page == null || page < 1 ? Constant.DEFAULT_PAGE : page; - pageSize = pageSize == null || pageSize < 1 ? Constant.DEFAULT_PAGE_SIZE : pageSize; - if (Constant.RadishGiftRecordType.SEND == type) {//赠送记录 - recordList = getRecordList(uid, null, page, pageSize, nextDate); - } else if (Constant.RadishGiftRecordType.RECEIVE == type) {//接收记录 - recordList = getRecordList(null, uid, page, pageSize, nextDate); - } - return this.buildRadishGiftRecordVo(recordList, type); - - } - - private List>> buildRadishGiftRecordVo(List recordList, Byte type) { - if (CollectionUtils.isEmpty(recordList)) { - return Collections.EMPTY_LIST; - } - LinkedHashMap> voMap = Maps.newLinkedHashMap(); - - List giftIds = recordList.stream().map(record -> record.getGiftId()).collect(Collectors.toList()); - List gifts = giftService.getGiftByIdsFromDb(giftIds); - Map giftMap = gifts.stream().collect(Collectors.toMap(Gift::getGiftId, a -> a)); - List uids = new ArrayList<>(); - if(Constant.RadishGiftRecordType.SEND == type){ - uids = recordList.stream().map(user -> user.getReceiveUid().toString()).collect(Collectors.toList()); - }else if (Constant.RadishGiftRecordType.RECEIVE == type) {//接收记录 - uids = recordList.stream().map(user -> user.getUid().toString()).collect(Collectors.toList()); - } - Map usersMap = usersService.getUsersMapBatch(uids.toArray(new String[uids.size()])); - - String amountStr = Constant.RadishGiftRecordType.SEND == type ? "-" : ""; - String describeStr = Constant.RadishGiftRecordType.SEND == type ? "收礼人：" : "送礼人："; - for (RadishGiftSendRecord record : recordList) { - Date date1 = DateTimeUtil.getDate(record.getCreateTime()); - List voList = voMap.get(date1.getTime()); - if (CollectionUtils.isEmpty(voList)) { - voList = Lists.newArrayList(); - voMap.put(date1.getTime(), voList); - } - RadishGiftRecordVo vo = new RadishGiftRecordVo(); - vo.setRecordId(record.getRecordId()); - vo.setGiftId(record.getGiftId()); - vo.setGiftNum(record.getGiftNum()); - vo.setAmountStr(amountStr + record.getRadishAmount()); - vo.setCurrencyStr("萝卜"); - vo.setCreateTime(record.getCreateTime().getTime()); - vo.setDate(date1.getTime()); - Gift gift = giftMap.get(record.getGiftId()); - if (gift != null) { - vo.setGiftName(gift.getGiftName()); - vo.setGiftPicUrl(gift.getPicUrl()); - } - Long uid = Constant.RadishGiftRecordType.SEND == type ? record.getReceiveUid() : record.getUid(); - Users users = usersMap.get(uid); - if (users != null) { - vo.setDescribeStr(describeStr + users.getNick()); - } - voList.add(vo); - - } - List>> reList = Lists.newArrayList(); - Set keySet = voMap.keySet(); - for (Long key : keySet) { - LinkedHashMap> map = Maps.newLinkedHashMap(); - map.put(key, voMap.get(key)); - reList.add(map); - } - return reList; - } - - public Long insertRadishGiftSendRecord(Long uid, Long receiveUid, Long roomUid, Integer giftId, Integer giftNum, - Integer radishAmount, Byte roomType, Byte giftSource, Byte sendEnv) { - RadishGiftSendRecord record = new RadishGiftSendRecord(); - record.setUid(uid); - record.setReceiveUid(receiveUid); - record.setRoomUid(roomUid); - record.setGiftId(giftId); - record.setGiftNum(giftNum); - record.setRadishAmount(radishAmount); - record.setRoomType(roomType); - record.setGiftSource(giftSource); - record.setSendEnv(sendEnv); - record.setDeleted(false); - record.setCreateTime(new Date()); - record.setUpdateTime(new Date()); - giftSendRecordMapper.insert(record); - return record.getRecordId(); - } - - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/radish/UserRadishGiftWallService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/radish/UserRadishGiftWallService.java deleted file mode 100644 index 534752db6..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/radish/UserRadishGiftWallService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.accompany.business.service.radish; - -import com.accompany.business.model.UserRadishGiftWall; -import com.accompany.business.mybatismapper.UserRadishGiftWallMapper; -import com.accompany.business.mybatismapper.UserRadishGiftWallMapperMgr; -import com.accompany.core.service.base.BaseService; -import com.accompany.business.vo.radish.UserRadishGiftWallVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/19 18:35 - * 4 - */ -@Service -public class UserRadishGiftWallService extends BaseService { - @Autowired - private UserRadishGiftWallMapper userRadishGiftWallMapper; - - @Autowired - private UserRadishGiftWallMapperMgr userRadishGiftWallMapperMgr; - - public List getUserRadishGiftWall(Long uid) { - return userRadishGiftWallMapperMgr.getUserRadishWallListByUid(uid); - } - - public boolean updateRadishGiftWallCount(Long uid, Integer giftId, Integer giftNum) { - UserRadishGiftWall userGiftWall = new UserRadishGiftWall(); - userGiftWall.setGiftId(giftId); - userGiftWall.setUid(uid); - userGiftWall.setReceiveCount(giftNum); - int updateCount = userRadishGiftWallMapperMgr.updateRadishGiftWallCount(userGiftWall); - if (updateCount == 0) { - userGiftWall.setCreateTime(new Date()); - userRadishGiftWallMapper.insert(userGiftWall); - } - return true; - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/UserPacketRecord2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/UserPacketRecord2Service.java deleted file mode 100644 index 55f166892..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/UserPacketRecord2Service.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.accompany.business.service.record; - -import com.accompany.business.model.UserPacketRecord; -import com.accompany.business.mybatismapper.UserPacketRecordExpand; -import com.accompany.business.vo.BillSearchVo; -import com.accompany.business.vo.PacketRecordVo; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.accompany.common.utils.DateTimeUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; - -@Service -public class UserPacketRecord2Service { - - @Autowired - private UserPacketRecordExpand userPacketRecordExpand; - - - public List getUserPacketRecord(long uid, long date, int page, int size) { - Date nextDate = DateTimeUtil.getNextDay(new Date(date), 1); - return userPacketRecordExpand.getRecordByDate(uid, nextDate, (page - 1) * size, size); - } - - /** - * 获取提现红包的记录 - * - * @param uid - * @param date - * @param page - * @param size - * @return - */ - public List getPacketDeposiRecord(long uid, long date, int page, int size) { - Date nextDate = DateTimeUtil.getNextDay(new Date(date), 1); - return userPacketRecordExpand.getDepositRecordByDate(uid, nextDate, (page - 1) * size, size); - } - - public List>> transToSearchVo(List list) { - LinkedHashMap> voMap = Maps.newLinkedHashMap(); - for (UserPacketRecord record : list) { - Date date1 = DateTimeUtil.getDate(record.getCreateTime()); - List voList = voMap.get(date1.getTime()); - if (voList == null) { - voList = Lists.newArrayList(); - voMap.put(date1.getTime(), voList); - } - PacketRecordVo searchVo = new PacketRecordVo(); - searchVo.setDate(date1.getTime()); - searchVo.setRecordTime(record.getCreateTime().getTime()); - searchVo.setPacketNum(record.getPacketNum()); - searchVo.setTypeStr(transTypeStr(record.getType())); - searchVo.setUid(record.getUid()); - voList.add(searchVo); - } - List>> reList = Lists.newArrayList(); - Set keySet = voMap.keySet(); - for (Long key : keySet) { - LinkedHashMap> map = Maps.newLinkedHashMap(); - map.put(key, voMap.get(key)); - reList.add(map); - } - return reList; - } - - /** - * 转换红包类型为文字的格式 - * - * @param type 红包类型,1申请成为分享小能手，新人红包 2分享动作 分享红包，3分享后用户注册 邀请红包，4注册用户充值抽成 分成红包 - * @return - */ - public String transTypeStr(int type) { - switch (type) { - case 1: - return "新人红包"; - case 2: - return "分享红包"; - case 3: - return "邀请红包"; - case 4: - return "分成红包"; - case 5: - return "提现红包"; - } - return "其它红包"; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatPacketActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatPacketActivityService.java deleted file mode 100644 index 0d14bff63..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatPacketActivityService.java +++ /dev/null @@ -1,296 +0,0 @@ -package com.accompany.business.service.statis; - -import com.accompany.business.model.StatPacketActivity; -import com.accompany.business.model.StatPacketActivityExample; -import com.accompany.business.model.UserPacket; -import com.accompany.business.mybatismapper.StatPacketActivityMapper; -import com.accompany.business.mybatismapper.UserPacketMapperMgr; -import com.accompany.business.service.user.UserPacketService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.*; -import com.accompany.common.constant.Constant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.model.Users; -import com.google.common.collect.Lists; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -/** - * Created by liuguofu on 2017/9/15. - */ -@Service -public class StatPacketActivityService { - - @Autowired - private StatPacketActivityMapper statPacketActivityMapper; - - @Autowired - private UserPacketService userPacketService; - @Autowired - private UsersService usersService; - @Autowired - private UserPacketMapperMgr userPacketMapperMgr; - private static DecimalFormat doubleFormat = new DecimalFormat("0.00"); - public void updateStatPacketAcitivtyByShare(Long uid){ - StatPacketActivity statPacketActivity=statPacketActivityMapper.selectByPrimaryKey(uid); - if(statPacketActivity==null){ - statPacketActivity=getStatPacketActivityByUid(uid); - } - Date date=new Date(); - int shareCount=statPacketActivity.getShareCount(); - shareCount++; - int packetCount=statPacketActivity.getPacketCount(); - packetCount++; - int sharePacketCount=statPacketActivity.getSharePacketCount(); - sharePacketCount++; - statPacketActivity.setUid(uid); - statPacketActivity.setShareCount(shareCount); - statPacketActivity.setPacketCount(packetCount); - statPacketActivity.setSharePacketCount(sharePacketCount); - statPacketActivity.setLatestShareDate(date); - statPacketActivityMapper.updateByPrimaryKeySelective(statPacketActivity); - - } - public void updateStatPacketActivityByRegister(Long uid){ - StatPacketActivity statPacketActivity=statPacketActivityMapper.selectByPrimaryKey(uid); - if(statPacketActivity==null){ - statPacketActivity=getStatPacketActivityByUid(uid); - } - Date date=new Date(); - int registerCout=statPacketActivity.getRegisterCout(); - registerCout++; - int packetCount=statPacketActivity.getPacketCount(); - packetCount++; - int todayRegisterCount=statPacketActivity.getTodayRegisterCount(); - - Date latestRegisterDate=statPacketActivity.getLatestRegisterDate(); - if(DateTimeUtil.checkIsToday(latestRegisterDate)){//今日新增注册，如果最近的一次注册日期是今天，则今日注册数量+1，如果不是，则今天注册数量为1 - todayRegisterCount++; - }else{ - todayRegisterCount=1; - } - statPacketActivity.setUid(uid); - statPacketActivity.setRegisterCout(registerCout); - statPacketActivity.setTodayRegisterCount(todayRegisterCount); - statPacketActivity.setPacketCount(packetCount); - statPacketActivity.setLatestRegisterDate(date); - statPacketActivityMapper.updateByPrimaryKeySelective(statPacketActivity); - } - public void updateStatPacketActivityByBouns(Long uid,double chargeBouns){ - StatPacketActivity statPacketActivity=statPacketActivityMapper.selectByPrimaryKey(uid); - if(statPacketActivity==null){ - statPacketActivity=getStatPacketActivityByUid(uid); - } - Date date=new Date(); - statPacketActivity.setUid(uid); - Double chargeBounsDb= statPacketActivity.getChargeBonus()==null?0:statPacketActivity.getChargeBonus(); - statPacketActivity.setChargeBonus(chargeBouns+chargeBounsDb); - statPacketActivity.setUpdateTime(date); - Date latestChargeBonusDate=statPacketActivity.getLatestChargeBonusDate(); - Double todayChargeBonus=statPacketActivity.getTodayChargeBonus(); - if(todayChargeBonus==null){ - todayChargeBonus=0.0; - } - if(DateTimeUtil.checkIsToday(latestChargeBonusDate)){//今日新增分成 - todayChargeBonus=todayChargeBonus+chargeBouns; - }else{ - todayChargeBonus=chargeBouns;//今日首笔分成 - } - statPacketActivity.setTodayChargeBonus(todayChargeBonus); - statPacketActivity.setLatestChargeBonusDate(date); - statPacketActivityMapper.updateByPrimaryKeySelective(statPacketActivity); - } - - public StatPacketActivity getStatPacketActivityByUid(Long uid){ - StatPacketActivity statPacketActivity=statPacketActivityMapper.selectByPrimaryKey(uid); - if(statPacketActivity==null){ - statPacketActivity=insertStatPacketActivityByFirstPacket(uid, Constant.PacketConst.fistrtPacketNum); - } - if(statPacketActivity.getLatestChargeBonusDate()!=null&&!DateTimeUtil.checkIsToday(statPacketActivity.getLatestChargeBonusDate())){ - statPacketActivity.setTodayChargeBonus(0.00); - } - if(statPacketActivity.getLatestRegisterDate()!=null&&!DateTimeUtil.checkIsToday(statPacketActivity.getLatestRegisterDate())){ - statPacketActivity.setTodayRegisterCount(0); - } - return statPacketActivity; - } - public BusiResult queryStatPacketVo(Long uid) throws Exception{ - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - StatPacketActivityVo statPacketActivityVo =getStatPacketActivityVo(uid); - busiResult.setData(statPacketActivityVo); - return busiResult; - } - - private StatPacketActivityVo getStatPacketActivityVo(Long uid){ - UserPacket userPacket=userPacketService.getUserPacket(uid); - StatPacketActivity statPacketActivity=getStatPacketActivityByUid(uid); - StatPacketActivityVo statPacketActivityVo =new StatPacketActivityVo(); - statPacketActivityVo.setUid(uid); - statPacketActivityVo.setShareCount(statPacketActivity.getShareCount()); - statPacketActivityVo.setPacketNum(userPacket.getPacketNum()); - statPacketActivityVo.setPacketCount(statPacketActivity.getPacketCount()); - statPacketActivityVo.setRegisterCout(statPacketActivity.getRegisterCout()); - statPacketActivityVo.setChargeBonus(statPacketActivity.getChargeBonus()); - statPacketActivityVo.setTodayRegisterCount(statPacketActivity.getTodayRegisterCount()); - return statPacketActivityVo; - } - public StatPacketActRankVo getStatPacketActRankVo(Long uid){ - - UserPacket userPacket=userPacketService.getUserPacket(uid); - - StatPacketActRankVo statPacketActRankVo=new StatPacketActRankVo(); - - statPacketActRankVo.setUid(uid); - - Users user=usersService.getUsersByUid(uid); - if(user==null){ - return statPacketActRankVo; - } - statPacketActRankVo.setUid(uid); - statPacketActRankVo.setNick(user.getNick()); - statPacketActRankVo.setAvatar(user.getAvatar()); - statPacketActRankVo.setPacketNum(userPacket.getPacketNum()); - statPacketActRankVo.setSeqNo(getStatPacketRankSeqNoByPacketNum(userPacket.getPacketNum())); - return statPacketActRankVo; - } - - public int getStatPacketRankSeqNoByPacketNum(double packetNum){ - int rankNo=userPacketMapperMgr.getStatPacketRankSeqNoByPacketNum(packetNum); - return rankNo; - } - - public BusiResult queryStatPacketActivityRankList(Long uid){ - StatPacketActivityParentVo statPacketActivityParentVo = new StatPacketActivityParentVo(); - - StatPacketActRankVo statPacketActivityVoMe= getStatPacketActRankVo(uid); - statPacketActivityParentVo.setMe(statPacketActivityVoMe); - - List userPacketList=queryUserPacketListBy(); - List rankList=getStatPacketActRankVoList(userPacketList); - statPacketActivityParentVo.setRankList(rankList); - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - busiResult.setData(statPacketActivityParentVo); - return busiResult; - } - - public BusiResult getInviteDetail(Long uid){ - StatPacketInviteDetailParentVo statPacketInviteDetailParentVo=new StatPacketInviteDetailParentVo(); - - StatPacketActivityVo statPacketActivityVo=getStatPacketActivityVo(uid); - StatPacketInviteDetailVo inviteDetail=new StatPacketInviteDetailVo(); - inviteDetail.setUid(uid); - inviteDetail.setTotalRegisterCount(statPacketActivityVo.getRegisterCout()); - inviteDetail.setPacketNum(statPacketActivityVo.getPacketNum()); - inviteDetail.setTodayRegisterCount(statPacketActivityVo.getTodayRegisterCount()); - - List inviteList=queryStatPacketInviteRegisterMap(uid); - double totalInviteNum=0.0; - if(!CollectionUtils.isEmpty(inviteList)){ - for(StatPacketInviteRegisterListVo StatPacketInviteRegisterListVo:inviteList){ - totalInviteNum+=StatPacketInviteRegisterListVo.getPacketNum(); - } - } - totalInviteNum=new Double(doubleFormat.format(totalInviteNum)); - inviteDetail.setPacketNum(totalInviteNum); - statPacketInviteDetailParentVo.setInviteDetail(inviteDetail); - statPacketInviteDetailParentVo.setInviteList(inviteList); - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - busiResult.setData(statPacketInviteDetailParentVo); - return busiResult; - } - - public BusiResult> getSomeInviteDetail(String uidList){ - List oldList = Arrays.asList(uidList.split(",")); - List newList = new ArrayList(oldList.size()); - List statPacketActivityList = Lists.newArrayList(); - for(String myString: oldList){ - newList.add(Long.valueOf(myString)); - } - StatPacketActivityExample statPacketActivityExample = new StatPacketActivityExample(); - statPacketActivityExample.createCriteria().andUidIn(newList); - statPacketActivityExample.setOrderByClause("uid"); - statPacketActivityList = statPacketActivityMapper.selectByExample(statPacketActivityExample); - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - busiResult.setData(statPacketActivityList); - return busiResult; - } - - private List queryStatPacketInviteRegisterMap(Long uid){ - List statPacketInviteRegisterMapList =userPacketMapperMgr.queryStatPacketInviteRegisterMapList(uid); - return statPacketInviteRegisterMapList; - } - - - private List queryUserPacketListBy(){ - List userPacketList=userPacketMapperMgr.queryUserPacketListBy(); - return userPacketList; - } - private List getStatPacketActRankVoList(List userPacketList){ - if(CollectionUtils.isEmpty(userPacketList)){ - return Lists.newArrayList(); - } - List statPacketActRankVoList=Lists.newArrayList(); - for(int i=0;i statPacketBounsListVo=userPacketMapperMgr.queryInviteBonusList(uid); - statPacketBounsDetailParentVo.setBounsList(statPacketBounsListVo); - statPacketBounsDetailParentVo.setTodayBouns(statPacketActivity.getTodayChargeBonus()); - statPacketBounsDetailParentVo.setTotalBouns(statPacketActivity.getChargeBonus()); - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - busiResult.setData(statPacketBounsDetailParentVo); - return busiResult; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatPacketRegisterService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatPacketRegisterService.java deleted file mode 100644 index 8a7aa20ce..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatPacketRegisterService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.accompany.business.service.statis; - -import com.accompany.business.model.StatPacketRegister; -import com.accompany.business.model.StatPacketRegisterExample; -import com.accompany.business.mybatismapper.StatPacketRegisterMapper; -import com.accompany.common.utils.UUIDUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.Date; -import java.util.List; - - -@Service -public class StatPacketRegisterService { - - @Autowired - private StatPacketRegisterMapper statPacketRegisterMapper; - - - public int saveStatPacketRegister(Long uid,Long registerUid){ - int count=0; - StatPacketRegisterExample statPacketRegisterExample=new StatPacketRegisterExample(); - statPacketRegisterExample.createCriteria().andUidEqualTo(uid).andRegisterUidEqualTo(registerUid); - List statPacketRegisterList=statPacketRegisterMapper.selectByExample(statPacketRegisterExample); - if(CollectionUtils.isEmpty(statPacketRegisterList)){ - StatPacketRegister statPacketRegister=new StatPacketRegister(); - statPacketRegister.setRegisterId(UUIDUtil.get()); - statPacketRegister.setUid(uid); - statPacketRegister.setRegisterUid(registerUid); - statPacketRegister.setCreateTime(new Date()); - statPacketRegisterMapper.insert(statPacketRegister); - count=1; - }else{ - count=0; - } - return count; - } - public StatPacketRegister getShareRegisterByRegisterUid(Long registerUid){ - StatPacketRegisterExample statPacketRegisterExample=new StatPacketRegisterExample(); - statPacketRegisterExample.createCriteria().andRegisterUidEqualTo(registerUid); - List statPacketRegisterList=statPacketRegisterMapper.selectByExample(statPacketRegisterExample); - if(!CollectionUtils.isEmpty(statPacketRegisterList)){ - return statPacketRegisterList.get(0); - }else{ - return null; - } - } - - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java index db9956610..e8456e125 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java @@ -3,8 +3,6 @@ package com.accompany.business.service.user; import com.accompany.business.message.GiftMessage; import com.accompany.business.model.UserGiftWall; import com.accompany.business.model.UserGiftWallExample; -import com.accompany.business.model.UserRadishGiftWall; -import com.accompany.business.model.UserRadishGiftWallExample; import com.accompany.business.model.giftAchievement.*; import com.accompany.business.mybatismapper.*; import com.accompany.business.service.gift.GiftService; @@ -40,15 +38,11 @@ public class UserGiftWallService extends BaseService { @Autowired private UserGiftWallMapper userGiftWallMapper; @Autowired - private UserRadishGiftWallMapper userRadishGiftWallMapper; - @Autowired private GiftAchievementTypeMapper giftAchievementTypeMapper; @Autowired private GiftAchievementMapperExpand giftAchievementMapperExpand; @Autowired private UserGiftAchievementTypeRecordMapper userGiftAchievementTypeRecordMapper; - @Autowired - private GiftService giftService; private String giftAchievementListKey = RedisKey.gift_achievement_list.getKey(); @@ -167,7 +161,6 @@ public class UserGiftWallService extends BaseService { */ private void updateLightStatus(List list, Long targetUid) { List goldRecordList = getGoldGiftListByUid(targetUid); - List radishRecordList = getRadishGiftListByUid(targetUid); list.forEach(type -> { type.getGiftList().forEach(gift -> { if (gift.getConsumeType().intValue() == 1) {//金币礼物 @@ -177,45 +170,11 @@ public class UserGiftWallService extends BaseService { gift.setStatus(1); type.setAttainNum(type.getAttainNum() + 1); }); - } else {//萝卜礼物 - Optional radishOptional = radishRecordList.stream().filter(record -> record.getGiftId().equals(gift.getGiftId())).findFirst(); - radishOptional.ifPresent(record -> { - gift.setGiftSum(record.getReceiveCount()); - gift.setStatus(1); - type.setAttainNum(type.getAttainNum() + 1); - }); } }); }); } - /** - * @description 统计以前的礼物成就 - * @author qiudonglin - * @date 2020/3/3/0003 - */ - @Async - public void checkAchievementStatistic(GiftAchievementTypeVo type, Long uid) { - UserGiftAchievementTypeRecordExample example = new UserGiftAchievementTypeRecordExample(); - example.createCriteria().andUidEqualTo(uid) - .andTypeIdEqualTo(type.getTypeId()); - int count = userGiftAchievementTypeRecordMapper.countByExample(example); - if (count == 0) {//补上成就记录 - UserGiftAchievementTypeRecord record = new UserGiftAchievementTypeRecord(); - record.setCreateTime(new Date()); - record.setTypeId(type.getTypeId()); - record.setUid(uid); - userGiftAchievementTypeRecordMapper.insertSelective(record); - } - } - - private List getRadishGiftListByUid(Long targetUid) { - UserRadishGiftWallExample example = new UserRadishGiftWallExample(); - example.createCriteria().andUidEqualTo(targetUid); - List recordList = userRadishGiftWallMapper.selectByExample(example); - return Optional.ofNullable(recordList).orElse(new ArrayList<>()); - } - private List getGoldGiftListByUid(Long targetUid) { UserGiftWallExample example = new UserGiftWallExample(); example.createCriteria().andUidEqualTo(targetUid); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserPacketRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserPacketRecordService.java deleted file mode 100644 index 192901d95..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserPacketRecordService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.accompany.business.service.user; - -import com.accompany.business.model.UserPacketRecord; -import com.accompany.business.mybatismapper.UserPacketRecordExpand; -import com.accompany.business.mybatismapper.UserPacketRecordMapper; -import com.accompany.common.utils.UUIDUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -@Service -public class UserPacketRecordService { - - @Autowired - private UserPacketRecordMapper userPacketRecordMapper; - - @Autowired - private UserPacketRecordExpand userPacketRecordExpand; - - @Autowired - private UserPacketService userPacketService; - - public void insertInPacketRecord(Long uid, Double money, Byte withDraw, Byte create) { - UserPacketRecord userPacketRecord = new UserPacketRecord(); - userPacketRecord.setPacketId(UUIDUtil.get()); - userPacketRecord.setCreateTime(new Date()); - userPacketRecord.setPacketNum(money); - userPacketRecord.setPacketStatus(create); - userPacketRecord.setType(withDraw); - userPacketRecord.setUid(uid); - userPacketRecordMapper.insertSelective(userPacketRecord); - } - - /** - * - * @param uid - * @param type 红包动作类型 - * @param randomPacketNum 随机红包金额 - * @param objId 目标ID - * @param srcUid 分享用户房间 - */ - public void savePacketRecordByAction(Long uid,Byte type,double randomPacketNum,String objId,Long srcUid){ - Date date=new Date(); - UserPacketRecord userPacketRecord=new UserPacketRecord(); - userPacketRecord.setPacketId(UUIDUtil.get()); - userPacketRecord.setPacketNum(randomPacketNum); - userPacketRecord.setUid(uid); - userPacketRecord.setObjId(objId); - userPacketRecord.setType(type); - userPacketRecord.setHasUnpack(false); - userPacketRecord.setCreateTime(date); - userPacketRecord.setSrcUid(srcUid); - userPacketRecordMapper.insert(userPacketRecord); - } - - public Integer getRecordCountByDate(Long uid, Date startTime, Date timesnights) { - Integer recordCount = userPacketRecordExpand.getRecordCountByDate(uid, startTime, timesnights); - return recordCount; - } - - public List getRecordByDateList(Long uid, Date startTime, Date timesnights, Integer pageNo, Integer pageSize) { - List userPacketRecords = userPacketRecordExpand.getRecordByDateList(uid, startTime, timesnights, pageNo, pageSize); - return userPacketRecords; - } - - public Integer getRecordCount(Long uid) { - Integer recordCount = userPacketRecordExpand.getRecordCount(uid); - return recordCount; - } - - public List getRecordAllList(Long uid, Integer pageNo, Integer pageSize) { - List userPacketRecords = userPacketRecordExpand.getRecordAllList(uid,pageNo, pageSize); - return userPacketRecords; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserPacketService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserPacketService.java deleted file mode 100644 index d81233e28..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserPacketService.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.accompany.business.service.user; - -import com.accompany.business.model.UserPacket; -import com.accompany.business.mybatismapper.UserPacketMapper; -import com.accompany.business.mybatismapper.UserPacketMapperMgr; -import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.business.param.neteasepush.Payload; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.statis.StatPacketActivityService; -import com.accompany.business.service.statis.StatPacketRegisterService; -import com.accompany.business.vo.UserPacketRecordVo; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.Attach; -import com.accompany.common.constant.Constant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.google.gson.Gson; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; - -@Service -public class UserPacketService { - - @Autowired - private UserPacketMapper userPacketMapper; - @Autowired - private UserPacketMapperMgr userPacketMapperMgr; - @Autowired - private StatPacketActivityService statPacketActivityService; - @Autowired - private UserPacketRecordService userPacketRecordService; - @Autowired - private StatPacketRegisterService statPacketRegisterService; - @Autowired - private SendSysMsgService sendSysMsgService; - - private Gson gson = new Gson(); - private static final Logger logger = LoggerFactory.getLogger(UserPacketService.class); - public UserPacket getUserPacketByUid(Long uid) { - return userPacketMapper.selectByPrimaryKey(uid); - } - - public void updateUserPacket(UserPacket userPacket) { - userPacket.setUpdateTime(new Date()); - userPacket.setFirstGetTime(null); - userPacket.setHistPacketNum(null); - userPacketMapper.updateByPrimaryKeySelective(userPacket); - } - public UserPacket createUserPacket(Long uid){ - Date date =new Date(); - UserPacket userPacket=new UserPacket(); - userPacket.setUid(uid); - userPacket.setPacketNum(Constant.PacketConst.fistrtPacketNum); - userPacket.setHistPacketNum(Constant.PacketConst.fistrtPacketNum); - userPacket.setCreateTime(date); - userPacket.setFirstGetTime(date); - userPacketMapper.insert(userPacket); - statPacketActivityService.insertStatPacketActivityByFirstPacket(uid,Constant.PacketConst.fistrtPacketNum); - userPacketRecordService.savePacketRecordByAction( uid,Constant.RedPacket.first, Constant.PacketConst.fistrtPacketNum, - null, null); - return userPacket; - - } - - public BusiResult checkAndGetFirsetPacket(Long uid) throws Exception{ - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - UserPacket getUserPacketByUid=getUserPacketByUid(uid); - logger.info("UserPacketService checkAndGetFirsetPacket "); - if(getUserPacketByUid!=null){ - logger.info("getUserPacketByUid="+uid); - busiResult.setData(new UserPacketRecordVo()); - return busiResult; - }else{ - logger.info("getUserPacketByUid="+getUserPacketByUid); - UserPacket userPacket= createUserPacket(uid); - UserPacketRecordVo userPacketRecordVo=new UserPacketRecordVo(); - userPacketRecordVo.setUid(userPacket.getUid()); - userPacketRecordVo.setType(Constant.RedPacket.first); - userPacketRecordVo.setPacketNum(userPacket.getPacketNum()); - userPacketRecordVo.setNeedAlert(true); - userPacketRecordVo.setPacketName("新人"); - busiResult.setData(userPacketRecordVo); - sendPush(userPacketRecordVo,Constant.DefMsgType.Packet,Constant.DefMsgType.PacketFirst); - } - return busiResult; - - } - public void sendPush( UserPacketRecordVo userPacketRecordVo,int first,int second) throws Exception{ - NeteaseSendMsgParam neteaseSendMsgParam = new NeteaseSendMsgParam(); - neteaseSendMsgParam.setFrom(SystemConfig.secretaryUid); - neteaseSendMsgParam.setTo(userPacketRecordVo.getUid().toString()); - neteaseSendMsgParam.setType(100); - neteaseSendMsgParam.setPushcontent("您獲得了一個紅包，點擊查看~"); - Attach attach = new Attach(); - attach.setFirst(first); - attach.setSecond(second); - attach.setData(userPacketRecordVo); - neteaseSendMsgParam.setAttach(attach); - Payload payload = new Payload(); - neteaseSendMsgParam.setPayload(payload); - sendSysMsgService.sendMsg(neteaseSendMsgParam); - } - - - - - public UserPacket getUserPacket(Long uid){ - UserPacket userPacket=userPacketMapper.selectByPrimaryKey(uid); - if(userPacket==null){ - userPacket=createUserPacket(uid); - } - return userPacket; - } - public void addUserPacketNumTransactional(Long uid,double packetNum,Byte type,String objId,Long srcUid){ - UserPacket userPacket =new UserPacket(); - userPacket.setUid(uid); - userPacket.setPacketNum(packetNum); - userPacketMapperMgr.addUserPacketNumTransactional(userPacket); - if(Constant.RedPacket.share.equals(type)){ - statPacketActivityService.updateStatPacketAcitivtyByShare(uid); - }else if(Constant.RedPacket.register.equals(type)){ - int count=statPacketRegisterService.saveStatPacketRegister(uid,srcUid); - if(count>0){ - statPacketActivityService.updateStatPacketActivityByRegister(uid); - } - }else if(Constant.RedPacket.bouns.equals(type)){ - statPacketActivityService.updateStatPacketActivityByBouns(uid,packetNum); - }else{ - return; - } - userPacketRecordService.savePacketRecordByAction( uid, type, packetNum, objId, srcUid); - } - -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserShareRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserShareRecordService.java index fd4fec588..3b5af88b9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserShareRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserShareRecordService.java @@ -2,35 +2,15 @@ package com.accompany.business.service.user; import com.accompany.business.model.*; import com.accompany.business.mybatismapper.UserShareRecordMapper; -import com.accompany.business.param.neteasepush.NeteaseSendMsgParam; -import com.accompany.business.param.neteasepush.Payload; -import com.accompany.business.service.SendSysMsgService; -import com.accompany.business.service.drawprize.UserDrawService; -import com.accompany.business.service.statis.StatPacketActivityService; -import com.accompany.business.service.statis.StatPacketRegisterService; -import com.accompany.business.vo.UserPacketRecordVo; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.Attach; -import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.GetTimeUtils; -import com.accompany.common.utils.StringUtils; import com.accompany.common.utils.UUIDUtil; -import com.accompany.core.service.common.JedisService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.text.DecimalFormat; import java.util.Date; -import java.util.List; -import java.util.Random; -import java.util.regex.Pattern; /** * Created by liuguofu on 2017/9/15. @@ -41,23 +21,6 @@ public class UserShareRecordService { @Autowired private UserShareRecordMapper userShareRecordMapper; - @Autowired - private UserPacketService userPacketService; - - @Autowired - private StatPacketActivityService statPacketActivityService; - - @Autowired - private StatPacketRegisterService statPacketRegisterService; - - @Autowired - private SendSysMsgService sendSysMsgService; - - @Autowired - private UserDrawService userDrawService; - @Autowired - private JedisService jedisService; - private static DecimalFormat doubleFormat = new DecimalFormat("0.00"); public BusiResult saveUserShareRecord(Long uid, String shareType, int sharePageId, Long targetUid, String shareUrl, String ip, String deviceId) { @@ -74,245 +37,8 @@ public class UserShareRecordService { userShareRecord.setCreateTime(date); userShareRecord.setShareUrl(shareUrl); userShareRecordMapper.insert(userShareRecord); - - try{ - handleActiveShareStrategy(uid, sharePageId, shareId, shareUrl,ip,deviceId); - }catch (Exception e){ - log.error("handle share strategy failed,shareUrl=" + shareUrl + ",uid=" + uid, e); - } - return busiResult; } - @Async - public void handleActiveShareStrategy(Long uid, int sharePageId, String shareId, String shareUrl,String ip,String deviceId) throws Exception{ - if (UserDrawService.sharePageId == sharePageId) { - userDrawService.genUserDrawChanceByShare(uid, shareId); - } else if (StringUtils.isNotEmpty(shareUrl) && Pattern.compile("/games/doll/").matcher(shareUrl).find()){ - // 分享娃娃机活动 暂时屏蔽 - // singleDollService.updateSpecialTimeByShare(uid); - } else if (StringUtils.isNotEmpty(shareUrl) && Pattern.compile("/activity/giftDraw/").matcher(shareUrl).find()){ - userDrawService.genUserGiftDrawChanceByShare(uid,deviceId); - } - } - - public BusiResult saveUserShareRecordTest(Long uid, String shareType, int sharePageId, Long targetUid) { - Date date = new Date(); - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - String shareId = UUIDUtil.get(); - - Double result = jedisService.zincrby(RedisKey.user_sharing_days.getKey(uid.toString()), 1.0, DateTimeUtil.getTodayStr()); - - - double sharePacketNum = 100D; - UserPacketRecordVo userPacketRecordVo = new UserPacketRecordVo(); - if (sharePacketNum > 0.00 && result == 1.0) { - userPacketService.addUserPacketNumTransactional(uid, sharePacketNum, Constant.RedPacket.share, shareId, null); - userPacketRecordVo.setUid(uid); - userPacketRecordVo.setPacketNum(sharePacketNum); - userPacketRecordVo.setCreateTime(date); - userPacketRecordVo.setType(Constant.RedPacket.share); - userPacketRecordVo.setNeedAlert(true); - userPacketRecordVo.setPacketName("分享"); - busiResult.setData(userPacketRecordVo); - - sendPush(userPacketRecordVo, Constant.DefMsgType.Packet, Constant.DefMsgType.PacketShare); - - } else { - busiResult.setData(userPacketRecordVo); - } - UserShareRecord userShareRecord = new UserShareRecord(); - userShareRecord.setShareId(shareId); - userShareRecord.setUid(uid); - userShareRecord.setShareId(UUIDUtil.get()); - userShareRecord.setSharePageId(sharePageId); - userShareRecord.setShareType(new Byte(shareType)); - userShareRecord.setTargetUid(targetUid); - userShareRecord.setCreateTime(date); - userShareRecordMapper.insert(userShareRecord); - - - if (UserDrawService.sharePageId == sharePageId) { - userDrawService.genUserDrawChanceByShare(uid, shareId); - } - return busiResult; - } - - public void sendPushTest(Long uid) { - UserPacketRecordVo userPacketRecordVo = new UserPacketRecordVo(); - userPacketRecordVo.setUid(uid); - userPacketRecordVo.setPacketNum(20.0); - userPacketRecordVo.setPacketName("首次送紅包"); - userPacketRecordVo.setNeedAlert(true); - sendPush(userPacketRecordVo, Constant.DefMsgType.Packet, Constant.DefMsgType.PacketFirst); - } - - public void sendPush(UserPacketRecordVo userPacketRecordVo, int first, int second) { - NeteaseSendMsgParam neteaseSendMsgParam = new NeteaseSendMsgParam(); - neteaseSendMsgParam.setFrom(SystemConfig.secretaryUid); - neteaseSendMsgParam.setTo(userPacketRecordVo.getUid().toString()); - neteaseSendMsgParam.setType(100); - neteaseSendMsgParam.setPushcontent("您獲得了一個紅包，點擊查看"); - Attach attach = new Attach(); - attach.setFirst(first); - attach.setSecond(second); - attach.setData(userPacketRecordVo); - neteaseSendMsgParam.setAttach(attach); - Payload payload = new Payload(); - neteaseSendMsgParam.setPayload(payload); - sendSysMsgService.sendMsg(neteaseSendMsgParam); - } - - public BusiResult saveUserBonusRecord(Long uid, String objId, int chargeMoneyCent) { - Date date = new Date(); - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - //查询是否是他人邀请注册 - StatPacketRegister statPacketRegister = statPacketRegisterService.getShareRegisterByRegisterUid(uid); - //没有被邀请记录，不做处理 - if (statPacketRegister == null) { - return busiResult; - } - Long gainBonusUid = statPacketRegister.getUid(); - double packetNumBonus = genBonus(chargeMoneyCent); - UserPacketRecordVo userPacketRecordVo = new UserPacketRecordVo(); - if (packetNumBonus > 0.00) { - userPacketService.addUserPacketNumTransactional(gainBonusUid, packetNumBonus, Constant.RedPacket.bouns, objId, uid); - userPacketRecordVo.setPacketNum(packetNumBonus); - userPacketRecordVo.setUid(gainBonusUid); - userPacketRecordVo.setCreateTime(date); - userPacketRecordVo.setType(Constant.RedPacket.bouns); - userPacketRecordVo.setNeedAlert(true); - userPacketRecordVo.setPacketName("分成"); - sendPush(userPacketRecordVo, Constant.DefMsgType.Packet, Constant.DefMsgType.PacketBouns); - - busiResult.setData(userPacketRecordVo); - } else { - busiResult.setData(userPacketRecordVo); - } - - return busiResult; - } - - private double genBonus(int chargeMoneyCent) { - double packetNumBonus = chargeMoneyCent / 100 * Constant.PacketConst.bonusRate; - packetNumBonus = new Double(doubleFormat.format(packetNumBonus)); - return packetNumBonus; - - } - - - private double genSharePacketNum(Long uid) { - double randomPacketNum = 0.00; - List todayShareRecordList = getTodayShareRecordList(uid); - if (CollectionUtils.isNotEmpty(todayShareRecordList)) {//每天只能领取一个红包 - return randomPacketNum; - } else { - List alleShareRecordList = getAllShareRecordList(uid); - int size; - if (CollectionUtils.isEmpty(alleShareRecordList)) { - size = 0; - } else { - size = alleShareRecordList.size(); - } - randomPacketNum = getSharePacketNumByCount(size); - } - randomPacketNum = new Double(doubleFormat.format(randomPacketNum)); - return randomPacketNum; - } - - private UserPacketRecord genPacketRecord(Long uid, String objId) { -// UserPacketRecordVo userPacketRecordVo=new UserPacketRecordVo(); -// userPacketRecordVo.setPacketNum(1.5); - - double randomPacketNum = 0.00; - List todayShareRecordList = getTodayShareRecordList(uid); - if (CollectionUtils.isNotEmpty(todayShareRecordList)) {//每天只能领取一个红包 - return null; - } else { - List alleShareRecordList = getAllShareRecordList(uid); - int size; - if (CollectionUtils.isEmpty(alleShareRecordList)) { - size = 0; - } else { - size = alleShareRecordList.size(); - } - randomPacketNum = getSharePacketNumByCount(size); - } - UserPacketRecord userPacketRecord = new UserPacketRecord(); - userPacketRecord.setPacketNum(randomPacketNum); - userPacketRecord.setUid(uid); - userPacketRecord.setObjId(objId); - userPacketRecord.setType(Constant.RedPacket.share); - userPacketRecord.setCreateTime(new Date()); - return userPacketRecord; - } - - private double getRegisterPacketNum(Long uid) { - StatPacketActivity statPacketActivity = statPacketActivityService.getStatPacketActivityByUid(uid); - double packetNum = 0.00; - if (statPacketActivity.getRegisterCout() <= 7) { - packetNum = genDoubleNumberByRegion(Constant.PacketNumRandomRegion.RegisterLess7); - } else { - packetNum = genDoubleNumberByRegion(Constant.PacketNumRandomRegion.RegisterMore7); - } - packetNum = new Double(doubleFormat.format(packetNum)); - return packetNum; - - } - - /** - * 分享红包0.5到1.5，前三次1到1.5 - * 1.分享红包,前七次分享0.5到1.5，后面分享0.1到0.5 升级改版2017-10-26 - * - * @param size - * @return - */ - private double getSharePacketNumByCount(int size) { - double packetNum = 0.00; - if (size <= 7) { - packetNum = genDoubleNumberByRegion(Constant.PacketNumRandomRegion.ShareLess7); - } else { - packetNum = genDoubleNumberByRegion(Constant.PacketNumRandomRegion.ShareMore7); - } - return packetNum; - } - - private double genDoubleNumberByRegion(Double region[]) { - Random ra = new Random(); - double dd = ra.nextDouble() * (region[1] - region[0]) + region[0]; - double number = new Double(doubleFormat.format(dd)); - return number; - } - - public List getTodayShareRecordList(Long uid) { - UserShareRecordExample userShareRecordExample = new UserShareRecordExample(); - userShareRecordExample.createCriteria().andUidEqualTo(uid).andCreateTimeBetween(GetTimeUtils.getTimesnight(0), GetTimeUtils.getTimesnight(24)); - List userShareRecordList = userShareRecordMapper.selectByExample(userShareRecordExample); - return userShareRecordList; - } - - public List getAllShareRecordList(Long uid) { - UserShareRecordExample userShareRecordExample = new UserShareRecordExample(); - userShareRecordExample.createCriteria().andUidEqualTo(uid); - List userShareRecordList = userShareRecordMapper.selectByExample(userShareRecordExample); - return userShareRecordList; - } - - - public static void business(String args[]) { - Date date = new Date(); - System.out.println(GetTimeUtils.getTimesnights(date, 0)); - System.out.println(GetTimeUtils.getTimesnight(24)); -// List alleShareRecordList=null; -// System.out.print(alleShareRecordList.size()); - UserShareRecordService userShareRecordService = new UserShareRecordService(); - for (int i = 0; i < 100; i++) { - Random ra = new Random(); - double dd = userShareRecordService.getSharePacketNumByCount(2); - System.out.println(dd); - } - - } - } diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PacketWithdrawRecordExpandMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PacketWithdrawRecordExpandMapper.xml deleted file mode 100644 index 1c992cd8e..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PacketWithdrawRecordExpandMapper.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PacketWithdrawRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PacketWithdrawRecordMapper.xml deleted file mode 100644 index ba5adf69f..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/PacketWithdrawRecordMapper.xml +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - record_id, uid, packet_prod_cash_id, packet_num, tax_num, bill_id, description, remark, - record_status, pay_id, pay_status, pay_result, create_time, update_time - - - - - delete from packet_withdraw_record - where record_id = #{recordId,jdbcType=VARCHAR} - - - insert into packet_withdraw_record (record_id, uid, packet_prod_cash_id, - packet_num, tax_num, bill_id, - description, remark, record_status, - pay_id, pay_status, pay_result, - create_time, update_time) - values (#{recordId,jdbcType=VARCHAR}, #{uid,jdbcType=BIGINT}, #{packetProdCashId,jdbcType=INTEGER}, - #{packetNum,jdbcType=DOUBLE}, #{taxNum,jdbcType=DOUBLE}, #{billId,jdbcType=VARCHAR}, - #{description,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{recordStatus,jdbcType=TINYINT}, - #{payId,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payResult,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - - - insert into packet_withdraw_record - - - record_id, - - - uid, - - - packet_prod_cash_id, - - - packet_num, - - - tax_num, - - - bill_id, - - - description, - - - remark, - - - record_status, - - - pay_id, - - - pay_status, - - - pay_result, - - - create_time, - - - update_time, - - - - - #{recordId,jdbcType=VARCHAR}, - - - #{uid,jdbcType=BIGINT}, - - - #{packetProdCashId,jdbcType=INTEGER}, - - - #{packetNum,jdbcType=DOUBLE}, - - - #{taxNum,jdbcType=DOUBLE}, - - - #{billId,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{recordStatus,jdbcType=TINYINT}, - - - #{payId,jdbcType=VARCHAR}, - - - #{payStatus,jdbcType=VARCHAR}, - - - #{payResult,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - update packet_withdraw_record - - - record_id = #{record.recordId,jdbcType=VARCHAR}, - - - uid = #{record.uid,jdbcType=BIGINT}, - - - packet_prod_cash_id = #{record.packetProdCashId,jdbcType=INTEGER}, - - - packet_num = #{record.packetNum,jdbcType=DOUBLE}, - - - tax_num = #{record.taxNum,jdbcType=DOUBLE}, - - - bill_id = #{record.billId,jdbcType=VARCHAR}, - - - description = #{record.description,jdbcType=VARCHAR}, - - - remark = #{record.remark,jdbcType=VARCHAR}, - - - record_status = #{record.recordStatus,jdbcType=TINYINT}, - - - pay_id = #{record.payId,jdbcType=VARCHAR}, - - - pay_status = #{record.payStatus,jdbcType=VARCHAR}, - - - pay_result = #{record.payResult,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - - - - - - update packet_withdraw_record - set record_id = #{record.recordId,jdbcType=VARCHAR}, - uid = #{record.uid,jdbcType=BIGINT}, - packet_prod_cash_id = #{record.packetProdCashId,jdbcType=INTEGER}, - packet_num = #{record.packetNum,jdbcType=DOUBLE}, - tax_num = #{record.taxNum,jdbcType=DOUBLE}, - bill_id = #{record.billId,jdbcType=VARCHAR}, - description = #{record.description,jdbcType=VARCHAR}, - remark = #{record.remark,jdbcType=VARCHAR}, - record_status = #{record.recordStatus,jdbcType=TINYINT}, - pay_id = #{record.payId,jdbcType=VARCHAR}, - pay_status = #{record.payStatus,jdbcType=VARCHAR}, - pay_result = #{record.payResult,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - - - - - - update packet_withdraw_record - - - uid = #{uid,jdbcType=BIGINT}, - - - packet_prod_cash_id = #{packetProdCashId,jdbcType=INTEGER}, - - - packet_num = #{packetNum,jdbcType=DOUBLE}, - - - tax_num = #{taxNum,jdbcType=DOUBLE}, - - - bill_id = #{billId,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - record_status = #{recordStatus,jdbcType=TINYINT}, - - - pay_id = #{payId,jdbcType=VARCHAR}, - - - pay_status = #{payStatus,jdbcType=VARCHAR}, - - - pay_result = #{payResult,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where record_id = #{recordId,jdbcType=VARCHAR} - - - update packet_withdraw_record - set uid = #{uid,jdbcType=BIGINT}, - packet_prod_cash_id = #{packetProdCashId,jdbcType=INTEGER}, - packet_num = #{packetNum,jdbcType=DOUBLE}, - tax_num = #{taxNum,jdbcType=DOUBLE}, - bill_id = #{billId,jdbcType=VARCHAR}, - description = #{description,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - record_status = #{recordStatus,jdbcType=TINYINT}, - pay_id = #{payId,jdbcType=VARCHAR}, - pay_status = #{payStatus,jdbcType=VARCHAR}, - pay_result = #{payResult,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where record_id = #{recordId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RadishBillMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RadishBillMapper.xml deleted file mode 100644 index 352107364..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RadishBillMapper.xml +++ /dev/null @@ -1,347 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - bill_id, uid, target_uid, room_uid, bill_type, amount, currency_type, gift_id, gift_num, - obj_id, deleted, create_time, update_time - - - - - delete from radish_bill - where bill_id = #{billId,jdbcType=VARCHAR} - - - delete from radish_bill - - - - - - insert into radish_bill (bill_id, uid, target_uid, - room_uid, bill_type, amount, - currency_type, gift_id, gift_num, - obj_id, deleted, create_time, - update_time) - values (#{billId,jdbcType=VARCHAR}, #{uid,jdbcType=BIGINT}, #{targetUid,jdbcType=BIGINT}, - #{roomUid,jdbcType=BIGINT}, #{billType,jdbcType=TINYINT}, #{amount,jdbcType=BIGINT}, - #{currencyType,jdbcType=TINYINT}, #{giftId,jdbcType=INTEGER}, #{giftNum,jdbcType=INTEGER}, - #{objId,jdbcType=VARCHAR}, #{deleted,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) - - - insert into radish_bill - - - bill_id, - - - uid, - - - target_uid, - - - room_uid, - - - bill_type, - - - amount, - - - currency_type, - - - gift_id, - - - gift_num, - - - obj_id, - - - deleted, - - - create_time, - - - update_time, - - - - - #{billId,jdbcType=VARCHAR}, - - - #{uid,jdbcType=BIGINT}, - - - #{targetUid,jdbcType=BIGINT}, - - - #{roomUid,jdbcType=BIGINT}, - - - #{billType,jdbcType=TINYINT}, - - - #{amount,jdbcType=BIGINT}, - - - #{currencyType,jdbcType=TINYINT}, - - - #{giftId,jdbcType=INTEGER}, - - - #{giftNum,jdbcType=INTEGER}, - - - #{objId,jdbcType=VARCHAR}, - - - #{deleted,jdbcType=BIT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - update radish_bill - - - bill_id = #{record.billId,jdbcType=VARCHAR}, - - - uid = #{record.uid,jdbcType=BIGINT}, - - - target_uid = #{record.targetUid,jdbcType=BIGINT}, - - - room_uid = #{record.roomUid,jdbcType=BIGINT}, - - - bill_type = #{record.billType,jdbcType=TINYINT}, - - - amount = #{record.amount,jdbcType=BIGINT}, - - - currency_type = #{record.currencyType,jdbcType=TINYINT}, - - - gift_id = #{record.giftId,jdbcType=INTEGER}, - - - gift_num = #{record.giftNum,jdbcType=INTEGER}, - - - obj_id = #{record.objId,jdbcType=VARCHAR}, - - - deleted = #{record.deleted,jdbcType=BIT}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - - - - - - update radish_bill - set bill_id = #{record.billId,jdbcType=VARCHAR}, - uid = #{record.uid,jdbcType=BIGINT}, - target_uid = #{record.targetUid,jdbcType=BIGINT}, - room_uid = #{record.roomUid,jdbcType=BIGINT}, - bill_type = #{record.billType,jdbcType=TINYINT}, - amount = #{record.amount,jdbcType=BIGINT}, - currency_type = #{record.currencyType,jdbcType=TINYINT}, - gift_id = #{record.giftId,jdbcType=INTEGER}, - gift_num = #{record.giftNum,jdbcType=INTEGER}, - obj_id = #{record.objId,jdbcType=VARCHAR}, - deleted = #{record.deleted,jdbcType=BIT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - - - - - - update radish_bill - - - uid = #{uid,jdbcType=BIGINT}, - - - target_uid = #{targetUid,jdbcType=BIGINT}, - - - room_uid = #{roomUid,jdbcType=BIGINT}, - - - bill_type = #{billType,jdbcType=TINYINT}, - - - amount = #{amount,jdbcType=BIGINT}, - - - currency_type = #{currencyType,jdbcType=TINYINT}, - - - gift_id = #{giftId,jdbcType=INTEGER}, - - - gift_num = #{giftNum,jdbcType=INTEGER}, - - - obj_id = #{objId,jdbcType=VARCHAR}, - - - deleted = #{deleted,jdbcType=BIT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where bill_id = #{billId,jdbcType=VARCHAR} - - - update radish_bill - set uid = #{uid,jdbcType=BIGINT}, - target_uid = #{targetUid,jdbcType=BIGINT}, - room_uid = #{roomUid,jdbcType=BIGINT}, - bill_type = #{billType,jdbcType=TINYINT}, - amount = #{amount,jdbcType=BIGINT}, - currency_type = #{currencyType,jdbcType=TINYINT}, - gift_id = #{giftId,jdbcType=INTEGER}, - gift_num = #{giftNum,jdbcType=INTEGER}, - obj_id = #{objId,jdbcType=VARCHAR}, - deleted = #{deleted,jdbcType=BIT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where bill_id = #{billId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RadishGiftSendRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RadishGiftSendRecordMapper.xml deleted file mode 100644 index d01f0ae25..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RadishGiftSendRecordMapper.xml +++ /dev/null @@ -1,341 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - record_id, uid, receive_uid, room_uid, gift_id, gift_num, radish_amount, room_type, - gift_source, send_env, deleted, create_time, update_time - - - - - delete from radish_gift_send_record - where record_id = #{recordId,jdbcType=BIGINT} - - - delete from radish_gift_send_record - - - - - - insert into radish_gift_send_record (uid, receive_uid, room_uid, - gift_id, gift_num, radish_amount, - room_type, gift_source, send_env, - deleted, create_time, update_time - ) - values (#{uid,jdbcType=BIGINT}, #{receiveUid,jdbcType=BIGINT}, #{roomUid,jdbcType=BIGINT}, - #{giftId,jdbcType=INTEGER}, #{giftNum,jdbcType=INTEGER}, #{radishAmount,jdbcType=INTEGER}, - #{roomType,jdbcType=TINYINT}, #{giftSource,jdbcType=TINYINT}, #{sendEnv,jdbcType=TINYINT}, - #{deleted,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - - - insert into radish_gift_send_record - - - uid, - - - receive_uid, - - - room_uid, - - - gift_id, - - - gift_num, - - - radish_amount, - - - room_type, - - - gift_source, - - - send_env, - - - deleted, - - - create_time, - - - update_time, - - - - - #{uid,jdbcType=BIGINT}, - - - #{receiveUid,jdbcType=BIGINT}, - - - #{roomUid,jdbcType=BIGINT}, - - - #{giftId,jdbcType=INTEGER}, - - - #{giftNum,jdbcType=INTEGER}, - - - #{radishAmount,jdbcType=INTEGER}, - - - #{roomType,jdbcType=TINYINT}, - - - #{giftSource,jdbcType=TINYINT}, - - - #{sendEnv,jdbcType=TINYINT}, - - - #{deleted,jdbcType=BIT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - update radish_gift_send_record - - - record_id = #{record.recordId,jdbcType=BIGINT}, - - - uid = #{record.uid,jdbcType=BIGINT}, - - - receive_uid = #{record.receiveUid,jdbcType=BIGINT}, - - - room_uid = #{record.roomUid,jdbcType=BIGINT}, - - - gift_id = #{record.giftId,jdbcType=INTEGER}, - - - gift_num = #{record.giftNum,jdbcType=INTEGER}, - - - radish_amount = #{record.radishAmount,jdbcType=INTEGER}, - - - room_type = #{record.roomType,jdbcType=TINYINT}, - - - gift_source = #{record.giftSource,jdbcType=TINYINT}, - - - send_env = #{record.sendEnv,jdbcType=TINYINT}, - - - deleted = #{record.deleted,jdbcType=BIT}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - - - - - - update radish_gift_send_record - set record_id = #{record.recordId,jdbcType=BIGINT}, - uid = #{record.uid,jdbcType=BIGINT}, - receive_uid = #{record.receiveUid,jdbcType=BIGINT}, - room_uid = #{record.roomUid,jdbcType=BIGINT}, - gift_id = #{record.giftId,jdbcType=INTEGER}, - gift_num = #{record.giftNum,jdbcType=INTEGER}, - radish_amount = #{record.radishAmount,jdbcType=INTEGER}, - room_type = #{record.roomType,jdbcType=TINYINT}, - gift_source = #{record.giftSource,jdbcType=TINYINT}, - send_env = #{record.sendEnv,jdbcType=TINYINT}, - deleted = #{record.deleted,jdbcType=BIT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - - - - - - update radish_gift_send_record - - - uid = #{uid,jdbcType=BIGINT}, - - - receive_uid = #{receiveUid,jdbcType=BIGINT}, - - - room_uid = #{roomUid,jdbcType=BIGINT}, - - - gift_id = #{giftId,jdbcType=INTEGER}, - - - gift_num = #{giftNum,jdbcType=INTEGER}, - - - radish_amount = #{radishAmount,jdbcType=INTEGER}, - - - room_type = #{roomType,jdbcType=TINYINT}, - - - gift_source = #{giftSource,jdbcType=TINYINT}, - - - send_env = #{sendEnv,jdbcType=TINYINT}, - - - deleted = #{deleted,jdbcType=BIT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where record_id = #{recordId,jdbcType=BIGINT} - - - update radish_gift_send_record - set uid = #{uid,jdbcType=BIGINT}, - receive_uid = #{receiveUid,jdbcType=BIGINT}, - room_uid = #{roomUid,jdbcType=BIGINT}, - gift_id = #{giftId,jdbcType=INTEGER}, - gift_num = #{giftNum,jdbcType=INTEGER}, - radish_amount = #{radishAmount,jdbcType=INTEGER}, - room_type = #{roomType,jdbcType=TINYINT}, - gift_source = #{giftSource,jdbcType=TINYINT}, - send_env = #{sendEnv,jdbcType=TINYINT}, - deleted = #{deleted,jdbcType=BIT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where record_id = #{recordId,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RadishGiftSendRecordMapperMgr.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RadishGiftSendRecordMapperMgr.xml deleted file mode 100644 index 7fd2a6422..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RadishGiftSendRecordMapperMgr.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - FROM radish_gift_send_record rg - LEFT JOIN users u on u.uid=rg.receive_uid - - 1=1 - - and u.erban_no in - - #{erbanNo} - - - - and rg.create_time >= #{beginDate} - - - and rg.create_time <= #{endDate} - - - GROUP BY rg.receive_uid - - - - - - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/StatPacketActivityMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/StatPacketActivityMapper.xml deleted file mode 100644 index 516dce1e8..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/StatPacketActivityMapper.xml +++ /dev/null @@ -1,233 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - uid, share_count, share_packet_count, latest_share_date, packet_count, register_cout, - today_register_count, latest_register_date, charge_bonus, today_charge_bonus, latest_charge_bonus_date, - create_time, update_time - - - - - delete from stat_packet_activity - where uid = #{uid,jdbcType=BIGINT} - - - insert into stat_packet_activity (uid, share_count, share_packet_count, - latest_share_date, packet_count, register_cout, - today_register_count, latest_register_date, charge_bonus, - today_charge_bonus, latest_charge_bonus_date, create_time, - update_time) - values (#{uid,jdbcType=BIGINT}, #{shareCount,jdbcType=INTEGER}, #{sharePacketCount,jdbcType=INTEGER}, - #{latestShareDate,jdbcType=DATE}, #{packetCount,jdbcType=INTEGER}, #{registerCout,jdbcType=INTEGER}, - #{todayRegisterCount,jdbcType=INTEGER}, #{latestRegisterDate,jdbcType=DATE}, #{chargeBonus,jdbcType=DOUBLE}, - #{todayChargeBonus,jdbcType=DOUBLE}, #{latestChargeBonusDate,jdbcType=DATE}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) - - - insert into stat_packet_activity - - - uid, - - - share_count, - - - share_packet_count, - - - latest_share_date, - - - packet_count, - - - register_cout, - - - today_register_count, - - - latest_register_date, - - - charge_bonus, - - - today_charge_bonus, - - - latest_charge_bonus_date, - - - create_time, - - - update_time, - - - - - #{uid,jdbcType=BIGINT}, - - - #{shareCount,jdbcType=INTEGER}, - - - #{sharePacketCount,jdbcType=INTEGER}, - - - #{latestShareDate,jdbcType=DATE}, - - - #{packetCount,jdbcType=INTEGER}, - - - #{registerCout,jdbcType=INTEGER}, - - - #{todayRegisterCount,jdbcType=INTEGER}, - - - #{latestRegisterDate,jdbcType=DATE}, - - - #{chargeBonus,jdbcType=DOUBLE}, - - - #{todayChargeBonus,jdbcType=DOUBLE}, - - - #{latestChargeBonusDate,jdbcType=DATE}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update stat_packet_activity - - - share_count = #{shareCount,jdbcType=INTEGER}, - - - share_packet_count = #{sharePacketCount,jdbcType=INTEGER}, - - - latest_share_date = #{latestShareDate,jdbcType=DATE}, - - - packet_count = #{packetCount,jdbcType=INTEGER}, - - - register_cout = #{registerCout,jdbcType=INTEGER}, - - - today_register_count = #{todayRegisterCount,jdbcType=INTEGER}, - - - latest_register_date = #{latestRegisterDate,jdbcType=DATE}, - - - charge_bonus = #{chargeBonus,jdbcType=DOUBLE}, - - - today_charge_bonus = #{todayChargeBonus,jdbcType=DOUBLE}, - - - latest_charge_bonus_date = #{latestChargeBonusDate,jdbcType=DATE}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where uid = #{uid,jdbcType=BIGINT} - - - update stat_packet_activity - set share_count = #{shareCount,jdbcType=INTEGER}, - share_packet_count = #{sharePacketCount,jdbcType=INTEGER}, - latest_share_date = #{latestShareDate,jdbcType=DATE}, - packet_count = #{packetCount,jdbcType=INTEGER}, - register_cout = #{registerCout,jdbcType=INTEGER}, - today_register_count = #{todayRegisterCount,jdbcType=INTEGER}, - latest_register_date = #{latestRegisterDate,jdbcType=DATE}, - charge_bonus = #{chargeBonus,jdbcType=DOUBLE}, - today_charge_bonus = #{todayChargeBonus,jdbcType=DOUBLE}, - latest_charge_bonus_date = #{latestChargeBonusDate,jdbcType=DATE}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where uid = #{uid,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/StatPacketBounsMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/StatPacketBounsMapper.xml deleted file mode 100644 index 99a3c5e11..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/StatPacketBounsMapper.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - bouns_id, uid, charge_record_id, amount, packet_num, create_time - - - - insert into stat_packet_bouns (bouns_id, uid, charge_record_id, - amount, packet_num, create_time - ) - values (#{bounsId,jdbcType=VARCHAR}, #{uid,jdbcType=BIGINT}, #{chargeRecordId,jdbcType=VARCHAR}, - #{amount,jdbcType=BIGINT}, #{packetNum,jdbcType=DOUBLE}, #{createTime,jdbcType=TIMESTAMP} - ) - - - insert into stat_packet_bouns - - - bouns_id, - - - uid, - - - charge_record_id, - - - amount, - - - packet_num, - - - create_time, - - - - - #{bounsId,jdbcType=VARCHAR}, - - - #{uid,jdbcType=BIGINT}, - - - #{chargeRecordId,jdbcType=VARCHAR}, - - - #{amount,jdbcType=BIGINT}, - - - #{packetNum,jdbcType=DOUBLE}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/StatPacketRegisterMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/StatPacketRegisterMapper.xml deleted file mode 100644 index 0b725de35..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/StatPacketRegisterMapper.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - register_id, uid, register_uid, create_time - - - - - delete from stat_packet_register - where register_id = #{registerId,jdbcType=VARCHAR} - - - insert into stat_packet_register (register_id, uid, register_uid, - create_time) - values (#{registerId,jdbcType=VARCHAR}, #{uid,jdbcType=BIGINT}, #{registerUid,jdbcType=BIGINT}, - #{createTime,jdbcType=TIMESTAMP}) - - - insert into stat_packet_register - - - register_id, - - - uid, - - - register_uid, - - - create_time, - - - - - #{registerId,jdbcType=VARCHAR}, - - - #{uid,jdbcType=BIGINT}, - - - #{registerUid,jdbcType=BIGINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - update stat_packet_register - - - uid = #{uid,jdbcType=BIGINT}, - - - register_uid = #{registerUid,jdbcType=BIGINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - where register_id = #{registerId,jdbcType=VARCHAR} - - - update stat_packet_register - set uid = #{uid,jdbcType=BIGINT}, - register_uid = #{registerUid,jdbcType=BIGINT}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where register_id = #{registerId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawMapper.xml deleted file mode 100644 index b21748018..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawMapper.xml +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - uid, left_draw_num, total_draw_num, total_win_draw_num, is_first_share, gift_draw_share_chance, - create_time, update_time - - - - - delete from user_draw - where uid = #{uid,jdbcType=BIGINT} - - - delete from user_draw - - - - - - insert into user_draw (uid, left_draw_num, total_draw_num, - total_win_draw_num, is_first_share, gift_draw_share_chance, - create_time, update_time) - values (#{uid,jdbcType=BIGINT}, #{leftDrawNum,jdbcType=INTEGER}, #{totalDrawNum,jdbcType=INTEGER}, - #{totalWinDrawNum,jdbcType=INTEGER}, #{isFirstShare,jdbcType=BIT}, #{giftDrawShareChance,jdbcType=TINYINT}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - - - insert into user_draw - - - uid, - - - left_draw_num, - - - total_draw_num, - - - total_win_draw_num, - - - is_first_share, - - - gift_draw_share_chance, - - - create_time, - - - update_time, - - - - - #{uid,jdbcType=BIGINT}, - - - #{leftDrawNum,jdbcType=INTEGER}, - - - #{totalDrawNum,jdbcType=INTEGER}, - - - #{totalWinDrawNum,jdbcType=INTEGER}, - - - #{isFirstShare,jdbcType=BIT}, - - - #{giftDrawShareChance,jdbcType=TINYINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - update user_draw - - - uid = #{record.uid,jdbcType=BIGINT}, - - - left_draw_num = #{record.leftDrawNum,jdbcType=INTEGER}, - - - total_draw_num = #{record.totalDrawNum,jdbcType=INTEGER}, - - - total_win_draw_num = #{record.totalWinDrawNum,jdbcType=INTEGER}, - - - is_first_share = #{record.isFirstShare,jdbcType=BIT}, - - - gift_draw_share_chance = #{record.giftDrawShareChance,jdbcType=TINYINT}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - - - - - - update user_draw - set uid = #{record.uid,jdbcType=BIGINT}, - left_draw_num = #{record.leftDrawNum,jdbcType=INTEGER}, - total_draw_num = #{record.totalDrawNum,jdbcType=INTEGER}, - total_win_draw_num = #{record.totalWinDrawNum,jdbcType=INTEGER}, - is_first_share = #{record.isFirstShare,jdbcType=BIT}, - gift_draw_share_chance = #{record.giftDrawShareChance,jdbcType=TINYINT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - - - - - - update user_draw - - - left_draw_num = #{leftDrawNum,jdbcType=INTEGER}, - - - total_draw_num = #{totalDrawNum,jdbcType=INTEGER}, - - - total_win_draw_num = #{totalWinDrawNum,jdbcType=INTEGER}, - - - is_first_share = #{isFirstShare,jdbcType=BIT}, - - - gift_draw_share_chance = #{giftDrawShareChance,jdbcType=TINYINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where uid = #{uid,jdbcType=BIGINT} - - - update user_draw - set left_draw_num = #{leftDrawNum,jdbcType=INTEGER}, - total_draw_num = #{totalDrawNum,jdbcType=INTEGER}, - total_win_draw_num = #{totalWinDrawNum,jdbcType=INTEGER}, - is_first_share = #{isFirstShare,jdbcType=BIT}, - gift_draw_share_chance = #{giftDrawShareChance,jdbcType=TINYINT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where uid = #{uid,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawMapperMgr.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawMapperMgr.xml deleted file mode 100644 index 8b06a122b..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawMapperMgr.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawPrettyErbanNoMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawPrettyErbanNoMapper.xml deleted file mode 100644 index 9717c8ca5..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawPrettyErbanNoMapper.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - pretty_erban_no, type, use_status, create_time - - - - - delete from user_draw_pretty_erban_no - where pretty_erban_no = #{prettyErbanNo,jdbcType=BIGINT} - - - delete from user_draw_pretty_erban_no - - - - - - insert into user_draw_pretty_erban_no (pretty_erban_no, type, use_status, - create_time) - values (#{prettyErbanNo,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{useStatus,jdbcType=TINYINT}, - #{createTime,jdbcType=TIMESTAMP}) - - - insert into user_draw_pretty_erban_no - - - pretty_erban_no, - - - type, - - - use_status, - - - create_time, - - - - - #{prettyErbanNo,jdbcType=BIGINT}, - - - #{type,jdbcType=TINYINT}, - - - #{useStatus,jdbcType=TINYINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - - update user_draw_pretty_erban_no - - - pretty_erban_no = #{record.prettyErbanNo,jdbcType=BIGINT}, - - - type = #{record.type,jdbcType=TINYINT}, - - - use_status = #{record.useStatus,jdbcType=TINYINT}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - - - - - - update user_draw_pretty_erban_no - set pretty_erban_no = #{record.prettyErbanNo,jdbcType=BIGINT}, - type = #{record.type,jdbcType=TINYINT}, - use_status = #{record.useStatus,jdbcType=TINYINT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - - - - - - update user_draw_pretty_erban_no - - - type = #{type,jdbcType=TINYINT}, - - - use_status = #{useStatus,jdbcType=TINYINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - where pretty_erban_no = #{prettyErbanNo,jdbcType=BIGINT} - - - update user_draw_pretty_erban_no - set type = #{type,jdbcType=TINYINT}, - use_status = #{useStatus,jdbcType=TINYINT}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where pretty_erban_no = #{prettyErbanNo,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawProdMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawProdMapper.xml deleted file mode 100644 index dbfa96752..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawProdMapper.xml +++ /dev/null @@ -1,286 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - prod_id, prod_type, prod_name, prod_value, prod_image, prod_desc, draw_type, draw_name, - draw_id, expire_days - - - - - delete from user_draw_prod - where prod_id = #{prodId,jdbcType=INTEGER} - - - insert into user_draw_prod (prod_id, prod_type, prod_name, - prod_value, prod_image, prod_desc, - draw_type, draw_name, draw_id, - expire_days) - values (#{prodId,jdbcType=INTEGER}, #{prodType,jdbcType=TINYINT}, #{prodName,jdbcType=VARCHAR}, - #{prodValue,jdbcType=BIGINT}, #{prodImage,jdbcType=VARCHAR}, #{prodDesc,jdbcType=VARCHAR}, - #{drawType,jdbcType=INTEGER}, #{drawName,jdbcType=VARCHAR}, #{drawId,jdbcType=VARCHAR}, - #{expireDays,jdbcType=INTEGER}) - - - insert into user_draw_prod - - - prod_id, - - - prod_type, - - - prod_name, - - - prod_value, - - - prod_image, - - - prod_desc, - - - draw_type, - - - draw_name, - - - draw_id, - - - expire_days, - - - - - #{prodId,jdbcType=INTEGER}, - - - #{prodType,jdbcType=TINYINT}, - - - #{prodName,jdbcType=VARCHAR}, - - - #{prodValue,jdbcType=BIGINT}, - - - #{prodImage,jdbcType=VARCHAR}, - - - #{prodDesc,jdbcType=VARCHAR}, - - - #{drawType,jdbcType=INTEGER}, - - - #{drawName,jdbcType=VARCHAR}, - - - #{drawId,jdbcType=VARCHAR}, - - - #{expireDays,jdbcType=INTEGER}, - - - - - - update user_draw_prod - - - prod_id = #{record.prodId,jdbcType=INTEGER}, - - - prod_type = #{record.prodType,jdbcType=TINYINT}, - - - prod_name = #{record.prodName,jdbcType=VARCHAR}, - - - prod_value = #{record.prodValue,jdbcType=BIGINT}, - - - prod_image = #{record.prodImage,jdbcType=VARCHAR}, - - - prod_desc = #{record.prodDesc,jdbcType=VARCHAR}, - - - draw_type = #{record.drawType,jdbcType=INTEGER}, - - - draw_name = #{record.drawName,jdbcType=VARCHAR}, - - - draw_id = #{record.drawId,jdbcType=VARCHAR}, - - - expire_days = #{record.expireDays,jdbcType=INTEGER}, - - - - - - - - update user_draw_prod - set prod_id = #{record.prodId,jdbcType=INTEGER}, - prod_type = #{record.prodType,jdbcType=TINYINT}, - prod_name = #{record.prodName,jdbcType=VARCHAR}, - prod_value = #{record.prodValue,jdbcType=BIGINT}, - prod_image = #{record.prodImage,jdbcType=VARCHAR}, - prod_desc = #{record.prodDesc,jdbcType=VARCHAR}, - draw_type = #{record.drawType,jdbcType=INTEGER}, - draw_name = #{record.drawName,jdbcType=VARCHAR}, - draw_id = #{record.drawId,jdbcType=VARCHAR}, - expire_days = #{record.expireDays,jdbcType=INTEGER} - - - - - - update user_draw_prod - - - prod_type = #{prodType,jdbcType=TINYINT}, - - - prod_name = #{prodName,jdbcType=VARCHAR}, - - - prod_value = #{prodValue,jdbcType=BIGINT}, - - - prod_image = #{prodImage,jdbcType=VARCHAR}, - - - prod_desc = #{prodDesc,jdbcType=VARCHAR}, - - - draw_type = #{drawType,jdbcType=INTEGER}, - - - draw_name = #{drawName,jdbcType=VARCHAR}, - - - draw_id = #{drawId,jdbcType=VARCHAR}, - - - expire_days = #{expireDays,jdbcType=INTEGER}, - - - where prod_id = #{prodId,jdbcType=INTEGER} - - - update user_draw_prod - set prod_type = #{prodType,jdbcType=TINYINT}, - prod_name = #{prodName,jdbcType=VARCHAR}, - prod_value = #{prodValue,jdbcType=BIGINT}, - prod_image = #{prodImage,jdbcType=VARCHAR}, - prod_desc = #{prodDesc,jdbcType=VARCHAR}, - draw_type = #{drawType,jdbcType=INTEGER}, - draw_name = #{drawName,jdbcType=VARCHAR}, - draw_id = #{drawId,jdbcType=VARCHAR}, - expire_days = #{expireDays,jdbcType=INTEGER} - where prod_id = #{prodId,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawRecordMapper.xml deleted file mode 100644 index 656ab3649..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserDrawRecordMapper.xml +++ /dev/null @@ -1,335 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - record_id, uid, draw_status, type, src_obj_id, src_obj_name, src_obj_amount, draw_prize_id, - draw_prize_name, draw_prize_putout, record_desc, create_time, update_time - - - - - delete from user_draw_record - where record_id = #{recordId,jdbcType=INTEGER} - - - insert into user_draw_record (uid, draw_status, type, - src_obj_id, src_obj_name, src_obj_amount, - draw_prize_id, draw_prize_name, draw_prize_putout, - record_desc, create_time, update_time - ) - values (#{uid,jdbcType=BIGINT}, #{drawStatus,jdbcType=TINYINT}, #{type,jdbcType=TINYINT}, - #{srcObjId,jdbcType=VARCHAR}, #{srcObjName,jdbcType=VARCHAR}, #{srcObjAmount,jdbcType=BIGINT}, - #{drawPrizeId,jdbcType=INTEGER}, #{drawPrizeName,jdbcType=VARCHAR}, #{drawPrizePutout,jdbcType=TINYINT}, - #{recordDesc,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - - - insert into user_draw_record - - - uid, - - - draw_status, - - - type, - - - src_obj_id, - - - src_obj_name, - - - src_obj_amount, - - - draw_prize_id, - - - draw_prize_name, - - - draw_prize_putout, - - - record_desc, - - - create_time, - - - update_time, - - - - - #{uid,jdbcType=BIGINT}, - - - #{drawStatus,jdbcType=TINYINT}, - - - #{type,jdbcType=TINYINT}, - - - #{srcObjId,jdbcType=VARCHAR}, - - - #{srcObjName,jdbcType=VARCHAR}, - - - #{srcObjAmount,jdbcType=BIGINT}, - - - #{drawPrizeId,jdbcType=INTEGER}, - - - #{drawPrizeName,jdbcType=VARCHAR}, - - - #{drawPrizePutout,jdbcType=TINYINT}, - - - #{recordDesc,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - update user_draw_record - - - record_id = #{record.recordId,jdbcType=INTEGER}, - - - uid = #{record.uid,jdbcType=BIGINT}, - - - draw_status = #{record.drawStatus,jdbcType=TINYINT}, - - - type = #{record.type,jdbcType=TINYINT}, - - - src_obj_id = #{record.srcObjId,jdbcType=VARCHAR}, - - - src_obj_name = #{record.srcObjName,jdbcType=VARCHAR}, - - - src_obj_amount = #{record.srcObjAmount,jdbcType=BIGINT}, - - - draw_prize_id = #{record.drawPrizeId,jdbcType=INTEGER}, - - - draw_prize_name = #{record.drawPrizeName,jdbcType=VARCHAR}, - - - draw_prize_putout = #{record.drawPrizePutout,jdbcType=TINYINT}, - - - record_desc = #{record.recordDesc,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - - - - - - update user_draw_record - set record_id = #{record.recordId,jdbcType=INTEGER}, - uid = #{record.uid,jdbcType=BIGINT}, - draw_status = #{record.drawStatus,jdbcType=TINYINT}, - type = #{record.type,jdbcType=TINYINT}, - src_obj_id = #{record.srcObjId,jdbcType=VARCHAR}, - src_obj_name = #{record.srcObjName,jdbcType=VARCHAR}, - src_obj_amount = #{record.srcObjAmount,jdbcType=BIGINT}, - draw_prize_id = #{record.drawPrizeId,jdbcType=INTEGER}, - draw_prize_name = #{record.drawPrizeName,jdbcType=VARCHAR}, - draw_prize_putout = #{record.drawPrizePutout,jdbcType=TINYINT}, - record_desc = #{record.recordDesc,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - - - - - - update user_draw_record - - - uid = #{uid,jdbcType=BIGINT}, - - - draw_status = #{drawStatus,jdbcType=TINYINT}, - - - type = #{type,jdbcType=TINYINT}, - - - src_obj_id = #{srcObjId,jdbcType=VARCHAR}, - - - src_obj_name = #{srcObjName,jdbcType=VARCHAR}, - - - src_obj_amount = #{srcObjAmount,jdbcType=BIGINT}, - - - draw_prize_id = #{drawPrizeId,jdbcType=INTEGER}, - - - draw_prize_name = #{drawPrizeName,jdbcType=VARCHAR}, - - - draw_prize_putout = #{drawPrizePutout,jdbcType=TINYINT}, - - - record_desc = #{recordDesc,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where record_id = #{recordId,jdbcType=INTEGER} - - - update user_draw_record - set uid = #{uid,jdbcType=BIGINT}, - draw_status = #{drawStatus,jdbcType=TINYINT}, - type = #{type,jdbcType=TINYINT}, - src_obj_id = #{srcObjId,jdbcType=VARCHAR}, - src_obj_name = #{srcObjName,jdbcType=VARCHAR}, - src_obj_amount = #{srcObjAmount,jdbcType=BIGINT}, - draw_prize_id = #{drawPrizeId,jdbcType=INTEGER}, - draw_prize_name = #{drawPrizeName,jdbcType=VARCHAR}, - draw_prize_putout = #{drawPrizePutout,jdbcType=TINYINT}, - record_desc = #{recordDesc,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where record_id = #{recordId,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketMapper.xml deleted file mode 100644 index b360ae28b..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketMapper.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - uid, packet_num, hist_packet_num, first_get_time, create_time, update_time - - - - - delete from user_packet - where uid = #{uid,jdbcType=BIGINT} - - - insert into user_packet (uid, packet_num, hist_packet_num, - first_get_time, create_time, update_time - ) - values (#{uid,jdbcType=BIGINT}, #{packetNum,jdbcType=DOUBLE}, #{histPacketNum,jdbcType=DOUBLE}, - #{firstGetTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - - - insert into user_packet - - - uid, - - - packet_num, - - - hist_packet_num, - - - first_get_time, - - - create_time, - - - update_time, - - - - - #{uid,jdbcType=BIGINT}, - - - #{packetNum,jdbcType=DOUBLE}, - - - #{histPacketNum,jdbcType=DOUBLE}, - - - #{firstGetTime,jdbcType=TIMESTAMP}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update user_packet - - - packet_num = #{packetNum,jdbcType=DOUBLE}, - - - hist_packet_num = #{histPacketNum,jdbcType=DOUBLE}, - - - first_get_time = #{firstGetTime,jdbcType=TIMESTAMP}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where uid = #{uid,jdbcType=BIGINT} - - - update user_packet - set packet_num = #{packetNum,jdbcType=DOUBLE}, - hist_packet_num = #{histPacketNum,jdbcType=DOUBLE}, - first_get_time = #{firstGetTime,jdbcType=TIMESTAMP}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where uid = #{uid,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketMapperMgr.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketMapperMgr.xml deleted file mode 100644 index 5cd29681e..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketMapperMgr.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - uid, packet_num, hist_packet_num, first_get_time, create_time, update_time - - - update user_packet set packet_num=packet_num+#{packetNum,jdbcType=DOUBLE}, - hist_packet_num=hist_packet_num + #{packetNum,jdbcType=DOUBLE}, - update_time =NOW() - where uid = #{uid,jdbcType=BIGINT} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketRecordExpand.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketRecordExpand.xml deleted file mode 100644 index c21530e84..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketRecordExpand.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketRecordMapper.xml deleted file mode 100644 index 258fe99bb..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketRecordMapper.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - packet_id, uid, packet_num, src_uid, type, obj_id, has_unpack, packet_status, create_time, - update_time - - - - - delete from user_packet_record - where packet_id = #{packetId,jdbcType=VARCHAR} - - - insert into user_packet_record (packet_id, uid, packet_num, - src_uid, type, obj_id, - has_unpack, packet_status, create_time, - update_time) - values (#{packetId,jdbcType=VARCHAR}, #{uid,jdbcType=BIGINT}, #{packetNum,jdbcType=DOUBLE}, - #{srcUid,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{objId,jdbcType=VARCHAR}, - #{hasUnpack,jdbcType=BIT}, #{packetStatus,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) - - - insert into user_packet_record - - - packet_id, - - - uid, - - - packet_num, - - - src_uid, - - - type, - - - obj_id, - - - has_unpack, - - - packet_status, - - - create_time, - - - update_time, - - - - - #{packetId,jdbcType=VARCHAR}, - - - #{uid,jdbcType=BIGINT}, - - - #{packetNum,jdbcType=DOUBLE}, - - - #{srcUid,jdbcType=BIGINT}, - - - #{type,jdbcType=TINYINT}, - - - #{objId,jdbcType=VARCHAR}, - - - #{hasUnpack,jdbcType=BIT}, - - - #{packetStatus,jdbcType=TINYINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update user_packet_record - - - uid = #{uid,jdbcType=BIGINT}, - - - packet_num = #{packetNum,jdbcType=DOUBLE}, - - - src_uid = #{srcUid,jdbcType=BIGINT}, - - - type = #{type,jdbcType=TINYINT}, - - - obj_id = #{objId,jdbcType=VARCHAR}, - - - has_unpack = #{hasUnpack,jdbcType=BIT}, - - - packet_status = #{packetStatus,jdbcType=TINYINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where packet_id = #{packetId,jdbcType=VARCHAR} - - - update user_packet_record - set uid = #{uid,jdbcType=BIGINT}, - packet_num = #{packetNum,jdbcType=DOUBLE}, - src_uid = #{srcUid,jdbcType=BIGINT}, - type = #{type,jdbcType=TINYINT}, - obj_id = #{objId,jdbcType=VARCHAR}, - has_unpack = #{hasUnpack,jdbcType=BIT}, - packet_status = #{packetStatus,jdbcType=TINYINT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where packet_id = #{packetId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketWithdrawRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketWithdrawRecordMapper.xml deleted file mode 100644 index 5d17ffd4f..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserPacketWithdrawRecordMapper.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - record_id, uid, packet_num, record_status, create_time - - - - - delete from user_packet_withdraw_record - where record_id = #{recordId,jdbcType=VARCHAR} - - - insert into user_packet_withdraw_record (record_id, uid, packet_num, - record_status, create_time) - values (#{recordId,jdbcType=VARCHAR}, #{uid,jdbcType=BIGINT}, #{packetNum,jdbcType=DOUBLE}, - #{recordStatus,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}) - - - insert into user_packet_withdraw_record - - - record_id, - - - uid, - - - packet_num, - - - record_status, - - - create_time, - - - - - #{recordId,jdbcType=VARCHAR}, - - - #{uid,jdbcType=BIGINT}, - - - #{packetNum,jdbcType=DOUBLE}, - - - #{recordStatus,jdbcType=TINYINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - update user_packet_withdraw_record - - - uid = #{uid,jdbcType=BIGINT}, - - - packet_num = #{packetNum,jdbcType=DOUBLE}, - - - record_status = #{recordStatus,jdbcType=TINYINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - where record_id = #{recordId,jdbcType=VARCHAR} - - - update user_packet_withdraw_record - set uid = #{uid,jdbcType=BIGINT}, - packet_num = #{packetNum,jdbcType=DOUBLE}, - record_status = #{recordStatus,jdbcType=TINYINT}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where record_id = #{recordId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserRadishGiftWallMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserRadishGiftWallMapper.xml deleted file mode 100644 index 11043ae15..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserRadishGiftWallMapper.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - wall_id, uid, gift_id, receive_count, create_time, update_time - - - - - delete from user_radish_gift_wall - where wall_id = #{wallId,jdbcType=BIGINT} - - - delete from user_radish_gift_wall - - - - - - insert into user_radish_gift_wall (uid, gift_id, receive_count, - create_time, update_time) - values (#{uid,jdbcType=BIGINT}, #{giftId,jdbcType=INTEGER}, #{receiveCount,jdbcType=INTEGER}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - - - insert into user_radish_gift_wall - - - uid, - - - gift_id, - - - receive_count, - - - create_time, - - - update_time, - - - - - #{uid,jdbcType=BIGINT}, - - - #{giftId,jdbcType=INTEGER}, - - - #{receiveCount,jdbcType=INTEGER}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - update user_radish_gift_wall - - - wall_id = #{record.wallId,jdbcType=BIGINT}, - - - uid = #{record.uid,jdbcType=BIGINT}, - - - gift_id = #{record.giftId,jdbcType=INTEGER}, - - - receive_count = #{record.receiveCount,jdbcType=INTEGER}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - - - - - - update user_radish_gift_wall - set wall_id = #{record.wallId,jdbcType=BIGINT}, - uid = #{record.uid,jdbcType=BIGINT}, - gift_id = #{record.giftId,jdbcType=INTEGER}, - receive_count = #{record.receiveCount,jdbcType=INTEGER}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - - - - - - update user_radish_gift_wall - - - uid = #{uid,jdbcType=BIGINT}, - - - gift_id = #{giftId,jdbcType=INTEGER}, - - - receive_count = #{receiveCount,jdbcType=INTEGER}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where wall_id = #{wallId,jdbcType=BIGINT} - - - update user_radish_gift_wall - set uid = #{uid,jdbcType=BIGINT}, - gift_id = #{giftId,jdbcType=INTEGER}, - receive_count = #{receiveCount,jdbcType=INTEGER}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where wall_id = #{wallId,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserRadishGiftWallMapperMgr.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserRadishGiftWallMapperMgr.xml deleted file mode 100644 index 36870ae49..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserRadishGiftWallMapperMgr.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - update user_radish_gift_wall set receive_count =receive_count+#{receiveCount,jdbcType=INTEGER},update_time=NOW() - where uid = #{uid,jdbcType=BIGINT} - and gift_id = #{giftId,jdbcType=INTEGER} - - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserWalletMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserWalletMapper.xml deleted file mode 100644 index dadf2d258..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserWalletMapper.xml +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - wallet_id, uid, amount, currency_type, use_status, deleted, create_time, update_time - - - - - delete from user_wallet - where wallet_id = #{walletId,jdbcType=BIGINT} - - - delete from user_wallet - - - - - - insert into user_wallet (uid, amount, currency_type, - use_status, deleted, create_time, - update_time) - values (#{uid,jdbcType=BIGINT}, #{amount,jdbcType=BIGINT}, #{currencyType,jdbcType=TINYINT}, - #{useStatus,jdbcType=TINYINT}, #{deleted,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) - - - insert into user_wallet - - - uid, - - - amount, - - - currency_type, - - - use_status, - - - deleted, - - - create_time, - - - update_time, - - - - - #{uid,jdbcType=BIGINT}, - - - #{amount,jdbcType=BIGINT}, - - - #{currencyType,jdbcType=TINYINT}, - - - #{useStatus,jdbcType=TINYINT}, - - - #{deleted,jdbcType=BIT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - update user_wallet - - - wallet_id = #{record.walletId,jdbcType=BIGINT}, - - - uid = #{record.uid,jdbcType=BIGINT}, - - - amount = #{record.amount,jdbcType=BIGINT}, - - - currency_type = #{record.currencyType,jdbcType=TINYINT}, - - - use_status = #{record.useStatus,jdbcType=TINYINT}, - - - deleted = #{record.deleted,jdbcType=BIT}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - - - - - - update user_wallet - set wallet_id = #{record.walletId,jdbcType=BIGINT}, - uid = #{record.uid,jdbcType=BIGINT}, - amount = #{record.amount,jdbcType=BIGINT}, - currency_type = #{record.currencyType,jdbcType=TINYINT}, - use_status = #{record.useStatus,jdbcType=TINYINT}, - deleted = #{record.deleted,jdbcType=BIT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP} - - - - - - update user_wallet - - - uid = #{uid,jdbcType=BIGINT}, - - - amount = #{amount,jdbcType=BIGINT}, - - - currency_type = #{currencyType,jdbcType=TINYINT}, - - - use_status = #{useStatus,jdbcType=TINYINT}, - - - deleted = #{deleted,jdbcType=BIT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where wallet_id = #{walletId,jdbcType=BIGINT} - - - update user_wallet - set uid = #{uid,jdbcType=BIGINT}, - amount = #{amount,jdbcType=BIGINT}, - currency_type = #{currencyType,jdbcType=TINYINT}, - use_status = #{useStatus,jdbcType=TINYINT}, - deleted = #{deleted,jdbcType=BIT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where wallet_id = #{walletId,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserWalletMapperMgr.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserWalletMapperMgr.xml deleted file mode 100644 index 0835261f4..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserWalletMapperMgr.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - update user_wallet set amount=amount + #{amount},update_time=now() - where uid=#{uid} and currency_type = #{currencyType} and amount + #{amount}>=0 - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserWalletWaterMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserWalletWaterMapper.xml deleted file mode 100644 index e92383b60..000000000 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/UserWalletWaterMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/drawprize/UserDrawController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/drawprize/UserDrawController.java deleted file mode 100644 index ece2460b4..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/drawprize/UserDrawController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.accompany.business.controller.drawprize; - -import com.accompany.business.common.BaseController; -import com.accompany.business.service.drawprize.UserDrawService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.vo.drawprize.UserDrawDoVo; -import com.accompany.business.vo.drawprize.UserDrawVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.exception.ApiException; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Users; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * Created by liuguofu on 2017/12/14. - */ -@Controller -@RequestMapping("/draw") -public class UserDrawController extends BaseController{ - @Autowired - private UserDrawService userDrawService; - @Autowired - private UsersService usersService; - - private static final Logger logger = LoggerFactory.getLogger(UserDrawController.class); - /** - * 获取我的促销活动信息 - * @param uid - * @return - */ - @RequestMapping(value = "/get", method = RequestMethod.GET) - @ResponseBody -// @Authorization - public BusiResult getUserDrawInfo(Long uid){ - BusiResult busiResult=userDrawService.getUserDrawByUid(uid); - return busiResult; - } - - /** - * 获取我的礼物促销活动信息 - * @param uid - * @return - */ - @RequestMapping(value = "/gift/get", method = RequestMethod.GET) - @ResponseBody -// @Authorization - public BusiResult getUserGiftDrawInfo(@RequestParam Long uid){ - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - Users users = this.usersService.getUsersByUid(uid); - if(users == null){ - return new BusiResult(BusiStatus.USERNOTEXISTS); - } - UserDrawVo userDrawVo = this.userDrawService.getUserGiftDrawByUid(uid); - busiResult.setData(userDrawVo); - return busiResult; - } - - /** - * 发起一次促销活动 - * @param uid - * @return - */ - @RequestMapping(value = "/do", method = RequestMethod.POST) - @ResponseBody - @Authorization - public BusiResult doUserDraw(Long uid){ - try{ - BusiResult busiResult = userDrawService.doUserDraw(uid); - return busiResult; - }catch (Exception e){ - logger.error("do draw failed,uid={}",uid,e); - return new BusiResult(BusiStatus.BUSIERROR); - } - - } - - /** - * 发起一次促销活动 - * @param uid - * @return - */ - @RequestMapping(value = "/gift/do", method = RequestMethod.POST) - @ResponseBody - @Authorization - public BusiResult doUserGiftDraw(@RequestParam Long uid, @RequestParam String deviceId){ - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - try{ - UserDrawDoVo userDrawDoVo = userDrawService.doUserGiftDraw(uid,deviceId); - busiResult.setData(userDrawDoVo); - return busiResult; - }catch (ServiceException e){ - return new BusiResult(e.getBusiStatus()); - }catch (ApiException e){ - return new BusiResult(e.getResponseCode(),e.getMessage(),null); - }catch (Exception e){ - logger.error("do draw failed,uid={}",uid,e); - return new BusiResult(BusiStatus.BUSIERROR); - } - - } - - /** - * 获取已经中奖的记录，用于滚屏 - * @return - */ - @RequestMapping(value = "/list", method = RequestMethod.GET) - @ResponseBody - public BusiResult doUserDraw(){ - BusiResult busiResult=userDrawService.getUserDrawRecordListByStatus(); - return busiResult; - } - - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/drawprize/UserDrawRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/drawprize/UserDrawRecordController.java deleted file mode 100644 index 92a480ea4..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/drawprize/UserDrawRecordController.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.accompany.business.controller.drawprize; - -import org.springframework.stereotype.Controller; - -/** - * Created by liuguofu on 2017/12/14. - */ -@Controller -public class UserDrawRecordController { -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/radish/RadishBillController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/radish/RadishBillController.java deleted file mode 100644 index 5832801f3..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/radish/RadishBillController.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.controller.radish; - -import com.accompany.business.service.radish.RadishBillService; -import com.accompany.business.vo.radish.RadishBillRecordVo; -import com.accompany.business.common.BaseController; -import com.google.common.collect.Maps; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.Constant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.LinkedHashMap; -import java.util.List; - -/** - * 萝卜账单 - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/19 18:26 - * 4 - */ -@RestController -@RequestMapping("/radish/bill") -public class RadishBillController extends BaseController { - private static final Logger logger = LoggerFactory.getLogger(RadishBillController.class); - @Autowired - private RadishBillService radishBillService; - - - /** - * 查询萝卜账单记录 - * - * @param uid - * @param page - * @param pageSize - * @param type 1支出，2收入 - * @param date - * @return - */ - @RequestMapping(value = "/record/get", method = RequestMethod.GET) - @Authorization - public BusiResult getRadishBilltRecordList(Long uid, @RequestParam(value = "page", defaultValue = "1") Integer page, - @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Byte type, - Long date) { - if (uid == null || type == null || date == null - || (Constant.RadishBillPayType.PAY != type && Constant.RadishBillPayType.INCOME != type)) { - return new BusiResult(BusiStatus.PARAMERROR); - } - List>> reList = radishBillService.getRadishBillRecordVoList(uid, page, pageSize, date, type); - - LinkedHashMap>>> reMap = Maps.newLinkedHashMap(); - reMap.put("billList", reList); - return new BusiResult(reMap); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/radish/RadishGiftRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/radish/RadishGiftRecordController.java deleted file mode 100644 index 38fb068dc..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/radish/RadishGiftRecordController.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.accompany.business.controller.radish; - -import com.accompany.business.service.radish.RadishGiftSendRecordService; -import com.accompany.business.vo.radish.RadishGiftRecordVo; -import com.accompany.business.common.BaseController; -import com.google.common.collect.Maps; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.constant.Constant; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.LinkedHashMap; -import java.util.List; - -/** - * 萝卜礼物 - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/19 18:26 - * 4 - */ -@RestController -@RequestMapping("/gift/radish") -public class RadishGiftRecordController extends BaseController { - private static final Logger logger = LoggerFactory.getLogger(RadishGiftRecordController.class); - @Autowired - private RadishGiftSendRecordService radishGiftSendRecordService; - - - /** - * 查询萝卜礼物收入记录 - * - * @param uid - * @param page - * @param pageSize - * @param type 1赠送，2收入 - * @param date - * @return - */ - @RequestMapping(value = "/record/get", method = RequestMethod.GET) - @Authorization - public BusiResult getRadishGiftRecordList(Long uid, @RequestParam(value = "page", defaultValue = "1") Integer page, - @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Byte type, - Long date) { - if (uid == null || type == null || date == null - || (Constant.RadishGiftRecordType.RECEIVE != type && Constant.RadishGiftRecordType.SEND != type)) { - return new BusiResult(BusiStatus.PARAMERROR); - } - List>> reList = radishGiftSendRecordService.getRadishGiftRecordVoList(uid, page, pageSize, date, type); - - LinkedHashMap>>> reMap = Maps.newLinkedHashMap(); - reMap.put("billList", reList); - return new BusiResult(reMap); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/radish/UserRadishGiftWallController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/radish/UserRadishGiftWallController.java deleted file mode 100644 index 01fdc494f..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/radish/UserRadishGiftWallController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.accompany.business.controller.radish; - -import com.accompany.business.service.radish.UserRadishGiftWallService; -import com.accompany.business.common.BaseController; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -/** - * 萝卜礼物墙 - * 2 * @Author: zhuct - * 3 * @Date: 2019/3/19 18:26 - * 4 - */ -@RestController -@RequestMapping("/radish/gift/wall") -public class UserRadishGiftWallController extends BaseController { - private static final Logger logger = LoggerFactory.getLogger(UserRadishGiftWallController.class); - @Autowired - private UserRadishGiftWallService userRadishGiftWallService; - - - /** - * 查询用户礼物墙 - * - * @param uid - * @return - */ - @RequestMapping(value = "/get", method = RequestMethod.GET) - public BusiResult getCarportList(Long uid) { - if (uid == null) { - return new BusiResult(BusiStatus.PARAMERROR); - } - return new BusiResult(userRadishGiftWallService.getUserRadishGiftWall(uid)); - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/record/PacketRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/record/PacketRecordController.java deleted file mode 100644 index a125c0a06..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/record/PacketRecordController.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.accompany.business.controller.record; - - -import com.accompany.business.model.UserPacketRecord; -import com.accompany.business.service.record.UserPacketRecord2Service; -import com.accompany.business.vo.PacketRecordVo; -import com.google.common.collect.Maps; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.LinkedHashMap; -import java.util.List; - -@Deprecated -//@Controller -@RequestMapping("/packetrecord") -public class PacketRecordController { - - private static final Logger logger = LoggerFactory.getLogger(PacketRecordController.class); - - @Autowired - private UserPacketRecord2Service packetRecord2Service; - - /** - * 获取红包账单记录（提现红包类型除外） - * - * @param uid 账号 - * @param date 查询日期 - * @param pageNo 当前页码 - * @return - */ - @RequestMapping(value = "get") - @ResponseBody - @Authorization - public BusiResult getPacketRecord(long uid, long date, int pageNo, Integer pageSize) { - if (pageSize == null || pageSize < 1) { - pageSize = 50; - } - List list = packetRecord2Service.getUserPacketRecord(uid, date, pageNo, pageSize); - List>> reList = packetRecord2Service.transToSearchVo(list); - LinkedHashMap>>> reMap = Maps.newLinkedHashMap(); - reMap.put("billList", reList); - BusiResult>>>> busiResult = new BusiResult>>>>(BusiStatus.SUCCESS); - busiResult.setData(reMap); - return busiResult; - } - - - /** - * 红包提现 - * @param uid - * @param date - * @param pageNo - * @param pageSize - * @return - */ - @RequestMapping(value = "deposit") - @ResponseBody - @Authorization - public BusiResult getPacketDepositRecord(long uid, long date, int pageNo, Integer pageSize) { - if (pageSize == null || pageSize < 1) { - pageSize = 50; - } - List list = packetRecord2Service.getPacketDeposiRecord(uid, date, pageNo, pageSize); - List>> reList = packetRecord2Service.transToSearchVo(list); - LinkedHashMap>>> reMap = Maps.newLinkedHashMap(); - reMap.put("billList", reList); - BusiResult>>>> busiResult = new BusiResult>>>>(BusiStatus.SUCCESS); - busiResult.setData(reMap); - return busiResult; - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/statis/StatPacketActivityController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/statis/StatPacketActivityController.java deleted file mode 100644 index 78bc4ca48..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/statis/StatPacketActivityController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.accompany.business.controller.statis; - -import com.accompany.business.service.statis.StatPacketActivityService; -import com.accompany.business.vo.*; -import com.google.common.util.concurrent.RateLimiter; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.BlankUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.concurrent.TimeUnit; - -/** - * Created by liuguofu on 2017/9/15. - */ -@Controller -@RequestMapping("/statpacket") -public class StatPacketActivityController { - - private static final Logger logger = LoggerFactory.getLogger(StatPacketActivityController.class); - - @Autowired - private StatPacketActivityService statPacketActivityService; - - private RateLimiter redPacketLimiter = RateLimiter.create(200); - - /** - * 我的红包页面 - * - * @param uid - * @return - */ - @RequestMapping(value = "get", method = RequestMethod.GET) - @ResponseBody -// @Authorization - public BusiResult getMyStatPacketDetail(Long uid) { - if (!redPacketLimiter.tryAcquire(5, TimeUnit.SECONDS)) { - return new BusiResult(BusiStatus.SERVER_BUSY); - } - - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - if (uid == null || uid == 0L) { - busiResult.setCode(BusiStatus.PARAMETERILLEGAL.value()); - busiResult.setMessage("参数异常"); - return busiResult; - } - try { - busiResult=statPacketActivityService.queryStatPacketVo(uid); - } catch (Exception e) { - logger.error("getMyStatPacketDetail error...uid="+uid,e); - } - return busiResult; - } - - /** - * 红包排行榜页面 - * - * @param uid - * @return - */ - @RequestMapping(value = "rank", method = RequestMethod.GET) - @ResponseBody -// @Authorization - public BusiResult queryStatPacketActivityRankList(Long uid) { - if (!redPacketLimiter.tryAcquire(5, TimeUnit.SECONDS)) { - return new BusiResult(BusiStatus.SERVER_BUSY); - } - - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - if (uid == null || uid == 0L) { - busiResult.setCode(BusiStatus.PARAMETERILLEGAL.value()); - busiResult.setMessage("参数异常"); - return busiResult; - } - busiResult=statPacketActivityService.queryStatPacketActivityRankList(uid); - return busiResult; - } - - - @RequestMapping(value = "invitedetail", method = RequestMethod.GET) - @ResponseBody -// @Authorization - public BusiResult getInviteDetail(Long uid) { - if (!redPacketLimiter.tryAcquire(5, TimeUnit.SECONDS)) { - return new BusiResult(BusiStatus.SERVER_BUSY); - } - - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - if (uid == null || uid == 0L) { - busiResult.setCode(BusiStatus.PARAMETERILLEGAL.value()); - busiResult.setMessage("参数异常"); - return busiResult; - } - busiResult =statPacketActivityService.getInviteDetail(uid); - return busiResult; - } - - @RequestMapping(value = "someinvitedetail", method = RequestMethod.GET) - @ResponseBody - public BusiResult getSomeInviteDetail(String uidList) { - if (!redPacketLimiter.tryAcquire(5, TimeUnit.SECONDS)) { - return new BusiResult(BusiStatus.SERVER_BUSY); - } - - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - if(BlankUtil.isBlank(uidList)){ - busiResult.setCode(BusiStatus.PARAMETERILLEGAL.value()); - busiResult.setMessage("参数异常"); - return busiResult; - } - busiResult = statPacketActivityService.getSomeInviteDetail(uidList); - return busiResult; - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/statis/StatPacketBounsController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/statis/StatPacketBounsController.java deleted file mode 100644 index 959194ecf..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/statis/StatPacketBounsController.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.accompany.business.controller.statis; - -import com.accompany.business.service.statis.StatPacketActivityService; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * Created by liuguofu on 2017/9/21. - */ -@Controller -@RequestMapping("/statbouns") -public class StatPacketBounsController { - @Autowired - private StatPacketActivityService statPacketActivityService; - - @RequestMapping(value = "detail", method = RequestMethod.GET) - @ResponseBody -// @Authorization - public BusiResult getStatBounsDetail(Long uid) { - BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); - if (uid == null || uid == 0L) { - busiResult.setCode(BusiStatus.PARAMETERILLEGAL.value()); - busiResult.setMessage("参数异常"); - return busiResult; - } - busiResult = statPacketActivityService.queryStatBounsDetail(uid); - return busiResult; - } -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/statis/StatRoomCtrbSumController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/statis/StatRoomCtrbSumController.java index 1e634881e..fe88e2496 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/statis/StatRoomCtrbSumController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/statis/StatRoomCtrbSumController.java @@ -4,7 +4,6 @@ package com.accompany.business.controller.statis; * Created by liuguofu on 2017/10/1. */ -import com.accompany.business.service.statis.StatPacketActivityService; import com.accompany.business.service.statis.StatRoomCtrbSumService; import com.accompany.business.service.statis.StatRoomCtrbSumTotalService; import com.accompany.business.vo.StatRoomCtrbSumVo; @@ -31,8 +30,6 @@ public class StatRoomCtrbSumController { @Autowired private StatRoomCtrbSumTotalService statRoomCtrbSumTotalService; - @Autowired - private StatPacketActivityService statPacketActivityService; @RequestMapping(value = "query",method = RequestMethod.GET) @ResponseBody @@ -63,19 +60,4 @@ public class StatRoomCtrbSumController { return busiResult; } -// /** -// * 数据割接 -// * @param uid -// * @return -// */ -// @RequestMapping(value = "auto",method = RequestMethod.GET) -// @ResponseBody -// public BusiResult> autoGenStatRoomCtrb(Long uid){ -// BusiResult> busiResult=statRoomCtrbSumService.getStatRoomCtrbSumListByUid(uid); -// return busiResult; -// } - - - - } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserPacketController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserPacketController.java deleted file mode 100644 index a2220e1a2..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserPacketController.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.accompany.business.controller.user; - -import com.accompany.business.service.user.UserPacketService; -import com.accompany.business.service.user.UserShareRecordService; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * Created by liuguofu on 2017/9/15. - */ -@Controller -@RequestMapping("/packet") -public class UserPacketController { - private static final Logger logger = LoggerFactory.getLogger(UserPacketController.class); - @Autowired - private UserShareRecordService userShareRecordService; - @Autowired - private UserPacketService userPacketService; - - /** - * 首次领取红包接口，在用户首次注册补全资料成功之后，客户端调用改接口 - * @param uid - * @return - */ - @RequestMapping(value = "first",method = RequestMethod.GET) - @ResponseBody - @Authorization - public BusiResult checkAndGetFirsetPacket(Long uid){ - logger.info("UserPacketController checkAndGetFirsetPacket "); - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - if(uid==null||uid==0L){ - busiResult.setCode(BusiStatus.PARAMETERILLEGAL.value()); - busiResult.setMessage("参数异常"); - return busiResult; - } - try { - busiResult=userPacketService.checkAndGetFirsetPacket(uid); - } catch (Exception e) { - logger.error("checkAndGetFirsetPacket error",e); - } - return busiResult; - } - -// @RequestMapping(value = "query",method = RequestMethod.GET) -// @ResponseBody -//// @Authorization -// public BusiResult query(Long uid,String shareType,int sharePageId,Long targetUid){ -// BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); -// if(uid==null||uid==0L){ -// busiResult.setCode(BusiStatus.PARAMETERILLEGAL.value()); -// busiResult.setMessage("参数异常"); -// return busiResult; -// } -//// busiResult=userPacketService.saveUserShareRecord(uid,shareType,sharePageId,targetUid); -// return busiResult; -// } - - - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserShareRecordController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserShareRecordController.java index 10bfe54ec..0f5a56e3b 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserShareRecordController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserShareRecordController.java @@ -1,6 +1,5 @@ package com.accompany.business.controller.user; -import com.accompany.business.service.statis.StatPacketRegisterService; import com.accompany.business.service.user.UserShareRecordService; import com.accompany.common.device.DeviceInfo; import com.accompany.common.result.BusiResult; @@ -25,8 +24,6 @@ public class UserShareRecordController { private static final Logger logger = LoggerFactory.getLogger(UserShareRecordController.class); @Autowired private UserShareRecordService userShareRecordService; - @Autowired - private StatPacketRegisterService statPacketRegisterService; /** * 保存分享记录 @@ -52,44 +49,6 @@ public class UserShareRecordController { busiResult=userShareRecordService.saveUserShareRecord(uid,shareType,sharePageId,targetUid, shareUrl,ip,deviceInfo==null?null:deviceInfo.getDeviceId()); return busiResult; } - @RequestMapping(value = "test",method = RequestMethod.GET) - @ResponseBody - public BusiResult test(){ - System.out.println("test...."); - userShareRecordService.saveUserShareRecordTest(90010883L,"3",1,null); - System.out.println("test2...."); - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - return busiResult; - } - - @RequestMapping(value = "sendPusTest",method = RequestMethod.GET) - @ResponseBody - public BusiResult sendPusTest(Long uid){ - System.out.println("sendPusTest...."); - userShareRecordService.sendPushTest(uid); - System.out.println("sendPusTest...."); - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - return busiResult; - } - - @RequestMapping(value = "saveUserBonusRecordTest",method = RequestMethod.GET) - @ResponseBody - public BusiResult saveUserBonusRecord(Long uid){ - System.out.println("sendPusTest...."); - userShareRecordService.saveUserBonusRecord(90589L,"",1000); - System.out.println("sendPusTest...."); - BusiResult busiResult=new BusiResult(BusiStatus.SUCCESS); - return busiResult; - } - -// @RequestMapping(value = "repairRegisterRecord",method = RequestMethod.GET) -// @ResponseBody -// public BusiResult repaireRegisterRecord(Long uid,Long targetUid){ -// BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS); -// Integer result = statPacketRegisterService.saveStatPacketRegister(uid,targetUid); -// busiResult.setData(result); -// return busiResult; -// } } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserWalletController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserWalletController.java deleted file mode 100644 index 379c9d40b..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserWalletController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.accompany.business.controller.user; - -import com.accompany.business.service.purse.UserWalletService; -import com.accompany.business.common.BaseController; -import com.accompany.business.vo.user.UserWalletVo; -import com.accompany.common.annotation.Authorization; -import com.accompany.common.result.BusiResult; -import com.accompany.common.status.BusiStatus; -import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - - -@Slf4j -@RestController -@RequestMapping("/wallet") -public class UserWalletController extends BaseController { - private static final Logger logger = LoggerFactory.getLogger(UserWalletController.class); - @Autowired - private UserWalletService userWalletService; - - /** - * 查询用户钱包 - * - * @param uid - * @param currencyType 1：萝卜币 - * @return - */ - @RequestMapping(value = "/get", method = RequestMethod.GET) - @Authorization - public BusiResult queryMyUserPurse(Long uid, Byte currencyType) { - if (uid == null || uid == 0L || currencyType == null) { - log.error("UserWalletController queryMyUserPurse is error, uid : {}, currencyType : {}", uid, currencyType); - return BusiResult.success(new UserWalletVo()); - } - return new BusiResult<>(userWalletService.getUserWalletVo(uid, currencyType)); - - } - - -} diff --git a/accompany-mq/accompany-mq-sdk/src/main/java/com/accompany/mq/constant/MqConstant.java b/accompany-mq/accompany-mq-sdk/src/main/java/com/accompany/mq/constant/MqConstant.java index 744650c88..076ab98a5 100644 --- a/accompany-mq/accompany-mq-sdk/src/main/java/com/accompany/mq/constant/MqConstant.java +++ b/accompany-mq/accompany-mq-sdk/src/main/java/com/accompany/mq/constant/MqConstant.java @@ -17,9 +17,6 @@ public interface MqConstant { String ACTIVITY_PACK_TOPIC = "activity_pack_topic"; String ACTIVITY_PACK_CONSUME_GROUP = "activity_pack_consume_group"; - String RADISH_GIFT_TOPIC = "radish_gift_topic"; - String RADISH_GIFT_CONSUME_GROUP = "radish_gift_consume_group"; - String PAY_FINISH_TOPIC = "pay_finish_topic"; String PAY_FINISH_CONSUME_GROUP = "pay_finish_consume_group"; diff --git a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/RadishGiftMessageConsumer.java b/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/RadishGiftMessageConsumer.java deleted file mode 100644 index 197472c13..000000000 --- a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/RadishGiftMessageConsumer.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.accompany.mq.consumer; - -import com.accompany.business.message.RadishGiftMessage; -import com.accompany.business.service.gift.RadishGiftMessageService; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.BlankUtil; -import com.accompany.core.service.common.JedisService; -import com.accompany.mq.constant.MqConstant; -import com.accompany.mq.listener.AbstractMessageListener; -import lombok.extern.slf4j.Slf4j; -import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.stereotype.Component; - -@Slf4j -@Component -@ConditionalOnProperty(name = "spring.application.name", havingValue = "web") -@RocketMQMessageListener(topic = MqConstant.RADISH_GIFT_TOPIC, consumerGroup = MqConstant.RADISH_GIFT_CONSUME_GROUP) -public class RadishGiftMessageConsumer extends AbstractMessageListener { - - @Autowired - private JedisService jedisService; - @Autowired - private RadishGiftMessageService radishGiftMessageService; - - @Override - public void onMessage(RadishGiftMessage radishGiftMessage) { - log.info("onMessage radishGiftMessage: {}", radishGiftMessage.toString()); - // 判断该消息是否已经消费过 - String messStatus = jedisService.hget(RedisKey.mq_radish_gift_status.getKey(), radishGiftMessage.getMessId()); - if (BlankUtil.isBlank(messStatus)) { - return; - } - radishGiftMessageService.handleRadishGiftMessage(radishGiftMessage); - } - -}