From 26f7accb815f55f18f8eedfca4324700a96884ec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 八月 2020 18:23:49 +0800
Subject: [PATCH] 资金验证优化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
index 0128ca1..08da77f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -41,12 +41,11 @@
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemClientParams;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
-import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.common.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.goods.ShareGoodsTextTemplateException;
-import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.tlj.UserTaoLiJinRecordException;
@@ -70,7 +69,7 @@
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -79,7 +78,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
-import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.common.vo.ClientTextStyleVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -262,7 +261,7 @@
data.put("notifyDesc", configService.getValue(ConfigKeyEnum.goodsShareNotify.getKey(),acceptData.getSystem()));
// 娣诲姞鍒嗕韩璁板綍
- BigDecimal rate = hongBaoManageService.getShareRate();
+ BigDecimal rate = hongBaoManageService.getShareRate(acceptData.getSystem());
BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(taoBaoLink.getGoods(), rate);
data.put("shareMoney", "楼" + shareMoney.toString());
@@ -430,7 +429,7 @@
data.put("notifyDesc", configService.getValue(ConfigKeyEnum.goodsShareNotify.getKey(),system));
// 娣诲姞鍒嗕韩璁板綍
- BigDecimal rate = hongBaoManageService.getShareRate();
+ BigDecimal rate = hongBaoManageService.getShareRate(system);
BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(taoBaoLink.getGoods(), rate);
data.put("shareMoney", "楼" + shareMoney.toString());
@@ -560,7 +559,7 @@
}
try {
- JSONObject data = userShareGoodsRecordService.getGoodsGroup(recordId);
+ JSONObject data = userShareGoodsRecordService.getGoodsGroup(recordId,acceptData.getSystem());
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
@@ -756,7 +755,7 @@
app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
app.setPid(TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT);
- TaoBaoGoodsBrief goodsLink = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
+ TaoBaoGoodsBrief goodsLink = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app,null,null);
if (goodsLink != null)
token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(),
StringUtil.isNullOrEmpty(goodsLink.getCouponLink()) ? goodsLink.getAuctionUrl()
--
Gitblit v1.8.0