From 00026c4255ed1b47961d17a5b4500fe788bfa9d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 09:45:50 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
similarity index 96%
rename from fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
rename to fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
index f9337b0..f71c207 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yeshi.fanli.service.impl.taobao;
+package com.yeshi.fanli.service.impl.money.tb;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -35,10 +35,10 @@
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;
-import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
-import com.yeshi.fanli.service.inter.user.UserMoneyService;
+import com.yeshi.fanli.service.inter.money.UserMoneyService;
+import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -241,7 +241,7 @@
BigDecimal drawBackMoney = computeDrawBackMoney(settleMent, wqMoney, userGetMoney);
// 璁＄畻璧勯噾鏄惁鍏呰冻
- UserInfo user = userInfoMapper.selectByPKey(uid);
+ UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 璧勯噾涓嶈冻
{
// 娣诲姞鍊哄姟
@@ -284,7 +284,7 @@
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,
- userInfoMapper.selectByPKey(uid).getMyHongBao());
+ userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
}
}
@@ -410,7 +410,7 @@
for (TaoBaoWeiQuanDrawBack drawBack : newWeiQuanDrawBackList)
taoBaoWeiQuanDrawBackMapper.insertSelective(drawBack);
// 璁＄畻璧勯噾鏄惁鍏呰冻
- UserInfo user = userInfoMapper.selectByPKey(uid);
+ UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 璧勯噾涓嶈冻
{
// 娣诲姞鍊哄姟
@@ -451,7 +451,7 @@
userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);
userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,
- userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());
}
}
@@ -511,7 +511,7 @@
if (drawBackMoney != null && drawBackMoney.compareTo(new BigDecimal(0)) > 0) {
// 鍒ゆ柇璧勯噾鏄惁瓒冲鎵ｆ
- UserInfo user = userInfoMapper.selectByPKey(uid);
+ UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 璧勯噾涓嶈冻
{
try {
@@ -539,7 +539,7 @@
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,
- drawBackMoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ drawBackMoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());
}
}
}
--
Gitblit v1.8.0