From 926b1fc4d697e1524d07c68e3bc3853ed19ce145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 8 Aug 2024 21:33:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=B8=88=E5=88=86=E6=8B=85=E5=88=86?= =?UTF-8?q?=E4=BD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/artificer/entity/Orders.java | 33 +++++++++++ .../service/impl/OrdersServiceImpl.java | 58 +++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/src/main/java/com/sqx/modules/artificer/entity/Orders.java b/src/main/java/com/sqx/modules/artificer/entity/Orders.java index 33d92cc..680ed6e 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Orders.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Orders.java @@ -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; /** * 技师总收益 diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 9652d30..65aeaa2 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -4813,12 +4813,27 @@ public class OrdersServiceImpl extends ServiceImpl 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 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 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 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 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 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 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()));