Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -983,7 +983,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
         }
         //计算总指导价-总成交价-总优惠包的价值
-        bigDecimalOne = guildPriceAll.subtract(finalPriceAll).subtract(discountPrice);
+        bigDecimalOne = guildPriceAll.subtract(finalPriceAll).add(discountPrice);
         List<String> vehicleList = new ArrayList<>();
         //是否是现车//ToDo:暂去掉
         /*if ("1".equals(busSalesOrder.getType())) {
@@ -1028,11 +1028,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<String> resultBean1 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery);
         if (resultBean1.getSuccess()) {
             String price = resultBean1.getData();
-            //ToDo:计算是否超权限：岗位权限（销售部经理权限、总经理权限）+总促销金额<总指导价-总成交价-优惠包总价值
+            //ToDo:修改公式计算是否超权限：岗位权限*台数>总指导价-总成交价+总优惠包+总返利
             //销售支持部经理的岗位权限价格
             BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
-            bigDecimalTwo = bigDecimal2.add(initBigDecimal);
-            //判断岗位权限+总促销价格和总指导价-总成交价-优惠包总价值的大小
+            bigDecimalTwo = bigDecimal2;
+            bigDecimalOne = bigDecimalOne.add(initBigDecimal);
             if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
                 //bigDecimalTwo<bigDecimalOne
                 isHavePower = true;
@@ -1056,12 +1056,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<String> resultBean2 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery);
         if (resultBean2.getSuccess()) {
             String price = resultBean2.getData();
-            //ToDo:计算是否有权限：岗位权限（销售部经理权限、总经理权限）+总促销金额>总指导价-总成交价-优惠包总价值
+            //ToDo:计算是否有权限：岗位权限*台数>总指导价-总成交价+总优惠包+总返利
             //总经理的岗位权限价格
             bigDecimalTwo = new BigDecimal("0");
             BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
-            bigDecimalTwo = bigDecimal2.add(initBigDecimal);
-            //判断岗位权限+总促销价格和总指导价-总成交价-优惠包总价值的大小
+            bigDecimalTwo = bigDecimal2;
+            bigDecimalOne = bigDecimalOne.add(initBigDecimal);
             if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
                 //bigDecimalTwo<bigDecimalOne
                 isPower = true;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -202,7 +202,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             if (orderInfo != null) {
                 BeanUtil.copyProperties(orderInfo, busSalesOrderModel1, "sid");
                 busSalesOrderModel1.setSalesOrderSid(salesOrderSid);
-                busSalesOrderModel1.setGuildPrice(new BigDecimal(guildPrice));
+                if(StringUtils.isNotBlank(guildPrice)){
+                    busSalesOrderModel1.setGuildPrice(new BigDecimal(guildPrice));
+                }
                 busSalesOrderModel1.setBrandName(brandName);
                 busSalesOrderModel1.setBrandSid(brandSid);
                 busSalesOrderModel1.setModelConfig(modelAlias);