confict

Helius

2021-02-03 fed1f885b03a5b4b7c62d44320c3ff2068ca02e6

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java

@@ -243,10 +243,8 @@
        achieveNew.setVipId(pageOrder.getVipId());
        achieveNew.setSaleId(pageOrder.getStaffId());

        if (pageOrder.getOrderTime() != null) {
            achieveNew.setDatatime(pageOrder.getOrderTime());
        } else if (pageOrder.getOrderTime() != null) {
            achieveNew.setDatatime(pageOrder.getOrderTime());
        if (pageOrder.getPayTime() != null) {
            achieveNew.setDatatime(pageOrder.getPayTime());
        } else {
            achieveNew.setDatatime(new Date());
        }