diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
index 651967f8..9e681a2f 100644
--- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
+++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
@@ -173,8 +173,9 @@ public class OrderServiceImpl implements OrderService {
      * 计算订单罚金(固定罚金+比例罚金)
      */
     private BigDecimal getFineMoney(OrderDetail order) {
+        OrderMaster orderMaster = orderMasterService.selectById(order.getOrderMasterId());
         FinancialDetail orderFinancial = financialDetailService.selectByOrderDetailId(order.getId());
-        SysDeptConfig deptConfig = sysDeptConfigService.selectByDeptId(order.getDeptId());
+        SysDeptConfig deptConfig = sysDeptConfigService.selectByDeptId(orderMaster.getDeptId());
         BigDecimal fineMoney = deptConfig.getGoingOutTime();
         // 如果扣款额为null或<0
         if (fineMoney == null || BigDecimal.ZERO.compareTo(fineMoney) > -1) {
diff --git a/ghy-system/src/main/java/com/ghy/system/service/impl/SysDeptConfigServiceImpl.java b/ghy-system/src/main/java/com/ghy/system/service/impl/SysDeptConfigServiceImpl.java
index c531687c..d82b87aa 100644
--- a/ghy-system/src/main/java/com/ghy/system/service/impl/SysDeptConfigServiceImpl.java
+++ b/ghy-system/src/main/java/com/ghy/system/service/impl/SysDeptConfigServiceImpl.java
@@ -7,6 +7,7 @@ import com.ghy.system.mapper.SysDeptConfigMapper;
 import com.ghy.system.mapper.SysDeptMapper;
 import com.ghy.system.service.ISysDeptConfigService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -26,6 +27,7 @@ public class SysDeptConfigServiceImpl implements ISysDeptConfigService {
 
     @Override
     public SysDeptConfig selectByDeptId(Long deptId) {
+        Assert.notNull(deptId, "deptId is null!!!");
         return sysDeptConfigMapper.selectByDeptId(deptId);
     }
 
diff --git a/ghy-system/src/main/resources/mapper/system/SysDeptConfigMapper.xml b/ghy-system/src/main/resources/mapper/system/SysDeptConfigMapper.xml
index bb696012..1660eebe 100644
--- a/ghy-system/src/main/resources/mapper/system/SysDeptConfigMapper.xml
+++ b/ghy-system/src/main/resources/mapper/system/SysDeptConfigMapper.xml
@@ -54,12 +54,7 @@
 
     <select id="selectByDeptId" parameterType="long" resultMap="SysDeptConfigResult">
         <include refid="selectSysDeptConfig"/>
-        <where>
-            <if test="deptId != null and deptId != 0">
-                AND dept_id = #{deptId}
-            </if>
-        </where>
-
+        WHERE dept_id = #{deptId}
     </select>
 
     <select id="selectAllMerchant" resultMap="SysDeptConfigResult">