From 0a21bd61c3c7f33606ea8f571e619e5b1a49c404 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 12 三月 2019 14:59:41 +0800 Subject: [PATCH] 旧版资金明细删除 --- fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java | 181 --------------------------------------------- 1 files changed, 0 insertions(+), 181 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java index c40e187..6603f5e 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java @@ -4,7 +4,6 @@ import java.util.Calendar; import java.util.Date; -import com.yeshi.fanli.entity.bus.user.AccountDetails; import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory; import com.yeshi.fanli.entity.bus.user.Extract; import com.yeshi.fanli.entity.bus.user.HongBao; @@ -44,46 +43,6 @@ detail.setTitle(UserMoneyDetailTypeEnum.fanli.getDesc()); detail.setType(UserMoneyDetailTypeEnum.fanli); detail.setDescInfo("璁㈠崟鍙凤細" + orderId); - detail.setUpdateTime(new Date()); - detail.setUserInfo(new UserInfo(uid)); - return detail; - } - - /** - * 鍘熸湁杩斿埄鏁版嵁鍚屾 - * - * @param uid - * @param orderId - * @param orderType - * @param money - * @return - * @throws UserMoneyDetailException - */ - public static UserMoneyDetail createOldFanLi(Long uid, AccountDetails accountDetails, BigDecimal money) - throws UserMoneyDetailException { - int orderType = 1; - String orderId = null; - if (accountDetails.getOrderItem() == null) - orderId = accountDetails.getId() + ""; - else - orderId = accountDetails.getId() + "-" + accountDetails.getOrderItem().getOrderId(); - - if (money == null) - throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖"); - - if (uid == null) - throw new UserMoneyDetailException(1, "UID涓虹┖"); - - UserMoneyDetail detail = new UserMoneyDetail(); - detail.setCreateTime( - new Date(TimeUtil.convertToTimeTemp(accountDetails.getCreateTime(), "yyyy-MM-dd HH:mm:ss"))); - detail.setIdentifyCode( - StringUtil.Md5(UserMoneyDetailTypeEnum.fanli.name() + "-" + uid + "-" + orderType + "-" + orderId)); - detail.setMoney(money); - detail.setTitle(UserMoneyDetailTypeEnum.fanli.getDesc()); - detail.setType(UserMoneyDetailTypeEnum.fanli); - if (accountDetails.getOrderItem() != null) - detail.setDescInfo("璁㈠崟鍙凤細" + accountDetails.getOrderItem().getOrderId()); detail.setUpdateTime(new Date()); detail.setUserInfo(new UserInfo(uid)); return detail; @@ -172,45 +131,6 @@ return detail; } - /** - * 鑰佺増鏈殑鍒嗕韩鍜岄個璇疯禋鍒拌处璁板綍 - * - * @param uid - * @param money - * @param time - * @return - * @throws UserMoneyDetailException - */ - public static UserMoneyDetail createShareAndInvite(AccountDetails accountDetail) throws UserMoneyDetailException { - if (accountDetail.getMoney() == null) - throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖"); - - if (accountDetail.getUserInfo() == null) - throw new UserMoneyDetailException(1, "UID涓虹┖"); - - if (accountDetail.getCreateTime() == null) - throw new UserMoneyDetailException(1, "鍙戠敓鏃堕棿涓虹┖"); - - Date time = new Date(TimeUtil.convertToTimeTemp(accountDetail.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); - - Calendar ca = Calendar.getInstance(); - ca.setTime(time); - ca.add(Calendar.MONTH, -1); - - String timeF = TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy骞碝M鏈�"); - - UserMoneyDetail detail = new UserMoneyDetail(); - detail.setCreateTime( - new Date(TimeUtil.convertToTimeTemp(accountDetail.getCreateTime(), "yyyy-MM-dd HH:mm:ss"))); - detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.inviteAndShare.name() + "-" - + accountDetail.getUserInfo().getId() + "-" + accountDetail.getId())); - detail.setMoney(new BigDecimal(accountDetail.getMoney())); - detail.setTitle(timeF + UserMoneyDetailTypeEnum.inviteAndShare.getDesc()); - detail.setType(UserMoneyDetailTypeEnum.inviteAndShare); - detail.setUpdateTime(new Date()); - detail.setUserInfo(accountDetail.getUserInfo()); - return detail; - } /** * 杩斿埄缁存潈 @@ -487,108 +407,7 @@ return createHongBaoDeduct(hb, "鏂颁汉绾㈠寘鎵i櫎"); } - /** - * 鑰佺増鏈殑鏂颁汉绾㈠寘閫�娆� - * - * @param hb - * @return - * @throws UserMoneyDetailException - */ - public static UserMoneyDetail createOldNewerHongBaoDeduct(AccountDetails accountDetails) - throws UserMoneyDetailException { - HongBao hb = new HongBao(); - hb.setId(accountDetails.getId()); - hb.setBeizhu("鑰佺増鏈�"); - hb.setMoney(new BigDecimal(accountDetails.getMoney())); - hb.setUserInfo(accountDetails.getUserInfo()); - UserMoneyDetail userMoneyDetail = createHongBaoDeduct(hb, "鏂颁汉绾㈠寘鎵i櫎"); - userMoneyDetail.setId(accountDetails.getId()); - return userMoneyDetail; - } - /** - * 鑰佺増鏈敭鍚庤鍗曟墸娆� - * - * @param accountDetails - * @return - * @throws UserMoneyDetailException - */ - public static UserMoneyDetail createOldWeiQuan(AccountDetails accountDetails) throws UserMoneyDetailException { - if (accountDetails == null) - throw new UserMoneyDetailException(1, "璇︽儏涓嶈兘涓虹┖"); - if (accountDetails.getUserInfo() == null) - throw new UserMoneyDetailException(1, "鐢ㄦ埛涓嶈兘涓虹┖"); - - UserMoneyDetail detail = new UserMoneyDetail(); - detail.setCreateTime(new Date()); - detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.weiQuan.name() + "-" + accountDetails.getId())); - detail.setMoney(new BigDecimal(accountDetails.getMoney())); - detail.setTitle(UserMoneyDetailTypeEnum.weiQuan.getDesc()); - detail.setType(UserMoneyDetailTypeEnum.weiQuan); - detail.setUpdateTime(new Date()); - detail.setUserInfo(accountDetails.getUserInfo()); - detail.setId(accountDetails.getId()); - return detail; - } - - /** - * 鏂颁汉绾㈠寘 - * - * @param accountDetails - * @return - * @throws UserMoneyDetailException - */ - - public static UserMoneyDetail createOldNewerHongBao(AccountDetails accountDetails) throws UserMoneyDetailException { - - if (accountDetails == null) - throw new UserMoneyDetailException(1, "璇︽儏涓嶈兘涓虹┖"); - if (accountDetails.getUserInfo() == null) - throw new UserMoneyDetailException(1, "鐢ㄦ埛涓嶈兘涓虹┖"); - - UserMoneyDetail detail = new UserMoneyDetail(); - detail.setCreateTime(new Date()); - detail.setIdentifyCode(StringUtil - .Md5(UserMoneyDetailTypeEnum.hongbao.name() + "-" + "鑰佺増鏈柊浜虹孩鍖�" + "-" + accountDetails.getId())); - detail.setMoney(new BigDecimal(accountDetails.getMoney())); - detail.setTitle(UserMoneyDetailTypeEnum.hongbao.getDesc()); - detail.setSubTitle("鏂颁汉绾㈠寘"); - detail.setType(UserMoneyDetailTypeEnum.hongbao); - detail.setUpdateTime(new Date()); - detail.setUserInfo(accountDetails.getUserInfo()); - detail.setId(accountDetails.getId()); - return detail; - } - - /** - * 鑰佺増鏈彁鐜拌处鍙烽獙璇� - * - * @param accountDetails - * @return - * @throws UserMoneyDetailException - */ - public static UserMoneyDetail createOldExtractAccountValid(AccountDetails accountDetails) - throws UserMoneyDetailException { - - if (accountDetails == null) - throw new UserMoneyDetailException(1, "楠岃瘉璁板綍涓嶈兘涓虹┖"); - if (accountDetails.getUserInfo() == null) - throw new UserMoneyDetailException(1, "UID涓嶈兘涓虹┖"); - if (accountDetails.getMoney() == null) - throw new UserMoneyDetailException(1, "閲戦涓嶈兘涓虹┖"); - - UserMoneyDetail detail = new UserMoneyDetail(); - detail.setCreateTime(new Date()); - detail.setIdentifyCode(StringUtil - .Md5(UserMoneyDetailTypeEnum.extractVerify.name() + "-" + "鑰佺増鏈�" + "-" + accountDetails.getId())); - detail.setMoney(new BigDecimal(accountDetails.getMoney())); - detail.setTitle(UserMoneyDetailTypeEnum.extractVerify.getDesc()); - detail.setType(UserMoneyDetailTypeEnum.extractVerify); - detail.setUpdateTime(new Date()); - detail.setUserInfo(accountDetails.getUserInfo()); - detail.setId(accountDetails.getId()); - return detail; - } /** * 杩斿埄濂栧姳 -- Gitblit v1.8.0