- check sku status in GetStoreSkus.

- ebai UpdateStore almost ok.

business/jxstore/cms/store_sku.go

@@ -56,7 +56,7 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string
 	db := dao.GetDB()
 	sql := `
 	FROM sku_name t1
-	JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = '1970-01-01 00:00:00'
+	JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = '1970-01-01 00:00:00' AND t2.status = ?
 	LEFT JOIN store_sku_bind t4 ON t4.sku_id = t2.id AND t4.deleted_at = '1970-01-01 00:00:00' AND t4.store_id = ?
 	WHERE t1.deleted_at = '1970-01-01 00:00:00'
 	`
@@ -66,6 +66,7 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string
 		sql += " AND t4.sku_id IS NULL"
 	}
 	sqlParams := []interface{}{
+		model.SkuStatusNormal,
 		storeID,
 	}
 	if keyword != "" {
@@ -130,8 +131,8 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string
 		if params["toStatus"] != nil {
 			toStatus = params["toStatus"].(int)
 		}
-		sql += " AND t2.status >= ? AND t2.status <= ? AND t4.status >= ? AND t4.status <= ?"
-		sqlParams = append(sqlParams, fromStatus, toStatus, fromStatus, toStatus)
+		sql += " AND t4.status >= ? AND t4.status <= ?"
+		sqlParams = append(sqlParams, fromStatus, toStatus)
 	}
 	sql += `
 	GROUP BY
@@ -194,6 +195,7 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string
 			panic(r)
 		}
 	}()
+	// globals.SugarLogger.Debug(sqlData, sqlParams)
 	if err = dao.GetRows(db, &skuNamesInfo.SkuNames, sqlData, sqlParams...); err == nil {
 		countInfo := &struct{ Ct int }{}
 		if err = dao.GetRow(db, countInfo, "SELECT FOUND_ROWS() ct"); err == nil {
@@ -208,6 +210,8 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string
 						for _, v := range skuName.Skus {
 							delete(v, "unitPrice")
 						}
+					} else {
+						skuName.UnitPrice = skuName.Price
 					}
 				}
 			}