打赏抽成
This commit is contained in:
parent
124db16329
commit
8997b9df0b
|
@ -17,6 +17,7 @@ import com.sqx.modules.artificer.entity.Orders;
|
|||
import com.sqx.modules.artificer.entity.Period;
|
||||
import com.sqx.modules.artificer.service.ArtificerService;
|
||||
import com.sqx.modules.bl.collect.entity.CollectMassage;
|
||||
import com.sqx.modules.common.service.CommonInfoService;
|
||||
import com.sqx.modules.message.entity.MessageInfo;
|
||||
import com.sqx.modules.message.service.MessageService;
|
||||
import com.sqx.modules.utils.PeriodUtil;
|
||||
|
@ -52,6 +53,8 @@ public class UserMoneyServiceImpl extends ServiceImpl<UserMoneyDao, UserMoney> i
|
|||
private UserMoneyDetailsServiceImpl userMoneyDetailsService;
|
||||
@Autowired
|
||||
private OrdersDao ordersDao;
|
||||
@Autowired
|
||||
private CommonInfoService commonInfoService;
|
||||
@Override
|
||||
public Result payUserMoneyArtificer(@RequestAttribute Long userId, Long artificerId, BigDecimal money){
|
||||
UserMoney userMoney = selectUserMoneyByUserId(userId);
|
||||
|
@ -95,9 +98,15 @@ public class UserMoneyServiceImpl extends ServiceImpl<UserMoneyDao, UserMoney> i
|
|||
// userMoneyArtificerService.updateMoney(1,userId,artificerId,money.doubleValue());
|
||||
// }
|
||||
|
||||
String value = commonInfoService.findOne(467).getValue();
|
||||
BigDecimal rate = new BigDecimal(value);
|
||||
BigDecimal artificerMoney = money.multiply(rate).setScale(2,BigDecimal.ROUND_HALF_UP);
|
||||
BigDecimal platformMoney = money.subtract(artificerMoney);
|
||||
|
||||
//技师获得打赏
|
||||
UserEntity userEntity = userService.queryByUserId(artificer.getUserId());
|
||||
updateMoney(1, userEntity.getUserId(), money.doubleValue());
|
||||
// updateMoney(1, userEntity.getUserId(), money.doubleValue());
|
||||
updateMoney(1, userEntity.getUserId(), artificerMoney.doubleValue());
|
||||
UserMoney userNowMoney2 = selectUserMoneyByUserId(userEntity.getUserId());
|
||||
UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails();
|
||||
userMoneyDetails2.setBalance(userNowMoney2.getMoney());
|
||||
|
@ -105,10 +114,11 @@ public class UserMoneyServiceImpl extends ServiceImpl<UserMoneyDao, UserMoney> i
|
|||
userMoneyDetails2.setManipulateType(2);
|
||||
userMoneyDetails2.setUserId(userEntity.getUserId());
|
||||
userMoneyDetails2.setTitle("用户钱包打赏");
|
||||
userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”钱包打赏:"+money);
|
||||
userMoneyDetails2.setContent("来自用户["+userEntity.getUserName()+"]钱包打赏:"+money+",实际获取金额"+artificerMoney+",平台抽成"+platformMoney+"。");
|
||||
userMoneyDetails2.setType(1);
|
||||
userMoneyDetails2.setState(2);
|
||||
userMoneyDetails2.setMoney(money);
|
||||
// userMoneyDetails2.setMoney(money);
|
||||
userMoneyDetails2.setMoney(artificerMoney);
|
||||
userMoneyDetails2.setCreateTime(sdf.format(new Date()));
|
||||
userMoneyDetails2.setBlRole(2);
|
||||
userMoneyDetails2.setBlFlag(1);
|
||||
|
|
|
@ -1309,6 +1309,7 @@ public class AliPayController {
|
|||
|
||||
}else if(payDetails.getType()==6){
|
||||
double money=payDetails.getMoney();
|
||||
BigDecimal bMoney = BigDecimal.valueOf(money);
|
||||
long artificerId = Long.parseLong(payDetails.getRemark());
|
||||
Artificer artificer = artificerService.getById(artificerId);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
|
@ -1318,7 +1319,7 @@ public class AliPayController {
|
|||
userMoneyDetails.setManipulateType(1);
|
||||
userMoneyDetails.setUserId(payDetails.getUserId());
|
||||
userMoneyDetails.setTitle("支付宝给技师打赏");
|
||||
userMoneyDetails.setContent("使用支付宝给指定技师“"+artificer.getArtificerName()+"”打赏:"+money);
|
||||
userMoneyDetails.setContent("使用支付宝给指定技师“"+artificer.getArtificerName()+"”打赏:"+bMoney);
|
||||
userMoneyDetails.setType(2);
|
||||
userMoneyDetails.setState(2);
|
||||
userMoneyDetails.setMoney(BigDecimal.valueOf(money));
|
||||
|
@ -1327,9 +1328,17 @@ public class AliPayController {
|
|||
userMoneyDetails.setBlRole(1);
|
||||
userMoneyDetails.setBlFlag(2);
|
||||
userMoneyDetailsService.save(userMoneyDetails);
|
||||
|
||||
String value = commonInfoService.findOne(467).getValue();
|
||||
BigDecimal rate = new BigDecimal(value);
|
||||
BigDecimal artificerMoney = bMoney.multiply(rate).setScale(2,BigDecimal.ROUND_HALF_UP);
|
||||
BigDecimal platformMoney = bMoney.subtract(artificerMoney);
|
||||
|
||||
//技师流水
|
||||
UserEntity userEntity = userService.queryByUserId(artificer.getUserId());
|
||||
userMoneyDao.updateMayMoney(1, userEntity.getUserId(), money);
|
||||
// userMoneyDao.updateMayMoney(1, userEntity.getUserId(), money);
|
||||
userMoneyDao.updateMayMoney(1, userEntity.getUserId(), artificerMoney.doubleValue());
|
||||
|
||||
//查询技师当前余额
|
||||
UserMoney userNowMoney = userMoneyService.selectUserMoneyByUserId(userEntity.getUserId());
|
||||
UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails();
|
||||
|
@ -1339,10 +1348,12 @@ public class AliPayController {
|
|||
userMoneyDetails2.setClassify(5);
|
||||
userMoneyDetails2.setUserId(userEntity.getUserId());
|
||||
userMoneyDetails2.setTitle("用户支付宝打赏");
|
||||
userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”支付宝打赏:"+money);
|
||||
// userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”支付宝打赏:"+money);
|
||||
userMoneyDetails2.setContent("来自用户["+userEntity.getUserName()+"]钱包打赏:"+bMoney+",实际获取金额"+artificerMoney+",平台抽成"+platformMoney+"。");
|
||||
userMoneyDetails2.setType(1);
|
||||
userMoneyDetails2.setState(2);
|
||||
userMoneyDetails2.setMoney(BigDecimal.valueOf(money));
|
||||
// userMoneyDetails2.setMoney(BigDecimal.valueOf(money));
|
||||
userMoneyDetails2.setMoney(artificerMoney);
|
||||
userMoneyDetails2.setCreateTime(sdf.format(new Date()));
|
||||
userMoneyDetails2.setBlRole(2);
|
||||
userMoneyDetails2.setBlFlag(1);
|
||||
|
|
|
@ -3393,6 +3393,7 @@ public class WxServiceImpl implements WxService {
|
|||
|
||||
}else if(payDetails.getType()==6){
|
||||
double money=payDetails.getMoney();
|
||||
BigDecimal bMoney = BigDecimal.valueOf(money);
|
||||
long artificerId = Long.parseLong(payDetails.getRemark());
|
||||
Artificer artificer = artificerService.getById(artificerId);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
|
@ -3402,7 +3403,7 @@ public class WxServiceImpl implements WxService {
|
|||
userMoneyDetails.setManipulateType(1);
|
||||
userMoneyDetails.setUserId(payDetails.getUserId());
|
||||
userMoneyDetails.setTitle("微信给技师打赏");
|
||||
userMoneyDetails.setContent("使用微信给指定技师“"+artificer.getArtificerName()+"”打赏:"+money);
|
||||
userMoneyDetails.setContent("使用微信给指定技师“"+artificer.getArtificerName()+"”打赏:"+bMoney);
|
||||
userMoneyDetails.setType(2);
|
||||
userMoneyDetails.setState(2);
|
||||
userMoneyDetails.setMoney(BigDecimal.valueOf(money));
|
||||
|
@ -3411,9 +3412,17 @@ public class WxServiceImpl implements WxService {
|
|||
userMoneyDetails.setBlRole(1);
|
||||
userMoneyDetails.setBlFlag(2);
|
||||
userMoneyDetailsService.save(userMoneyDetails);
|
||||
|
||||
String value = commonInfoService.findOne(467).getValue();
|
||||
BigDecimal rate = new BigDecimal(value);
|
||||
BigDecimal artificerMoney = bMoney.multiply(rate).setScale(2,BigDecimal.ROUND_HALF_UP);
|
||||
BigDecimal platformMoney = bMoney.subtract(artificerMoney);
|
||||
|
||||
//技师流水
|
||||
UserEntity userEntity = userService.queryByUserId(artificer.getUserId());
|
||||
userMoneyDao.updateMayMoney(1, userEntity.getUserId(), money);
|
||||
// userMoneyDao.updateMayMoney(1, userEntity.getUserId(), money);
|
||||
userMoneyDao.updateMayMoney(1, userEntity.getUserId(), artificerMoney.doubleValue());
|
||||
|
||||
//查询技师当前余额
|
||||
UserMoney userNowMoney = userMoneyService.selectUserMoneyByUserId(userEntity.getUserId());
|
||||
UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails();
|
||||
|
@ -3423,10 +3432,12 @@ public class WxServiceImpl implements WxService {
|
|||
userMoneyDetails2.setClassify(5);
|
||||
userMoneyDetails2.setUserId(userEntity.getUserId());
|
||||
userMoneyDetails2.setTitle("用户微信打赏");
|
||||
userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”微信打赏:"+money);
|
||||
// userMoneyDetails2.setContent("来自用户“"+userEntity.getUserName()+"”微信打赏:"+money);
|
||||
userMoneyDetails2.setContent("来自用户["+userEntity.getUserName()+"]钱包打赏:"+bMoney+",实际获取金额"+artificerMoney+",平台抽成"+platformMoney+"。");
|
||||
userMoneyDetails2.setType(1);
|
||||
userMoneyDetails2.setState(2);
|
||||
userMoneyDetails2.setMoney(BigDecimal.valueOf(money));
|
||||
// userMoneyDetails2.setMoney(BigDecimal.valueOf(money));
|
||||
userMoneyDetails2.setMoney(artificerMoney);
|
||||
userMoneyDetails2.setCreateTime(sdf.format(new Date()));
|
||||
userMoneyDetails2.setBlRole(2);
|
||||
userMoneyDetails2.setBlFlag(1);
|
||||
|
|
Loading…
Reference in New Issue