From 5a9e4c13d08d3b1cb7da8f50f1097b33bb113b23 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期一, 10 十二月 2018 17:52:03 +0800
Subject: [PATCH] 选品库商品优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
index 5373f3c..9b1e98d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java
@@ -2,7 +2,6 @@
import java.io.Serializable;
import java.math.BigDecimal;
-import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -36,22 +35,22 @@
import com.yeshi.fanli.dao.user.ExtractRecordDao;
import com.yeshi.fanli.dao.user.MoneyRecordDao;
import com.yeshi.fanli.entity.bus.user.AccountDetails;
-import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
import com.yeshi.fanli.entity.bus.user.ExtractRecord;
+import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.MoneyRecord;
import com.yeshi.fanli.entity.bus.user.PayInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.common.AdminUser;
-import com.yeshi.fanli.exception.AlipayAccountException;
-import com.yeshi.fanli.exception.AlipayTransferException;
+import com.yeshi.fanli.exception.ExtractException;
import com.yeshi.fanli.exception.NotExistObjectException;
import com.yeshi.fanli.exception.ObjectStateException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.user.AccountDetailsService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
@@ -60,12 +59,10 @@
import com.yeshi.fanli.service.inter.user.MoneyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
-import com.yeshi.fanli.util.BeanUtil;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.AccountDetailsFactory;
@@ -138,7 +135,7 @@
private SystemMapper systemMapper;
@Resource
- private HongBaoMapper hongBaoService;
+ private HongBaoMapper hongBaoMapper;
@Resource
private PushService pushService;
@@ -249,7 +246,7 @@
find, find.getUserInfo());
accountDetailsMapper.insertSelective(ad);
try {
- userNotificationService.extractWrong(user.getId(),
+ userNotificationService.extractWrong(user.getId(), find,
TimeUtil.getGernalTime(find.getExtractTime(), "yyyy-MM-dd HH:mm"));
} catch (Exception e) {
e.printStackTrace();
@@ -488,7 +485,7 @@
extractMapper.updateByPrimaryKeySelective(updateExtract);
try {
- userNotificationService.extractSuccess(extract.getUserInfo().getId(),
+ userNotificationService.extractSuccess(extract.getUserInfo().getId(), extract,
TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));
LogHelper.userInfo("鏀粯瀹濊浆璐︽垚鍔�:[鎻愮幇IP锛�" + extract.getIp() + ",鎵�杞处鍙�:" + extract.getAccount() + ",鐪熷疄濮撳悕锛�"
@@ -508,8 +505,13 @@
}
@Override
- public List<Integer> checkExtract(String uid) {
- return extractMapper.checkExtract(uid);
+ public void checkExtract(String uid) throws ExtractException {
+ int count = hongBaoMapper.getCountByUidAndState(Long.parseLong(uid), HongBao.STATE_YILINGQU);
+ if (count == 0)
+ throw new ExtractException(1, "娌℃湁宸插埌璐︾殑绾㈠寘");
+ List<Integer> list = extractMapper.checkExtract(uid);
+ if (list != null && list.size() > 0 && list.get(0) == 0)
+ throw new ExtractException(2, "缁撶畻璧勯噾寮傚父");
}
@Override
--
Gitblit v1.8.0