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/service/impl/hongbao/HongBaoServiceImpl.java | 135 ++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 81 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
index f604d7a..63dcab2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
@@ -12,8 +12,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import net.sf.json.JSONObject;
-
import org.hibernate.HibernateException;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
@@ -28,7 +26,6 @@
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.hongbao.HongBaoDao;
-import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper;
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
import com.yeshi.fanli.dao.mybatis.ConfigMapper;
import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;
@@ -41,7 +38,6 @@
import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.entity.admin.OrderAdmin;
-import com.yeshi.fanli.entity.bus.user.AccountDetails;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoExtra;
@@ -66,7 +62,6 @@
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.user.AccountDetailsService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.MoneyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -78,13 +73,14 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.Utils;
-import com.yeshi.fanli.util.factory.AccountDetailsFactory;
import com.yeshi.fanli.util.factory.AccountMessageFactory;
import com.yeshi.fanli.util.factory.HongBaoFactory;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.push.XiaoMiPushUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+
+import net.sf.json.JSONObject;
@Service
public class HongBaoServiceImpl implements HongBaoService {
@@ -126,9 +122,6 @@
private ThreeSaleGiftService threeSaleGiftService;
@Resource
- private AccountDetailsService accountDetailsService;
-
- @Resource
private AccountMessageService accountMessageService;
@Resource
@@ -153,9 +146,6 @@
private OrderItemServcie orderItemService;
@Resource
- private AccountDetailsMapper accountDetailsMapper;
-
- @Resource
private AccountMessageMapper accountMessageMapper;
@Resource
@@ -169,7 +159,7 @@
@Resource
private UserNotificationService userNotificationService;
-
+
@Resource
private UserMoneyDetailMapper userMoneyDetailMapper;
@@ -419,10 +409,9 @@
MoneyRecord moneyRecord = new MoneyRecord(form, hongBao, new BigDecimal(money), "鏂颁汉绾㈠寘", "",
System.currentTimeMillis(), 1);
moneyRecordService.addMoneyRecord(moneyRecord);
- AccountDetails ac = AccountDetailsFactory.create("+" + money, AccountDetailsFactory.XINREN, null, null, form);
+
AccountMessage am = AccountMessageFactory.create(form, null, new BigDecimal(money),
AccountMessageFactory.NEWUSER);
- accountDetailsService.save(ac);
accountMessageService.save(am);
userInfoService.addMoney(form, new BigDecimal(money));
com.yeshi.fanli.entity.system.System system = form.getSystem();
@@ -447,12 +436,9 @@
System.currentTimeMillis(), 1);
moneyRecordMapper.insertSelective(moneyRecord);
- AccountDetails ac = AccountDetailsFactory.create("+" + money, AccountDetailsFactory.XINREN, null, null, form);
- accountDetailsMapper.insertSelective(ac);
// 鏂扮増璧勯噾鏄庣粏
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createNewerHongBao(hongBao);
- userMoneyDetail.setId(ac.getId());
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e) {
try {
@@ -671,9 +657,7 @@
MoneyRecord moneyRecord = new MoneyRecord(find.getUserInfo(), find, find.getMoney(),
hongBaoExtra.getTitle(), "", currentTimeMillis, 1);
moneyRecordService.addMoneyRecord(moneyRecord);
- AccountDetails ad = AccountDetailsFactory.create(find, orderItem);
AccountMessage am = AccountMessageFactory.create(find);
- accountDetailsService.save(ad);
accountMessageService.save(am);
return hongBaoExtra;
}
@@ -736,10 +720,7 @@
userInfoMapper.subHongBaoByUid(user.getId(), hb.getMoney());
// 娣诲姞璐︾洰鏄庣粏
if (hb.getOrderItemId() != null) {
- AccountDetails accountDetails = AccountDetailsFactory.create("-" + hb.getMoney(),
- AccountDetailsFactory.TUIKUAN, new OrderItem(hb.getOrderItemId()), null,
- hb.getUserInfo());
- accountDetailsMapper.insertSelective(accountDetails);
+
}
// 娣诲姞璐︽埛娑堟伅
@@ -834,9 +815,7 @@
MoneyRecord moneyRecord = new MoneyRecord(hb.getUserInfo(), hb, hb.getMoney(),
hongBaoExtra.getTitle(), "", currentTimeMillis, 1);
moneyRecordService.addMoneyRecord(moneyRecord);
- AccountDetails ad = AccountDetailsFactory.create(hb, null);
AccountMessage am = AccountMessageFactory.create(hb);
- accountDetailsService.save(ad);
accountMessageService.save(am);
}
return null;
@@ -996,7 +975,6 @@
System.out.println("璁㈠崟:" + order);
}
-
@Override
public BigDecimal getTotalTiChengMoney(Long uid) {
@@ -1107,33 +1085,30 @@
return hongBaoMapper.getTotalTiChengCount(uid);
}
-
@Override
- public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years,
- String startTime, String endTime) throws Exception{
+ public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years, String startTime,
+ String endTime) throws Exception {
return hongBaoMapper.count24HOderByChannel(channel, type, years, startTime, endTime);
}
-
+
@Override
public List<Map<String, Object>> countHistoryOderByChannel(String channel, Integer type, String years,
- String startTime, String endTime) throws Exception{
-
- return hongBaoMapper.countHistoryOderByChannel(channel, type, years,
- startTime, endTime);
+ String startTime, String endTime) throws Exception {
+
+ return hongBaoMapper.countHistoryOderByChannel(channel, type, years, startTime, endTime);
}
-
-
+
public List<Object> dayFactory(String startTime, String endTime, List<Map<String, Object>> list) throws Exception {
-
+
List<Object> listObject = new ArrayList<Object>();
-
+
if (startTime.equals(endTime)) {
-
+
Map<String, Object> map = list.get(0);
Object payMoney = map.get("payMoney");
Object countOrder = map.get("countOrder");
Object commision = map.get("commision");
-
+
if (payMoney == null) {
map.put("payMoney", 0);
}
@@ -1146,21 +1121,20 @@
listObject.add(map);
return listObject;
}
-
-
+
String plusDay = "";
- for (int i = 0; i < 1000 ; i++) {
+ for (int i = 0; i < 1000; i++) {
if (i == 0) {
plusDay = startTime;
} else {
plusDay = DateUtil.plusDay(i, startTime);
}
-
+
Map<String, Object> mapObject = new HashMap<String, Object>();
Object payMoney = null;
Object countOrder = null;
- Object commision = null;
-
+ Object commision = null;
+
for (int j = 0; j < list.size(); j++) {
Map<String, Object> map = list.get(j);
Object createDate = map.get("showDate");
@@ -1172,111 +1146,110 @@
break;
}
}
-
+
if (payMoney == null) {
payMoney = 0;
}
mapObject.put("payMoney", payMoney);
-
+
if (countOrder == null) {
countOrder = 0;
}
mapObject.put("countOrder", countOrder);
-
+
if (commision == null) {
- commision = 0;
+ commision = 0;
}
mapObject.put("commision", commision);
-
+
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
Date parseDate = sdf.parse(plusDay.toString());
-
+
mapObject.put("showDate", sdf2.format(parseDate));
-
+
listObject.add(mapObject);
-
+
if (plusDay.equals(endTime)) {
break; // 鏃堕棿缁撴潫
}
}
-
+
return listObject;
}
-
-
+
public List<Object> monthFactory(List<Map<String, Object>> list) {
-
+
List<Object> listObject = new ArrayList<Object>();
// 12 涓湀澶勭悊
for (int i = 1; i <= 12; i++) {
Map<String, Object> mapObject = new HashMap<String, Object>();
Object payMoney = null;
Object countOrder = null;
- Object commision = null;
-
+ Object commision = null;
+
for (int j = 0; j < list.size(); j++) {
Map<String, Object> map = list.get(j);
Object createDate = map.get("showDate");
String month = createDate.toString();
- if ((i+"").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
+ if ((i + "").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
payMoney = map.get("payMoney");
countOrder = map.get("countOrder");
commision = map.get("commision");
break;
}
}
-
+
if (payMoney == null) {
payMoney = 0;
}
mapObject.put("payMoney", payMoney);
-
+
if (countOrder == null) {
countOrder = 0;
}
mapObject.put("countOrder", countOrder);
-
+
if (commision == null) {
- commision = 0;
+ commision = 0;
}
mapObject.put("commision", commision);
-
+
mapObject.put("showDate", i + "鏈�");
-
+
listObject.add(mapObject);
}
return listObject;
}
-
+
public List<Object> yearFactory(List<Map<String, Object>> list) {
-
+
List<Object> listObject = new ArrayList<Object>();
-
+
for (int i = 0; i < list.size(); i++) {
Map<String, Object> map = list.get(i);
- Object payMoney = map.get("payMoney");
- Object countOrder = map.get("countOrder");
- Object commision = map.get("commision");
-
+ Object payMoney = map.get("payMoney");
+ Object countOrder = map.get("countOrder");
+ Object commision = map.get("commision");
+
if (payMoney == null) {
payMoney = 0;
}
map.put("payMoney", payMoney);
-
+
if (countOrder == null) {
countOrder = 0;
}
map.put("countOrder", countOrder);
-
+
if (commision == null) {
- commision = 0;
+ commision = 0;
}
map.put("commision", commision);
-
+
listObject.add(map);
}
-
+
return listObject;
}
}
--
Gitblit v1.8.0