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

经纪人

This commit is contained in:
曹磊 2024-08-08 16:05:21 +08:00
parent 7ae902ee19
commit 5f113d964f
8 changed files with 737 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sqx/modules/app/entity/UserEntity.java
View File

@ -245,8 +245,9 @@ public class UserEntity implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String loglataddress; private String loglataddress;
private Integer blIsJjr;
private String blJjrCode; private String blJjrCode;
private BigDecimal blJjrRate;
@TableField(exist = false) @TableField(exist = false)
private String jjrName; private String jjrName;

715
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

2
src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrApplyDao.java
View File

@ -12,9 +12,11 @@ import java.util.List;
@Mapper @Mapper
public interface JjrApplyDao extends BaseMapper<JjrApply> { public interface JjrApplyDao extends BaseMapper<JjrApply> {
IPage<JjrApply> findPage(Page<JjrApply> page, @Param("params") JjrApply jjrApply); IPage<JjrApply> findPage(Page<JjrApply> page, @Param("params") JjrApply jjrApply);
JjrApply findByUserId(Long userId);
List<JjrApply> findList(JjrApply jjrApply); List<JjrApply> findList(JjrApply jjrApply);
int add(JjrApply jjrApply); int add(JjrApply jjrApply);
int update(JjrApply jjrApply); int update(JjrApply jjrApply);
int approve(JjrApply jjrApply); int approve(JjrApply jjrApply);
IPage<JjrApply> findUserPage(Page<JjrApply> page, @Param("params") JjrApply jjrApply); IPage<JjrApply> findUserPage(Page<JjrApply> page, @Param("params") JjrApply jjrApply);
int getInvitationCn(String invitationCode);
} }

2
src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrApplyService.java
View File

@ -6,8 +6,10 @@ import com.sqx.modules.bl.commission.jjr.entity.JjrApply;
public interface JjrApplyService extends IService<JjrApply> { public interface JjrApplyService extends IService<JjrApply> {
Result findPage(JjrApply jjrApply); Result findPage(JjrApply jjrApply);
JjrApply findByUserId(Long userId);
int add(JjrApply jjrApply); int add(JjrApply jjrApply);
int update(JjrApply jjrApply); int update(JjrApply jjrApply);
void approve(JjrApply jjrApply); void approve(JjrApply jjrApply);
Result findUserPage(JjrApply jjrApply); Result findUserPage(JjrApply jjrApply);
int getInvitationCn(String invitationCode);
} }

22
src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.PageUtils;
import com.sqx.common.utils.Result; import com.sqx.common.utils.Result;
import com.sqx.modules.app.entity.UserEntity;
import com.sqx.modules.app.service.UserService;
import com.sqx.modules.bl.commission.jjr.dao.JjrApplyDao; import com.sqx.modules.bl.commission.jjr.dao.JjrApplyDao;
import com.sqx.modules.bl.commission.jjr.entity.JjrApply; import com.sqx.modules.bl.commission.jjr.entity.JjrApply;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfig; import com.sqx.modules.bl.commission.jjr.entity.JjrConfig;
@ -30,12 +32,20 @@ public class JjrApplyServiceImpl extends ServiceImpl<JjrApplyDao, JjrApply> impl
@Autowired @Autowired
private JjrConfigLevelService configLevelService; private JjrConfigLevelService configLevelService;
@Autowired
private UserService userService;
@Override @Override
public Result findPage(JjrApply jjrApply){ public Result findPage(JjrApply jjrApply){
Page<JjrApply> pages=new Page<>(jjrApply.getPage(),jjrApply.getLimit()); Page<JjrApply> pages=new Page<>(jjrApply.getPage(),jjrApply.getLimit());
return Result.success().put("data",new PageUtils(baseMapper.findPage(pages,jjrApply))); return Result.success().put("data",new PageUtils(baseMapper.findPage(pages,jjrApply)));
} }
@Override
public JjrApply findByUserId(Long userId){
return baseMapper.findByUserId(userId);
}
@Override @Override
public int add(JjrApply jjrApply){ public int add(JjrApply jjrApply){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -54,6 +64,13 @@ public class JjrApplyServiceImpl extends ServiceImpl<JjrApplyDao, JjrApply> impl
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
jjrApply.setApproveTime(sdf.format(new Date())); jjrApply.setApproveTime(sdf.format(new Date()));
jjrApply.setApproveUser(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()); jjrApply.setApproveUser(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId());
UserEntity userEntity = userService.selectUserById(jjrApply.getUserId());
userService.updateById(userEntity);
if(jjrApply.getStatus().equals(1)){
userEntity.setBlIsJjr(1);
}else{
userEntity.setBlIsJjr(0);
}
baseMapper.approve(jjrApply); baseMapper.approve(jjrApply);
} }
@ -63,4 +80,9 @@ public class JjrApplyServiceImpl extends ServiceImpl<JjrApplyDao, JjrApply> impl
return Result.success().put("data",new PageUtils(baseMapper.findUserPage(pages,jjrApply))); return Result.success().put("data",new PageUtils(baseMapper.findUserPage(pages,jjrApply)));
} }
@Override
public int getInvitationCn(String invitationCode){
return baseMapper.getInvitationCn(invitationCode);
}
} }

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

@ -32,6 +32,12 @@ 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;
import com.sqx.modules.bl.commission.fxy.service.FxyConfigService; import com.sqx.modules.bl.commission.fxy.service.FxyConfigService;
import com.sqx.modules.bl.commission.jjr.entity.JjrApply;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfig;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel;
import com.sqx.modules.bl.commission.jjr.service.JjrApplyService;
import com.sqx.modules.bl.commission.jjr.service.JjrConfigLevelService;
import com.sqx.modules.bl.commission.jjr.service.JjrConfigService;
import com.sqx.modules.bl.massage.entity.MassagePackage; import com.sqx.modules.bl.massage.entity.MassagePackage;
import com.sqx.modules.bl.massage.service.MassagePackageService; import com.sqx.modules.bl.massage.service.MassagePackageService;
import com.sqx.modules.bl.order.dao.UserPackageOrderDao; import com.sqx.modules.bl.order.dao.UserPackageOrderDao;
@ -157,6 +163,12 @@ public class AliPayController {
private FxyApplyService fxyApplyService; private FxyApplyService fxyApplyService;
@Autowired @Autowired
private FxyConfigService fxyConfigService; private FxyConfigService fxyConfigService;
@Autowired
private JjrApplyService jjrApplyService;
@Autowired
private JjrConfigService jjrConfigService;
@Autowired
private JjrConfigLevelService jjrConfigServiceLevel;
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -549,7 +561,7 @@ public class AliPayController {
PayDetails payDetails = payDetailsDao.selectByOrderId(outTradeNo); PayDetails payDetails = payDetailsDao.selectByOrderId(outTradeNo);
if (payDetails.getState() == 0) { if (payDetails.getState() == 0) {
payDetailsDao.updateState(payDetails.getId(), 1, sdf.format(new Date()), tradeNo); payDetailsDao.updateState(payDetails.getId(), 1, sdf.format(new Date()), tradeNo);
if (payDetails.getType() == 1) { if (payDetails.getType()==1) {
Orders orders = ordersService.selectOrdersByOrderNo(payDetails.getOrderId()); Orders orders = ordersService.selectOrdersByOrderNo(payDetails.getOrderId());
if(orders.getIsSupplement() != null){ if(orders.getIsSupplement() != null){
if(orders.getIsSupplement() == 2){ if(orders.getIsSupplement() == 2){
@ -641,25 +653,42 @@ public class AliPayController {
// orders.setProjectBenefits(projectBenefits); // orders.setProjectBenefits(projectBenefits);
orders.setProjectBenefits(artificerPrice); orders.setProjectBenefits(artificerPrice);
UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
// BigDecimal oneArtificerMoney = BigDecimal.ZERO; if(jc.getIsOpen().equals(1)){
// if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) { UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
// orders.setOneArtificerUserId(oneArtificerUser.getUserId()); JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
// orders.setOneArtificerUserName(oneArtificerUser.getUserName()); if(jjrApply.getStatus().equals(1)){
// oneArtificerMoney = artificerPrice.multiply(oneArtificerUser.getShopRate()); if(jjrUser!=null && jjrUser.getBlIsJjr() !=null && jjrUser.getBlIsJjr() ==1){
// oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP); orders.setJjrUserId(jjrUser.getUserId());
// } orders.setJjrUserName(jjrUser.getUserName());
// orders.setOneArtificerMoney(oneArtificerMoney); BigDecimal artificerRate = jc.getArtificerRate();
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode()); BigDecimal agentRate = jc.getAgentRate();
BigDecimal jjrMoney = BigDecimal.ZERO; BigDecimal jjrRate = BigDecimal.ZERO;
if (jjrUser != null) { if(jc.getType().equals(1)){
orders.setJjrUserId(jjrUser.getUserId()); jjrRate = jc.getRate();
orders.setJjrUserName(jjrUser.getUserName()); }else{
jjrMoney = jjrMoney.multiply(jjrUser.getBlJjrRate()); int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
jjrMoney = jjrMoney.setScale(2, BigDecimal.ROUND_HALF_UP); List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
for(int i=0;i<list.size();i++){
JjrConfigLevel jjrcl = list.get(i);
if(invitationCn>jjrcl.getMinNumber() && invitationCn<=jjrcl.getMaxNumber()){
jjrRate = jjrcl.getRate();
break;
}
}
}
BigDecimal jjrMoney = subtract.multiply(jjrRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrMoney(jjrMoney);
BigDecimal jjrOneArtificerDeductMoney = jjrMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrArtificerDeductMoney(jjrOneArtificerDeductMoney);
}
}
}else{
orders.setJjrMoney(BigDecimal.ZERO);
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
} }
orders.setJjrMoney(jjrMoney); UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
BigDecimal shopMoney = BigDecimal.ZERO; BigDecimal shopMoney = BigDecimal.ZERO;
if (artificerUser.getConsortiaId() != null) { if (artificerUser.getConsortiaId() != null) {
Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@ -689,7 +718,6 @@ public class AliPayController {
//分销商分佣 //分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>()); FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){ if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){ if(faOne.getStatus().equals(1)){
@ -800,7 +828,7 @@ public class AliPayController {
} }
// artificerPrice = artificerPrice.subtract(oneArtificerMoney); // artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(orders.getJjrArtificerDeductMoney());
artificerPrice = artificerPrice.subtract(shopMoney); artificerPrice = artificerPrice.subtract(shopMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney); // artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担 artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
@ -816,9 +844,9 @@ public class AliPayController {
//平台扣款 //平台扣款
BigDecimal pingMoney = orders.getPayMoney(); BigDecimal pingMoney = orders.getPayMoney();
pingMoney = pingMoney.subtract(artificerPrice); pingMoney = pingMoney.subtract(artificerPrice);
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); pingMoney = pingMoney.subtract(orders.getJjrMoney());
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneUserMoney); // pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
@ -972,7 +1000,7 @@ public class AliPayController {
userMoneyDetails.setBlFlag(2); userMoneyDetails.setBlFlag(2);
userMoneyDetailsService.save(userMoneyDetails); userMoneyDetailsService.save(userMoneyDetails);
} else if (payDetails.getType() == 2) { } else if (payDetails.getType()==2) {
//缴纳保证金 //缴纳保证金
Double cashDeposit = payDetails.getMoney(); Double cashDeposit = payDetails.getMoney();
Long userId = payDetails.getUserId(); Long userId = payDetails.getUserId();
@ -995,7 +1023,7 @@ public class AliPayController {
userMoneyDetails.setBlRole(2); userMoneyDetails.setBlRole(2);
userMoneyDetails.setBlFlag(2); userMoneyDetails.setBlFlag(2);
userMoneyDetailsService.save(userMoneyDetails); userMoneyDetailsService.save(userMoneyDetails);
} else if (payDetails.getType() == 3) { } else if (payDetails.getType()==3) {
PayClassify payClassify = payClassifyService.getById(Long.parseLong(payDetails.getRemark())); PayClassify payClassify = payClassifyService.getById(Long.parseLong(payDetails.getRemark()));
userMoneyDao.updateMayMoney(1, payDetails.getUserId(), payClassify.getMoney().doubleValue()); userMoneyDao.updateMayMoney(1, payDetails.getUserId(), payClassify.getMoney().doubleValue());
//查询用户当前余额 //查询用户当前余额
@ -1399,7 +1427,7 @@ public class AliPayController {
massagePackage.setSales(sales); massagePackage.setSales(sales);
massagePackageService.updateSales(massagePackage); massagePackageService.updateSales(massagePackage);
} }
}else if (payDetails.getType() == 9) { }else if (payDetails.getType()==9) {
//缴纳门槛费 //缴纳门槛费
Double cashDeposit = payDetails.getMoney(); Double cashDeposit = payDetails.getMoney();
Long userId = payDetails.getUserId(); Long userId = payDetails.getUserId();
@ -1719,7 +1747,7 @@ public class AliPayController {
orders.setProjectBenefits(artificerPrice); orders.setProjectBenefits(artificerPrice);
UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
// UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); // UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode());
// BigDecimal oneArtificerMoney = BigDecimal.ZERO; // BigDecimal oneArtificerMoney = BigDecimal.ZERO;
// if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) { // if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) {
@ -1729,15 +1757,43 @@ public class AliPayController {
// oneArtificerMoney = oneArtificerMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // oneArtificerMoney = oneArtificerMoney.setScale(2, BigDecimal.ROUND_HALF_UP);
// } // }
// orders.setOneArtificerMoney(oneArtificerMoney); // orders.setOneArtificerMoney(oneArtificerMoney);
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode());
BigDecimal jjrMoney = BigDecimal.ZERO; UserEntity user = userService.selectUserById(orders.getUserId());
if (jjrUser != null) { JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
orders.setJjrUserId(jjrUser.getUserId()); if(jc.getIsOpen().equals(1)){
orders.setJjrUserName(jjrUser.getUserName()); UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
jjrMoney = jjrMoney.multiply(jjrUser.getBlJjrRate()); JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
jjrMoney = jjrMoney.setScale(2, BigDecimal.ROUND_HALF_UP); if(jjrApply.getStatus().equals(1)){
if(jjrUser!=null && jjrUser.getBlIsJjr() !=null && jjrUser.getBlIsJjr() ==1){
orders.setJjrUserId(jjrUser.getUserId());
orders.setJjrUserName(jjrUser.getUserName());
BigDecimal artificerRate = jc.getArtificerRate();
BigDecimal agentRate = jc.getAgentRate();
BigDecimal jjrRate = BigDecimal.ZERO;
if(jc.getType().equals(1)){
jjrRate = jc.getRate();
}else{
int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
for(int i=0;i<list.size();i++){
JjrConfigLevel jjrcl = list.get(i);
if(invitationCn>jjrcl.getMinNumber() && invitationCn<=jjrcl.getMaxNumber()){
jjrRate = jjrcl.getRate();
break;
}
}
}
BigDecimal jjrMoney = subtract.multiply(jjrRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrMoney(jjrMoney);
BigDecimal jjrOneArtificerDeductMoney = jjrMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrArtificerDeductMoney(jjrOneArtificerDeductMoney);
}
}
}else{
orders.setJjrMoney(BigDecimal.ZERO);
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
} }
orders.setJjrMoney(jjrMoney); UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
BigDecimal shopMoney = BigDecimal.ZERO; BigDecimal shopMoney = BigDecimal.ZERO;
if (artificerUser.getConsortiaId() != null) { if (artificerUser.getConsortiaId() != null) {
Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@ -1767,7 +1823,6 @@ public class AliPayController {
//分销商分佣 //分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>()); FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){ if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){ if(faOne.getStatus().equals(1)){
@ -1878,7 +1933,7 @@ public class AliPayController {
} }
// artificerPrice = artificerPrice.subtract(oneArtificerMoney); // artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(orders.getJjrArtificerDeductMoney());
artificerPrice = artificerPrice.subtract(shopMoney); artificerPrice = artificerPrice.subtract(shopMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney); // artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担 artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
@ -1894,9 +1949,9 @@ public class AliPayController {
//平台扣款 //平台扣款
BigDecimal pingMoney = orders.getPayMoney(); BigDecimal pingMoney = orders.getPayMoney();
pingMoney = pingMoney.subtract(artificerPrice); pingMoney = pingMoney.subtract(artificerPrice);
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); pingMoney = pingMoney.subtract(orders.getJjrMoney());
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneUserMoney); // pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
@ -2192,7 +2247,7 @@ public class AliPayController {
PayDetails payDetails = payDetailsDao.selectByOrderId(outTradeNo); PayDetails payDetails = payDetailsDao.selectByOrderId(outTradeNo);
if (payDetails.getState() == 0) { if (payDetails.getState() == 0) {
payDetailsDao.updateState(payDetails.getId(), 1, sdf.format(new Date()), tradeNo); payDetailsDao.updateState(payDetails.getId(), 1, sdf.format(new Date()), tradeNo);
if (payDetails.getType() == 1) { if (payDetails.getType()==1) {
Orders orders = ordersService.selectOrdersByOrderNo(payDetails.getOrderId()); Orders orders = ordersService.selectOrdersByOrderNo(payDetails.getOrderId());
if(orders.getIsSupplement() != null){ if(orders.getIsSupplement() != null){
if(orders.getIsSupplement() == 2){ if(orders.getIsSupplement() == 2){
@ -2284,7 +2339,7 @@ public class AliPayController {
// orders.setProjectBenefits(projectBenefits); // orders.setProjectBenefits(projectBenefits);
orders.setProjectBenefits(artificerPrice); orders.setProjectBenefits(artificerPrice);
UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
// UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); // UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode());
// BigDecimal oneArtificerMoney = BigDecimal.ZERO; // BigDecimal oneArtificerMoney = BigDecimal.ZERO;
// if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) { // if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) {
@ -2294,15 +2349,43 @@ public class AliPayController {
// oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP); // oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
// } // }
// orders.setOneArtificerMoney(oneArtificerMoney); // orders.setOneArtificerMoney(oneArtificerMoney);
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode());
BigDecimal jjrMoney = BigDecimal.ZERO; UserEntity user = userService.selectUserById(orders.getUserId());
if (jjrUser != null) { JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
orders.setJjrUserId(jjrUser.getUserId()); if(jc.getIsOpen().equals(1)){
orders.setJjrUserName(jjrUser.getUserName()); UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
jjrMoney = jjrMoney.multiply(jjrUser.getBlJjrRate()); JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
jjrMoney = jjrMoney.setScale(2, BigDecimal.ROUND_HALF_UP); if(jjrApply.getStatus().equals(1)){
if(jjrUser!=null && jjrUser.getBlIsJjr() !=null && jjrUser.getBlIsJjr() ==1){
orders.setJjrUserId(jjrUser.getUserId());
orders.setJjrUserName(jjrUser.getUserName());
BigDecimal artificerRate = jc.getArtificerRate();
BigDecimal agentRate = jc.getAgentRate();
BigDecimal jjrRate = BigDecimal.ZERO;
if(jc.getType().equals(1)){
jjrRate = jc.getRate();
}else{
int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
for(int i=0;i<list.size();i++){
JjrConfigLevel jjrcl = list.get(i);
if(invitationCn>jjrcl.getMinNumber() && invitationCn<=jjrcl.getMaxNumber()){
jjrRate = jjrcl.getRate();
break;
}
}
}
BigDecimal jjrMoney = subtract.multiply(jjrRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrMoney(jjrMoney);
BigDecimal jjrOneArtificerDeductMoney = jjrMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrArtificerDeductMoney(jjrOneArtificerDeductMoney);
}
}
}else{
orders.setJjrMoney(BigDecimal.ZERO);
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
} }
orders.setJjrMoney(jjrMoney); UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
BigDecimal shopMoney = BigDecimal.ZERO; BigDecimal shopMoney = BigDecimal.ZERO;
if (artificerUser.getConsortiaId() != null) { if (artificerUser.getConsortiaId() != null) {
Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@ -2332,7 +2415,6 @@ public class AliPayController {
//分销商分佣 //分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>()); FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){ if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){ if(faOne.getStatus().equals(1)){
@ -2443,7 +2525,7 @@ public class AliPayController {
} }
// artificerPrice = artificerPrice.subtract(oneArtificerMoney); // artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(orders.getJjrArtificerDeductMoney());
artificerPrice = artificerPrice.subtract(shopMoney); artificerPrice = artificerPrice.subtract(shopMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney); // artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担 artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
@ -2459,9 +2541,9 @@ public class AliPayController {
//平台扣款 //平台扣款
BigDecimal pingMoney = orders.getPayMoney(); BigDecimal pingMoney = orders.getPayMoney();
pingMoney = pingMoney.subtract(artificerPrice); pingMoney = pingMoney.subtract(artificerPrice);
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); pingMoney = pingMoney.subtract(orders.getJjrMoney());
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneUserMoney); // pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
@ -2615,7 +2697,7 @@ public class AliPayController {
userMoneyDetails.setBlFlag(2); userMoneyDetails.setBlFlag(2);
userMoneyDetailsService.save(userMoneyDetails); userMoneyDetailsService.save(userMoneyDetails);
} else if (payDetails.getType() == 2) { } else if (payDetails.getType()==2) {
//缴纳保证金 //缴纳保证金
Double cashDeposit = payDetails.getMoney(); Double cashDeposit = payDetails.getMoney();
Long userId = payDetails.getUserId(); Long userId = payDetails.getUserId();
@ -2639,7 +2721,7 @@ public class AliPayController {
userMoneyDetails.setBlFlag(2); userMoneyDetails.setBlFlag(2);
userMoneyDetailsService.save(userMoneyDetails); userMoneyDetailsService.save(userMoneyDetails);
} else } else
if (payDetails.getType() == 3) { if (payDetails.getType()==3) {
PayClassify payClassify = payClassifyService.getById(Long.parseLong(payDetails.getRemark())); PayClassify payClassify = payClassifyService.getById(Long.parseLong(payDetails.getRemark()));
userMoneyDao.updateMayMoney(1, payDetails.getUserId(), payClassify.getMoney().doubleValue()); userMoneyDao.updateMayMoney(1, payDetails.getUserId(), payClassify.getMoney().doubleValue());
//查询用户当前余额 //查询用户当前余额
@ -3137,7 +3219,7 @@ public class AliPayController {
massagePackage.setSales(sales); massagePackage.setSales(sales);
massagePackageService.updateSales(massagePackage); massagePackageService.updateSales(massagePackage);
} }
}else if (payDetails.getType() == 9) { }else if (payDetails.getType()==9) {
//缴纳门槛费 //缴纳门槛费
Double cashDeposit = payDetails.getMoney(); Double cashDeposit = payDetails.getMoney();
Long userId = payDetails.getUserId(); Long userId = payDetails.getUserId();

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

@ -22,6 +22,12 @@ 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;
import com.sqx.modules.bl.commission.fxy.service.FxyConfigService; import com.sqx.modules.bl.commission.fxy.service.FxyConfigService;
import com.sqx.modules.bl.commission.jjr.entity.JjrApply;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfig;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel;
import com.sqx.modules.bl.commission.jjr.service.JjrApplyService;
import com.sqx.modules.bl.commission.jjr.service.JjrConfigLevelService;
import com.sqx.modules.bl.commission.jjr.service.JjrConfigService;
import com.sqx.modules.bl.massage.entity.MassagePackage; import com.sqx.modules.bl.massage.entity.MassagePackage;
import com.sqx.modules.bl.massage.service.MassagePackageService; import com.sqx.modules.bl.massage.service.MassagePackageService;
import com.sqx.modules.bl.order.dao.UserPackageOrderDao; import com.sqx.modules.bl.order.dao.UserPackageOrderDao;
@ -149,6 +155,12 @@ public class WxServiceImpl implements WxService {
private FxyApplyService fxyApplyService; private FxyApplyService fxyApplyService;
@Autowired @Autowired
private FxyConfigService fxyConfigService; private FxyConfigService fxyConfigService;
@Autowired
private JjrApplyService jjrApplyService;
@Autowired
private JjrConfigService jjrConfigService;
@Autowired
private JjrConfigLevelService jjrConfigServiceLevel;
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -885,25 +897,42 @@ public class WxServiceImpl implements WxService {
orders.setProjectBenefits(artificerPrice); orders.setProjectBenefits(artificerPrice);
UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
// BigDecimal oneArtificerMoney = BigDecimal.ZERO; if(jc.getIsOpen().equals(1)){
// if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) { UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
// orders.setOneArtificerUserId(oneArtificerUser.getUserId()); JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
// orders.setOneArtificerUserName(oneArtificerUser.getUserName()); if(jjrApply.getStatus().equals(1)){
// oneArtificerMoney = artificerPrice.multiply(oneArtificerUser.getShopRate()); if(jjrUser!=null && jjrUser.getBlIsJjr() !=null && jjrUser.getBlIsJjr() ==1){
// oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP); orders.setJjrUserId(jjrUser.getUserId());
// } orders.setJjrUserName(jjrUser.getUserName());
// orders.setOneArtificerMoney(oneArtificerMoney); BigDecimal artificerRate = jc.getArtificerRate();
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode()); BigDecimal agentRate = jc.getAgentRate();
BigDecimal jjrMoney = BigDecimal.ZERO; BigDecimal jjrRate = BigDecimal.ZERO;
if (jjrUser != null) { if(jc.getType().equals(1)){
orders.setJjrUserId(jjrUser.getUserId()); jjrRate = jc.getRate();
orders.setJjrUserName(jjrUser.getUserName()); }else{
jjrMoney = jjrMoney.multiply(jjrUser.getBlJjrRate()); int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
jjrMoney = jjrMoney.setScale(2, BigDecimal.ROUND_HALF_UP); List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
for(int i=0;i<list.size();i++){
JjrConfigLevel jjrcl = list.get(i);
if(invitationCn>jjrcl.getMinNumber() && invitationCn<=jjrcl.getMaxNumber()){
jjrRate = jjrcl.getRate();
break;
}
}
}
BigDecimal jjrMoney = subtract.multiply(jjrRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrMoney(jjrMoney);
BigDecimal jjrOneArtificerDeductMoney = jjrMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrArtificerDeductMoney(jjrOneArtificerDeductMoney);
}
}
}else{
orders.setJjrMoney(BigDecimal.ZERO);
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
} }
orders.setJjrMoney(jjrMoney); UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
BigDecimal shopMoney = BigDecimal.ZERO; BigDecimal shopMoney = BigDecimal.ZERO;
if (artificerUser.getConsortiaId() != null) { if (artificerUser.getConsortiaId() != null) {
Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@ -933,7 +962,6 @@ public class WxServiceImpl implements WxService {
//分销商分佣 //分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>()); FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){ if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){ if(faOne.getStatus().equals(1)){
@ -1044,7 +1072,7 @@ public class WxServiceImpl implements WxService {
} }
// artificerPrice = artificerPrice.subtract(oneArtificerMoney); // artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(orders.getJjrArtificerDeductMoney());
artificerPrice = artificerPrice.subtract(shopMoney); artificerPrice = artificerPrice.subtract(shopMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney); // artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担 artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
@ -1060,9 +1088,9 @@ public class WxServiceImpl implements WxService {
//平台扣款 //平台扣款
BigDecimal pingMoney = orders.getPayMoney(); BigDecimal pingMoney = orders.getPayMoney();
pingMoney = pingMoney.subtract(artificerPrice); pingMoney = pingMoney.subtract(artificerPrice);
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); pingMoney = pingMoney.subtract(orders.getJjrMoney());
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneUserMoney); // pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
@ -1651,25 +1679,42 @@ public class WxServiceImpl implements WxService {
// orders.setProjectBenefits(projectBenefits); // orders.setProjectBenefits(projectBenefits);
orders.setProjectBenefits(artificerPrice); orders.setProjectBenefits(artificerPrice);
UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
// BigDecimal oneArtificerMoney = BigDecimal.ZERO; if(jc.getIsOpen().equals(1)){
// if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) { UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
// orders.setOneArtificerUserId(oneArtificerUser.getUserId()); JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
// orders.setOneArtificerUserName(oneArtificerUser.getUserName()); if(jjrApply.getStatus().equals(1)){
// oneArtificerMoney = artificerPrice.multiply(oneArtificerUser.getShopRate()); if(jjrUser!=null && jjrUser.getBlIsJjr() !=null && jjrUser.getBlIsJjr() ==1){
// oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP); orders.setJjrUserId(jjrUser.getUserId());
// } orders.setJjrUserName(jjrUser.getUserName());
// orders.setOneArtificerMoney(oneArtificerMoney); BigDecimal artificerRate = jc.getArtificerRate();
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode()); BigDecimal agentRate = jc.getAgentRate();
BigDecimal jjrMoney = BigDecimal.ZERO; BigDecimal jjrRate = BigDecimal.ZERO;
if (jjrUser != null) { if(jc.getType().equals(1)){
orders.setJjrUserId(jjrUser.getUserId()); jjrRate = jc.getRate();
orders.setJjrUserName(jjrUser.getUserName()); }else{
jjrMoney = jjrMoney.multiply(jjrUser.getBlJjrRate()); int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
jjrMoney = jjrMoney.setScale(2, BigDecimal.ROUND_HALF_UP); List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
for(int i=0;i<list.size();i++){
JjrConfigLevel jjrcl = list.get(i);
if(invitationCn>jjrcl.getMinNumber() && invitationCn<=jjrcl.getMaxNumber()){
jjrRate = jjrcl.getRate();
break;
}
}
}
BigDecimal jjrMoney = subtract.multiply(jjrRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrMoney(jjrMoney);
BigDecimal jjrOneArtificerDeductMoney = jjrMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrArtificerDeductMoney(jjrOneArtificerDeductMoney);
}
}
}else{
orders.setJjrMoney(BigDecimal.ZERO);
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
} }
orders.setJjrMoney(jjrMoney); UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
BigDecimal shopMoney = BigDecimal.ZERO; BigDecimal shopMoney = BigDecimal.ZERO;
if (artificerUser.getConsortiaId() != null) { if (artificerUser.getConsortiaId() != null) {
Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@ -1699,7 +1744,6 @@ public class WxServiceImpl implements WxService {
//分销商分佣 //分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>()); FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){ if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){ if(faOne.getStatus().equals(1)){
@ -1810,7 +1854,7 @@ public class WxServiceImpl implements WxService {
} }
// artificerPrice = artificerPrice.subtract(oneArtificerMoney); // artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(orders.getJjrArtificerDeductMoney());
artificerPrice = artificerPrice.subtract(shopMoney); artificerPrice = artificerPrice.subtract(shopMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney); // artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担 artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
@ -1826,9 +1870,9 @@ public class WxServiceImpl implements WxService {
//平台扣款 //平台扣款
BigDecimal pingMoney = orders.getPayMoney(); BigDecimal pingMoney = orders.getPayMoney();
pingMoney = pingMoney.subtract(artificerPrice); pingMoney = pingMoney.subtract(artificerPrice);
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); pingMoney = pingMoney.subtract(orders.getJjrMoney());
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneUserMoney); // pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
@ -2636,25 +2680,42 @@ public class WxServiceImpl implements WxService {
// orders.setProjectBenefits(projectBenefits); // orders.setProjectBenefits(projectBenefits);
orders.setProjectBenefits(artificerPrice); orders.setProjectBenefits(artificerPrice);
UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
// BigDecimal oneArtificerMoney = BigDecimal.ZERO; if(jc.getIsOpen().equals(1)){
// if (oneArtificerUser != null && oneArtificerUser.getIsAgency() != null && oneArtificerUser.getIsAgency() == 1) { UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
// orders.setOneArtificerUserId(oneArtificerUser.getUserId()); JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
// orders.setOneArtificerUserName(oneArtificerUser.getUserName()); if(jjrApply.getStatus().equals(1)){
// oneArtificerMoney = artificerPrice.multiply(oneArtificerUser.getShopRate()); if(jjrUser!=null && jjrUser.getBlIsJjr() !=null && jjrUser.getBlIsJjr() ==1){
// oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP); orders.setJjrUserId(jjrUser.getUserId());
// } orders.setJjrUserName(jjrUser.getUserName());
// orders.setOneArtificerMoney(oneArtificerMoney); BigDecimal artificerRate = jc.getArtificerRate();
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode()); BigDecimal agentRate = jc.getAgentRate();
BigDecimal jjrMoney = BigDecimal.ZERO; BigDecimal jjrRate = BigDecimal.ZERO;
if (jjrUser != null) { if(jc.getType().equals(1)){
orders.setJjrUserId(jjrUser.getUserId()); jjrRate = jc.getRate();
orders.setJjrUserName(jjrUser.getUserName()); }else{
jjrMoney = jjrMoney.multiply(jjrUser.getBlJjrRate()); int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
jjrMoney = jjrMoney.setScale(2, BigDecimal.ROUND_HALF_UP); List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
for(int i=0;i<list.size();i++){
JjrConfigLevel jjrcl = list.get(i);
if(invitationCn>jjrcl.getMinNumber() && invitationCn<=jjrcl.getMaxNumber()){
jjrRate = jjrcl.getRate();
break;
}
}
}
BigDecimal jjrMoney = subtract.multiply(jjrRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrMoney(jjrMoney);
BigDecimal jjrOneArtificerDeductMoney = jjrMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setJjrArtificerDeductMoney(jjrOneArtificerDeductMoney);
}
}
}else{
orders.setJjrMoney(BigDecimal.ZERO);
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
} }
orders.setJjrMoney(jjrMoney); UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
BigDecimal shopMoney = BigDecimal.ZERO; BigDecimal shopMoney = BigDecimal.ZERO;
if (artificerUser.getConsortiaId() != null) { if (artificerUser.getConsortiaId() != null) {
Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
@ -2684,7 +2745,6 @@ public class WxServiceImpl implements WxService {
//分销商分佣 //分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>()); FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){ if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode()); UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId()); FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){ if(faOne.getStatus().equals(1)){
@ -2795,7 +2855,7 @@ public class WxServiceImpl implements WxService {
} }
// artificerPrice = artificerPrice.subtract(oneArtificerMoney); // artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(orders.getJjrArtificerDeductMoney());
artificerPrice = artificerPrice.subtract(shopMoney); artificerPrice = artificerPrice.subtract(shopMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney); // artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担 artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
@ -2811,9 +2871,9 @@ public class WxServiceImpl implements WxService {
//平台扣款 //平台扣款
BigDecimal pingMoney = orders.getPayMoney(); BigDecimal pingMoney = orders.getPayMoney();
pingMoney = pingMoney.subtract(artificerPrice); pingMoney = pingMoney.subtract(artificerPrice);
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); pingMoney = pingMoney.subtract(orders.getJjrMoney());
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneUserMoney); // pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣 pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣

14
src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml
View File

@ -26,6 +26,13 @@
order by id desc order by id desc
</select> </select>
<select id="findByUserId" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrApply">
select a.id,a.user_id,a.name,a.phone,a.remarks,a.create_time,a.status,a.opinion
from bl_fxy_apply a
where user_id = #{userId}
limit 1
</select>
<select id="findList" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrApply"> <select id="findList" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrApply">
select a.id,a.user_id,b.avatar,b.user_name,a.name,a.phone,a.remarks,a.create_time,a.status,a.opinion,b.invitation_code select a.id,a.user_id,b.avatar,b.user_name,a.name,a.phone,a.remarks,a.create_time,a.status,a.opinion,b.invitation_code
from bl_jjr_apply a from bl_jjr_apply a
@ -79,4 +86,11 @@
order by b.user_id order by b.user_id
</select> </select>
<select id="getInvitationCn" resultType="Integer">
select count(*) as cn
from tb_user ac
inner join artificer aa on ac.user_id = aa.user_id
where ac.bl_jjr_code = #{invitationCode}
</select>
</mapper> </mapper>