Merge remote-tracking branch 'origin/master'

guyue

3 天以前 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -2722,6 +2722,7 @@
            BigDecimal bigDecimal = tDriverPromotionActivity.getCommissionRatio().divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_UP);
            orderCrossCity.setPromotionDriverId(userInfo.getBindDriverId());
            orderCrossCity.setPromotionMoney(bigDecimal);
            orderCrossCity.setPromotionActivityId(tDriverPromotionActivity.getId());
            this.baseMapper.updateById(orderCrossCity);
         }
      }