Merge remote-tracking branch 'origin/developer' into developer

bc29dccd · 墨竹 · 2b196895 · bbd2eb54 · bc29dccd
Commit bc29dccd authored Jan 22, 2022 by 墨竹
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

DictController.java .../com/gic/haoban/manage/web/controller/DictController.java +5 -1

No files found.
--- a/haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/DictController.java
+++ b/haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/DictController.java
@@ -52,7 +52,11 @@ public class DictController extends WebBaseController {
            // 默认7
            day = 7;
        } else {
-            day =  orderSetting.getData().getAfterSaleTime();
+            if (Objects.isNull(orderSetting.getData().getAfterSaleTime())) {
+                day = 7;
+            } else {
+                day = orderSetting.getData().getAfterSaleTime();
+            }
        }
        DictDTO dictDTO = new DictDTO();
        dictDTO.setDictName("提现说明");