yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

盛安豆BUG处理

This commit is contained in:
曹磊 2024-08-21 15:43:20 +08:00
parent 775cfa0552
commit f461af3fc4
2 changed files with 1272 additions and 1150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2247
src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
View File

File diff suppressed because it is too large Load Diff

175
src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
View File

@ -18,6 +18,8 @@ import com.sqx.modules.artificer.dao.RealNameDao;
import com.sqx.modules.artificer.dao.UserRechargeDao; import com.sqx.modules.artificer.dao.UserRechargeDao;
import com.sqx.modules.artificer.entity.*; import com.sqx.modules.artificer.entity.*;
import com.sqx.modules.artificer.service.*; import com.sqx.modules.artificer.service.*;
import com.sqx.modules.bl.artificer.entity.ArtificerRechargeReward;
import com.sqx.modules.bl.artificer.service.ArtificerRechargeRewardService;
import com.sqx.modules.bl.commission.fxy.entity.FxyApply; import com.sqx.modules.bl.commission.fxy.entity.FxyApply;
import com.sqx.modules.bl.commission.fxy.entity.FxyConfig; import com.sqx.modules.bl.commission.fxy.entity.FxyConfig;
import com.sqx.modules.bl.commission.fxy.service.FxyApplyService; import com.sqx.modules.bl.commission.fxy.service.FxyApplyService;
@ -161,6 +163,8 @@ public class WxServiceImpl implements WxService {
private JjrConfigService jjrConfigService; private JjrConfigService jjrConfigService;
@Autowired @Autowired
private JjrConfigLevelService jjrConfigServiceLevel; private JjrConfigLevelService jjrConfigServiceLevel;
@Autowired
private ArtificerRechargeRewardService artificerRechargeRewardService;
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -2037,8 +2041,8 @@ public class WxServiceImpl implements WxService {
// //插入余额 // //插入余额
// userMoneyDetails.setBalance(userNowMoney.getMoney()); // userMoneyDetails.setBalance(userNowMoney.getMoney());
// userMoneyDetails.setUserId(payDetails.getUserId()); // userMoneyDetails.setUserId(payDetails.getUserId());
// userMoneyDetails.setTitle("支付宝充值"); // userMoneyDetails.setTitle("微信充值");
// userMoneyDetails.setContent("支付宝花费："+payClassify.getPrice()+",钱包增加余额："+payClassify.getMoney()); // userMoneyDetails.setContent("微信花费："+payClassify.getPrice()+",钱包增加余额："+payClassify.getMoney());
// userMoneyDetails.setManipulateType(2); // userMoneyDetails.setManipulateType(2);
// userMoneyDetails.setType(1); // userMoneyDetails.setType(1);
// userMoneyDetails.setState(2); // userMoneyDetails.setState(2);
@ -2048,8 +2052,8 @@ public class WxServiceImpl implements WxService {
// userMoneyDetails.setBlRole(1); // userMoneyDetails.setBlRole(1);
// userMoneyDetails.setBlFlag(1); // userMoneyDetails.setBlFlag(1);
// userMoneyDetailsService.save(userMoneyDetails); // userMoneyDetailsService.save(userMoneyDetails);
// userMoneyDetails.setTitle("支付宝充值"); // userMoneyDetails.setTitle("微信充值");
// userMoneyDetails.setContent("支付宝花费:"+payClassify.getPrice()); // userMoneyDetails.setContent("微信花费:"+payClassify.getPrice());
// userMoneyDetails.setMoney(payClassify.getPrice()); // userMoneyDetails.setMoney(payClassify.getPrice());
// userMoneyDetails.setType(2); // userMoneyDetails.setType(2);
// userMoneyDetails.setState(2); // userMoneyDetails.setState(2);
@ -2084,16 +2088,78 @@ public class WxServiceImpl implements WxService {
// } // }
// } // }
// //
// //用户在充值余额时，指定技师ID，则充值成功后给指定技师增加业绩，入userRecharge表 // //判断是否赠送盛安豆
// if(payClassify.getDayNum()!=null && payClassify.getDayNum()>0){
// String date=sdf.format(new Date());
// userMoneyService.updateSad(1,payDetails.getUserId(),payClassify.getDayMoney());
// UserSadDetails userSadDetails=new UserSadDetails();
// //查询用户当前余额
// UserMoney userNowMoney2 = userMoneyService.selectUserMoneyByUserId(payDetails.getUserId());
// //插入余额
// userSadDetails.setBalance(userNowMoney2.getSad());
// //插入操作类型为已操作用户余额
// userSadDetails.setManipulateType(2);
// userSadDetails.setUserId(payDetails.getUserId());
// userSadDetails.setTitle("[充值赠送]标题：充值");
// userSadDetails.setContent("获得盛安豆："+payClassify.getDayMoney());
// userSadDetails.setType(1);
// userSadDetails.setMoney(userNowMoney2.getSad());
// userSadDetails.setCreateTime(date);
// userSadDetails.setBlRole(1);
// userSadDetails.setBlFlag(1);
// userSadDetailsService.insert(userSadDetails);
//
// //添加定时任务
// BlSadJob blSadJob = new BlSadJob();
// blSadJob.setCreateTime(new Date());
// blSadJob.setUpdateTime(new Date());
// blSadJob.setDayMoney(payClassify.getDayMoney());
// blSadJob.setDaySumNum(payClassify.getDayNum());
// blSadJob.setDayNum(1);
// blSadJob.setUserId(payDetails.getUserId());
// blSadJob.setSfwc(0);
// blSadJobService.save(blSadJob);
// }
//
// //用户在充值余额时，指定技师ID，则充值成功后给指定技师增加积分，入user_recharge表
// if(payDetails.getArtificerId()!=null){ // if(payDetails.getArtificerId()!=null){
// UserRecharge o = new UserRecharge(); // Artificer artificer = artificerService.getById(payDetails.getArtificerId());
// o.setUserRecharge(payClassify.getPrice()); // //获取充值时，技师奖金配置，技师获取积分配置
// o.setType("2"); // ArtificerRechargeReward artificerRechargeReward = artificerRechargeRewardService.getInfo(payClassify.getMoney());
// o.setUserId(payDetails.getUserId()); // //用户在充值余额时，指定技师ID，则充值成功后给指定技师增加奖金，入技师余额表user_money表
// o.setArtificerId(payDetails.getArtificerId()); // if(artificerRechargeReward.getRewardMoney()!=null && artificerRechargeReward.getRewardMoney().compareTo(BigDecimal.ZERO)>0){
// o.setOrdersId(payDetails.getMassageOrdersId()); // userMoneyDao.updateMayMoney(1, artificer.getUserId(), artificerRechargeReward.getRewardMoney().doubleValue());
// o.setCreateTime(DateUtils.format(new Date())); // //查询用户当前余额
// userRechargeDao.insert(o); // UserMoney artificerMoney = userMoneyService.selectUserMoneyByUserId(artificer.getUserId());
// //钱包明细需要做调整2条记录，充值时钱包类型增加金额，现金类型减少金额
// UserMoneyDetails userMoneyDetailsA = new UserMoneyDetails();
// //插入余额
// userMoneyDetailsA.setBalance(artificerMoney.getMoney());
// userMoneyDetailsA.setUserId(artificer.getUserId());
// userMoneyDetailsA.setTitle("用户充值，技师获取奖金");
// userMoneyDetailsA.setContent("钱包增加余额："+artificerRechargeReward.getRewardMoney());
// userMoneyDetailsA.setManipulateType(2);
// userMoneyDetailsA.setClassify(4);
// userMoneyDetailsA.setType(1);
// userMoneyDetailsA.setState(2);
// userMoneyDetailsA.setMoney(artificerRechargeReward.getRewardMoney());
// userMoneyDetailsA.setCreateTime(sdf.format(new Date()));
// userMoneyDetailsA.setBlRole(2);
// userMoneyDetailsA.setBlFlag(1);
// userMoneyDetailsService.save(userMoneyDetailsA);
// }
//
// if(artificerRechargeReward.getIntegralRate()!=null && artificerRechargeReward.getIntegralRate().compareTo(BigDecimal.ZERO)>0){
// BigDecimal jf = payClassify.getPrice().multiply(artificerRechargeReward.getIntegralRate()).setScale(0,BigDecimal.ROUND_HALF_UP);
// UserRecharge o = new UserRecharge();
// o.setUserRecharge(jf);
// o.setType("2");
// o.setUserId(payDetails.getUserId());
// o.setArtificerId(payDetails.getArtificerId());
// o.setOrdersId(payDetails.getMassageOrdersId());
// o.setCreateTime(DateUtils.format(new Date()));
// userRechargeDao.insert(o);
// }
// } // }
// //
// }else if(payDetails.getType()==4){ // }else if(payDetails.getType()==4){
@ -3049,8 +3115,8 @@ public class WxServiceImpl implements WxService {
//插入余额 //插入余额
userMoneyDetails.setBalance(userNowMoney.getMoney()); userMoneyDetails.setBalance(userNowMoney.getMoney());
userMoneyDetails.setUserId(payDetails.getUserId()); userMoneyDetails.setUserId(payDetails.getUserId());
userMoneyDetails.setTitle("支付宝充值"); userMoneyDetails.setTitle("微信充值");
userMoneyDetails.setContent("支付宝花费："+payClassify.getPrice()+",钱包增加余额："+payClassify.getMoney()); userMoneyDetails.setContent("微信花费："+payClassify.getPrice()+",钱包增加余额："+payClassify.getMoney());
userMoneyDetails.setManipulateType(2); userMoneyDetails.setManipulateType(2);
userMoneyDetails.setType(1); userMoneyDetails.setType(1);
userMoneyDetails.setState(2); userMoneyDetails.setState(2);
@ -3060,8 +3126,8 @@ public class WxServiceImpl implements WxService {
userMoneyDetails.setBlRole(1); userMoneyDetails.setBlRole(1);
userMoneyDetails.setBlFlag(1); userMoneyDetails.setBlFlag(1);
userMoneyDetailsService.save(userMoneyDetails); userMoneyDetailsService.save(userMoneyDetails);
userMoneyDetails.setTitle("支付宝充值"); userMoneyDetails.setTitle("微信充值");
userMoneyDetails.setContent("支付宝花费:"+payClassify.getPrice()); userMoneyDetails.setContent("微信花费:"+payClassify.getPrice());
userMoneyDetails.setMoney(payClassify.getPrice()); userMoneyDetails.setMoney(payClassify.getPrice());
userMoneyDetails.setType(2); userMoneyDetails.setType(2);
userMoneyDetails.setState(2); userMoneyDetails.setState(2);
@ -3097,25 +3163,25 @@ public class WxServiceImpl implements WxService {
} }
//判断是否赠送盛安豆 //判断是否赠送盛安豆
if(StringUtils.isNotEmpty(payClassify.getDayNum()+"")){ if(payClassify.getDayNum()!=null && payClassify.getDayNum()>0){
String date=sdf.format(new Date());
userMoneyService.updateSad(1,payDetails.getUserId(),payClassify.getDayMoney()); userMoneyService.updateSad(1,payDetails.getUserId(),payClassify.getDayMoney());
UserSadDetails userMoneyDetails2=new UserSadDetails(); UserSadDetails userSadDetails=new UserSadDetails();
//查询用户当前余额 //查询用户当前余额
UserMoney userNowMoney2 = userMoneyService.selectUserMoneyByUserId(payDetails.getUserId()); UserMoney userNowMoney2 = userMoneyService.selectUserMoneyByUserId(payDetails.getUserId());
//插入余额 //插入余额
userMoneyDetails2.setBalance(userNowMoney2.getSad()); userSadDetails.setBalance(userNowMoney2.getSad());
//插入操作类型为已操作用户余额 //插入操作类型为已操作用户余额
userMoneyDetails2.setManipulateType(2); userSadDetails.setManipulateType(2);
userMoneyDetails2.setUserId(payDetails.getUserId()); userSadDetails.setUserId(payDetails.getUserId());
userMoneyDetails2.setTitle("[充值赠送]标题：充值"); userSadDetails.setTitle("[充值赠送]标题：充值");
userMoneyDetails2.setContent("获得盛安豆："+payClassify.getDayMoney()); userSadDetails.setContent("获得盛安豆："+payClassify.getDayMoney());
userMoneyDetails2.setType(1); userSadDetails.setType(1);
userMoneyDetails2.setMoney(userNowMoney2.getSad()); userSadDetails.setMoney(userNowMoney2.getSad());
userMoneyDetails2.setCreateTime(sdf.format(new Date())); userSadDetails.setCreateTime(date);
userMoneyDetails2.setBlRole(2); userSadDetails.setBlRole(1);
userMoneyDetails2.setBlFlag(1); userSadDetails.setBlFlag(1);
userSadDetailsService.insert(userMoneyDetails2); userSadDetailsService.insert(userSadDetails);
//添加定时任务 //添加定时任务
BlSadJob blSadJob = new BlSadJob(); BlSadJob blSadJob = new BlSadJob();
@ -3129,16 +3195,45 @@ public class WxServiceImpl implements WxService {
blSadJobService.save(blSadJob); blSadJobService.save(blSadJob);
} }
//用户在充值余额时，指定技师ID，则充值成功后给指定技师增加业绩，入userRecharge表 //用户在充值余额时，指定技师ID，则充值成功后给指定技师增加积分，入user_recharge表
if(payDetails.getArtificerId()!=null){ if(payDetails.getArtificerId()!=null){
UserRecharge o = new UserRecharge(); Artificer artificer = artificerService.getById(payDetails.getArtificerId());
o.setUserRecharge(payClassify.getPrice()); //获取充值时，技师奖金配置，技师获取积分配置
o.setType("2"); ArtificerRechargeReward artificerRechargeReward = artificerRechargeRewardService.getInfo(payClassify.getMoney());
o.setUserId(payDetails.getUserId()); //用户在充值余额时，指定技师ID，则充值成功后给指定技师增加奖金，入技师余额表user_money表
o.setArtificerId(payDetails.getArtificerId()); if(artificerRechargeReward.getRewardMoney()!=null && artificerRechargeReward.getRewardMoney().compareTo(BigDecimal.ZERO)>0){
o.setOrdersId(payDetails.getMassageOrdersId()); userMoneyDao.updateMayMoney(1, artificer.getUserId(), artificerRechargeReward.getRewardMoney().doubleValue());
o.setCreateTime(DateUtils.format(new Date())); //查询用户当前余额
userRechargeDao.insert(o); UserMoney artificerMoney = userMoneyService.selectUserMoneyByUserId(artificer.getUserId());
//钱包明细需要做调整2条记录，充值时钱包类型增加金额，现金类型减少金额
UserMoneyDetails userMoneyDetailsA = new UserMoneyDetails();
//插入余额
userMoneyDetailsA.setBalance(artificerMoney.getMoney());
userMoneyDetailsA.setUserId(artificer.getUserId());
userMoneyDetailsA.setTitle("用户充值，技师获取奖金");
userMoneyDetailsA.setContent("钱包增加余额："+artificerRechargeReward.getRewardMoney());
userMoneyDetailsA.setManipulateType(2);
userMoneyDetailsA.setClassify(4);
userMoneyDetailsA.setType(1);
userMoneyDetailsA.setState(2);
userMoneyDetailsA.setMoney(artificerRechargeReward.getRewardMoney());
userMoneyDetailsA.setCreateTime(sdf.format(new Date()));
userMoneyDetailsA.setBlRole(2);
userMoneyDetailsA.setBlFlag(1);
userMoneyDetailsService.save(userMoneyDetailsA);
}
if(artificerRechargeReward.getIntegralRate()!=null && artificerRechargeReward.getIntegralRate().compareTo(BigDecimal.ZERO)>0){
BigDecimal jf = payClassify.getPrice().multiply(artificerRechargeReward.getIntegralRate()).setScale(0,BigDecimal.ROUND_HALF_UP);
UserRecharge o = new UserRecharge();
o.setUserRecharge(jf);
o.setType("2");
o.setUserId(payDetails.getUserId());
o.setArtificerId(payDetails.getArtificerId());
o.setOrdersId(payDetails.getMassageOrdersId());
o.setCreateTime(DateUtils.format(new Date()));
userRechargeDao.insert(o);
}
} }
}else if(payDetails.getType()==4){ }else if(payDetails.getType()==4){