正在显示
3 个修改的文件
包含
7 行增加
和
6 行删除
@@ -748,6 +748,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent | @@ -748,6 +748,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent | ||
748 | var countDividendsEstimate int64 | 748 | var countDividendsEstimate int64 |
749 | 749 | ||
750 | for _, orderGood := range orderGoods { | 750 | for _, orderGood := range orderGoods { |
751 | + log.Logger.Info("hello 1") | ||
751 | dividendsEstimate := &domain.DividendsEstimate{} | 752 | dividendsEstimate := &domain.DividendsEstimate{} |
752 | if orderGood.DividendsOrderNumber != "" { // 查询分红订单 | 753 | if orderGood.DividendsOrderNumber != "" { // 查询分红订单 |
753 | orderGoodsToConfirm := make([]*domain.OrderGood, 0) | 754 | orderGoodsToConfirm := make([]*domain.OrderGood, 0) |
@@ -757,6 +758,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent | @@ -757,6 +758,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent | ||
757 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 758 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
758 | } else { | 759 | } else { |
759 | for _, dividendsEstimateDetail := range dividendsEstimateDetails { | 760 | for _, dividendsEstimateDetail := range dividendsEstimateDetails { |
761 | + log.Logger.Info("hello 2") | ||
760 | if dividendsEstimateDetail.IsSuccessfully { | 762 | if dividendsEstimateDetail.IsSuccessfully { |
761 | // 生成分红预算单号 | 763 | // 生成分红预算单号 |
762 | dividendsEstimateOrderNumber, err := dividendsEstimateDetail.GenerateSpecificDividendsEstimateNumber(int64(count), countDividendsEstimate) | 764 | dividendsEstimateOrderNumber, err := dividendsEstimateDetail.GenerateSpecificDividendsEstimateNumber(int64(count), countDividendsEstimate) |
@@ -806,6 +808,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent | @@ -806,6 +808,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent | ||
806 | } | 808 | } |
807 | } | 809 | } |
808 | } else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单 | 810 | } else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单 |
811 | + log.Logger.Info("hello 3") | ||
809 | orderGoodsToConfirm := make([]*domain.OrderGood, 0) | 812 | orderGoodsToConfirm := make([]*domain.OrderGood, 0) |
810 | orderGoodsToConfirm = append(orderGoodsToConfirm, orderGood) | 813 | orderGoodsToConfirm = append(orderGoodsToConfirm, orderGood) |
811 | // 分红退货单产品预算 | 814 | // 分红退货单产品预算 |
@@ -6,7 +6,7 @@ const SERVICE_NAME = "allied-creation-cooperation" | @@ -6,7 +6,7 @@ const SERVICE_NAME = "allied-creation-cooperation" | ||
6 | 6 | ||
7 | // LOG_TYPE 日志相关设置 | 7 | // LOG_TYPE 日志相关设置 |
8 | var LOG_TYPE = "console" // file, console, es | 8 | var LOG_TYPE = "console" // file, console, es |
9 | -var LOG_FRAMEWORK = "beego" // beego logrus | 9 | +var LOG_FRAMEWORK = "logrus" // beego logrus |
10 | var LOG_LEVEL = "debug" | 10 | var LOG_LEVEL = "debug" |
11 | var LOG_FILE = "app.log" | 11 | var LOG_FILE = "app.log" |
12 | var LOG_PREFIX = "[allied-creation-cooperation]" | 12 | var LOG_PREFIX = "[allied-creation-cooperation]" |
@@ -17,7 +17,6 @@ var USER_MODULE_HOST = "http://127.0.0.1:8081" | @@ -17,7 +17,6 @@ var USER_MODULE_HOST = "http://127.0.0.1:8081" | ||
17 | // BASIC_MODULE_HOST 基础服务模块 | 17 | // BASIC_MODULE_HOST 基础服务模块 |
18 | var BASIC_MODULE_HOST = "http://127.0.0.1:8080" | 18 | var BASIC_MODULE_HOST = "http://127.0.0.1:8080" |
19 | 19 | ||
20 | - | ||
21 | // ENABLE_HTTPS 是否开启https访问 | 20 | // ENABLE_HTTPS 是否开启https访问 |
22 | var ENABLE_HTTPS = "false" | 21 | var ENABLE_HTTPS = "false" |
23 | 22 |
@@ -8,8 +8,6 @@ import ( | @@ -8,8 +8,6 @@ import ( | ||
8 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/constant" | 8 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/constant" |
9 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg/models" | 9 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg/models" |
10 | _ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg/models" | 10 | _ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg/models" |
11 | - "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/log" | ||
12 | - | ||
13 | rawlog "log" | 11 | rawlog "log" |
14 | ) | 12 | ) |
15 | 13 | ||
@@ -70,9 +68,10 @@ func (hook SqlGeneratePrintHook) AfterQuery(c context.Context, q *pg.QueryEvent) | @@ -70,9 +68,10 @@ func (hook SqlGeneratePrintHook) AfterQuery(c context.Context, q *pg.QueryEvent) | ||
70 | } | 68 | } |
71 | if constant.LOG_FRAMEWORK == "logrus" { | 69 | if constant.LOG_FRAMEWORK == "logrus" { |
72 | rawlog.Println(string(sqlStr)) | 70 | rawlog.Println(string(sqlStr)) |
73 | - } else { | ||
74 | - log.Logger.Debug(string(sqlStr)) | ||
75 | } | 71 | } |
72 | + //else { | ||
73 | + // log.Logger.Debug(string(sqlStr)) | ||
74 | + //} | ||
76 | 75 | ||
77 | return nil | 76 | return nil |
78 | } | 77 | } |
-
请 注册 或 登录 后发表评论