merge

dal/order/orderTrack/order_track.go

 package orderTrack
 package orderTrack
 
 
 import (
 import (
-	"errors"
 	"fmt"
 	"fmt"
 	"github.com/ichunt2019/logger"
 	"github.com/ichunt2019/logger"
 	"go-queue-server/dal/db"
 	"go-queue-server/dal/db"
@@ -63,6 +62,7 @@ func InsertData(trackList OrderTrackList) error{
 		create_time int64
 		create_time int64
 		status_cn string
 		status_cn string
 		ok bool
 		ok bool
+		currency int64
 	)
 	)
 	//开启事务
 	//开启事务
 	tx, _ := db.DB.Beginx()
 	tx, _ := db.DB.Beginx()
@@ -71,13 +71,26 @@ func InsertData(trackList OrderTrackList) error{
 		orderItems := &OrderItems{}
 		orderItems := &OrderItems{}
 		err = db.DB.Get(orderItems,"SELECT order_id,rec_id,goods_number,fqty FROM lie_order_items  WHERE erp_rec_id = ?",data.ORDERENTRYID)
 		err = db.DB.Get(orderItems,"SELECT order_id,rec_id,goods_number,fqty FROM lie_order_items  WHERE erp_rec_id = ?",data.ORDERENTRYID)
 		if err != nil{
 		if err != nil{
-			logger.Error("%s",fmt.Sprintf("没有找到该明细的信息 %d",data.ORDERENTRYID))
-			return errors.New(fmt.Sprintf("没有找到该明细的信息 %d",data.ORDERENTRYID))
+			logger.Error("%s",fmt.Sprintf("没有找到该明细的信息 %s",data.ORDERENTRYID))
+
+			continue
+		}
+
+		err = db.DB.Get(&currency,"SELECT currency FROM lie_order  WHERE order_id = ?",orderItems.OrderId)
+		if err != nil{
+			logger.Error("%s",fmt.Sprintf("没有找到订单信息 %d",orderItems.OrderId))
+			continue
 		}
 		}
 		create_time = util.ParseTimestrToTimestamp(data.BIZDATE,5)
 		create_time = util.ParseTimestrToTimestamp(data.BIZDATE,5)
 		if status_cn,ok = ORDER_TRACK_STATUS_CN[data.STATUS];!ok {
 		if status_cn,ok = ORDER_TRACK_STATUS_CN[data.STATUS];!ok {
 			status_cn = ""
 			status_cn = ""
 		}
 		}
+		if data.STATUS == 90 && currency == 2{
+			status_cn = "香港已到货"
+			data.MSG = "香港仓库入库验收成功,等待出库通知"
+		}
+
+
 
 
 		sql := " INSERT INTO lie_order_items_tracking  (rec_id,order_id,status,fqty,msg,status_cn,create_name,create_time) VALUES(?,?,?,?,?,?,?,?)"
 		sql := " INSERT INTO lie_order_items_tracking  (rec_id,order_id,status,fqty,msg,status_cn,create_name,create_time) VALUES(?,?,?,?,?,?,?,?)"
 		_,err :=tx.Exec(sql, orderItems.RecId,orderItems.OrderId,data.STATUS,data.FQTY,data.MSG,status_cn,data.CREATOR,create_time)
 		_,err :=tx.Exec(sql, orderItems.RecId,orderItems.OrderId,data.STATUS,data.FQTY,data.MSG,status_cn,data.CREATOR,create_time)
@@ -88,6 +101,7 @@ func InsertData(trackList OrderTrackList) error{
 		}
 		}
 		if data.FQTY  > 0 && data.STATUS == 110{
 		if data.FQTY  > 0 && data.STATUS == 110{
 			sql1 := " UPDATE lie_order_items set fqty = ? where rec_id = ? "
 			sql1 := " UPDATE lie_order_items set fqty = ? where rec_id = ? "
+			//fmt.Println(orderItems.RecId)
 			newFqty := int64(data.FQTY)+int64(orderItems.FQTY)
 			newFqty := int64(data.FQTY)+int64(orderItems.FQTY)
 			if newFqty > orderItems.GoodsNumber{
 			if newFqty > orderItems.GoodsNumber{
 				newFqty = orderItems.GoodsNumber
 				newFqty = orderItems.GoodsNumber

order/goods_remind/main.go

@@ -41,6 +41,14 @@ func initArgs() {
 func initDB() {
 func initDB() {
 	dsn := util.Configs.Liexin_databases.Dns
 	dsn := util.Configs.Liexin_databases.Dns
 	engine, err = gorose.Open(&gorose.Config{Driver: "mysql", Dsn: dsn})
 	engine, err = gorose.Open(&gorose.Config{Driver: "mysql", Dsn: dsn})
+	engine.Use(func(eg *gorose.Engin) {
+		eg.SetLogger(gorose.NewLogger(&gorose.LogOption{
+			FilePath:       "./log",
+			EnableSqlLog:   false,
+			EnableSlowLog:  5,
+			EnableErrorLog: false,
+		}))
+	})
 	if err != nil {
 	if err != nil {
 		panic(err)
 		panic(err)
 	}
 	}