Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/model/const.go

@@ -186,7 +186,7 @@ var (
 		VendorIDJxprint: []string{
 			VendorChineseNames[VendorIDJxprint],
 			"打印机编号",
-			"不填",
+			"密钥",
 		},
 	}
 	AfsReasonTypeName = map[int]string{
@@ -308,6 +308,13 @@ const (
 	OperateCopyStoreSkus = 3 //复制门店商品
 )
 
+const (
+	PrintTypeOrder   = "order"    // 京西云打印机:打印订单
+	PrintTypeWayBill = "wayBill " // 京西云打印机:打印运单
+	PrintTypeStore   = "store "   // 京西云打印机:门店下线
+	PrintTypeEnter   = "enter"    // 京西云打印机:进店订单
+)
+
 const (
 	WaybillStatusRefuseFailedGetGoods = -70
 	WaybillStatusUnknown              = 0

business/model/dao/store_sku.go

@@ -679,7 +679,9 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	// }
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
-	// globals.SugarLogger.Debug(sql)
+	globals.SugarLogger.Debug("sql======", sql)
+	globals.SugarLogger.Debug("sqlparam======", sqlParams)
+
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
 		return nil, err
 	}

business/model/dao/store_sku_test.go

@@ -17,7 +17,7 @@ func TestGetFullStoreSkus(t *testing.T) {
 }
 
 func TestGetStoreSkus(t *testing.T) {
-	skuList, err := GetStoreSkus(GetDB(), model.VendorIDMTWM, 100134, nil)
+	skuList, err := GetStoreSkus(GetDB(), model.VendorIDMTWM, 800165, []int{30969})
 	if err != nil {
 		t.Fatal(err)
 	}