20210226 积分商城基础数据上传

xiaoyong931011

2021-02-26 f7d131702da095fa291d76ddea3d9acc8cd2af76

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

@@ -177,11 +177,7 @@
                achieveNew.setHisConsume(projUse.getPrice());
            }
            achieveNew.setT2(projUse.getSource());
            if (projServices.getCreateTime() != null) {
                achieveNew.setDatatime(projServices.getCreateTime());
            } else {
                achieveNew.setDatatime(new Date());
            }
            achieveNew.setDatatime(new Date());
            achieveNew.setOrderType(Dictionary.ORDER_TYPE_SERVICE);
            achieveNew.setServiceOrderId(projServices.getId());
            achieveNew.setOrderItemId(beauticianState.getId());
@@ -247,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());
        }