作者 陈志颖

Merge branch 'fixbug' into dev

... ... @@ -57,11 +57,11 @@ spec:
- name: POSTGRESQL_USER
value: "postgres"
- name: POSTGRESQL_PASSWORD
value: "postgres_55_online"
value: "chJVQkg1sys"
- name: POSTGRESQL_HOST
value: "112.124.115.55"
value: "114.55.200.59"
- name: POSTGRESQL_PORT
value: "15432"
value: "31544"
- name: LOG_LEVEL
value: "debug"
- name: ERROR_BASE_CODE
... ...
... ... @@ -2,6 +2,7 @@ package subscriber
import (
"fmt"
coreDomain "github.com/linmadan/egglib-go/core/domain"
pgTransaction "github.com/linmadan/egglib-go/transaction/pg"
"gitlab.fjmaimaimai.com/linmadan/mmm-worth/pkg/application/factory"
... ...
... ... @@ -234,6 +234,7 @@ func (unifiedUserCenterService *UnifiedUserCenterService) SyncEmployeeCallback(s
if _, err := employeeRepository.Save(employee); err != nil {
return false, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
}
// TODO 业务数据修改
break
case "batchDelete":
err := employeeDao.BatchRemove(uids)
... ...
... ... @@ -2,7 +2,7 @@ package constant
import "os"
var POSTGRESQL_DB_NAME = "mmm_worth"
var POSTGRESQL_DB_NAME = "mmmworth_dev"
var POSTGRESQL_USER = "postgres"
var POSTGRESQL_PASSWORD = "1993618jack"
var POSTGRESQL_HOST = "127.0.0.1"
... ...
... ... @@ -54,7 +54,7 @@ func (exchangeCashActivity *ExchangeCashActivity) Update(data map[string]interfa
if createTime, ok := data["createTime"]; ok && createTime.(time.Time).IsZero() {
exchangeCashActivity.CreateTime = createTime.(time.Time)
}
exchangeCashActivity.CreateTime = time.Now()
//exchangeCashActivity.CreateTime = time.Now()
return nil
}
... ...