|
|
@@ -276,7 +276,7 @@ public class PayCodeOrderServiceImpl implements PayCodeOrderService {
|
|
|
UserInfo channelManager = userInfoService.getUserInfoById(channelManagerId + "");
|
|
|
if (channelManager != null) {
|
|
|
|
|
|
- fenrun(channelMoney, channelManager, "渠道");
|
|
|
+ fenrun(channelMoney, channelManager, "代理商", userInfo, payCodeOrder.getMoney().doubleValue());
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -289,7 +289,7 @@ public class PayCodeOrderServiceImpl implements PayCodeOrderService {
|
|
|
UserInfo recommender = userInfoService.getUserInfoById(recommenderId + "");
|
|
|
if (recommender != null) {
|
|
|
|
|
|
- fenrun(money, recommender, "一级");
|
|
|
+ fenrun(money, recommender, "一级招募者", userInfo, payCodeOrder.getMoney().doubleValue());
|
|
|
Integer recommenderId2 = recommender.getRecommender();
|
|
|
|
|
|
|
|
|
@@ -298,14 +298,14 @@ public class PayCodeOrderServiceImpl implements PayCodeOrderService {
|
|
|
UserInfo recommender2 = userInfoService.getUserInfoById(recommenderId2 + "");
|
|
|
if (recommender2 != null) {
|
|
|
|
|
|
- fenrun(money2, recommender2, "二级");
|
|
|
+ fenrun(money2, recommender2, "二级招募者", userInfo, payCodeOrder.getMoney().doubleValue());
|
|
|
} else {//如果没有二级,则分润给一级
|
|
|
- fenrun(money2, recommender, "二级");
|
|
|
+ fenrun(money2, recommender, "二级招募者", userInfo, payCodeOrder.getMoney().doubleValue());
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
////如果没有二级,则分润给一级
|
|
|
- fenrun(money2, recommender, "二级");
|
|
|
+ fenrun(money2, recommender, "二级招募者", userInfo, payCodeOrder.getMoney().doubleValue());
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -338,10 +338,11 @@ public class PayCodeOrderServiceImpl implements PayCodeOrderService {
|
|
|
* @param money
|
|
|
* @param recommender
|
|
|
*/
|
|
|
- private void fenrun(double money, UserInfo recommender, String remark) {
|
|
|
+ private void fenrun(double money, UserInfo recommender, String remark, UserInfo payUserInfo, double payMoney) {
|
|
|
UserInfo updateUser = new UserInfo();
|
|
|
updateUser.setId(recommender.getId());
|
|
|
|
|
|
+ recommender = userInfoService.getSingleUserInfo(updateUser);
|
|
|
|
|
|
double balance = recommender.getMoneyCoin();
|
|
|
double moneyCoin = balance + money;
|
|
|
@@ -353,7 +354,7 @@ public class PayCodeOrderServiceImpl implements PayCodeOrderService {
|
|
|
memberCoin.setMoney(BigDecimal.valueOf(money));
|
|
|
memberCoin.setBalance(BigDecimal.valueOf(moneyCoin));
|
|
|
memberCoin.setTypeFlag(AppConstant.CoinType.SONG);
|
|
|
- memberCoin.setRemark(remark + "成员购买参赛券,赠送:" + money + "积分");
|
|
|
+ memberCoin.setRemark("用户[" + payUserInfo.getNickname() + "]充值[" + payMoney + "]元,您作为" + remark + " 可以获得[" + money + "]积分");
|
|
|
memberCoinMapper.insertSelective(memberCoin);
|
|
|
|
|
|
updateUser.setMoneyCoin(moneyCoin);
|
|
|
@@ -363,7 +364,7 @@ public class PayCodeOrderServiceImpl implements PayCodeOrderService {
|
|
|
systemNotice.setUserId(recommender.getId());
|
|
|
systemNotice.setRemark("分润");
|
|
|
|
|
|
- systemNotice.setContent(remark + "成员购买参赛券,赠送:[" + money + "] 积分");
|
|
|
+ systemNotice.setContent("用户[" + payUserInfo.getNickname() + "]充值[" + payMoney + "]元,您作为" + remark + " 可以获得[" + money + "]积分");
|
|
|
systemNotice.setTypeFlag(AppConstant.NoticeType.FEN_RUN);
|
|
|
|
|
|
systemNoticeService.createSystemNotice(systemNotice);
|