diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 6c1f622d78..252dce2b66 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -88,6 +88,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto; +import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; @@ -977,8 +978,8 @@ public class BusSalesOrderService extends MybatisBaseService vehicleList = new ArrayList<>(); - //是否是现车 - if ("1".equals(busSalesOrder.getType())) { + //是否是现车//ToDo:暂去掉 + /*if ("1".equals(busSalesOrder.getType())) { //根据销售订单sid查询现车的sid集合 vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid); //根据现车去查询销售政策的总促销政策之和 @@ -990,13 +991,21 @@ public class BusSalesOrderService extends MybatisBaseService stringList = listResultBean.getData(); initBigDecimal = initBigDecimal.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add)); } - /*ResultBean priceResultBean = baseVehiclePolicyFeign.selectPrice(vehicleList.get(i)); - if (priceResultBean.getSuccess() && priceResultBean.getData() != null) { - String price = priceResultBean.getData().getDiscountMoney(); - BigDecimal bigDecimal1 = new BigDecimal(price); - initBigDecimal = initBigDecimal.add(bigDecimal1); - }*/ - + } + } + }*/ + //查询返利金额 + BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid); + if(busSalesOrderSubmit != null){ + //台数 + if(busSalesOrderSubmit.getDistributorPrice() != null){ + if(quantity != null){ + initBigDecimal = initBigDecimal.add(new BigDecimal(quantity).multiply(busSalesOrderSubmit.getDistributorPrice())); + } + } + if(busSalesOrderSubmit.getDistributorPriceTwo() != null){ + if(quantity != null){ + initBigDecimal = initBigDecimal.add(new BigDecimal(quantity).multiply(busSalesOrderSubmit.getDistributorPriceTwo())); } } } @@ -1010,14 +1019,7 @@ public class BusSalesOrderService extends MybatisBaseService resultBean1 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery); - /* BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(sid); - String brandSid = busSalesOrderModel.getBrandSid(); - BaseOrderPostPriceQuery baseOrderPostPriceQuery = new BaseOrderPostPriceQuery(); - baseOrderPostPriceQuery.setBrandSid(brandSid); - baseOrderPostPriceQuery.setRoleSid(roleSid); - ResultBean resultBean1 = basePostPriceFeign.selectPostPrice(baseOrderPostPriceQuery);*/ if (resultBean1.getSuccess()) { -// String price = resultBean1.getData().getPrice(); String price = resultBean1.getData(); //ToDo:计算是否超权限:岗位权限(销售部经理权限、总经理权限)+总促销金额<总指导价-总成交价-优惠包总价值 //销售支持部经理的岗位权限价格 @@ -1038,17 +1040,12 @@ public class BusSalesOrderService extends MybatisBaseService resultBean2 = basePostPriceFeign.selectPostPrice(baseOrderPostPriceQuery);*/ baseBrandMitQuery = new BaseBrandMitQuery(); baseBrandMitQuery.setRoleSid(roleSid); baseBrandMitQuery.setOrgSid(busSalesOrder.getUseOrgSid()); baseBrandMitQuery.setBrandSid(busSalesOrderModel.getBrandSid()); ResultBean resultBean2 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery); if (resultBean2.getSuccess()) { -// String price = resultBean2.getData().getPrice(); String price = resultBean2.getData(); //ToDo:计算是否有权限:岗位权限(销售部经理权限、总经理权限)+总促销金额>总指导价-总成交价-优惠包总价值 //总经理的岗位权限价格 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java index c7c5ac23a3..2704666a81 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java @@ -55,4 +55,8 @@ public class BusSalesOrderSubmitService extends MybatisBaseService diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java index d7b1e14fa5..fb79ba36b8 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java @@ -43,5 +43,10 @@ public class ConfirmationDetailedVo implements Vo { @ApiModelProperty("收款方式") private String collectionType; + + @ApiModelProperty("收款账户名称") + private String receivingName; + @ApiModelProperty("付款账号后4位") + private String payAccount; }