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 c00860f..733e0f7 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 @@ -5707,14 +5707,14 @@ public class OrdersServiceImpl extends ServiceImpl implements orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); - orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); - orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); +// orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); +// orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); // orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney())); - orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); - orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); - orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); - orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); - orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); +// orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); +// orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); +// orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); +// orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); +// orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); if (orders1.getStatus().equals(6)) { String endTime = orders1.getEndTime(); @@ -6254,14 +6254,14 @@ public class OrdersServiceImpl extends ServiceImpl implements orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); - orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); - orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); +// orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); +// orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); // orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney())); - orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); - orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); - orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); - orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); - orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); +// orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); +// orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); +// orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); +// orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); +// orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); if (orders1.getStatus().equals(6)) { String endTime = orders1.getEndTime(); diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index 980d444..3ec76e6 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -930,6 +930,10 @@ public class AliPayController { 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()); @@ -937,19 +941,23 @@ public class AliPayController { 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())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); - orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); - orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); +// orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); +// orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); // orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney())); - orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); - orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); - orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); - orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); - orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); +// orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); +// orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); +// orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); +// orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); +// orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); if(orders1.getStatus().equals(6)){ // ordersMassage = ordersMassageService.getOne(new QueryWrapper().eq("orders_id", orders1.getOrdersId())); @@ -1996,6 +2004,10 @@ public class AliPayController { 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()); @@ -2003,19 +2015,23 @@ public class AliPayController { 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())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); - orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); - orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); +// orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); +// orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); // orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney())); - orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); - orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); - orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); - orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); - orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); +// orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); +// orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); +// orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); +// orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); +// orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); if(orders1.getStatus().equals(6)){ // ordersMassage = ordersMassageService.getOne(new QueryWrapper().eq("orders_id", orders1.getOrdersId())); @@ -2633,6 +2649,10 @@ public class AliPayController { 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()); @@ -2640,19 +2660,24 @@ public class AliPayController { 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())); + // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); - orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); - orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); +// orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); +// orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); // orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney())); - orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); - orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); - orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); - orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); - orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); +// orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); +// orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); +// orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); +// orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); +// orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); if(orders1.getStatus().equals(6)){ // ordersMassage = ordersMassageService.getOne(new QueryWrapper().eq("orders_id", orders1.getOrdersId())); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index cd99236..82bc473 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -1132,6 +1132,10 @@ public class WxServiceImpl implements WxService { 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()); @@ -1139,19 +1143,23 @@ public class WxServiceImpl implements WxService { 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())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); - orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); - orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); +// orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); +// orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); // orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney())); - orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); - orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); - orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); - orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); - orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); +// orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); +// orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); +// orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); +// orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); +// orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); if(orders1.getStatus().equals(6)){ // ordersMassage = ordersMassageService.getOne(new QueryWrapper().eq("orders_id", orders1.getOrdersId())); @@ -1953,6 +1961,10 @@ public class WxServiceImpl implements WxService { 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()); @@ -1960,19 +1972,23 @@ public class WxServiceImpl implements WxService { 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())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); - orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); - orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); +// orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); +// orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); // orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney())); - orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); - orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); - orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); - orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); - orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); +// orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); +// orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); +// orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); +// orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); +// orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); if(orders1.getStatus().equals(6)){ // ordersMassage = ordersMassageService.getOne(new QueryWrapper().eq("orders_id", orders1.getOrdersId())); @@ -2957,6 +2973,10 @@ public class WxServiceImpl implements WxService { 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()); @@ -2964,19 +2984,23 @@ public class WxServiceImpl implements WxService { 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())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); - orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); - orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); +// orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); +// orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); // orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney())); - orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); - orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); - orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); - orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); - orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); +// orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney())); +// orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney())); +// orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney())); +// orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney())); +// orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney())); if(orders1.getStatus().equals(6)){ // ordersMassage = ordersMassageService.getOne(new QueryWrapper().eq("orders_id", orders1.getOrdersId()));