经纪人
This commit is contained in:
parent
d4671b652b
commit
478db49967
|
@ -1336,13 +1336,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
// oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
|
// oneArtificerMoney = oneArtificerMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
|
||||||
// }
|
// }
|
||||||
// ordersOld.setOneArtificerMoney(oneArtificerMoney);
|
// ordersOld.setOneArtificerMoney(oneArtificerMoney);
|
||||||
UserEntity user = userService.selectUserById(orders.getUserId());
|
|
||||||
|
UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
|
||||||
//经纪人分佣
|
//经纪人分佣
|
||||||
ordersOld.setJjrMoney(BigDecimal.ZERO);
|
ordersOld.setJjrMoney(BigDecimal.ZERO);
|
||||||
ordersOld.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
ordersOld.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
||||||
if(jc!=null && jc.getIsOpen().equals(1)){
|
if(jc!=null && jc.getIsOpen().equals(1)){
|
||||||
UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
|
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode());
|
||||||
if(jjrUser!=null){
|
if(jjrUser!=null){
|
||||||
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
||||||
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
||||||
|
@ -1355,7 +1356,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
if(jc.getType().equals(1)){
|
if(jc.getType().equals(1)){
|
||||||
rate = jc.getRate();
|
rate = jc.getRate();
|
||||||
}else{
|
}else{
|
||||||
int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
|
int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode());
|
||||||
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
|
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
|
||||||
for(int i=0;i<list.size();i++){
|
for(int i=0;i<list.size();i++){
|
||||||
JjrConfigLevel jjrcl = list.get(i);
|
JjrConfigLevel jjrcl = list.get(i);
|
||||||
|
@ -1373,7 +1374,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
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());
|
||||||
|
@ -1407,6 +1408,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
ordersOld.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
ordersOld.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
||||||
if(fc!=null && fc.getIsOpen().equals(1)){
|
if(fc!=null && fc.getIsOpen().equals(1)){
|
||||||
|
UserEntity user = userService.selectUserById(orders.getUserId());
|
||||||
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
||||||
if(fxyOneUser!=null){
|
if(fxyOneUser!=null){
|
||||||
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
||||||
|
@ -1969,13 +1971,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
//计算技师项目提成金额
|
//计算技师项目提成金额
|
||||||
orders.setProjectBenefits(artificerPrice);
|
orders.setProjectBenefits(artificerPrice);
|
||||||
}
|
}
|
||||||
UserEntity user = userService.selectUserById(orders.getUserId());
|
|
||||||
|
UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
|
||||||
//经纪人分佣
|
//经纪人分佣
|
||||||
orders.setJjrMoney(BigDecimal.ZERO);
|
orders.setJjrMoney(BigDecimal.ZERO);
|
||||||
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
||||||
if(jc!=null && jc.getIsOpen().equals(1)){
|
if(jc!=null && jc.getIsOpen().equals(1)){
|
||||||
UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
|
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode());
|
||||||
if(jjrUser!=null){
|
if(jjrUser!=null){
|
||||||
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
||||||
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
||||||
|
@ -1988,7 +1991,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
if(jc.getType().equals(1)){
|
if(jc.getType().equals(1)){
|
||||||
rate = jc.getRate();
|
rate = jc.getRate();
|
||||||
}else{
|
}else{
|
||||||
int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
|
int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode());
|
||||||
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
|
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
|
||||||
for(int i=0;i<list.size();i++){
|
for(int i=0;i<list.size();i++){
|
||||||
JjrConfigLevel jjrcl = list.get(i);
|
JjrConfigLevel jjrcl = list.get(i);
|
||||||
|
@ -2006,7 +2009,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
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());
|
||||||
|
@ -2040,6 +2043,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
||||||
if(fc!=null && fc.getIsOpen().equals(1)){
|
if(fc!=null && fc.getIsOpen().equals(1)){
|
||||||
|
UserEntity user = userService.selectUserById(orders.getUserId());
|
||||||
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
||||||
if(fxyOneUser!=null){
|
if(fxyOneUser!=null){
|
||||||
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
||||||
|
@ -2326,13 +2330,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
//计算技师项目提成金额
|
//计算技师项目提成金额
|
||||||
ordersOld.setProjectBenefits(oldArtificerPrice);
|
ordersOld.setProjectBenefits(oldArtificerPrice);
|
||||||
}
|
}
|
||||||
UserEntity user = userService.selectUserById(orders.getUserId());
|
UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
|
||||||
//经纪人分佣
|
//经纪人分佣
|
||||||
ordersOld.setJjrMoney(BigDecimal.ZERO);
|
ordersOld.setJjrMoney(BigDecimal.ZERO);
|
||||||
ordersOld.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
ordersOld.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
||||||
if(jc!=null && jc.getIsOpen().equals(1)){
|
if(jc!=null && jc.getIsOpen().equals(1)){
|
||||||
UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
|
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode());
|
||||||
if(jjrUser!=null){
|
if(jjrUser!=null){
|
||||||
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
||||||
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
||||||
|
@ -2345,7 +2349,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
if(jc.getType().equals(1)){
|
if(jc.getType().equals(1)){
|
||||||
rate = jc.getRate();
|
rate = jc.getRate();
|
||||||
}else{
|
}else{
|
||||||
int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
|
int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode());
|
||||||
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
|
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
|
||||||
for(int i=0;i<list.size();i++){
|
for(int i=0;i<list.size();i++){
|
||||||
JjrConfigLevel jjrcl = list.get(i);
|
JjrConfigLevel jjrcl = list.get(i);
|
||||||
|
@ -2363,7 +2367,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
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());
|
||||||
|
@ -2397,6 +2401,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
ordersOld.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
ordersOld.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
||||||
if(fc!=null && fc.getIsOpen().equals(1)){
|
if(fc!=null && fc.getIsOpen().equals(1)){
|
||||||
|
UserEntity user = userService.selectUserById(orders.getUserId());
|
||||||
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
||||||
if(fxyOneUser!=null){
|
if(fxyOneUser!=null){
|
||||||
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
||||||
|
@ -2866,13 +2871,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
orders.setArtificerTaxiMoney(artificerTaxiMoney);
|
orders.setArtificerTaxiMoney(artificerTaxiMoney);
|
||||||
orders.setPingTaxiMoney(pingTaxiMoney);
|
orders.setPingTaxiMoney(pingTaxiMoney);
|
||||||
|
|
||||||
UserEntity user = userService.selectUserById(orders.getUserId());
|
UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
|
||||||
//经纪人分佣
|
//经纪人分佣
|
||||||
orders.setJjrMoney(BigDecimal.ZERO);
|
orders.setJjrMoney(BigDecimal.ZERO);
|
||||||
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
||||||
if(jc!=null && jc.getIsOpen().equals(1)){
|
if(jc!=null && jc.getIsOpen().equals(1)){
|
||||||
UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
|
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode());
|
||||||
if(jjrUser!=null){
|
if(jjrUser!=null){
|
||||||
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
||||||
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
||||||
|
@ -2885,7 +2890,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
if(jc.getType().equals(1)){
|
if(jc.getType().equals(1)){
|
||||||
jjrRate = jc.getRate();
|
jjrRate = jc.getRate();
|
||||||
}else{
|
}else{
|
||||||
int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
|
int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode());
|
||||||
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
|
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
|
||||||
for(int i=0;i<list.size();i++){
|
for(int i=0;i<list.size();i++){
|
||||||
JjrConfigLevel jjrcl = list.get(i);
|
JjrConfigLevel jjrcl = list.get(i);
|
||||||
|
@ -2903,7 +2908,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
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());
|
||||||
|
@ -2937,6 +2942,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
||||||
if(fc!=null && fc.getIsOpen().equals(1)){
|
if(fc!=null && fc.getIsOpen().equals(1)){
|
||||||
|
UserEntity user = userService.selectUserById(orders.getUserId());
|
||||||
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
||||||
if(fxyOneUser!=null){
|
if(fxyOneUser!=null){
|
||||||
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
||||||
|
@ -3442,13 +3448,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
orders.setArtificerTaxiMoney(artificerTaxiMoney);
|
orders.setArtificerTaxiMoney(artificerTaxiMoney);
|
||||||
orders.setPingTaxiMoney(pingTaxiMoney);
|
orders.setPingTaxiMoney(pingTaxiMoney);
|
||||||
|
|
||||||
UserEntity user = userService.selectUserById(orders.getUserId());
|
UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
|
||||||
//经纪人分佣
|
//经纪人分佣
|
||||||
orders.setJjrMoney(BigDecimal.ZERO);
|
orders.setJjrMoney(BigDecimal.ZERO);
|
||||||
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
||||||
if(jc!=null && jc.getIsOpen().equals(1)){
|
if(jc!=null && jc.getIsOpen().equals(1)){
|
||||||
UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
|
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode());
|
||||||
if(jjrUser!=null){
|
if(jjrUser!=null){
|
||||||
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
||||||
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
||||||
|
@ -3461,7 +3467,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
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());
|
||||||
|
@ -3483,6 +3489,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
||||||
if(fc!=null && fc.getIsOpen().equals(1)){
|
if(fc!=null && fc.getIsOpen().equals(1)){
|
||||||
|
UserEntity user = userService.selectUserById(orders.getUserId());
|
||||||
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
||||||
if(fxyOneUser!=null){
|
if(fxyOneUser!=null){
|
||||||
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
||||||
|
@ -5985,13 +5992,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
orders.setValueStorageDeduction(valueStorageDeduction);
|
orders.setValueStorageDeduction(valueStorageDeduction);
|
||||||
orders.setProjectBenefits(artificerPrice);
|
orders.setProjectBenefits(artificerPrice);
|
||||||
|
|
||||||
UserEntity user = userService.selectUserById(orders.getUserId());
|
UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
|
||||||
//经纪人分佣
|
//经纪人分佣
|
||||||
orders.setJjrMoney(BigDecimal.ZERO);
|
orders.setJjrMoney(BigDecimal.ZERO);
|
||||||
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
orders.setJjrArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
JjrConfig jc = jjrConfigService.getOne(new QueryWrapper<JjrConfig>());
|
||||||
if(jc.getIsOpen().equals(1)){
|
if(jc.getIsOpen().equals(1)){
|
||||||
UserEntity jjrUser = userService.queryByInvitationCode(user.getBlJjrCode());
|
UserEntity jjrUser = userService.queryByInvitationCode(artificerUser.getBlJjrCode());
|
||||||
if(jjrUser!=null){
|
if(jjrUser!=null){
|
||||||
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
JjrApply jjrApply = jjrApplyService.findByUserId(jjrUser.getUserId());
|
||||||
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
if(jjrApply!=null && jjrApply.getStatus().equals(1)){
|
||||||
|
@ -6004,7 +6011,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
if(jc.getType().equals(1)){
|
if(jc.getType().equals(1)){
|
||||||
jjrRate = jc.getRate();
|
jjrRate = jc.getRate();
|
||||||
}else{
|
}else{
|
||||||
int invitationCn = jjrApplyService.getInvitationCn(user.getBlJjrCode());
|
int invitationCn = jjrApplyService.getInvitationCn(artificerUser.getBlJjrCode());
|
||||||
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
|
List<JjrConfigLevel> list = jjrConfigServiceLevel.findList(null);
|
||||||
for(int i=0;i<list.size();i++){
|
for(int i=0;i<list.size();i++){
|
||||||
JjrConfigLevel jjrcl = list.get(i);
|
JjrConfigLevel jjrcl = list.get(i);
|
||||||
|
@ -6022,7 +6029,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
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());
|
||||||
|
@ -6056,6 +6063,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
|
||||||
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
|
||||||
if(fc!=null && fc.getIsOpen().equals(1)){
|
if(fc!=null && fc.getIsOpen().equals(1)){
|
||||||
|
UserEntity user = userService.selectUserById(orders.getUserId());
|
||||||
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
|
||||||
if(fxyOneUser!=null){
|
if(fxyOneUser!=null){
|
||||||
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
|
||||||
|
|
Loading…
Reference in New Issue