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

技师分担分佣

This commit is contained in:
曹磊 2024-08-08 21:33:56 +08:00
parent c6f6c79426
commit 926b1fc4d6
2 changed files with 91 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/sqx/modules/artificer/entity/Orders.java
View File

@ -88,6 +88,23 @@ public class Orders implements Serializable {
@TableField(exist = false)
private BigDecimal artificerMoneyTotal;
/**
* 商家收益总金额
*/
@TableField(exist = false)
private BigDecimal shopMoneyTotal;
/**
* 经纪人分佣技师承担总金额
*/
@TableField(exist = false)
private BigDecimal jjrArtificerDeductMoneyTotal;
/**
* 分销员分佣技师承担总金额
*/
@TableField(exist = false)
private BigDecimal fxyArtificerDeductMoneyTotal;
/**
* 总业绩
*/
@ -211,6 +228,22 @@ public class Orders implements Serializable {
* 加钟技师价
*/
private BigDecimal addArtificerMoney;
/**
* 加钟商家收益技师分担
*/
private BigDecimal addShopMoney;
/**
* 加钟经纪人分佣技师分担
*/
private BigDecimal addJjrArtificerDeductMoney;
/**
* 加钟一级分销员分佣技师分担
*/
private BigDecimal addFxyOneArtificerDeductMoney;
/**
* 加钟二级分销员分佣技师分担
*/
private BigDecimal addFxyTwoArtificerDeductMoney;
/**
* 技师总收益

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

@ -4813,12 +4813,27 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
BigDecimal payMoneyTotal = BigDecimal.ZERO;
BigDecimal artificerMoneyTotal = BigDecimal.ZERO;
BigDecimal shopMoneyTotal = BigDecimal.ZERO;
BigDecimal jjrArtificerDeductMoneyTotal = BigDecimal.ZERO;
BigDecimal fxyArtificerDeductMoneyTotal = BigDecimal.ZERO;
if(orders.getPayMoney()!=null){
payMoneyTotal = payMoneyTotal.add(orders.getPayMoney());
}
if(orders.getArtificerMoney()!=null){
artificerMoneyTotal = artificerMoneyTotal.add(orders.getArtificerMoney());
}
if(orders.getShopMoney()!=null){
shopMoneyTotal = shopMoneyTotal.add(orders.getShopMoney());
}
if(orders.getJjrArtificerDeductMoney()!=null){
jjrArtificerDeductMoneyTotal = jjrArtificerDeductMoneyTotal.add(orders.getJjrArtificerDeductMoney());
}
if(orders.getFxyOneArtificerDeductMoney()!=null){
fxyArtificerDeductMoneyTotal = fxyArtificerDeductMoneyTotal.add(orders.getFxyOneArtificerDeductMoney());
}
if(orders.getFxyTwoArtificerDeductMoney()!=null){
fxyArtificerDeductMoneyTotal = fxyArtificerDeductMoneyTotal.add(orders.getFxyTwoArtificerDeductMoney());
}
//获取是否有加钟订单
if(orders.getAddNum()!=null){
@ -4828,6 +4843,18 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
if(orders.getAddArtificerMoney()!=null){
artificerMoneyTotal = artificerMoneyTotal.add(orders.getAddArtificerMoney());
}
if(orders.getAddShopMoney()!=null){
shopMoneyTotal = shopMoneyTotal.add(orders.getAddShopMoney());
}
if(orders.getAddJjrArtificerDeductMoney()!=null){
jjrArtificerDeductMoneyTotal = jjrArtificerDeductMoneyTotal.add(orders.getAddJjrArtificerDeductMoney());
}
if(orders.getAddFxyOneArtificerDeductMoney()!=null){
fxyArtificerDeductMoneyTotal = fxyArtificerDeductMoneyTotal.add(orders.getAddFxyOneArtificerDeductMoney());
}
if(orders.getAddFxyTwoArtificerDeductMoney()!=null){
fxyArtificerDeductMoneyTotal = fxyArtificerDeductMoneyTotal.add(orders.getAddFxyTwoArtificerDeductMoney());
}
}
//获取是否有改价订单
@ -4851,9 +4878,24 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
if(oldOrders.getArtificerMoney()!=null){
artificerMoneyTotal = artificerMoneyTotal.add(oldOrders.getArtificerMoney());
}
if(oldOrders.getShopMoney()!=null){
shopMoneyTotal = shopMoneyTotal.add(oldOrders.getShopMoney());
}
if(oldOrders.getJjrArtificerDeductMoney()!=null){
jjrArtificerDeductMoneyTotal = jjrArtificerDeductMoneyTotal.add(oldOrders.getJjrArtificerDeductMoney());
}
if(oldOrders.getFxyOneArtificerDeductMoney()!=null){
fxyArtificerDeductMoneyTotal = fxyArtificerDeductMoneyTotal.add(oldOrders.getFxyOneArtificerDeductMoney());
}
if(oldOrders.getFxyTwoArtificerDeductMoney()!=null){
fxyArtificerDeductMoneyTotal = fxyArtificerDeductMoneyTotal.add(oldOrders.getFxyTwoArtificerDeductMoney());
}
}
orders.setPayMoneyTotal(payMoneyTotal);
orders.setArtificerMoneyTotal(artificerMoneyTotal);
orders.setShopMoneyTotal(shopMoneyTotal);
orders.setJjrArtificerDeductMoneyTotal(jjrArtificerDeductMoneyTotal);
orders.setFxyArtificerDeductMoneyTotal(fxyArtificerDeductMoneyTotal);
return Result.success().put("data", orders);
}
@ -5605,6 +5647,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders1.setAddPriceMarkup(orders1.getAddPriceMarkup().add(orders.getPriceMarkup()));
orders1.setAddTechnicianMoney(orders1.getAddTechnicianMoney().add(orders.getTechnicianMoney()));
orders1.setAddVipReductionMoney(orders1.getAddVipReductionMoney().add(orders.getVipReductionMoney()));
orders1.setAddShopMoney(orders1.getAddShopMoney().add(orders.getShopMoney()));
orders1.setAddJjrArtificerDeductMoney(orders1.getAddJjrArtificerDeductMoney().add(orders.getJjrArtificerDeductMoney()));
orders1.setAddFxyOneArtificerDeductMoney(orders1.getAddFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney()));
orders1.setAddFxyTwoArtificerDeductMoney(orders1.getAddFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney()));
} else {
orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney());
@ -5612,6 +5658,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders1.setAddPriceMarkup(orders.getPriceMarkup());
orders1.setAddTechnicianMoney(orders.getTechnicianMoney());
orders1.setAddVipReductionMoney(orders.getVipReductionMoney());
orders1.setAddShopMoney(orders.getShopMoney());
orders1.setAddJjrArtificerDeductMoney(orders.getJjrArtificerDeductMoney());
orders1.setAddFxyOneArtificerDeductMoney(orders.getFxyOneArtificerDeductMoney());
orders1.setAddFxyTwoArtificerDeductMoney(orders.getFxyTwoArtificerDeductMoney());
}
orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -6143,6 +6193,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders1.setAddPriceMarkup(orders1.getAddPriceMarkup().add(orders.getPriceMarkup()));
orders1.setAddTechnicianMoney(orders1.getAddTechnicianMoney().add(orders.getTechnicianMoney()));
orders1.setAddVipReductionMoney(orders1.getAddVipReductionMoney().add(orders.getVipReductionMoney()));
orders1.setAddShopMoney(orders1.getAddShopMoney().add(orders.getShopMoney()));
orders1.setAddJjrArtificerDeductMoney(orders1.getAddJjrArtificerDeductMoney().add(orders.getJjrArtificerDeductMoney()));
orders1.setAddFxyOneArtificerDeductMoney(orders1.getAddFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney()));
orders1.setAddFxyTwoArtificerDeductMoney(orders1.getAddFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney()));
} else {
orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney());
@ -6150,6 +6204,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders1.setAddPriceMarkup(orders.getPriceMarkup());
orders1.setAddTechnicianMoney(orders.getTechnicianMoney());
orders1.setAddVipReductionMoney(orders.getVipReductionMoney());
orders1.setAddShopMoney(orders.getShopMoney());
orders1.setAddJjrArtificerDeductMoney(orders.getJjrArtificerDeductMoney());
orders1.setAddFxyOneArtificerDeductMoney(orders.getFxyOneArtificerDeductMoney());
orders1.setAddFxyTwoArtificerDeductMoney(orders.getFxyTwoArtificerDeductMoney());
}
orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));