1

business/model/const.go

@@ -346,15 +346,15 @@ const (
 )
 
 const (
-	RiderGetOrder              = "骑手接单"
-	RiderToStore               = "骑手到店"
-	RiderGetOrderDelivering    = "骑手配送中"
-	RiderGetOrderDelivered     = "骑手配送完成"
-	RiderGetOrderCanceled      = "骑手取消"
+	RiderGetOrder              = "骑手 %s (%s) 已接单"
+	RiderToStore               = "骑手 %s (%s) 已到店"
+	RiderGetOrderDelivering    = "骑手 %s (%s) 配送中"
+	RiderGetOrderDelivered     = "骑手 %s (%s) 已送达"
+	RiderGetOrderCanceled      = "骑手 %s (%s) 已取消"
 	RiderGetOrderDeliverFailed = "骑手配送异常"
 	RiderGetOrderDeliverOther  = "其他待处理信息"
 	RiderWaitRider             = "待接单,正在分配骑手"
-	RiderWaitGetGoods          = "已经分配骑手,待取货"
+	RiderWaitGetGoods          = "骑手 %s (%s) 已接单"
 )
 
 const (

business/model/dao/store.go

@@ -2,7 +2,9 @@ package dao
 
 import (
 	"errors"
+	"fmt"
 	"sort"
+	"strings"
 	"time"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -1582,42 +1584,41 @@ func QueryStoreBindInfo(storeID int) (*model.FreightTemplate, error) {
 //向FreightTemplate 插入数据
 func InsertIntoFreightTemplate(storeID int, vendorStoreID string, templateID, warehouseID, fenceID, tradeLimitID int64) error {
 	var (
-		sqlStr    = []string{}
+		sqlStr    []string
 		tStr      = ""
-		sqlParams = []interface{}{}
+		sqlParams []interface{}
 	)
 	if storeID == 0 && utils.Str2Int(vendorStoreID) == 0 {
 		return errors.New("storeID,vendorStoreID 必传")
 	}
-	if _, err := ExecuteSQL(GetDB(), "SELECT COUNT(*) FROM freight_template a WHERE a.store_id = ? AND a.vendor_store_id = ?", storeID, vendorStoreID); err != nil {
-		if _, err := ExecuteSQL(GetDB(), "INSERT INTO freight_template (store_id,vendor_store_id,created_at,updated_at) VALUES (?,?,?,?)", storeID, vendorStoreID, time.Now(), time.Now()); err != nil {
-			return err
-		}
-	}
+
+	sql := `UPDATE freight_template a SET  `
+
 	if templateID != 0 {
-		sqlStr = append(sqlStr, " UPDATE freight_template a SET a.template_id = ? ")
-		sqlParams = append(sqlParams, templateID)
+		templateIDSql := ` a.template_id = ? `
+		sqlParams = append(sqlParams, templateIDSql)
+		sqlStr = append(sqlStr, sql)
 	}
 	if warehouseID != 0 {
-		sqlStr = append(sqlStr, " UPDATE freight_template a SET a.warehouse_id = ? ")
-		sqlParams = append(sqlParams, warehouseID)
+		warehouseIDSql := ` a.warehouse_id = ?  `
+		sqlParams = append(sqlParams, warehouseIDSql)
+		sqlStr = append(sqlStr, sql)
 	}
 	if fenceID != 0 {
-		sqlStr = append(sqlStr, " UPDATE freight_template a SET a.fence_id = ? ")
-		sqlParams = append(sqlParams, fenceID)
+		fenceIDSql := ` a.fence_id = ?`
+		sqlParams = append(sqlParams, fenceIDSql)
+		sqlStr = append(sqlStr, sql)
 	}
 	if tradeLimitID != 0 {
-		sqlStr = append(sqlStr, " UPDATE freight_template a SET a.fence_id = ? ")
-		sqlParams = append(sqlParams, tradeLimitID)
+		sql += ` a.fence_id = ?  `
+		sqlParams = append(sqlParams, templateID)
+		sqlStr = append(sqlStr, sql)
 	}
 	tStr = "WHERE a.store_id = ? AND a.vendor_store_id = ?"
-	sqlParams = append(sqlParams, storeID, vendorStoreID)
-	for _, v := range sqlStr {
-		v += tStr
-		if _, err := ExecuteSQL(GetDB(), v, sqlParams); err != nil {
-			return err
-		}
-		v = ""
-	}
-	return nil
+
+	tStr2 := sql + strings.Join(sqlStr, ",") + tStr
+
+	_, err := ExecuteSQL(GetDB(), tStr2, sqlParams...)
+	fmt.Println(tStr2)
+	return err
 }