From a8178b55132921c08f1eb720dfad2c45cad90589 Mon Sep 17 00:00:00 2001
From: YJ <YJ>
Date: 星期五, 14 五月 2021 15:16:16 +0800
Subject: [PATCH] 查询条件
---
service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinExpendRecordServiceImpl.java | 75 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 18 deletions(-)
diff --git a/service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinExpendRecordServiceImpl.java b/service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinExpendRecordServiceImpl.java
index d0cb411..b7c97d3 100644
--- a/service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinExpendRecordServiceImpl.java
+++ b/service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinExpendRecordServiceImpl.java
@@ -5,12 +5,17 @@
import com.ks.lijin.exception.TaoKeApiException;
import com.ks.lijin.mapper.LiJinExpendRecordMapper;
import com.ks.lijin.pojo.DO.LiJinExpendRecord;
+import com.ks.lijin.pojo.DO.LiJinProviderAccount;
+import com.ks.lijin.pojo.DO.LiJinProviderNotice;
import com.ks.lijin.pojo.DTO.LiJinCreateParam;
import com.ks.lijin.pojo.DTO.taobao.TaoBaoGoodsBrief;
import com.ks.lijin.pojo.DTO.taobao.TaoKeAppInfo;
import com.ks.lijin.pojo.DTO.taobao.TaoLiJinDTO;
+import com.ks.lijin.pojo.Enums.NoticeTypeEnum;
import com.ks.lijin.query.ExpendRecordQuery;
import com.ks.lijin.service.LiJinExpendRecordService;
+import com.ks.lijin.service.LiJinProviderAccountService;
+import com.ks.lijin.service.LiJinProviderNoticeService;
import com.ks.lijin.utils.taobao.TaoKeApiUtil;
import org.apache.dubbo.config.annotation.Service;
import org.springframework.core.task.TaskExecutor;
@@ -32,12 +37,21 @@
@Resource
private LiJinExpendRecordMapper liJinExpendRecordMapper;
+ @Resource
+ private LiJinProviderNoticeService liJinProviderNoticeService;
+
+ @Resource
+ private LiJinProviderAccountService liJinProviderAccountService;
@Override
public long count(LiJinExpendRecord obj) {
ExpendRecordQuery query = new ExpendRecordQuery();
-// query.appId = appId;
-// query.uid = uid;
+ query.uid = obj.getUid();
+ query.accountId = obj.getAccountId();
+ query.goodsId = obj.getGoodsId();
+ query.money = obj.getMoney();
+ query.title = obj.getTitle();
+ query.rightsId = obj.getRightsId();
return liJinExpendRecordMapper.count(query);
}
@@ -45,9 +59,12 @@
@Override
public List<LiJinExpendRecord> listByPage(int page, int pageSize, LiJinExpendRecord obj) {
ExpendRecordQuery query = new ExpendRecordQuery();
-// query.appId = appId;
-// query.uid = uid;
-// query.drawStateList = Arrays.asList(new Integer[]{LuckyActivityJoinRecord.DRAW_STATE_UNOPEN});
+ query.uid = obj.getUid();
+ query.accountId = obj.getAccountId();
+ query.goodsId = obj.getGoodsId();
+ query.money = obj.getMoney();
+ query.title = obj.getTitle();
+ query.rightsId = obj.getRightsId();
query.start = (page - 1) * pageSize;
query.count = pageSize;
return liJinExpendRecordMapper.listByPage(query);
@@ -72,8 +89,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public LiJinExpendRecord createLiJin(Long uid, BigDecimal money, TaoBaoGoodsBrief goods)
+ public LiJinExpendRecord createLiJin(String uid, BigDecimal money, TaoBaoGoodsBrief goods)
throws LiJinExpendRecordException {
+
+ // TODO 楠岃瘉娆℃暟
+ int expendNum = countTodayNumByExpend(uid);
+ // TODO 楠岃瘉閲戦
+ BigDecimal bigDecimal = countTodayMoneyByExpend(uid);
+
+
Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -106,7 +130,10 @@
params.setSendEndTime(sendEndTime);
params.setNum(1);
params.setMoney(money);
+
// params.setPid(); // pid缂哄皯 TODO
+ // params.setAppkey();
+ // params.setAppsecret();
return createTaoLiJin(params);
}
@@ -114,12 +141,8 @@
@Transactional(rollbackFor = Exception.class)
public LiJinExpendRecord createTaoLiJin(LiJinCreateParam params) throws LiJinExpendRecordException {
-
- String appkey = "";
- String appsecret = "";
-
- // 鎬婚噾棰�
- //BigDecimal totalMoney = BigDecimalUtil.mul(params.getMoney(), new BigDecimal(params.getNum()));
+ String appkey =params.getAppkey();
+ String appsecret = params.getAppsecret();
// 鍒涘缓娣樼ぜ閲戠孩鍖�
TaoLiJinDTO taoLiJinDTO = null;
@@ -132,10 +155,23 @@
executor.execute(new Runnable() {
@Override
public void run() {
+ LiJinProviderAccount account = liJinProviderAccountService.getByAppInfo(appkey, appsecret);
+ if (account == null) {
+ return;
+ }
+
+ LiJinProviderNotice notice = new LiJinProviderNotice();
+ notice.setRead(false);
+ notice.setProviderId(account.getProviderId());
+
if (e.getCode() == LiJinException.CODE_TLJ_FORBIDDEN) {
// 璇ュ晢鍝佷笉鏀寔鍒涘缓娣樼ぜ閲戠孩鍖�
} else if (e.getCode() == LiJinException.CODE_TLJ_NO_MONEY) {
// 瀹樻柟鐜╂硶閽卞寘浣欓涓嶈冻
+ notice.setTitle("鐜╂硶閽卞寘浣欓涓嶈冻");
+ notice.setContent("璐﹀彿锛�"+ appkey +"瀹樻柟鐜╂硶閽卞寘浣欓涓嶈冻");
+ notice.setType(NoticeTypeEnum.noMoney.name());
+ liJinProviderNoticeService.save(notice);
} else if (e.getCode() == LiJinException.CODE_TLJ_UN_PAID) {
// 鏈垱寤鸿处鎴�
}
@@ -161,14 +197,17 @@
record.setCreateTime(new Date());
liJinExpendRecordMapper.insertSelective(record);
- executor.execute(new Runnable() {
- @Override
- public void run() {
- // 鏇存柊瀵瑰簲 闄愬埗娆℃暟鍜岄噾棰�
- }
- });
return record;
}
+ @Override
+ public int countTodayNumByExpend(String uid) {
+ return liJinExpendRecordMapper.countTodayNumByExpend(uid);
+ }
+
+ @Override
+ public BigDecimal countTodayMoneyByExpend(String uid) {
+ return liJinExpendRecordMapper.countTodayMoneyByExpend(uid);
+ }
}
--
Gitblit v1.8.0