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

business/model/dao/dao_order.go

@@ -1101,6 +1101,7 @@ func GetOrdersSupplement(db *DaoDB, storIDs, vendorIDs, statuss []int, vendorOrd
 	} else if IsReverse == 1 {
 		sql += " AND link_id <> 0"
 	}
+	sql += " ORDER BY supplement_time DESC"
 	sql += " LIMIT ? OFFSET ?"
 	sqlParams = append(sqlParams, pageSize, offset)
 	Begin(db)

business/model/store.go

@@ -475,6 +475,7 @@ type PriceReferSnapshot struct {
 
 func (*PriceReferSnapshot) TableUnique() [][]string {
 	return [][]string{
+		[]string{"CityCode", "SkuID", "SnapshotAt"},
 		[]string{"CityCode", "NameID", "SkuID", "SnapshotAt"},
 	}
 }