aa

business/model/dao/dao_user.go

@@ -317,3 +317,17 @@ func GetUserMember(db *DaoDB, userID, vendorOrderID, mobile string, vendorID, me
 	err = GetRows(db, &userMembers, sql, sqlParams)
 	return userMembers, err
 }
+
+func GetUserMemberWithoutDeleted(db *DaoDB, vendorID int) (userMembers []*model.UserMember, err error) {
+	sql := `
+		SELECT * 
+		  FROM user_member
+	`
+	sqlParams := []interface{}{}
+	if vendorID != -1 {
+		sql += " AND vendor_id = ?"
+		sqlParams = append(sqlParams, vendorID)
+	}
+	err = GetRows(db, &userMembers, sql, sqlParams)
+	return userMembers, err
+}

business/model/dao/store_sku.go

@@ -186,12 +186,48 @@ type StoreSkuNameExt struct {
 	AuditUnitPrice   int    `json:"auditUnitPrice"` //审核价格
 }
 
+type StoreSkuNameExt2 struct {
+	ID int `orm:"id" json:"id"`
+
+	Prefix string `orm:"size(255)" json:"prefix"`
+	Name   string `orm:"size(255)" json:"name"`
+
+	CategoryID int `orm:"column(category_id);index" json:"categoryID"` // 标准类别
+
+	Unit        string  `orm:"size(8)" json:"unit"`
+	SpecQuality float32 `json:"-"`               // 为份必然为500，这个主要作用只是用于确保SkuName的唯一性
+	SpecUnit    string  `orm:"size(8)" json:"-"` // 为份必然为克，这个主要作用只是用于确保SkuName的唯一性
+	Price       int     `json:"price"`           // 单位为分，标准价，不为份的就为实际标准价，为份的为每市斤价，实际还要乘质量。todo 为份的确定必须有质量
+	Img         string  `orm:"size(512)" json:"img"`
+	Status      int     `orm:"default(1)" json:"status"` // skuname状态，取值同sku.Status
+
+	YbNameSuffix  string         `json:"ybNameSuffix"` //银豹商品后缀
+	StoreID       int            `orm:"column(store_id)" json:"storeID"`
+	StoreName     string         `json:"storeName"`
+	SkuID         int            `orm:"column(sku_id)" json:"skuID"`
+	PayPercentage int            `json:"-"`
+	UnitPrice     int            `json:"unitPrice"`
+	Skus          []*StoreSkuExt `orm:"-" json:"skus,omitempty"`
+	SkusStr       string         `json:"-"`
+
+	PendingUnitPrice int    `json:"pendingUnitPrice"` // 这个是待审核的价格申请
+	RealMidUnitPrice int    `json:"realMidUnitPrice"`
+	Count            int    `json:"count"`
+	YbSkuName        string `json:"ybSkuName"`
+	AuditUnitPrice   int    `json:"auditUnitPrice"` //审核价格
+}
+
 // GetStoreSkus用
 type StoreSkuNamesInfo struct {
 	TotalCount int                `json:"totalCount"`
 	SkuNames   []*StoreSkuNameExt `json:"skuNames"`
 }
 
+type StoreSkuNamesInfo2 struct {
+	TotalCount int                 `json:"totalCount"`
+	SkuNames   []*StoreSkuNameExt2 `json:"skuNames"`
+}
+
 type StoreSkuVendorInfo struct {
 	VendorID int `orm:"column(vendor_id)" json:"vendorID"`