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

business/model/api_config.go

@@ -71,6 +71,7 @@ const (
 	MTWMStorePSWay13 = "0016"     //达达快递
 	MTWMStorePSWay14 = "0033"     //E_代送
 )
+const BrandIdChengShan = 142 // 成山农场品牌id
 
 type VendorInfo struct {
 	Name string `json:"name"`

business/model/dao/store_sku.go

@@ -688,6 +688,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
 
+	globals.SugarLogger.Debugf("===========sql := %s", sql)
+	globals.SugarLogger.Debugf("===========sql := %s", utils.Format4Output(sqlParams, false))
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
 		return nil, err
 	}