From 6d29a32259f3f5e896b26db27d29f616203127ca Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 15 五月 2021 18:11:31 +0800
Subject: [PATCH] Merge branch 'master' of ssh://193.112.35.168:29418/tejia
---
service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinExpendRecordServiceImpl.java | 114 ---------------------------------------------------------
1 files changed, 0 insertions(+), 114 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 b7c97d3..5f0b6d4 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
@@ -8,7 +8,6 @@
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;
@@ -86,119 +85,6 @@
liJinExpendRecordMapper.deleteByPrimaryKey(id);
}
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- 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");
- String date_str = format.format(date);
- String sendEndTime_str = date_str + " 22:00:00";
- String useEndTime_str = date_str + " 23:59:59";
-
- /* 鍒涘缓娣樼ぜ閲� */
- String name = "鑷喘娣樼ぜ閲戠孩鍖�";
- // 鍙戞斁寮�濮嬫椂闂�
- Date sendStartTime = date;
- // 鍙戞斁鎴鏃堕棿 - 鍒嗕韩褰撴棩22:00
- Date sendEndTime = null;
- // 浣跨敤缁撴潫鏃ユ湡 - 鍒嗕韩褰撴棩 23锛�59
- Date useEndTime = null;
-
- try {
- sendEndTime = formatStr.parse(sendEndTime_str);
- useEndTime = formatStr.parse(useEndTime_str);
- } catch (ParseException e2) {
- e2.printStackTrace();
- }
-
- LiJinCreateParam params = new LiJinCreateParam();
- params.setTitle("鑷喘娣樼ぜ閲戠孩鍖�");
- params.setUid(uid + "");
- params.setGoodsId(goods.getAuctionId());
- params.setUseEndTime(useEndTime);
- params.setSendStartTime(sendStartTime);
- params.setSendEndTime(sendEndTime);
- params.setNum(1);
- params.setMoney(money);
-
- // params.setPid(); // pid缂哄皯 TODO
- // params.setAppkey();
- // params.setAppsecret();
-
- return createTaoLiJin(params);
- }
-
-
- @Transactional(rollbackFor = Exception.class)
- public LiJinExpendRecord createTaoLiJin(LiJinCreateParam params) throws LiJinExpendRecordException {
- String appkey =params.getAppkey();
- String appsecret = params.getAppsecret();
-
- // 鍒涘缓娣樼ぜ閲戠孩鍖�
- TaoLiJinDTO taoLiJinDTO = null;
- try {
- taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(params.getGoodsId(), params.getTitle(), params.getMoney(),
- params.getNum(), params.getSendStartTime(), params.getSendEndTime(),
- params.getUseStartTime(), params.getUseEndTime(), new TaoKeAppInfo(appkey, appsecret, params.getPid()));
- } catch (LiJinException e) {
- // 閫氱煡鐩稿簲渚涘簲鍟� TODO
- 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) {
- // 鏈垱寤鸿处鎴�
- }
- }
- });
- } catch (TaoKeApiException e1) {
- // TODO
- }
-
- if (taoLiJinDTO == null) {
- throw new LiJinExpendRecordException(101, "娣樺疂API鎺ㄥ箍绾㈠寘鍒涘缓澶辫触");
- }
-
- // 淇濆瓨璁板綍
- LiJinExpendRecord record = new LiJinExpendRecord();
- record.setUid(params.getUid());
- record.setGoodsId(params.getGoodsId() + "");
- record.setTitle(params.getTitle());
- record.setNum(params.getNum());
- record.setMoney(params.getMoney());
- record.setRightsId(taoLiJinDTO.getRightsId());
- record.setSendUrl(taoLiJinDTO.getSendUrl());
- record.setCreateTime(new Date());
- liJinExpendRecordMapper.insertSelective(record);
-
- return record;
- }
@Override
public int countTodayNumByExpend(String uid) {
--
Gitblit v1.8.0